diff --git a/README.md b/README.md
index ca363b382..539cea166 100644
--- a/README.md
+++ b/README.md
@@ -26,16 +26,26 @@ npm run generate-provider
 ```
 output openapi3 specs (`components/schemas`) are written to `opneapi/src/aws/v00.00.00000/services`
 
-### 5. Test all metadata routes (services, resources, methods) in the provider:
+### 5. Test resource coverage in the provider:
+
+Verifies that every supported resource type in `provider-dev/config/cc_supported_resources.js` is accounted for in the generated provider:
+
+```bash
+npm run test-resource-coverage
+```
+
+### 6. Test all metadata routes (services, resources, methods) in the provider:
 
 ```bash
 PROVIDER_REGISTRY_ROOT_DIR="$(pwd)/openapi"
 npm run start-server -- --provider awscc --registry $PROVIDER_REGISTRY_ROOT_DIR
-npm run test-meta-routes -- awscc --ignore-no-methods
+npm run test-meta-routes -- awscc --ignore-no-methods --skip-resources awscc.tagging.tagged_resources
 npm run stop-server
 ```
 
-### 6. Testing locally with `stackql`
+*(`awscc.tagging.tagged_resources` is a native resource in a statically defined service; `DESCRIBE` does not return columns for it so it is excluded from the metadata route tests)*
+
+### 7. Testing locally with `stackql`
 1. ensure the `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` environment variables are set
 2. download the latest `stackql` binary, for example `curl -L https://bit.ly/stackql-zip -O && unzip stackql-zip` for Linux systems
 3. run the following:
@@ -75,14 +85,14 @@ and TagFilters = '[{"Key": "StackName", "Values": ["stackql-serverless"]}]'
 where key = 'StackName' and value = 'stackql-serverless';
 ```
 
-### 6. Generate web docs:
+### 8. Generate web docs:
 
 ```bash
 npm run generate-docs
 ```
 output markdown docs are written to `website/docs`
 
-### 7. Test web docs locally
+### 9. Test web docs locally
 
 ```bash
 cd website
@@ -93,7 +103,7 @@ yarn build
 yarn start
 ```
 
-### 8. Publish web docs to GitHub Pages
+### 10. Publish web docs to GitHub Pages
 
 Under __Pages__ in the repository, in the __Build and deployment__ section select __GitHub Actions__ as the __Source__. In Netlify DNS create the following records:
 
diff --git a/bin/generate-provider.js b/bin/generate-provider.js
index 8a5633f3b..dc020346b 100644
--- a/bin/generate-provider.js
+++ b/bin/generate-provider.js
@@ -198,6 +198,11 @@ async function processService(servicePrefix, outputFilename) {
 
   const files = findFiles(docsDir, servicePrefix);
   const serviceTitle = path.basename(outputFilename, '.yaml');
+
+  // pre-read all supported docs so every resource schema name in the service is
+  // known before merging definitions, regardless of file processing order
+  const supportedDocs = [];
+  const reservedNames = new Set();
   for (const file of files) {
     const content = await fs.promises.readFile(file);
     const jsonContent = JSON.parse(content);
@@ -206,12 +211,17 @@ async function processService(servicePrefix, outputFilename) {
       console.log(`Skipping unsupported resource type: ${jsonContent.typeName}`);
       continue;
     }
+    supportedDocs.push(jsonContent);
+    reservedNames.add(jsonContent.typeName.split("::").pop());
+  }
 
+  for (const jsonContent of supportedDocs) {
     const componentName = jsonContent.typeName.split("::").pop();
     const openAPIComponent = convertToOpenAPI(
       jsonContent,
       componentName,
-      openAPI.components.schemas
+      openAPI.components.schemas,
+      reservedNames
     );
     Object.assign(openAPI.components.schemas, openAPIComponent);
   }
@@ -237,21 +247,16 @@ async function processService(servicePrefix, outputFilename) {
 
   const cleanedOpenAPI = cleanOpenAPISpec(openAPI);
 
-  if(serviceTitle == 'ec2'){
-    // fix bug with self referencing object
-    delete cleanedOpenAPI.components.schemas.SseSpecification.$ref;
-    cleanedOpenAPI.components.schemas.SseSpecification['type'] = 'object';
-    cleanedOpenAPI.components.schemas.SseSpecification['properties'] = {
-      KmsKeyArn: {
-        description: 'KMS Key Arn used to encrypt the group policy',
-        type: 'string'
-      },
-      CustomerManagedKeyEnabled: {
-        description: 'Whether to encrypt the policy with the provided key or disable encryption',
-        type: 'boolean'
+  // break self referencing schemas (broken upstream definitions, e.g. the
+  // SseSpecification definition in AWS::EC2::VerifiedAccessTrustProvider)
+  for (const [schemaName, schema] of Object.entries(cleanedOpenAPI.components.schemas || {})) {
+    if (schema && schema.$ref === `#/components/schemas/${schemaName}`) {
+      console.log(`Breaking self referencing schema ${schemaName} in ${serviceTitle}`);
+      delete schema.$ref;
+      if (!schema.type) {
+        schema.type = 'object';
       }
     }
-    cleanedOpenAPI.components.schemas.SseSpecification['additionalProperties'] = false;
   }
  
   // const finalAPI = addAdditionalRoutes(cleanedOpenAPI, serviceTitle);
diff --git a/bin/test-meta-routes.cjs b/bin/test-meta-routes.cjs
index 0ce69141a..94a17b792 100644
--- a/bin/test-meta-routes.cjs
+++ b/bin/test-meta-routes.cjs
@@ -24,6 +24,7 @@ let verbose = false;
 let outputFormat = 'json';
 let timeoutMs = 60000; // Default timeout: 60 seconds
 let ignoreNoMethods = false;
+let skipResources = new Set();
 
 for (let i = 0; i < args.length; i++) {
   if (args[i].startsWith('--')) {
@@ -46,7 +47,10 @@ for (let i = 0; i < args.length; i++) {
         break;
       case '--ignore-no-methods':
         ignoreNoMethods = true;
-        break;        
+        break;
+      case '--skip-resources':
+        skipResources = new Set(args[++i].split(',').map(r => r.trim()).filter(r => r.length > 0));
+        break;
       case '--help':
         console.log(`
 Usage: test-meta-routes.js <provider> [OPTIONS]
@@ -62,6 +66,7 @@ Options:
   --format FORMAT           Output format: json, csv, markdown (default: json)
   --timeout MILLISECONDS    Query timeout in milliseconds (default: 60000)
   --ignore-no-methods       Skip resources with no methods (e.g., views)
+  --skip-resources LIST     Comma separated list of fully qualified resource names to skip
   --help                    Display this help message
         `);
         process.exit(0);
@@ -213,9 +218,15 @@ async function testMetaRoutes() {
       // for each resource
       for (const resource of resources) {
         const resourceName = resource.name;
-        console.log(`\n  🔹 Testing resource: ${resourceName}`);
-        
+
         const resourceFQRN = `${provider}.${serviceName}.${resourceName}`;
+
+        if (skipResources.has(resourceFQRN)) {
+          console.log(`\n  🔹 Skipping resource: ${resourceName} (in --skip-resources)`);
+          continue;
+        }
+
+        console.log(`\n  🔹 Testing resource: ${resourceName}`);
         const resourceData = {
           name: resourceName,
           service: serviceName,
diff --git a/bin/test-resource-coverage.js b/bin/test-resource-coverage.js
new file mode 100644
index 000000000..50a1d567a
--- /dev/null
+++ b/bin/test-resource-coverage.js
@@ -0,0 +1,112 @@
+// bin/test-resource-coverage.js
+//
+// Verifies that every resource type in provider-dev/config/cc_supported_resources.js
+// is present in the generated provider (openapi/src/awscc/.../services), with an
+// exact accounting for types that cannot be generated:
+//   - no schema file in provider-dev/downloaded
+//   - schema has no handlers (no Cloud Control operations to generate)
+// Fails if any supported type is missing for an unexplained reason, if the totals
+// do not reconcile, or if the provider contains a type not in the supported list.
+
+import * as fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { dirname } from 'path';
+import { load } from 'js-yaml';
+import { resourceTypes } from '../provider-dev/config/cc_supported_resources.js';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const downloadedDir = path.join(__dirname, '../provider-dev/downloaded');
+const servicesDir = path.join(__dirname, '../openapi/src/awscc/v00.00.00000/services');
+
+const supported = new Set(resourceTypes);
+
+// index downloaded schemas by typeName
+const downloaded = {};
+for (const file of fs.readdirSync(downloadedDir)) {
+  if (!file.endsWith('.json')) continue;
+  const doc = JSON.parse(fs.readFileSync(path.join(downloadedDir, file), 'utf8'));
+  if (doc.typeName) {
+    downloaded[doc.typeName] = {
+      file,
+      hasHandlers: !!(doc.handlers && Object.keys(doc.handlers).length > 0),
+    };
+  }
+}
+
+// collect distinct x-cfn-type-name values from generated resources
+const generated = new Set();
+for (const file of fs.readdirSync(servicesDir)) {
+  if (!file.endsWith('.yaml')) continue;
+  const doc = load(fs.readFileSync(path.join(servicesDir, file), 'utf8'));
+  const resources = (doc.components && doc.components['x-stackQL-resources']) || {};
+  for (const resourceDef of Object.values(resources)) {
+    if (resourceDef && resourceDef['x-cfn-type-name']) {
+      generated.add(resourceDef['x-cfn-type-name']);
+    }
+  }
+}
+
+const noSchema = [];
+const noHandlers = [];
+const unexplainedMissing = [];
+
+for (const typeName of [...supported].sort()) {
+  if (generated.has(typeName)) continue;
+  if (!downloaded[typeName]) {
+    noSchema.push(typeName);
+  } else if (!downloaded[typeName].hasHandlers) {
+    noHandlers.push(typeName);
+  } else {
+    unexplainedMissing.push(typeName);
+  }
+}
+
+const notSupported = [...generated].filter(t => !supported.has(t)).sort();
+
+console.log('Resource coverage summary');
+console.log('-------------------------');
+console.log(`supported resource types (cc_supported_resources.js): ${supported.size}`);
+console.log(`resource types in generated provider:                 ${generated.size}`);
+console.log(`excluded - no schema in provider-dev/downloaded:      ${noSchema.length}`);
+console.log(`excluded - schema has no handlers:                    ${noHandlers.length}`);
+console.log(`missing for an unexplained reason:                    ${unexplainedMissing.length}`);
+console.log(`generated but not in supported list:                  ${notSupported.length}`);
+
+if (noSchema.length > 0) {
+  console.log('\ntypes with no downloaded schema:');
+  noSchema.forEach(t => console.log(`  ${t}`));
+}
+
+if (noHandlers.length > 0) {
+  console.log('\ntypes with no handlers in schema (nothing to generate):');
+  noHandlers.forEach(t => console.log(`  ${t}`));
+}
+
+let failed = false;
+
+if (unexplainedMissing.length > 0) {
+  console.error('\nFAIL: supported types missing from the generated provider:');
+  unexplainedMissing.forEach(t => console.error(`  ${t}`));
+  failed = true;
+}
+
+if (notSupported.length > 0) {
+  console.error('\nFAIL: generated types not present in the supported list:');
+  notSupported.forEach(t => console.error(`  ${t}`));
+  failed = true;
+}
+
+const reconciled = generated.size + noSchema.length + noHandlers.length + unexplainedMissing.length === supported.size;
+if (!reconciled) {
+  console.error(`\nFAIL: totals do not reconcile: ${generated.size} generated + ${noSchema.length} no schema + ${noHandlers.length} no handlers != ${supported.size} supported`);
+  failed = true;
+}
+
+if (failed) {
+  process.exit(1);
+}
+
+console.log('\nPASS: all supported resource types are accounted for in the generated provider');
diff --git a/lib/utils/openapi-utils.js b/lib/utils/openapi-utils.js
index 86b42b411..31d2d984f 100644
--- a/lib/utils/openapi-utils.js
+++ b/lib/utils/openapi-utils.js
@@ -86,7 +86,11 @@ function processObjectProperties(object, parentKey, grandparentKey) {
   let result = {};
 
   for (const [key, val] of Object.entries(object)) {
-    if (isReferenceKey(key, val)) {
+    if (key === "x-stackQL-resources") {
+      // stackql resource config is not a JSON schema; the key prefixing
+      // heuristic misfires on resources named 'schemas' or 'properties'
+      result[key] = val;
+    } else if (isReferenceKey(key, val)) {
       result[key] = updateReference(val);
     } else if (needsPrefix(key, parentKey, grandparentKey)) {
       result[`x-${key}`] = processProperties(val, key, parentKey);
@@ -104,9 +108,51 @@ function processArrayProperties(array, parentKey, grandparentKey) {
   );
 }
 
-export function convertToOpenAPI(input, componentName, schemaDefinitions) {
+function resolveDefinitionCollisions(input, formattedComponentName, schemaDefinitions, reservedNames) {
+  // definitions and top level resource schemas share one flat components.schemas
+  // namespace per service; a definition that collides with a resource schema name
+  // (or with a differing definition from a sibling file) is renamed to
+  // <ComponentName>_<Key> and its $refs are rewritten to match
+  const renames = {};
+  let current = input;
+
+  while (true) {
+    let added = false;
+    for (const [key, value] of Object.entries(current.definitions || {})) {
+      if (renames[key]) continue;
+      const collidesWithResource = reservedNames.has(key);
+      const collidesWithExisting = key in schemaDefinitions && !_.isEqual(schemaDefinitions[key], value);
+      if (collidesWithResource || collidesWithExisting) {
+        renames[key] = `${formattedComponentName}_${key}`;
+        added = true;
+      }
+    }
+    if (!added) break;
+
+    // re-apply all renames to the original input so ref rewrites stay consistent
+    let serialized = JSON.stringify(input);
+    for (const [oldKey, newKey] of Object.entries(renames)) {
+      serialized = serialized.split(`"#/definitions/${oldKey}"`).join(`"#/definitions/${newKey}"`);
+    }
+    current = JSON.parse(serialized);
+  }
+
+  if (Object.keys(renames).length > 0) {
+    console.log(`Renamed colliding definition(s) in ${formattedComponentName}: ${Object.entries(renames).map(([o, n]) => `${o} -> ${n}`).join(', ')}`);
+  }
+
+  return { input: current, renames };
+}
+
+export function convertToOpenAPI(input, componentName, schemaDefinitions, reservedNames) {
 
   const formattedComponentName = formatComponentName(componentName);
+
+  let definitionRenames = {};
+  if (reservedNames) {
+    ({ input, renames: definitionRenames } = resolveDefinitionCollisions(input, formattedComponentName, schemaDefinitions, reservedNames));
+  }
+
   const requiredProperties = input.required;
   const openAPIComponent = createOpenAPIComponent(
     formattedComponentName,
@@ -232,7 +278,7 @@ export function convertToOpenAPI(input, componentName, schemaDefinitions) {
   }
 
   for (const [key, value] of Object.entries(input.definitions || {})) {
-    schemaDefinitions[key] = value;
+    schemaDefinitions[definitionRenames[key] || key] = value;
   }
 
   return { [formattedComponentName]: openAPIComponent };
diff --git a/lib/utils/stackql-utils.js b/lib/utils/stackql-utils.js
index 837453412..19aabb668 100644
--- a/lib/utils/stackql-utils.js
+++ b/lib/utils/stackql-utils.js
@@ -2,6 +2,10 @@
 
 import pluralize from 'pluralize';
 
+// pluralize returns 'schemata' for 'schema', which collides with the
+// information_schema.schemata table handling in stackql
+pluralize.addIrregularRule('schema', 'schemas');
+
 const providerName = 'awscc';
 
 function fixReservedWordColumnAlias(columnAlias) {
@@ -19,7 +23,9 @@ function fixReservedWordColumnAlias(columnAlias) {
     case 'force':
       return `_${columnAlias}`;
     case 'match':
-      return `_${columnAlias}`;                      
+      return `_${columnAlias}`;
+    case 'registry':
+      return `_${columnAlias}`;
     default:
       return columnAlias;
   }
diff --git a/openapi/src/awscc/v00.00.00000/services/accessanalyzer.yaml b/openapi/src/awscc/v00.00.00000/services/accessanalyzer.yaml
index 77ebe5dab..cf45a7690 100644
--- a/openapi/src/awscc/v00.00.00000/services/accessanalyzer.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/accessanalyzer.yaml
@@ -694,7 +694,7 @@ components:
       id: awscc.accessanalyzer.analyzers
       x-cfn-schema-name: Analyzer
       x-cfn-type-name: AWS::AccessAnalyzer::Analyzer
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -790,8 +790,7 @@ components:
       id: awscc.accessanalyzer.analyzers_list_only
       x-cfn-schema-name: Analyzer
       x-cfn-type-name: AWS::AccessAnalyzer::Analyzer
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/acmpca.yaml b/openapi/src/awscc/v00.00.00000/services/acmpca.yaml
index 310a73097..9f6c94679 100644
--- a/openapi/src/awscc/v00.00.00000/services/acmpca.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/acmpca.yaml
@@ -475,58 +475,77 @@ components:
       items:
         $ref: '#/components/schemas/GeneralName'
     GeneralName:
-      description: Structure that contains X.509 GeneralName information. Assign one and ONLY one field.
+      description: Describes an ASN.1 X.400 ``GeneralName`` as defined in [RFC 5280](https://docs.aws.amazon.com/https://datatracker.ietf.org/doc/html/rfc5280). Only one of the following naming options should be provided. Providing more than one option results in an ``InvalidArgsException`` error.
       type: object
       additionalProperties: false
       properties:
         OtherName:
           $ref: '#/components/schemas/OtherName'
+          description: Represents ``GeneralName`` using an ``OtherName`` object.
         Rfc822Name:
           $ref: '#/components/schemas/Rfc822Name'
+          description: Represents ``GeneralName`` as an [RFC 822](https://docs.aws.amazon.com/https://datatracker.ietf.org/doc/html/rfc822) email address.
         DnsName:
           $ref: '#/components/schemas/DnsName'
+          description: Represents ``GeneralName`` as a DNS name.
         DirectoryName:
           $ref: '#/components/schemas/Subject'
+          description: >-
+            Contains information about the certificate subject. The certificate can be one issued by your private certificate authority (CA) or it can be your private CA certificate. The Subject field in the certificate identifies the entity that owns or controls the public key in the certificate. The entity can be a user, computer, device, or service. The Subject must contain an X.500 distinguished name (DN). A DN is a sequence of relative distinguished names (RDNs). The RDNs are separated by
+            commas in the certificate. The DN must be unique for each entity, but your private CA can issue more than one certificate with the same DN to the same entity.
         EdiPartyName:
           $ref: '#/components/schemas/EdiPartyName'
+          description: Represents ``GeneralName`` as an ``EdiPartyName`` object.
         UniformResourceIdentifier:
           $ref: '#/components/schemas/UniformResourceIdentifier'
+          description: Represents ``GeneralName`` as a URI.
         IpAddress:
           $ref: '#/components/schemas/IpAddress'
+          description: Represents ``GeneralName`` as an IPv4 or IPv6 address.
         RegisteredId:
           $ref: '#/components/schemas/CustomObjectIdentifier'
+          description: Represents ``GeneralName`` as an object identifier (OID).
     KeyUsage:
-      description: Structure that contains X.509 KeyUsage information.
+      description: Defines one or more purposes for which the key contained in the certificate can be used. Default value for each option is false.
       type: object
       additionalProperties: false
       properties:
         DigitalSignature:
           type: boolean
           default: false
+          description: Key can be used for digital signing.
         NonRepudiation:
           type: boolean
           default: false
+          description: Key can be used for non-repudiation.
         KeyEncipherment:
           type: boolean
           default: false
+          description: Key can be used to encipher data.
         DataEncipherment:
           type: boolean
           default: false
+          description: Key can be used to decipher data.
         KeyAgreement:
           type: boolean
           default: false
+          description: Key can be used in a key-agreement protocol.
         KeyCertSign:
           type: boolean
           default: false
+          description: Key can be used to sign certificates.
         CRLSign:
           type: boolean
           default: false
+          description: Key can be used to sign CRLs.
         EncipherOnly:
           type: boolean
           default: false
+          description: Key can be used only to encipher data.
         DecipherOnly:
           type: boolean
           default: false
+          description: Key can be used only to decipher data.
     PolicyInformation:
       description: Defines the X.509 ``CertificatePolicies`` extension.
       type: object
@@ -569,54 +588,75 @@ components:
       required:
         - CpsUri
     Subject:
-      description: Structure that contains X.500 distinguished name information for your CA.
+      description: Contains information about the certificate subject. The ``Subject`` field in the certificate identifies the entity that owns or controls the public key in the certificate. The entity can be a user, computer, device, or service. The ``Subject``must contain an X.500 distinguished name (DN). A DN is a sequence of relative distinguished names (RDNs). The RDNs are separated by commas in the certificate.
       type: object
       additionalProperties: false
       properties:
         Country:
           type: string
+          description: Two-digit code that specifies the country in which the certificate subject located.
         Organization:
           type: string
+          description: Legal name of the organization with which the certificate subject is affiliated.
         OrganizationalUnit:
           type: string
+          description: A subdivision or unit of the organization (such as sales or finance) with which the certificate subject is affiliated.
         DistinguishedNameQualifier:
           type: string
+          description: Disambiguating information for the certificate subject.
         State:
           type: string
+          description: State in which the subject of the certificate is located.
         CommonName:
           type: string
+          description: |-
+            For CA and end-entity certificates in a private PKI, the common name (CN) can be any string within the length limit.
+             Note: In publicly trusted certificates, the common name must be a fully qualified domain name (FQDN) associated with the certificate subject.
         SerialNumber:
           type: string
+          description: The certificate serial number.
         Locality:
           type: string
+          description: The locality (such as a city or town) in which the certificate subject is located.
         Title:
           type: string
+          description: A title such as Mr. or Ms., which is pre-pended to the name to refer formally to the certificate subject.
         Surname:
           type: string
+          description: Family name. In the US and the UK, for example, the surname of an individual is ordered last. In Asian cultures the surname is typically ordered first.
         GivenName:
           type: string
+          description: First name.
         Initials:
           type: string
+          description: Concatenation that typically contains the first letter of the *GivenName*, the first letter of the middle name if one exists, and the first letter of the *Surname*.
         Pseudonym:
           type: string
+          description: Typically a shortened version of a longer *GivenName*. For example, Jonathan is often shortened to John. Elizabeth is often shortened to Beth, Liz, or Eliza.
         GenerationQualifier:
           type: string
+          description: Typically a qualifier appended to the name of an individual. Examples include Jr. for junior, Sr. for senior, and III for third.
         CustomAttributes:
           $ref: '#/components/schemas/CustomAttributeList'
+          description: |-
+            Contains a sequence of one or more X.500 relative distinguished names (RDNs), each of which consists of an object identifier (OID) and a value. For more information, see NIST’s definition of [Object Identifier (OID)](https://docs.aws.amazon.com/https://csrc.nist.gov/glossary/term/Object_Identifier).
+              Custom attributes cannot be used in combination with standard attributes.
     CustomAttributeList:
       description: Array of X.500 attribute type and value. CustomAttributes cannot be used along with pre-defined attributes.
       type: array
       items:
         $ref: '#/components/schemas/CustomAttribute'
     CustomAttribute:
-      description: Structure that contains X.500 attribute type and value.
+      description: Defines the X.500 relative distinguished name (RDN).
       type: object
       additionalProperties: false
       properties:
         ObjectIdentifier:
           $ref: '#/components/schemas/CustomObjectIdentifier'
+          description: Specifies the object identifier (OID) of the attribute type of the relative distinguished name (RDN).
         Value:
           type: string
+          description: Specifies the attribute value of relative distinguished name (RDN).
       required:
         - ObjectIdentifier
         - Value
@@ -638,14 +678,16 @@ components:
       description: String that contains X.509 ObjectIdentifier information.
       type: string
     OtherName:
-      description: Structure that contains X.509 OtherName information.
+      description: Defines a custom ASN.1 X.400 ``GeneralName`` using an object identifier (OID) and value. The OID must satisfy the regular expression shown below. For more information, see NIST's definition of [Object Identifier (OID)](https://docs.aws.amazon.com/https://csrc.nist.gov/glossary/term/Object_Identifier).
       type: object
       additionalProperties: false
       properties:
         TypeId:
           $ref: '#/components/schemas/CustomObjectIdentifier'
+          description: Specifies an OID.
         Value:
           type: string
+          description: Specifies an OID value.
       required:
         - TypeId
         - Value
@@ -656,16 +698,19 @@ components:
       description: String that contains X.509 DnsName information.
       type: string
     EdiPartyName:
-      description: Structure that contains X.509 EdiPartyName information.
+      description: Describes an Electronic Data Interchange (EDI) entity as described in as defined in [Subject Alternative Name](https://docs.aws.amazon.com/https://datatracker.ietf.org/doc/html/rfc5280) in RFC 5280.
       type: object
       additionalProperties: false
       properties:
         PartyName:
           type: string
+          description: Specifies the party name.
         NameAssigner:
           type: string
+          description: Specifies the name assigner.
       required:
         - PartyName
+        - NameAssigner
     UniformResourceIdentifier:
       description: String that contains X.509 UniformResourceIdentifier information.
       type: string
@@ -767,6 +812,58 @@ components:
           type: string
       required:
         - Key
+    CertificateAuthority_Subject:
+      description: Structure that contains X.500 distinguished name information for your CA.
+      type: object
+      additionalProperties: false
+      properties:
+        Country:
+          type: string
+        Organization:
+          type: string
+        OrganizationalUnit:
+          type: string
+        DistinguishedNameQualifier:
+          type: string
+        State:
+          type: string
+        CommonName:
+          type: string
+        SerialNumber:
+          type: string
+        Locality:
+          type: string
+        Title:
+          type: string
+        Surname:
+          type: string
+        GivenName:
+          type: string
+        Initials:
+          type: string
+        Pseudonym:
+          type: string
+        GenerationQualifier:
+          type: string
+        CustomAttributes:
+          $ref: '#/components/schemas/CertificateAuthority_CustomAttributeList'
+    CertificateAuthority_CustomAttributeList:
+      description: Array of X.500 attribute type and value. CustomAttributes cannot be used along with pre-defined attributes.
+      type: array
+      items:
+        $ref: '#/components/schemas/CertificateAuthority_CustomAttribute'
+    CertificateAuthority_CustomAttribute:
+      description: Structure that contains X.500 attribute type and value.
+      type: object
+      additionalProperties: false
+      properties:
+        ObjectIdentifier:
+          $ref: '#/components/schemas/CustomObjectIdentifier'
+        Value:
+          type: string
+      required:
+        - ObjectIdentifier
+        - Value
     CrlDistributionPointExtensionConfiguration:
       description: Configures the default behavior of the CRL Distribution Point extension for certificates issued by your certificate authority
       type: object
@@ -819,6 +916,38 @@ components:
           $ref: '#/components/schemas/CrlConfiguration'
         OcspConfiguration:
           $ref: '#/components/schemas/OcspConfiguration'
+    CertificateAuthority_KeyUsage:
+      description: Structure that contains X.509 KeyUsage information.
+      type: object
+      additionalProperties: false
+      properties:
+        DigitalSignature:
+          type: boolean
+          default: false
+        NonRepudiation:
+          type: boolean
+          default: false
+        KeyEncipherment:
+          type: boolean
+          default: false
+        DataEncipherment:
+          type: boolean
+          default: false
+        KeyAgreement:
+          type: boolean
+          default: false
+        KeyCertSign:
+          type: boolean
+          default: false
+        CRLSign:
+          type: boolean
+          default: false
+        EncipherOnly:
+          type: boolean
+          default: false
+        DecipherOnly:
+          type: boolean
+          default: false
     AccessMethodType:
       description: Pre-defined enum string for X.509 AccessMethod ObjectIdentifiers.
       type: string
@@ -831,6 +960,50 @@ components:
           $ref: '#/components/schemas/CustomObjectIdentifier'
         AccessMethodType:
           $ref: '#/components/schemas/AccessMethodType'
+    CertificateAuthority_OtherName:
+      description: Structure that contains X.509 OtherName information.
+      type: object
+      additionalProperties: false
+      properties:
+        TypeId:
+          $ref: '#/components/schemas/CustomObjectIdentifier'
+        Value:
+          type: string
+      required:
+        - TypeId
+        - Value
+    CertificateAuthority_EdiPartyName:
+      description: Structure that contains X.509 EdiPartyName information.
+      type: object
+      additionalProperties: false
+      properties:
+        PartyName:
+          type: string
+        NameAssigner:
+          type: string
+      required:
+        - PartyName
+    CertificateAuthority_GeneralName:
+      description: Structure that contains X.509 GeneralName information. Assign one and ONLY one field.
+      type: object
+      additionalProperties: false
+      properties:
+        OtherName:
+          $ref: '#/components/schemas/CertificateAuthority_OtherName'
+        Rfc822Name:
+          $ref: '#/components/schemas/Rfc822Name'
+        DnsName:
+          $ref: '#/components/schemas/DnsName'
+        DirectoryName:
+          $ref: '#/components/schemas/CertificateAuthority_Subject'
+        EdiPartyName:
+          $ref: '#/components/schemas/CertificateAuthority_EdiPartyName'
+        UniformResourceIdentifier:
+          $ref: '#/components/schemas/UniformResourceIdentifier'
+        IpAddress:
+          $ref: '#/components/schemas/IpAddress'
+        RegisteredId:
+          $ref: '#/components/schemas/CustomObjectIdentifier'
     AccessDescription:
       description: Structure that contains X.509 AccessDescription information.
       type: object
@@ -839,7 +1012,7 @@ components:
         AccessMethod:
           $ref: '#/components/schemas/AccessMethod'
         AccessLocation:
-          $ref: '#/components/schemas/GeneralName'
+          $ref: '#/components/schemas/CertificateAuthority_GeneralName'
       required:
         - AccessMethod
         - AccessLocation
@@ -854,7 +1027,7 @@ components:
       additionalProperties: false
       properties:
         KeyUsage:
-          $ref: '#/components/schemas/KeyUsage'
+          $ref: '#/components/schemas/CertificateAuthority_KeyUsage'
         SubjectInformationAccess:
           $ref: '#/components/schemas/SubjectInformationAccess'
     CertificateAuthority:
@@ -874,7 +1047,7 @@ components:
           type: string
         Subject:
           description: Structure that contains X.500 distinguished name information for your CA.
-          $ref: '#/components/schemas/Subject'
+          $ref: '#/components/schemas/CertificateAuthority_Subject'
         RevocationConfiguration:
           description: Certificate revocation information used by the CreateCertificateAuthority and UpdateCertificateAuthority actions.
           $ref: '#/components/schemas/RevocationConfiguration'
@@ -1138,7 +1311,7 @@ components:
               type: string
             Subject:
               description: Structure that contains X.500 distinguished name information for your CA.
-              $ref: '#/components/schemas/Subject'
+              $ref: '#/components/schemas/CertificateAuthority_Subject'
             RevocationConfiguration:
               description: Certificate revocation information used by the CreateCertificateAuthority and UpdateCertificateAuthority actions.
               $ref: '#/components/schemas/RevocationConfiguration'
@@ -1325,7 +1498,7 @@ components:
       id: awscc.acmpca.certificate_authorities
       x-cfn-schema-name: CertificateAuthority
       x-cfn-type-name: AWS::ACMPCA::CertificateAuthority
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -1431,8 +1604,7 @@ components:
       id: awscc.acmpca.certificate_authorities_list_only
       x-cfn-schema-name: CertificateAuthority
       x-cfn-type-name: AWS::ACMPCA::CertificateAuthority
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/aiops.yaml b/openapi/src/awscc/v00.00.00000/services/aiops.yaml
index bddb7e056..6db254bc9 100644
--- a/openapi/src/awscc/v00.00.00000/services/aiops.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/aiops.yaml
@@ -673,7 +673,7 @@ components:
       id: awscc.aiops.investigation_groups
       x-cfn-schema-name: InvestigationGroup
       x-cfn-type-name: AWS::AIOps::InvestigationGroup
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -787,8 +787,7 @@ components:
       id: awscc.aiops.investigation_groups_list_only
       x-cfn-schema-name: InvestigationGroup
       x-cfn-type-name: AWS::AIOps::InvestigationGroup
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/amazonmq.yaml b/openapi/src/awscc/v00.00.00000/services/amazonmq.yaml
index 09c9030dd..b855be0ff 100644
--- a/openapi/src/awscc/v00.00.00000/services/amazonmq.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/amazonmq.yaml
@@ -786,7 +786,7 @@ components:
       id: awscc.amazonmq.configurations
       x-cfn-schema-name: Configuration
       x-cfn-type-name: AWS::AmazonMQ::Configuration
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
       x-type: cloud_control
       methods:
@@ -890,8 +890,7 @@ components:
       id: awscc.amazonmq.configurations_list_only
       x-cfn-schema-name: Configuration
       x-cfn-type-name: AWS::AmazonMQ::Configuration
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/amplify.yaml b/openapi/src/awscc/v00.00.00000/services/amplify.yaml
index 89bf62e61..01339b942 100644
--- a/openapi/src/awscc/v00.00.00000/services/amplify.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/amplify.yaml
@@ -450,9 +450,6 @@ components:
           type: string
           minLength: 1
           maxLength: 255
-      required:
-        - Username
-        - Password
     CacheConfig:
       type: object
       additionalProperties: false
@@ -530,7 +527,6 @@ components:
           type: string
           minLength: 0
           maxLength: 256
-          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
       required:
         - Key
         - Value
@@ -706,6 +702,41 @@ components:
           type: string
           minLength: 20
           maxLength: 2048
+    Branch_Tag:
+      type: object
+      additionalProperties: false
+      x-insertionOrder: false
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+        Value:
+          type: string
+          minLength: 0
+          maxLength: 256
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+      required:
+        - Key
+        - Value
+    Branch_BasicAuthConfig:
+      type: object
+      additionalProperties: false
+      properties:
+        EnableBasicAuth:
+          type: boolean
+        Username:
+          type: string
+          minLength: 1
+          maxLength: 255
+        Password:
+          type: string
+          minLength: 1
+          maxLength: 255
+      required:
+        - Username
+        - Password
     Branch:
       type: object
       properties:
@@ -719,7 +750,7 @@ components:
           maxLength: 1000
           pattern: (?s).*
         BasicAuthConfig:
-          $ref: '#/components/schemas/BasicAuthConfig'
+          $ref: '#/components/schemas/Branch_BasicAuthConfig'
         Backend:
           $ref: '#/components/schemas/Backend'
         BranchName:
@@ -774,7 +805,7 @@ components:
           type: array
           uniqueItems: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Branch_Tag'
       required:
         - AppId
         - BranchName
@@ -1133,7 +1164,7 @@ components:
               maxLength: 1000
               pattern: (?s).*
             BasicAuthConfig:
-              $ref: '#/components/schemas/BasicAuthConfig'
+              $ref: '#/components/schemas/Branch_BasicAuthConfig'
             Backend:
               $ref: '#/components/schemas/Backend'
             BranchName:
@@ -1188,7 +1219,7 @@ components:
               type: array
               uniqueItems: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Branch_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateBranchRequest
       type: object
@@ -1270,7 +1301,7 @@ components:
       id: awscc.amplify.apps
       x-cfn-schema-name: App
       x-cfn-type-name: AWS::Amplify::App
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -1398,8 +1429,7 @@ components:
       id: awscc.amplify.apps_list_only
       x-cfn-schema-name: App
       x-cfn-type-name: AWS::Amplify::App
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1429,7 +1459,7 @@ components:
       id: awscc.amplify.branches
       x-cfn-schema-name: Branch
       x-cfn-type-name: AWS::Amplify::Branch
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -1547,8 +1577,7 @@ components:
       id: awscc.amplify.branches_list_only
       x-cfn-schema-name: Branch
       x-cfn-type-name: AWS::Amplify::Branch
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1578,7 +1607,7 @@ components:
       id: awscc.amplify.domains
       x-cfn-schema-name: Domain
       x-cfn-type-name: AWS::Amplify::Domain
-      x-identifiers:
+      x-identifiers: &ref_2
         - Arn
       x-type: cloud_control
       methods:
@@ -1688,8 +1717,7 @@ components:
       id: awscc.amplify.domains_list_only
       x-cfn-schema-name: Domain
       x-cfn-type-name: AWS::Amplify::Domain
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/amplifyuibuilder.yaml b/openapi/src/awscc/v00.00.00000/services/amplifyuibuilder.yaml
index c70fb5636..2445dde90 100644
--- a/openapi/src/awscc/v00.00.00000/services/amplifyuibuilder.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/amplifyuibuilder.yaml
@@ -1411,7 +1411,7 @@ components:
       id: awscc.amplifyuibuilder.components
       x-cfn-schema-name: Component
       x-cfn-type-name: AWS::AmplifyUIBuilder::Component
-      x-identifiers:
+      x-identifiers: &ref_0
         - AppId
         - EnvironmentName
         - Id
@@ -1531,10 +1531,7 @@ components:
       id: awscc.amplifyuibuilder.components_list_only
       x-cfn-schema-name: Component
       x-cfn-type-name: AWS::AmplifyUIBuilder::Component
-      x-identifiers:
-        - AppId
-        - EnvironmentName
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1568,7 +1565,7 @@ components:
       id: awscc.amplifyuibuilder.forms
       x-cfn-schema-name: Form
       x-cfn-type-name: AWS::AmplifyUIBuilder::Form
-      x-identifiers:
+      x-identifiers: &ref_1
         - AppId
         - EnvironmentName
         - Id
@@ -1680,10 +1677,7 @@ components:
       id: awscc.amplifyuibuilder.forms_list_only
       x-cfn-schema-name: Form
       x-cfn-type-name: AWS::AmplifyUIBuilder::Form
-      x-identifiers:
-        - AppId
-        - EnvironmentName
-        - Id
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1717,7 +1711,7 @@ components:
       id: awscc.amplifyuibuilder.themes
       x-cfn-schema-name: Theme
       x-cfn-type-name: AWS::AmplifyUIBuilder::Theme
-      x-identifiers:
+      x-identifiers: &ref_2
         - AppId
         - EnvironmentName
         - Id
@@ -1821,10 +1815,7 @@ components:
       id: awscc.amplifyuibuilder.themes_list_only
       x-cfn-schema-name: Theme
       x-cfn-type-name: AWS::AmplifyUIBuilder::Theme
-      x-identifiers:
-        - AppId
-        - EnvironmentName
-        - Id
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/apigateway.yaml b/openapi/src/awscc/v00.00.00000/services/apigateway.yaml
index edb8affac..b605c8aa3 100644
--- a/openapi/src/awscc/v00.00.00000/services/apigateway.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/apigateway.yaml
@@ -436,10 +436,15 @@ components:
       type: object
       additionalProperties: false
       properties:
-        Value:
-          type: string
         Key:
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
           type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          type: string
+          maxLength: 256
       required:
         - Value
         - Key
@@ -700,6 +705,18 @@ components:
           - apigateway:DELETE
         list:
           - apigateway:GET
+    ClientCertificate_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+        Value:
+          type: string
+      required:
+        - Value
+        - Key
+      description: ''
     ClientCertificate:
       type: object
       properties:
@@ -714,7 +731,7 @@ components:
           type: array
           uniqueItems: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ClientCertificate_Tag'
       x-stackql-resource-name: client_certificate
       description: The ``AWS::ApiGateway::ClientCertificate`` resource creates a client certificate that API Gateway uses to configure client-side SSL authentication for sending requests to the integration endpoint.
       x-type-name: AWS::ApiGateway::ClientCertificate
@@ -751,44 +768,40 @@ components:
     MethodSetting:
       description: |-
         The ``MethodSetting`` property type configures settings for all methods in a stage.
-         The ``MethodSettings`` property of the ``AWS::ApiGateway::Stage`` resource contains a list of ``MethodSetting`` property types.
-      type: object
+         The ``MethodSettings`` property of the [Amazon API Gateway Deployment StageDescription](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html) property type contains a list of ``MethodSetting`` property types.
       additionalProperties: false
+      type: object
       properties:
-        CacheDataEncrypted:
-          description: ''
-          type: boolean
         CacheTtlInSeconds:
           description: ''
           type: integer
-        CachingEnabled:
+        LoggingLevel:
+          description: ''
+          type: string
+        ResourcePath:
+          description: The resource path for this method. Forward slashes (``/``) are encoded as ``~1`` and the initial slash must include a forward slash. For example, the path value ``/resource/subresource`` must be encoded as ``/~1resource~1subresource``. To specify the root path, use only a slash (``/``).
+          type: string
+        CacheDataEncrypted:
           description: ''
           type: boolean
         DataTraceEnabled:
           description: ''
           type: boolean
-        HttpMethod:
-          description: The HTTP method. To apply settings to multiple resources and methods, specify an asterisk (``*``) for the ``HttpMethod`` and ``/*`` for the ``ResourcePath``. This parameter is required when you specify a ``MethodSetting``.
-          type: string
-        LoggingLevel:
+        ThrottlingBurstLimit:
           description: ''
-          type: string
+          type: integer
+        CachingEnabled:
+          description: ''
+          type: boolean
         MetricsEnabled:
           description: ''
           type: boolean
-        ResourcePath:
-          description: >-
-            The resource path for this method. Forward slashes (``/``) are encoded as ``~1`` and the initial slash must include a forward slash. For example, the path value ``/resource/subresource`` must be encoded as ``/~1resource~1subresource``. To specify the root path, use only a slash (``/``). To apply settings to multiple resources and methods, specify an asterisk (``*``) for the ``HttpMethod`` and ``/*`` for the ``ResourcePath``. This parameter is required when you specify a
-            ``MethodSetting``.
+        HttpMethod:
+          description: The HTTP method.
           type: string
-        ThrottlingBurstLimit:
-          description: ''
-          type: integer
-          minimum: 0
         ThrottlingRateLimit:
           description: ''
           type: number
-          minimum: 0
     StageDescription:
       description: '``StageDescription`` is a property of the [AWS::ApiGateway::Deployment](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-deployment.html) resource that configures a deployment stage.'
       additionalProperties: false
@@ -861,33 +874,44 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Deployment_Tag'
         CacheClusterEnabled:
           description: ''
           type: boolean
     CanarySetting:
-      description: ''
-      type: object
+      description: |-
+        The ``CanarySetting`` property type specifies settings for the canary deployment in this stage.
+         ``CanarySetting`` is a property of the [StageDescription](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html) property type.
       additionalProperties: false
+      type: object
       properties:
-        DeploymentId:
-          description: ''
-          type: string
-        PercentTraffic:
-          description: ''
-          type: number
-          minimum: 0
-          maximum: 100
         StageVariableOverrides:
-          description: ''
-          type: object
-          additionalProperties: false
           x-patternProperties:
             '[a-zA-Z0-9]+':
               type: string
+          description: ''
+          additionalProperties: false
+          type: object
+        PercentTraffic:
+          description: ''
+          type: number
         UseStageCache:
           description: ''
           type: boolean
+    Deployment_Tag:
+      description: ''
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          description: The value for the tag
+          type: string
+        Key:
+          description: The key name of the tag
+          type: string
+      required:
+        - Value
+        - Key
     DeploymentCanarySettings:
       description: The ``DeploymentCanarySettings`` property type specifies settings for the canary deployment.
       additionalProperties: false
@@ -909,15 +933,15 @@ components:
     AccessLogSetting:
       description: |-
         The ``AccessLogSetting`` property type specifies settings for logging access in this stage.
-          ``AccessLogSetting`` is a property of the [AWS::ApiGateway::Stage](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html) resource.
-      type: object
+          ``AccessLogSetting`` is a property of the [StageDescription](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html) property type.
       additionalProperties: false
+      type: object
       properties:
-        DestinationArn:
-          description: The Amazon Resource Name (ARN) of the CloudWatch Logs log group or Kinesis Data Firehose delivery stream to receive access logs. If you specify a Kinesis Data Firehose delivery stream, the stream name must begin with ``amazon-apigateway-``. This parameter is required to enable access logging.
-          type: string
         Format:
-          description: A single line format of the access logs of data, as specified by selected [$context variables](https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-mapping-template-reference.html#context-variable-reference). The format must include at least ``$context.requestId``. This parameter is required to enable access logging.
+          description: ''
+          type: string
+        DestinationArn:
+          description: ''
           type: string
     Deployment:
       type: object
@@ -1108,30 +1132,20 @@ components:
         list:
           - apigateway:GET
     EndpointConfiguration:
-      description: |-
-        The ``EndpointConfiguration`` property type specifies the endpoint types of a REST API.
-         ``EndpointConfiguration`` is a property of the [AWS::ApiGateway::RestApi](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html) resource.
-      additionalProperties: false
       type: object
       properties:
-        IpAddressType:
-          description: ''
-          type: string
         Types:
-          uniqueItems: true
-          description: ''
           type: array
           items:
             type: string
-        VpcEndpointIds:
-          uniqueItems: true
           description: ''
-          type: array
-          items:
-            relationshipRef:
-              typeName: AWS::EC2::VPCEndpoint
-              propertyPath: /properties/Id
-            type: string
+        IpAddressType:
+          type: string
+          description: ''
+      additionalProperties: false
+      description: |-
+        The ``EndpointConfiguration`` property type specifies the endpoint types of an Amazon API Gateway domain name.
+         ``EndpointConfiguration`` is a property of the [AWS::ApiGateway::DomainName](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainname.html) resource.
     MutualTlsAuthentication:
       type: object
       properties:
@@ -1143,6 +1157,15 @@ components:
           description: ''
       additionalProperties: false
       description: ''
+    DomainName_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+        Value:
+          type: string
+      additionalProperties: false
+      description: ''
     DomainName:
       type: object
       properties:
@@ -1193,7 +1216,7 @@ components:
         Tags:
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/DomainName_Tag'
           description: ''
       x-stackql-resource-name: domain_name
       description: |-
@@ -1232,6 +1255,17 @@ components:
           - apigateway:DELETE
         list:
           - apigateway:GET
+    DomainNameAccessAssociation_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Value:
+          type: string
+        Key:
+          type: string
+      required:
+        - Value
+        - Key
     DomainNameAccessAssociation:
       type: object
       properties:
@@ -1254,7 +1288,7 @@ components:
           uniqueItems: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/DomainNameAccessAssociation_Tag'
       required:
         - DomainNameArn
         - AccessAssociationSource
@@ -1296,6 +1330,24 @@ components:
           - apigateway:GET
         list:
           - apigateway:GET
+    DomainNameV2_EndpointConfiguration:
+      type: object
+      properties:
+        Types:
+          type: array
+          items:
+            type: string
+        IpAddressType:
+          type: string
+      additionalProperties: false
+    DomainNameV2_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+        Value:
+          type: string
+      additionalProperties: false
     DomainNameV2:
       type: object
       properties:
@@ -1304,7 +1356,7 @@ components:
         DomainName:
           type: string
         EndpointConfiguration:
-          $ref: '#/components/schemas/EndpointConfiguration'
+          $ref: '#/components/schemas/DomainNameV2_EndpointConfiguration'
         SecurityPolicy:
           type: string
         Policy:
@@ -1325,7 +1377,7 @@ components:
         Tags:
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/DomainNameV2_Tag'
       x-stackql-resource-name: domain_name_v2
       description: Resource Type definition for AWS::ApiGateway::DomainNameV2.
       x-type-name: AWS::ApiGateway::DomainNameV2
@@ -1808,6 +1860,43 @@ components:
           - apigateway:GET
         delete:
           - apigateway:DELETE
+    RestApi_EndpointConfiguration:
+      description: |-
+        The ``EndpointConfiguration`` property type specifies the endpoint types of a REST API.
+         ``EndpointConfiguration`` is a property of the [AWS::ApiGateway::RestApi](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html) resource.
+      additionalProperties: false
+      type: object
+      properties:
+        IpAddressType:
+          description: ''
+          type: string
+        Types:
+          uniqueItems: true
+          description: ''
+          type: array
+          items:
+            type: string
+        VpcEndpointIds:
+          uniqueItems: true
+          description: ''
+          type: array
+          items:
+            relationshipRef:
+              typeName: AWS::EC2::VPCEndpoint
+              propertyPath: /properties/Id
+            type: string
+    RestApi_Tag:
+      description: ''
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          type: string
+        Key:
+          type: string
+      required:
+        - Key
+        - Value
     S3Location:
       description: |-
         ``S3Location`` is a property of the [AWS::ApiGateway::RestApi](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html) resource that specifies the Amazon S3 location of a OpenAPI (formerly Swagger) file that defines a set of RESTful APIs in JSON or YAML.
@@ -1887,7 +1976,7 @@ components:
           type: string
         EndpointConfiguration:
           description: A list of the endpoint types of the API. Use this property when creating an API. When importing an existing API, specify the endpoint configuration types using the ``Parameters`` property.
-          $ref: '#/components/schemas/EndpointConfiguration'
+          $ref: '#/components/schemas/RestApi_EndpointConfiguration'
         Body:
           description: An OpenAPI specification that defines a set of RESTful APIs in JSON format. For YAML templates, you can also provide the specification in YAML format.
           type: object
@@ -1896,7 +1985,7 @@ components:
           description: ''
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/RestApi_Tag'
       x-stackql-resource-name: rest_api
       description: |-
         The ``AWS::ApiGateway::RestApi`` resource creates a REST API. For more information, see [restapi:create](https://docs.aws.amazon.com/apigateway/latest/api/API_CreateRestApi.html) in the *Amazon API Gateway REST API Reference*.
@@ -1947,12 +2036,107 @@ components:
           - apigateway:GET
         delete:
           - apigateway:DELETE
+    Stage_CanarySetting:
+      description: ''
+      type: object
+      additionalProperties: false
+      properties:
+        DeploymentId:
+          description: ''
+          type: string
+        PercentTraffic:
+          description: ''
+          type: number
+          minimum: 0
+          maximum: 100
+        StageVariableOverrides:
+          description: ''
+          type: object
+          additionalProperties: false
+          x-patternProperties:
+            '[a-zA-Z0-9]+':
+              type: string
+        UseStageCache:
+          description: ''
+          type: boolean
+    Stage_AccessLogSetting:
+      description: |-
+        The ``AccessLogSetting`` property type specifies settings for logging access in this stage.
+          ``AccessLogSetting`` is a property of the [AWS::ApiGateway::Stage](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html) resource.
+      type: object
+      additionalProperties: false
+      properties:
+        DestinationArn:
+          description: The Amazon Resource Name (ARN) of the CloudWatch Logs log group or Kinesis Data Firehose delivery stream to receive access logs. If you specify a Kinesis Data Firehose delivery stream, the stream name must begin with ``amazon-apigateway-``. This parameter is required to enable access logging.
+          type: string
+        Format:
+          description: A single line format of the access logs of data, as specified by selected [$context variables](https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-mapping-template-reference.html#context-variable-reference). The format must include at least ``$context.requestId``. This parameter is required to enable access logging.
+          type: string
+    Stage_MethodSetting:
+      description: |-
+        The ``MethodSetting`` property type configures settings for all methods in a stage.
+         The ``MethodSettings`` property of the ``AWS::ApiGateway::Stage`` resource contains a list of ``MethodSetting`` property types.
+      type: object
+      additionalProperties: false
+      properties:
+        CacheDataEncrypted:
+          description: ''
+          type: boolean
+        CacheTtlInSeconds:
+          description: ''
+          type: integer
+        CachingEnabled:
+          description: ''
+          type: boolean
+        DataTraceEnabled:
+          description: ''
+          type: boolean
+        HttpMethod:
+          description: The HTTP method. To apply settings to multiple resources and methods, specify an asterisk (``*``) for the ``HttpMethod`` and ``/*`` for the ``ResourcePath``. This parameter is required when you specify a ``MethodSetting``.
+          type: string
+        LoggingLevel:
+          description: ''
+          type: string
+        MetricsEnabled:
+          description: ''
+          type: boolean
+        ResourcePath:
+          description: >-
+            The resource path for this method. Forward slashes (``/``) are encoded as ``~1`` and the initial slash must include a forward slash. For example, the path value ``/resource/subresource`` must be encoded as ``/~1resource~1subresource``. To specify the root path, use only a slash (``/``). To apply settings to multiple resources and methods, specify an asterisk (``*``) for the ``HttpMethod`` and ``/*`` for the ``ResourcePath``. This parameter is required when you specify a
+            ``MethodSetting``.
+          type: string
+        ThrottlingBurstLimit:
+          description: ''
+          type: integer
+          minimum: 0
+        ThrottlingRateLimit:
+          description: ''
+          type: number
+          minimum: 0
+    Stage_Tag:
+      description: ''
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          description: The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:.
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          description: The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:.
+          type: string
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
     Stage:
       type: object
       properties:
         AccessLogSetting:
           description: ''
-          $ref: '#/components/schemas/AccessLogSetting'
+          $ref: '#/components/schemas/Stage_AccessLogSetting'
         CacheClusterEnabled:
           description: ''
           type: boolean
@@ -1961,7 +2145,7 @@ components:
           type: string
         CanarySetting:
           description: ''
-          $ref: '#/components/schemas/CanarySetting'
+          $ref: '#/components/schemas/Stage_CanarySetting'
         ClientCertificateId:
           description: ''
           type: string
@@ -1980,7 +2164,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/MethodSetting'
+            $ref: '#/components/schemas/Stage_MethodSetting'
         RestApiId:
           description: ''
           type: string
@@ -1993,7 +2177,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Stage_Tag'
         TracingEnabled:
           description: ''
           type: boolean
@@ -2075,6 +2259,24 @@ components:
           minimum: 0
           description: ''
       description: '``ThrottleSettings`` is a property of the [AWS::ApiGateway::UsagePlan](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplan.html) resource that specifies the overall request rate (average requests per second) and burst capacity when users call your REST APIs.'
+    UsagePlan_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+        Value:
+          type: string
+          minLength: 0
+          maxLength: 256
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+      required:
+        - Value
+        - Key
+      description: ''
     QuotaSettings:
       type: object
       additionalProperties: false
@@ -2117,7 +2319,7 @@ components:
           x-insertionOrder: false
           uniqueItems: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/UsagePlan_Tag'
         Throttle:
           $ref: '#/components/schemas/ThrottleSettings'
           description: ''
@@ -2210,6 +2412,18 @@ components:
           - apigateway:GET
         list:
           - apigateway:GET
+    VpcLink_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Value:
+          type: string
+        Key:
+          type: string
+      required:
+        - Value
+        - Key
+      description: ''
     VpcLink:
       type: object
       properties:
@@ -2225,7 +2439,7 @@ components:
           uniqueItems: true
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/VpcLink_Tag'
         TargetArns:
           description: ''
           type: array
@@ -2509,7 +2723,7 @@ components:
               type: array
               uniqueItems: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ClientCertificate_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateClientCertificateRequest
       type: object
@@ -2666,7 +2880,7 @@ components:
             Tags:
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/DomainName_Tag'
               description: ''
           x-stackQL-stringOnly: true
       x-title: CreateDomainNameRequest
@@ -2704,7 +2918,7 @@ components:
               uniqueItems: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/DomainNameAccessAssociation_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateDomainNameAccessAssociationRequest
       type: object
@@ -2727,7 +2941,7 @@ components:
             DomainName:
               type: string
             EndpointConfiguration:
-              $ref: '#/components/schemas/EndpointConfiguration'
+              $ref: '#/components/schemas/DomainNameV2_EndpointConfiguration'
             SecurityPolicy:
               type: string
             Policy:
@@ -2748,7 +2962,7 @@ components:
             Tags:
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/DomainNameV2_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateDomainNameV2Request
       type: object
@@ -3032,7 +3246,7 @@ components:
               type: string
             EndpointConfiguration:
               description: A list of the endpoint types of the API. Use this property when creating an API. When importing an existing API, specify the endpoint configuration types using the ``Parameters`` property.
-              $ref: '#/components/schemas/EndpointConfiguration'
+              $ref: '#/components/schemas/RestApi_EndpointConfiguration'
             Body:
               description: An OpenAPI specification that defines a set of RESTful APIs in JSON format. For YAML templates, you can also provide the specification in YAML format.
               type: object
@@ -3041,7 +3255,7 @@ components:
               description: ''
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/RestApi_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateRestApiRequest
       type: object
@@ -3061,7 +3275,7 @@ components:
           properties:
             AccessLogSetting:
               description: ''
-              $ref: '#/components/schemas/AccessLogSetting'
+              $ref: '#/components/schemas/Stage_AccessLogSetting'
             CacheClusterEnabled:
               description: ''
               type: boolean
@@ -3070,7 +3284,7 @@ components:
               type: string
             CanarySetting:
               description: ''
-              $ref: '#/components/schemas/CanarySetting'
+              $ref: '#/components/schemas/Stage_CanarySetting'
             ClientCertificateId:
               description: ''
               type: string
@@ -3089,7 +3303,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/MethodSetting'
+                $ref: '#/components/schemas/Stage_MethodSetting'
             RestApiId:
               description: ''
               type: string
@@ -3102,7 +3316,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Stage_Tag'
             TracingEnabled:
               description: ''
               type: boolean
@@ -3151,7 +3365,7 @@ components:
               x-insertionOrder: false
               uniqueItems: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/UsagePlan_Tag'
             Throttle:
               $ref: '#/components/schemas/ThrottleSettings'
               description: ''
@@ -3218,7 +3432,7 @@ components:
               uniqueItems: true
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/VpcLink_Tag'
             TargetArns:
               description: ''
               type: array
@@ -3334,7 +3548,7 @@ components:
       id: awscc.apigateway.api_keys
       x-cfn-schema-name: ApiKey
       x-cfn-type-name: AWS::ApiGateway::ApiKey
-      x-identifiers:
+      x-identifiers: &ref_0
         - APIKeyId
       x-type: cloud_control
       methods:
@@ -3436,8 +3650,7 @@ components:
       id: awscc.apigateway.api_keys_list_only
       x-cfn-schema-name: ApiKey
       x-cfn-type-name: AWS::ApiGateway::ApiKey
-      x-identifiers:
-        - APIKeyId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3467,7 +3680,7 @@ components:
       id: awscc.apigateway.authorizers
       x-cfn-schema-name: Authorizer
       x-cfn-type-name: AWS::ApiGateway::Authorizer
-      x-identifiers:
+      x-identifiers: &ref_1
         - RestApiId
         - AuthorizerId
       x-type: cloud_control
@@ -3574,9 +3787,7 @@ components:
       id: awscc.apigateway.authorizers_list_only
       x-cfn-schema-name: Authorizer
       x-cfn-type-name: AWS::ApiGateway::Authorizer
-      x-identifiers:
-        - RestApiId
-        - AuthorizerId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3608,7 +3819,7 @@ components:
       id: awscc.apigateway.base_path_mappings
       x-cfn-schema-name: BasePathMapping
       x-cfn-type-name: AWS::ApiGateway::BasePathMapping
-      x-identifiers:
+      x-identifiers: &ref_2
         - DomainName
         - BasePath
       x-type: cloud_control
@@ -3701,9 +3912,7 @@ components:
       id: awscc.apigateway.base_path_mappings_list_only
       x-cfn-schema-name: BasePathMapping
       x-cfn-type-name: AWS::ApiGateway::BasePathMapping
-      x-identifiers:
-        - DomainName
-        - BasePath
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3735,7 +3944,7 @@ components:
       id: awscc.apigateway.base_path_mapping_v2s
       x-cfn-schema-name: BasePathMappingV2
       x-cfn-type-name: AWS::ApiGateway::BasePathMappingV2
-      x-identifiers:
+      x-identifiers: &ref_3
         - BasePathMappingArn
       x-type: cloud_control
       methods:
@@ -3829,8 +4038,7 @@ components:
       id: awscc.apigateway.base_path_mapping_v2s_list_only
       x-cfn-schema-name: BasePathMappingV2
       x-cfn-type-name: AWS::ApiGateway::BasePathMappingV2
-      x-identifiers:
-        - BasePathMappingArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3860,7 +4068,7 @@ components:
       id: awscc.apigateway.client_certificates
       x-cfn-schema-name: ClientCertificate
       x-cfn-type-name: AWS::ApiGateway::ClientCertificate
-      x-identifiers:
+      x-identifiers: &ref_4
         - ClientCertificateId
       x-type: cloud_control
       methods:
@@ -3950,8 +4158,7 @@ components:
       id: awscc.apigateway.client_certificates_list_only
       x-cfn-schema-name: ClientCertificate
       x-cfn-type-name: AWS::ApiGateway::ClientCertificate
-      x-identifiers:
-        - ClientCertificateId
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3981,7 +4188,7 @@ components:
       id: awscc.apigateway.deployments
       x-cfn-schema-name: Deployment
       x-cfn-type-name: AWS::ApiGateway::Deployment
-      x-identifiers:
+      x-identifiers: &ref_5
         - DeploymentId
         - RestApiId
       x-type: cloud_control
@@ -4078,9 +4285,7 @@ components:
       id: awscc.apigateway.deployments_list_only
       x-cfn-schema-name: Deployment
       x-cfn-type-name: AWS::ApiGateway::Deployment
-      x-identifiers:
-        - DeploymentId
-        - RestApiId
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4112,7 +4317,7 @@ components:
       id: awscc.apigateway.documentation_parts
       x-cfn-schema-name: DocumentationPart
       x-cfn-type-name: AWS::ApiGateway::DocumentationPart
-      x-identifiers:
+      x-identifiers: &ref_6
         - DocumentationPartId
         - RestApiId
       x-type: cloud_control
@@ -4205,9 +4410,7 @@ components:
       id: awscc.apigateway.documentation_parts_list_only
       x-cfn-schema-name: DocumentationPart
       x-cfn-type-name: AWS::ApiGateway::DocumentationPart
-      x-identifiers:
-        - DocumentationPartId
-        - RestApiId
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4239,7 +4442,7 @@ components:
       id: awscc.apigateway.documentation_versions
       x-cfn-schema-name: DocumentationVersion
       x-cfn-type-name: AWS::ApiGateway::DocumentationVersion
-      x-identifiers:
+      x-identifiers: &ref_7
         - DocumentationVersion
         - RestApiId
       x-type: cloud_control
@@ -4330,9 +4533,7 @@ components:
       id: awscc.apigateway.documentation_versions_list_only
       x-cfn-schema-name: DocumentationVersion
       x-cfn-type-name: AWS::ApiGateway::DocumentationVersion
-      x-identifiers:
-        - DocumentationVersion
-        - RestApiId
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4364,7 +4565,7 @@ components:
       id: awscc.apigateway.domain_names
       x-cfn-schema-name: DomainName
       x-cfn-type-name: AWS::ApiGateway::DomainName
-      x-identifiers:
+      x-identifiers: &ref_8
         - DomainName
       x-type: cloud_control
       methods:
@@ -4476,8 +4677,7 @@ components:
       id: awscc.apigateway.domain_names_list_only
       x-cfn-schema-name: DomainName
       x-cfn-type-name: AWS::ApiGateway::DomainName
-      x-identifiers:
-        - DomainName
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4507,7 +4707,7 @@ components:
       id: awscc.apigateway.domain_name_access_associations
       x-cfn-schema-name: DomainNameAccessAssociation
       x-cfn-type-name: AWS::ApiGateway::DomainNameAccessAssociation
-      x-identifiers:
+      x-identifiers: &ref_9
         - DomainNameAccessAssociationArn
       x-type: cloud_control
       methods:
@@ -4584,8 +4784,7 @@ components:
       id: awscc.apigateway.domain_name_access_associations_list_only
       x-cfn-schema-name: DomainNameAccessAssociation
       x-cfn-type-name: AWS::ApiGateway::DomainNameAccessAssociation
-      x-identifiers:
-        - DomainNameAccessAssociationArn
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4615,7 +4814,7 @@ components:
       id: awscc.apigateway.domain_name_v2s
       x-cfn-schema-name: DomainNameV2
       x-cfn-type-name: AWS::ApiGateway::DomainNameV2
-      x-identifiers:
+      x-identifiers: &ref_10
         - DomainNameArn
       x-type: cloud_control
       methods:
@@ -4717,8 +4916,7 @@ components:
       id: awscc.apigateway.domain_name_v2s_list_only
       x-cfn-schema-name: DomainNameV2
       x-cfn-type-name: AWS::ApiGateway::DomainNameV2
-      x-identifiers:
-        - DomainNameArn
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4748,7 +4946,7 @@ components:
       id: awscc.apigateway.gateway_responses
       x-cfn-schema-name: GatewayResponse
       x-cfn-type-name: AWS::ApiGateway::GatewayResponse
-      x-identifiers:
+      x-identifiers: &ref_11
         - Id
       x-type: cloud_control
       methods:
@@ -4844,8 +5042,7 @@ components:
       id: awscc.apigateway.gateway_responses_list_only
       x-cfn-schema-name: GatewayResponse
       x-cfn-type-name: AWS::ApiGateway::GatewayResponse
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_11
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4987,7 +5184,7 @@ components:
       id: awscc.apigateway.models
       x-cfn-schema-name: Model
       x-cfn-type-name: AWS::ApiGateway::Model
-      x-identifiers:
+      x-identifiers: &ref_12
         - RestApiId
         - Name
       x-type: cloud_control
@@ -5082,9 +5279,7 @@ components:
       id: awscc.apigateway.models_list_only
       x-cfn-schema-name: Model
       x-cfn-type-name: AWS::ApiGateway::Model
-      x-identifiers:
-        - RestApiId
-        - Name
+      x-identifiers: *ref_12
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5116,7 +5311,7 @@ components:
       id: awscc.apigateway.request_validators
       x-cfn-schema-name: RequestValidator
       x-cfn-type-name: AWS::ApiGateway::RequestValidator
-      x-identifiers:
+      x-identifiers: &ref_13
         - RestApiId
         - RequestValidatorId
       x-type: cloud_control
@@ -5211,9 +5406,7 @@ components:
       id: awscc.apigateway.request_validators_list_only
       x-cfn-schema-name: RequestValidator
       x-cfn-type-name: AWS::ApiGateway::RequestValidator
-      x-identifiers:
-        - RestApiId
-        - RequestValidatorId
+      x-identifiers: *ref_13
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5245,7 +5438,7 @@ components:
       id: awscc.apigateway.resources
       x-cfn-schema-name: Resource
       x-cfn-type-name: AWS::ApiGateway::Resource
-      x-identifiers:
+      x-identifiers: &ref_14
         - RestApiId
         - ResourceId
       x-type: cloud_control
@@ -5338,9 +5531,7 @@ components:
       id: awscc.apigateway.resources_list_only
       x-cfn-schema-name: Resource
       x-cfn-type-name: AWS::ApiGateway::Resource
-      x-identifiers:
-        - RestApiId
-        - ResourceId
+      x-identifiers: *ref_14
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5372,7 +5563,7 @@ components:
       id: awscc.apigateway.rest_apis
       x-cfn-schema-name: RestApi
       x-cfn-type-name: AWS::ApiGateway::RestApi
-      x-identifiers:
+      x-identifiers: &ref_15
         - RestApiId
       x-type: cloud_control
       methods:
@@ -5490,8 +5681,7 @@ components:
       id: awscc.apigateway.rest_apis_list_only
       x-cfn-schema-name: RestApi
       x-cfn-type-name: AWS::ApiGateway::RestApi
-      x-identifiers:
-        - RestApiId
+      x-identifiers: *ref_15
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5521,7 +5711,7 @@ components:
       id: awscc.apigateway.stages
       x-cfn-schema-name: Stage
       x-cfn-type-name: AWS::ApiGateway::Stage
-      x-identifiers:
+      x-identifiers: &ref_16
         - RestApiId
         - StageName
       x-type: cloud_control
@@ -5634,9 +5824,7 @@ components:
       id: awscc.apigateway.stages_list_only
       x-cfn-schema-name: Stage
       x-cfn-type-name: AWS::ApiGateway::Stage
-      x-identifiers:
-        - RestApiId
-        - StageName
+      x-identifiers: *ref_16
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5668,7 +5856,7 @@ components:
       id: awscc.apigateway.usage_plans
       x-cfn-schema-name: UsagePlan
       x-cfn-type-name: AWS::ApiGateway::UsagePlan
-      x-identifiers:
+      x-identifiers: &ref_17
         - Id
       x-type: cloud_control
       methods:
@@ -5766,8 +5954,7 @@ components:
       id: awscc.apigateway.usage_plans_list_only
       x-cfn-schema-name: UsagePlan
       x-cfn-type-name: AWS::ApiGateway::UsagePlan
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_17
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5797,7 +5984,7 @@ components:
       id: awscc.apigateway.usage_plan_keys
       x-cfn-schema-name: UsagePlanKey
       x-cfn-type-name: AWS::ApiGateway::UsagePlanKey
-      x-identifiers:
+      x-identifiers: &ref_18
         - Id
       x-type: cloud_control
       methods:
@@ -5872,8 +6059,7 @@ components:
       id: awscc.apigateway.usage_plan_keys_list_only
       x-cfn-schema-name: UsagePlanKey
       x-cfn-type-name: AWS::ApiGateway::UsagePlanKey
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_18
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5903,7 +6089,7 @@ components:
       id: awscc.apigateway.vpc_links
       x-cfn-schema-name: VpcLink
       x-cfn-type-name: AWS::ApiGateway::VpcLink
-      x-identifiers:
+      x-identifiers: &ref_19
         - VpcLinkId
       x-type: cloud_control
       methods:
@@ -5997,8 +6183,7 @@ components:
       id: awscc.apigateway.vpc_links_list_only
       x-cfn-schema-name: VpcLink
       x-cfn-type-name: AWS::ApiGateway::VpcLink
-      x-identifiers:
-        - VpcLinkId
+      x-identifiers: *ref_19
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/apigatewayv2.yaml b/openapi/src/awscc/v00.00.00000/services/apigatewayv2.yaml
index ea3743924..d206ad5f6 100644
--- a/openapi/src/awscc/v00.00.00000/services/apigatewayv2.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/apigatewayv2.yaml
@@ -1171,11 +1171,10 @@ components:
       properties:
         Required:
           type: boolean
-          description: Specifies whether the parameter is required.
       required:
         - Required
       additionalProperties: false
-      description: Specifies whether the parameter is required.
+      description: ''
     Route:
       type: object
       properties:
@@ -1258,10 +1257,20 @@ components:
           - apigateway:DELETE
         list:
           - apigateway:GET
+    RouteResponse_ParameterConstraints:
+      type: object
+      properties:
+        Required:
+          type: boolean
+          description: Specifies whether the parameter is required.
+      required:
+        - Required
+      additionalProperties: false
+      description: Specifies whether the parameter is required.
     RouteParameters:
       x-patternProperties:
         ^.+$:
-          $ref: '#/components/schemas/ParameterConstraints'
+          $ref: '#/components/schemas/RouteResponse_ParameterConstraints'
       additionalProperties: false
     RouteResponse:
       type: object
@@ -2136,7 +2145,7 @@ components:
       id: awscc.apigatewayv2.apis
       x-cfn-schema-name: Api
       x-cfn-type-name: AWS::ApiGatewayV2::Api
-      x-identifiers:
+      x-identifiers: &ref_0
         - ApiId
       x-type: cloud_control
       methods:
@@ -2260,8 +2269,7 @@ components:
       id: awscc.apigatewayv2.apis_list_only
       x-cfn-schema-name: Api
       x-cfn-type-name: AWS::ApiGatewayV2::Api
-      x-identifiers:
-        - ApiId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2291,7 +2299,7 @@ components:
       id: awscc.apigatewayv2.api_mappings
       x-cfn-schema-name: ApiMapping
       x-cfn-type-name: AWS::ApiGatewayV2::ApiMapping
-      x-identifiers:
+      x-identifiers: &ref_1
         - ApiMappingId
         - DomainName
       x-type: cloud_control
@@ -2386,9 +2394,7 @@ components:
       id: awscc.apigatewayv2.api_mappings_list_only
       x-cfn-schema-name: ApiMapping
       x-cfn-type-name: AWS::ApiGatewayV2::ApiMapping
-      x-identifiers:
-        - ApiMappingId
-        - DomainName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2420,7 +2426,7 @@ components:
       id: awscc.apigatewayv2.authorizers
       x-cfn-schema-name: Authorizer
       x-cfn-type-name: AWS::ApiGatewayV2::Authorizer
-      x-identifiers:
+      x-identifiers: &ref_2
         - AuthorizerId
         - ApiId
       x-type: cloud_control
@@ -2529,9 +2535,7 @@ components:
       id: awscc.apigatewayv2.authorizers_list_only
       x-cfn-schema-name: Authorizer
       x-cfn-type-name: AWS::ApiGatewayV2::Authorizer
-      x-identifiers:
-        - AuthorizerId
-        - ApiId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2563,7 +2567,7 @@ components:
       id: awscc.apigatewayv2.deployments
       x-cfn-schema-name: Deployment
       x-cfn-type-name: AWS::ApiGatewayV2::Deployment
-      x-identifiers:
+      x-identifiers: &ref_3
         - ApiId
         - DeploymentId
       x-type: cloud_control
@@ -2656,9 +2660,7 @@ components:
       id: awscc.apigatewayv2.deployments_list_only
       x-cfn-schema-name: Deployment
       x-cfn-type-name: AWS::ApiGatewayV2::Deployment
-      x-identifiers:
-        - ApiId
-        - DeploymentId
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2690,7 +2692,7 @@ components:
       id: awscc.apigatewayv2.domain_names
       x-cfn-schema-name: DomainName
       x-cfn-type-name: AWS::ApiGatewayV2::DomainName
-      x-identifiers:
+      x-identifiers: &ref_4
         - DomainName
       x-type: cloud_control
       methods:
@@ -2790,8 +2792,7 @@ components:
       id: awscc.apigatewayv2.domain_names_list_only
       x-cfn-schema-name: DomainName
       x-cfn-type-name: AWS::ApiGatewayV2::DomainName
-      x-identifiers:
-        - DomainName
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2821,7 +2822,7 @@ components:
       id: awscc.apigatewayv2.integrations
       x-cfn-schema-name: Integration
       x-cfn-type-name: AWS::ApiGatewayV2::Integration
-      x-identifiers:
+      x-identifiers: &ref_5
         - ApiId
         - IntegrationId
       x-type: cloud_control
@@ -2944,9 +2945,7 @@ components:
       id: awscc.apigatewayv2.integrations_list_only
       x-cfn-schema-name: Integration
       x-cfn-type-name: AWS::ApiGatewayV2::Integration
-      x-identifiers:
-        - ApiId
-        - IntegrationId
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2978,7 +2977,7 @@ components:
       id: awscc.apigatewayv2.integration_responses
       x-cfn-schema-name: IntegrationResponse
       x-cfn-type-name: AWS::ApiGatewayV2::IntegrationResponse
-      x-identifiers:
+      x-identifiers: &ref_6
         - ApiId
         - IntegrationId
         - IntegrationResponseId
@@ -3080,10 +3079,7 @@ components:
       id: awscc.apigatewayv2.integration_responses_list_only
       x-cfn-schema-name: IntegrationResponse
       x-cfn-type-name: AWS::ApiGatewayV2::IntegrationResponse
-      x-identifiers:
-        - ApiId
-        - IntegrationId
-        - IntegrationResponseId
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3117,7 +3113,7 @@ components:
       id: awscc.apigatewayv2.models
       x-cfn-schema-name: Model
       x-cfn-type-name: AWS::ApiGatewayV2::Model
-      x-identifiers:
+      x-identifiers: &ref_7
         - ApiId
         - ModelId
       x-type: cloud_control
@@ -3214,9 +3210,7 @@ components:
       id: awscc.apigatewayv2.models_list_only
       x-cfn-schema-name: Model
       x-cfn-type-name: AWS::ApiGatewayV2::Model
-      x-identifiers:
-        - ApiId
-        - ModelId
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3248,7 +3242,7 @@ components:
       id: awscc.apigatewayv2.routes
       x-cfn-schema-name: Route
       x-cfn-type-name: AWS::ApiGatewayV2::Route
-      x-identifiers:
+      x-identifiers: &ref_8
         - ApiId
         - RouteId
       x-type: cloud_control
@@ -3359,9 +3353,7 @@ components:
       id: awscc.apigatewayv2.routes_list_only
       x-cfn-schema-name: Route
       x-cfn-type-name: AWS::ApiGatewayV2::Route
-      x-identifiers:
-        - ApiId
-        - RouteId
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3393,7 +3385,7 @@ components:
       id: awscc.apigatewayv2.route_responses
       x-cfn-schema-name: RouteResponse
       x-cfn-type-name: AWS::ApiGatewayV2::RouteResponse
-      x-identifiers:
+      x-identifiers: &ref_9
         - ApiId
         - RouteId
         - RouteResponseId
@@ -3493,10 +3485,7 @@ components:
       id: awscc.apigatewayv2.route_responses_list_only
       x-cfn-schema-name: RouteResponse
       x-cfn-type-name: AWS::ApiGatewayV2::RouteResponse
-      x-identifiers:
-        - ApiId
-        - RouteId
-        - RouteResponseId
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3530,7 +3519,7 @@ components:
       id: awscc.apigatewayv2.routing_rules
       x-cfn-schema-name: RoutingRule
       x-cfn-type-name: AWS::ApiGatewayV2::RoutingRule
-      x-identifiers:
+      x-identifiers: &ref_10
         - RoutingRuleArn
       x-type: cloud_control
       methods:
@@ -3626,8 +3615,7 @@ components:
       id: awscc.apigatewayv2.routing_rules_list_only
       x-cfn-schema-name: RoutingRule
       x-cfn-type-name: AWS::ApiGatewayV2::RoutingRule
-      x-identifiers:
-        - RoutingRuleArn
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3657,7 +3645,7 @@ components:
       id: awscc.apigatewayv2.vpc_links
       x-cfn-schema-name: VpcLink
       x-cfn-type-name: AWS::ApiGatewayV2::VpcLink
-      x-identifiers:
+      x-identifiers: &ref_11
         - VpcLinkId
       x-type: cloud_control
       methods:
@@ -3751,8 +3739,7 @@ components:
       id: awscc.apigatewayv2.vpc_links_list_only
       x-cfn-schema-name: VpcLink
       x-cfn-type-name: AWS::ApiGatewayV2::VpcLink
-      x-identifiers:
-        - VpcLinkId
+      x-identifiers: *ref_11
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/appconfig.yaml b/openapi/src/awscc/v00.00.00000/services/appconfig.yaml
index 718924c9d..3bca05dc2 100644
--- a/openapi/src/awscc/v00.00.00000/services/appconfig.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/appconfig.yaml
@@ -391,20 +391,23 @@ components:
       type: object
   schemas:
     Tags:
-      description: Metadata to assign to the configuration profile. Tags help organize and categorize your AWS AppConfig resources. Each tag consists of a key and an optional value, both of which you define.
-      additionalProperties: false
+      description: Metadata to assign to the application. Tags help organize and categorize your AWS AppConfig resources. Each tag consists of a key and an optional value, both of which you define.
       type: object
+      additionalProperties: false
       properties:
-        Value:
-          minLength: 0
-          description: The tag value can be up to 256 characters.
-          type: string
-          maxLength: 256
         Key:
-          minLength: 1
-          description: The key-value string map. The tag key can be up to 128 characters and must not start with aws:.
           type: string
+          description: The key-value string map. The valid character set is [a-zA-Z1-9 +-=._:/-]. The tag key can be up to 128 characters and must not start with aws:.
+          minLength: 1
           maxLength: 128
+        Value:
+          type: string
+          description: The tag value can be up to 256 characters.
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
     Application:
       type: object
       properties:
@@ -476,6 +479,21 @@ components:
           description: Either the JSON Schema content or the Amazon Resource Name (ARN) of an Lambda function.
           type: string
           maxLength: 32768
+    ConfigurationProfile_Tags:
+      description: Metadata to assign to the configuration profile. Tags help organize and categorize your AWS AppConfig resources. Each tag consists of a key and an optional value, both of which you define.
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          minLength: 0
+          description: The tag value can be up to 256 characters.
+          type: string
+          maxLength: 256
+        Key:
+          minLength: 1
+          description: The key-value string map. The tag key can be up to 128 characters and must not start with aws:.
+          type: string
+          maxLength: 128
     ConfigurationProfile:
       type: object
       properties:
@@ -537,7 +555,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tags'
+            $ref: '#/components/schemas/ConfigurationProfile_Tags'
         Name:
           minLength: 1
           description: A name for the configuration profile.
@@ -596,23 +614,16 @@ components:
         delete:
           - appconfig:DeleteConfigurationProfile
     Tag:
-      description: A key-value pair to associate with a resource.
+      description: Metadata to assign to the deployment. Tags help organize and categorize your AWS AppConfig resources. Each tag consists of a key and an optional value, both of which you define.
+      additionalProperties: false
       type: object
       properties:
-        Key:
-          type: string
-          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
-          minLength: 1
-          maxLength: 128
         Value:
+          description: The tag value can be up to 256 characters.
+          type: string
+        Key:
+          description: The key-value string map. The valid character set is [a-zA-Z1-9+-=._:/]. The tag key can be up to 128 characters and must not start with aws:.
           type: string
-          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
-          minLength: 0
-          maxLength: 256
-      required:
-        - Key
-        - Value
-      additionalProperties: false
     DynamicExtensionParameters:
       additionalProperties: false
       type: object
@@ -732,6 +743,17 @@ components:
           - appconfig:ListDeployments
         delete:
           - appconfig:StopDeployment
+    DeploymentStrategy_Tag:
+      description: Metadata to assign to the deployment strategy. Tags help organize and categorize your AWS AppConfig resources. Each tag consists of a key and an optional value, both of which you define.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+      additionalProperties: false
     DeploymentStrategy:
       type: object
       properties:
@@ -783,7 +805,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/DeploymentStrategy_Tag'
         Id:
           type: string
           description: The deployment strategy ID.
@@ -849,6 +871,24 @@ components:
           maxLength: 2048
       required:
         - AlarmArn
+    Environment_Tag:
+      description: Metadata to assign to the environment. Tags help organize and categorize your AWS AppConfig resources. Each tag consists of a key and an optional value, both of which you define.
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          minLength: 0
+          description: The tag value can be up to 256 characters.
+          type: string
+          maxLength: 256
+        Key:
+          minLength: 1
+          description: The key-value string map. The valid character set is [a-zA-Z1-9+-=._:/]. The tag key can be up to 128 characters and must not start with aws:.
+          type: string
+          maxLength: 128
+      required:
+        - Key
+        - Value
     Environment:
       type: object
       properties:
@@ -886,7 +926,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Environment_Tag'
         Name:
           minLength: 1
           description: A name for the environment.
@@ -940,6 +980,24 @@ components:
         delete:
           - appconfig:GetEnvironment
           - appconfig:DeleteEnvironment
+    Extension_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     Actions:
       description: A list of actions for an extension to take at a specific action point.
       uniqueItems: true
@@ -1026,7 +1084,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Extension_Tag'
       required:
         - Name
         - Actions
@@ -1073,6 +1131,24 @@ components:
           - appconfig:UntagResource
         list:
           - appconfig:ListExtensions
+    ExtensionAssociation_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     ExtensionAssociation:
       type: object
       properties:
@@ -1102,7 +1178,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ExtensionAssociation_Tag'
       x-stackql-resource-name: extension_association
       description: An example resource schema demonstrating some basic constructs and validation rules.
       x-type-name: AWS::AppConfig::ExtensionAssociation
@@ -1329,7 +1405,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tags'
+                $ref: '#/components/schemas/ConfigurationProfile_Tags'
             Name:
               minLength: 1
               description: A name for the configuration profile.
@@ -1465,7 +1541,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/DeploymentStrategy_Tag'
             Id:
               type: string
               description: The deployment strategy ID.
@@ -1520,7 +1596,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Environment_Tag'
             Name:
               minLength: 1
               description: A name for the environment.
@@ -1575,7 +1651,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Extension_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateExtensionRequest
       type: object
@@ -1619,7 +1695,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ExtensionAssociation_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateExtensionAssociationRequest
       type: object
@@ -1687,7 +1763,7 @@ components:
       id: awscc.appconfig.applications
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::AppConfig::Application
-      x-identifiers:
+      x-identifiers: &ref_0
         - ApplicationId
       x-type: cloud_control
       methods:
@@ -1779,8 +1855,7 @@ components:
       id: awscc.appconfig.applications_list_only
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::AppConfig::Application
-      x-identifiers:
-        - ApplicationId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1810,7 +1885,7 @@ components:
       id: awscc.appconfig.configuration_profiles
       x-cfn-schema-name: ConfigurationProfile
       x-cfn-type-name: AWS::AppConfig::ConfigurationProfile
-      x-identifiers:
+      x-identifiers: &ref_1
         - ApplicationId
         - ConfigurationProfileId
       x-type: cloud_control
@@ -1919,9 +1994,7 @@ components:
       id: awscc.appconfig.configuration_profiles_list_only
       x-cfn-schema-name: ConfigurationProfile
       x-cfn-type-name: AWS::AppConfig::ConfigurationProfile
-      x-identifiers:
-        - ApplicationId
-        - ConfigurationProfileId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1953,7 +2026,7 @@ components:
       id: awscc.appconfig.deployments
       x-cfn-schema-name: Deployment
       x-cfn-type-name: AWS::AppConfig::Deployment
-      x-identifiers:
+      x-identifiers: &ref_2
         - ApplicationId
         - EnvironmentId
         - DeploymentNumber
@@ -2044,10 +2117,7 @@ components:
       id: awscc.appconfig.deployments_list_only
       x-cfn-schema-name: Deployment
       x-cfn-type-name: AWS::AppConfig::Deployment
-      x-identifiers:
-        - ApplicationId
-        - EnvironmentId
-        - DeploymentNumber
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2081,7 +2151,7 @@ components:
       id: awscc.appconfig.deployment_strategies
       x-cfn-schema-name: DeploymentStrategy
       x-cfn-type-name: AWS::AppConfig::DeploymentStrategy
-      x-identifiers:
+      x-identifiers: &ref_3
         - Id
       x-type: cloud_control
       methods:
@@ -2183,8 +2253,7 @@ components:
       id: awscc.appconfig.deployment_strategies_list_only
       x-cfn-schema-name: DeploymentStrategy
       x-cfn-type-name: AWS::AppConfig::DeploymentStrategy
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2214,7 +2283,7 @@ components:
       id: awscc.appconfig.environments
       x-cfn-schema-name: Environment
       x-cfn-type-name: AWS::AppConfig::Environment
-      x-identifiers:
+      x-identifiers: &ref_4
         - ApplicationId
         - EnvironmentId
       x-type: cloud_control
@@ -2313,9 +2382,7 @@ components:
       id: awscc.appconfig.environments_list_only
       x-cfn-schema-name: Environment
       x-cfn-type-name: AWS::AppConfig::Environment
-      x-identifiers:
-        - ApplicationId
-        - EnvironmentId
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2347,7 +2414,7 @@ components:
       id: awscc.appconfig.extensions
       x-cfn-schema-name: Extension
       x-cfn-type-name: AWS::AppConfig::Extension
-      x-identifiers:
+      x-identifiers: &ref_5
         - Id
       x-type: cloud_control
       methods:
@@ -2449,8 +2516,7 @@ components:
       id: awscc.appconfig.extensions_list_only
       x-cfn-schema-name: Extension
       x-cfn-type-name: AWS::AppConfig::Extension
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2480,7 +2546,7 @@ components:
       id: awscc.appconfig.extension_associations
       x-cfn-schema-name: ExtensionAssociation
       x-cfn-type-name: AWS::AppConfig::ExtensionAssociation
-      x-identifiers:
+      x-identifiers: &ref_6
         - Id
       x-type: cloud_control
       methods:
@@ -2582,8 +2648,7 @@ components:
       id: awscc.appconfig.extension_associations_list_only
       x-cfn-schema-name: ExtensionAssociation
       x-cfn-type-name: AWS::AppConfig::ExtensionAssociation
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2613,7 +2678,7 @@ components:
       id: awscc.appconfig.hosted_configuration_versions
       x-cfn-schema-name: HostedConfigurationVersion
       x-cfn-type-name: AWS::AppConfig::HostedConfigurationVersion
-      x-identifiers:
+      x-identifiers: &ref_7
         - ApplicationId
         - ConfigurationProfileId
         - VersionNumber
@@ -2698,10 +2763,7 @@ components:
       id: awscc.appconfig.hosted_configuration_versions_list_only
       x-cfn-schema-name: HostedConfigurationVersion
       x-cfn-type-name: AWS::AppConfig::HostedConfigurationVersion
-      x-identifiers:
-        - ApplicationId
-        - ConfigurationProfileId
-        - VersionNumber
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/appflow.yaml b/openapi/src/awscc/v00.00.00000/services/appflow.yaml
index 8c2753f50..9b609f577 100644
--- a/openapi/src/awscc/v00.00.00000/services/appflow.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/appflow.yaml
@@ -473,17 +473,16 @@ components:
     ConnectorType:
       type: string
       enum:
-        - SAPOData
         - Salesforce
         - Pardot
         - Singular
         - Slack
         - Redshift
-        - S3
         - Marketo
         - Googleanalytics
         - Zendesk
         - Servicenow
+        - SAPOData
         - Datadog
         - Trendmicro
         - Snowflake
@@ -492,9 +491,6 @@ components:
         - Amplitude
         - Veeva
         - CustomConnector
-        - EventBridge
-        - Upsolver
-        - LookoutMetrics
     ConnectorProfileConfig:
       description: Connector specific configurations needed to create connector profile
       type: object
@@ -1167,7 +1163,7 @@ components:
       pattern: \S+
     BucketPrefix:
       type: string
-      maxLength: 512
+      maxLength: 128
     Key:
       type: string
       pattern: \S+
@@ -1415,7 +1411,7 @@ components:
       properties:
         ConnectorType:
           description: Type of source connector
-          $ref: '#/components/schemas/ConnectorType'
+          $ref: '#/components/schemas/Flow_ConnectorType'
         ApiVersion:
           description: The API version that the destination connector uses.
           $ref: '#/components/schemas/ApiVersion'
@@ -1438,7 +1434,7 @@ components:
       properties:
         ConnectorType:
           description: Destination connector type
-          $ref: '#/components/schemas/ConnectorType'
+          $ref: '#/components/schemas/Flow_ConnectorType'
         ApiVersion:
           description: The API version that the destination connector uses.
           $ref: '#/components/schemas/ApiVersion'
@@ -1718,6 +1714,9 @@ components:
       minLength: 16
       maxLength: 63
       pattern: ^(upsolver-appflow)\S*
+    Flow_BucketPrefix:
+      type: string
+      maxLength: 512
     S3InputFormatConfig:
       type: object
       properties:
@@ -1732,7 +1731,7 @@ components:
         FailOnFirstError:
           type: boolean
         BucketPrefix:
-          $ref: '#/components/schemas/BucketPrefix'
+          $ref: '#/components/schemas/Flow_BucketPrefix'
         BucketName:
           $ref: '#/components/schemas/BucketName'
       additionalProperties: false
@@ -1740,7 +1739,7 @@ components:
       type: object
       properties:
         BucketPrefix:
-          $ref: '#/components/schemas/BucketPrefix'
+          $ref: '#/components/schemas/Flow_BucketPrefix'
         BucketName:
           $ref: '#/components/schemas/BucketName'
       additionalProperties: false
@@ -1834,6 +1833,31 @@ components:
       required:
         - PrefixConfig
       additionalProperties: false
+    Flow_ConnectorType:
+      type: string
+      enum:
+        - SAPOData
+        - Salesforce
+        - Pardot
+        - Singular
+        - Slack
+        - Redshift
+        - S3
+        - Marketo
+        - Googleanalytics
+        - Zendesk
+        - Servicenow
+        - Datadog
+        - Trendmicro
+        - Snowflake
+        - Dynatrace
+        - Infornexus
+        - Amplitude
+        - Veeva
+        - CustomConnector
+        - EventBridge
+        - Upsolver
+        - LookoutMetrics
     ApiVersion:
       description: The API version that the connector will use.
       type: string
@@ -1898,7 +1922,7 @@ components:
         BucketName:
           $ref: '#/components/schemas/BucketName'
         BucketPrefix:
-          $ref: '#/components/schemas/BucketPrefix'
+          $ref: '#/components/schemas/Flow_BucketPrefix'
         S3InputFormatConfig:
           $ref: '#/components/schemas/S3InputFormatConfig'
       required:
@@ -2066,7 +2090,7 @@ components:
         IntermediateBucketName:
           $ref: '#/components/schemas/BucketName'
         BucketPrefix:
-          $ref: '#/components/schemas/BucketPrefix'
+          $ref: '#/components/schemas/Flow_BucketPrefix'
         ErrorHandlingConfig:
           $ref: '#/components/schemas/ErrorHandlingConfig'
       required:
@@ -2079,7 +2103,7 @@ components:
         BucketName:
           $ref: '#/components/schemas/BucketName'
         BucketPrefix:
-          $ref: '#/components/schemas/BucketPrefix'
+          $ref: '#/components/schemas/Flow_BucketPrefix'
         S3OutputFormatConfig:
           $ref: '#/components/schemas/S3OutputFormatConfig'
       required:
@@ -2131,7 +2155,7 @@ components:
         IntermediateBucketName:
           $ref: '#/components/schemas/BucketName'
         BucketPrefix:
-          $ref: '#/components/schemas/BucketPrefix'
+          $ref: '#/components/schemas/Flow_BucketPrefix'
         ErrorHandlingConfig:
           $ref: '#/components/schemas/ErrorHandlingConfig'
       required:
@@ -2154,7 +2178,7 @@ components:
         BucketName:
           $ref: '#/components/schemas/UpsolverBucketName'
         BucketPrefix:
-          $ref: '#/components/schemas/BucketPrefix'
+          $ref: '#/components/schemas/Flow_BucketPrefix'
         S3OutputFormatConfig:
           $ref: '#/components/schemas/UpsolverS3OutputFormatConfig'
       required:
@@ -2885,7 +2909,7 @@ components:
       id: awscc.appflow.connectors
       x-cfn-schema-name: Connector
       x-cfn-type-name: AWS::AppFlow::Connector
-      x-identifiers:
+      x-identifiers: &ref_0
         - ConnectorLabel
       x-type: cloud_control
       methods:
@@ -2979,8 +3003,7 @@ components:
       id: awscc.appflow.connectors_list_only
       x-cfn-schema-name: Connector
       x-cfn-type-name: AWS::AppFlow::Connector
-      x-identifiers:
-        - ConnectorLabel
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3010,7 +3033,7 @@ components:
       id: awscc.appflow.connector_profiles
       x-cfn-schema-name: ConnectorProfile
       x-cfn-type-name: AWS::AppFlow::ConnectorProfile
-      x-identifiers:
+      x-identifiers: &ref_1
         - ConnectorProfileName
       x-type: cloud_control
       methods:
@@ -3110,8 +3133,7 @@ components:
       id: awscc.appflow.connector_profiles_list_only
       x-cfn-schema-name: ConnectorProfile
       x-cfn-type-name: AWS::AppFlow::ConnectorProfile
-      x-identifiers:
-        - ConnectorProfileName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3141,7 +3163,7 @@ components:
       id: awscc.appflow.flows
       x-cfn-schema-name: Flow
       x-cfn-type-name: AWS::AppFlow::Flow
-      x-identifiers:
+      x-identifiers: &ref_2
         - FlowName
       x-type: cloud_control
       methods:
@@ -3247,8 +3269,7 @@ components:
       id: awscc.appflow.flows_list_only
       x-cfn-schema-name: Flow
       x-cfn-type-name: AWS::AppFlow::Flow
-      x-identifiers:
-        - FlowName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/appintegrations.yaml b/openapi/src/awscc/v00.00.00000/services/appintegrations.yaml
index a76af94a3..0c6f690e0 100644
--- a/openapi/src/awscc/v00.00.00000/services/appintegrations.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/appintegrations.yaml
@@ -391,6 +391,7 @@ components:
       type: object
   schemas:
     Tag:
+      description: A label for tagging Application resources
       type: object
       properties:
         Key:
@@ -603,6 +604,25 @@ components:
       additionalProperties: false
       required:
         - ScheduleExpression
+    DataIntegration_Tag:
+      description: A label for tagging DataIntegration resources
+      type: object
+      properties:
+        Key:
+          description: A key to identify the tag.
+          type: string
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+          minLength: 1
+          maxLength: 128
+        Value:
+          description: Corresponding tag value for the key.
+          type: string
+          minLength: 0
+          maxLength: 256
+      additionalProperties: false
+      required:
+        - Key
+        - Value
     FileConfiguration:
       description: The configuration for what files should be pulled from the source.
       type: object
@@ -695,7 +715,7 @@ components:
           description: The tags (keys and values) associated with the data integration.
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/DataIntegration_Tag'
           minItems: 0
           maxItems: 200
         FileConfiguration:
@@ -799,6 +819,24 @@ components:
       additionalProperties: false
       required:
         - Source
+    EventIntegration_Tag:
+      type: object
+      properties:
+        Key:
+          description: A key to identify the tag.
+          type: string
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+          minLength: 1
+          maxLength: 128
+        Value:
+          description: Corresponding tag value for the key.
+          type: string
+          minLength: 0
+          maxLength: 256
+      additionalProperties: false
+      required:
+        - Key
+        - Value
     Metadata:
       type: object
       properties:
@@ -851,7 +889,7 @@ components:
           description: The tags (keys and values) associated with the event integration.
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/EventIntegration_Tag'
           minItems: 0
           maxItems: 200
       required:
@@ -1036,7 +1074,7 @@ components:
               description: The tags (keys and values) associated with the data integration.
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/DataIntegration_Tag'
               minItems: 0
               maxItems: 200
             FileConfiguration:
@@ -1092,7 +1130,7 @@ components:
               description: The tags (keys and values) associated with the event integration.
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/EventIntegration_Tag'
               minItems: 0
               maxItems: 200
           x-stackQL-stringOnly: true
@@ -1112,7 +1150,7 @@ components:
       id: awscc.appintegrations.applications
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::AppIntegrations::Application
-      x-identifiers:
+      x-identifiers: &ref_0
         - ApplicationArn
       x-type: cloud_control
       methods:
@@ -1220,8 +1258,7 @@ components:
       id: awscc.appintegrations.applications_list_only
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::AppIntegrations::Application
-      x-identifiers:
-        - ApplicationArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1251,7 +1288,7 @@ components:
       id: awscc.appintegrations.data_integrations
       x-cfn-schema-name: DataIntegration
       x-cfn-type-name: AWS::AppIntegrations::DataIntegration
-      x-identifiers:
+      x-identifiers: &ref_1
         - Id
       x-type: cloud_control
       methods:
@@ -1355,8 +1392,7 @@ components:
       id: awscc.appintegrations.data_integrations_list_only
       x-cfn-schema-name: DataIntegration
       x-cfn-type-name: AWS::AppIntegrations::DataIntegration
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1386,7 +1422,7 @@ components:
       id: awscc.appintegrations.event_integrations
       x-cfn-schema-name: EventIntegration
       x-cfn-type-name: AWS::AppIntegrations::EventIntegration
-      x-identifiers:
+      x-identifiers: &ref_2
         - Name
       x-type: cloud_control
       methods:
@@ -1482,8 +1518,7 @@ components:
       id: awscc.appintegrations.event_integrations_list_only
       x-cfn-schema-name: EventIntegration
       x-cfn-type-name: AWS::AppIntegrations::EventIntegration
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/applicationautoscaling.yaml b/openapi/src/awscc/v00.00.00000/services/applicationautoscaling.yaml
index 06c908f46..765d6cd13 100644
--- a/openapi/src/awscc/v00.00.00000/services/applicationautoscaling.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/applicationautoscaling.yaml
@@ -1456,7 +1456,7 @@ components:
       id: awscc.applicationautoscaling.scalable_targets
       x-cfn-schema-name: ScalableTarget
       x-cfn-type-name: AWS::ApplicationAutoScaling::ScalableTarget
-      x-identifiers:
+      x-identifiers: &ref_0
         - ResourceId
         - ScalableDimension
         - ServiceNamespace
@@ -1560,10 +1560,7 @@ components:
       id: awscc.applicationautoscaling.scalable_targets_list_only
       x-cfn-schema-name: ScalableTarget
       x-cfn-type-name: AWS::ApplicationAutoScaling::ScalableTarget
-      x-identifiers:
-        - ResourceId
-        - ScalableDimension
-        - ServiceNamespace
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1597,7 +1594,7 @@ components:
       id: awscc.applicationautoscaling.scaling_policies
       x-cfn-schema-name: ScalingPolicy
       x-cfn-type-name: AWS::ApplicationAutoScaling::ScalingPolicy
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
         - ScalableDimension
       x-type: cloud_control
@@ -1702,9 +1699,7 @@ components:
       id: awscc.applicationautoscaling.scaling_policies_list_only
       x-cfn-schema-name: ScalingPolicy
       x-cfn-type-name: AWS::ApplicationAutoScaling::ScalingPolicy
-      x-identifiers:
-        - Arn
-        - ScalableDimension
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/applicationinsights.yaml b/openapi/src/awscc/v00.00.00000/services/applicationinsights.yaml
index 0f3ba92b0..cf662026a 100644
--- a/openapi/src/awscc/v00.00.00000/services/applicationinsights.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/applicationinsights.yaml
@@ -1092,7 +1092,7 @@ components:
       id: awscc.applicationinsights.applications
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::ApplicationInsights::Application
-      x-identifiers:
+      x-identifiers: &ref_0
         - ApplicationARN
       x-type: cloud_control
       methods:
@@ -1202,8 +1202,7 @@ components:
       id: awscc.applicationinsights.applications_list_only
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::ApplicationInsights::Application
-      x-identifiers:
-        - ApplicationARN
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/applicationsignals.yaml b/openapi/src/awscc/v00.00.00000/services/applicationsignals.yaml
index 11330a6be..85b20223d 100644
--- a/openapi/src/awscc/v00.00.00000/services/applicationsignals.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/applicationsignals.yaml
@@ -1010,7 +1010,7 @@ components:
       id: awscc.applicationsignals.discoveries
       x-cfn-schema-name: Discovery
       x-cfn-type-name: AWS::ApplicationSignals::Discovery
-      x-identifiers:
+      x-identifiers: &ref_0
         - AccountId
       x-type: cloud_control
       methods:
@@ -1096,8 +1096,7 @@ components:
       id: awscc.applicationsignals.discoveries_list_only
       x-cfn-schema-name: Discovery
       x-cfn-type-name: AWS::ApplicationSignals::Discovery
-      x-identifiers:
-        - AccountId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1127,7 +1126,7 @@ components:
       id: awscc.applicationsignals.service_level_objectives
       x-cfn-schema-name: ServiceLevelObjective
       x-cfn-type-name: AWS::ApplicationSignals::ServiceLevelObjective
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -1235,8 +1234,7 @@ components:
       id: awscc.applicationsignals.service_level_objectives_list_only
       x-cfn-schema-name: ServiceLevelObjective
       x-cfn-type-name: AWS::ApplicationSignals::ServiceLevelObjective
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/apprunner.yaml b/openapi/src/awscc/v00.00.00000/services/apprunner.yaml
index dcd3f2833..c6282a947 100644
--- a/openapi/src/awscc/v00.00.00000/services/apprunner.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/apprunner.yaml
@@ -1405,7 +1405,7 @@ components:
       id: awscc.apprunner.auto_scaling_configurations
       x-cfn-schema-name: AutoScalingConfiguration
       x-cfn-type-name: AWS::AppRunner::AutoScalingConfiguration
-      x-identifiers:
+      x-identifiers: &ref_0
         - AutoScalingConfigurationArn
       x-type: cloud_control
       methods:
@@ -1488,8 +1488,7 @@ components:
       id: awscc.apprunner.auto_scaling_configurations_list_only
       x-cfn-schema-name: AutoScalingConfiguration
       x-cfn-type-name: AWS::AppRunner::AutoScalingConfiguration
-      x-identifiers:
-        - AutoScalingConfigurationArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1519,7 +1518,7 @@ components:
       id: awscc.apprunner.observability_configurations
       x-cfn-schema-name: ObservabilityConfiguration
       x-cfn-type-name: AWS::AppRunner::ObservabilityConfiguration
-      x-identifiers:
+      x-identifiers: &ref_1
         - ObservabilityConfigurationArn
       x-type: cloud_control
       methods:
@@ -1598,8 +1597,7 @@ components:
       id: awscc.apprunner.observability_configurations_list_only
       x-cfn-schema-name: ObservabilityConfiguration
       x-cfn-type-name: AWS::AppRunner::ObservabilityConfiguration
-      x-identifiers:
-        - ObservabilityConfigurationArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1629,7 +1627,7 @@ components:
       id: awscc.apprunner.services
       x-cfn-schema-name: Service
       x-cfn-type-name: AWS::AppRunner::Service
-      x-identifiers:
+      x-identifiers: &ref_2
         - ServiceArn
       x-type: cloud_control
       methods:
@@ -1739,8 +1737,7 @@ components:
       id: awscc.apprunner.services_list_only
       x-cfn-schema-name: Service
       x-cfn-type-name: AWS::AppRunner::Service
-      x-identifiers:
-        - ServiceArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1770,7 +1767,7 @@ components:
       id: awscc.apprunner.vpc_connectors
       x-cfn-schema-name: VpcConnector
       x-cfn-type-name: AWS::AppRunner::VpcConnector
-      x-identifiers:
+      x-identifiers: &ref_3
         - VpcConnectorArn
       x-type: cloud_control
       methods:
@@ -1849,8 +1846,7 @@ components:
       id: awscc.apprunner.vpc_connectors_list_only
       x-cfn-schema-name: VpcConnector
       x-cfn-type-name: AWS::AppRunner::VpcConnector
-      x-identifiers:
-        - VpcConnectorArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1880,7 +1876,7 @@ components:
       id: awscc.apprunner.vpc_ingress_connections
       x-cfn-schema-name: VpcIngressConnection
       x-cfn-type-name: AWS::AppRunner::VpcIngressConnection
-      x-identifiers:
+      x-identifiers: &ref_4
         - VpcIngressConnectionArn
       x-type: cloud_control
       methods:
@@ -1978,8 +1974,7 @@ components:
       id: awscc.apprunner.vpc_ingress_connections_list_only
       x-cfn-schema-name: VpcIngressConnection
       x-cfn-type-name: AWS::AppRunner::VpcIngressConnection
-      x-identifiers:
-        - VpcIngressConnectionArn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/appstream.yaml b/openapi/src/awscc/v00.00.00000/services/appstream.yaml
index ce743a90a..f50310e8c 100644
--- a/openapi/src/awscc/v00.00.00000/services/appstream.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/appstream.yaml
@@ -400,7 +400,6 @@ components:
       additionalProperties: false
       required:
         - S3Bucket
-        - S3Key
     ScriptDetails:
       type: object
       properties:
@@ -420,16 +419,27 @@ components:
     Arn:
       type: string
     Tag:
-      type: object
-      additionalProperties: false
-      properties:
-        Value:
-          type: string
-        Key:
-          type: string
-      required:
-        - Value
-        - Key
+      oneOf:
+        - type: object
+          properties:
+            Key:
+              type: string
+            Value:
+              type: string
+          required:
+            - Key
+            - Value
+          additionalProperties: false
+        - type: object
+          properties:
+            TagKey:
+              type: string
+            TagValue:
+              type: string
+          required:
+            - TagKey
+            - TagValue
+          additionalProperties: false
     PackagingType:
       type: string
     AppBlock:
@@ -521,17 +531,30 @@ components:
       required:
         - EndpointType
         - VpceId
+    AppBlockBuilder_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+        Value:
+          type: string
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     VpcConfig:
       type: object
       additionalProperties: false
       properties:
         SecurityGroupIds:
           type: array
+          x-insertionOrder: false
           uniqueItems: false
           items:
             type: string
         SubnetIds:
           type: array
+          x-insertionOrder: false
           uniqueItems: false
           items:
             type: string
@@ -559,7 +582,7 @@ components:
           x-insertionOrder: false
           uniqueItems: true
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/AppBlockBuilder_Tag'
         VpcConfig:
           $ref: '#/components/schemas/VpcConfig'
         EnableDefaultInternetAccess:
@@ -640,6 +663,17 @@ components:
           - appstream:DescribeAppBlockBuilderAppBlockAssociations
         list:
           - appstream:DescribeAppBlockBuilders
+    Application_S3Location:
+      type: object
+      properties:
+        S3Bucket:
+          type: string
+        S3Key:
+          type: string
+      additionalProperties: false
+      required:
+        - S3Bucket
+        - S3Key
     ApplicationAttribute:
       type: string
     Application:
@@ -664,7 +698,7 @@ components:
             type: string
           x-insertionOrder: false
         IconS3Location:
-          $ref: '#/components/schemas/S3Location'
+          $ref: '#/components/schemas/Application_S3Location'
         Arn:
           $ref: '#/components/schemas/Arn'
         AppBlockArn:
@@ -974,6 +1008,20 @@ components:
           - appstream:UpdateEntitlement
         delete:
           - appstream:DeleteEntitlement
+    ImageBuilder_VpcConfig:
+      type: object
+      additionalProperties: false
+      properties:
+        SecurityGroupIds:
+          type: array
+          uniqueItems: false
+          items:
+            type: string
+        SubnetIds:
+          type: array
+          uniqueItems: false
+          items:
+            type: string
     DomainJoinInfo:
       type: object
       additionalProperties: false
@@ -982,13 +1030,24 @@ components:
           type: string
         DirectoryName:
           type: string
+    ImageBuilder_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Value:
+          type: string
+        Key:
+          type: string
+      required:
+        - Value
+        - Key
     ImageBuilder:
       type: object
       properties:
         Description:
           type: string
         VpcConfig:
-          $ref: '#/components/schemas/VpcConfig'
+          $ref: '#/components/schemas/ImageBuilder_VpcConfig'
         EnableDefaultInternetAccess:
           type: boolean
         DomainJoinInfo:
@@ -1009,7 +1068,7 @@ components:
           type: array
           uniqueItems: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ImageBuilder_Tag'
         StreamingUrl:
           type: string
         ImageArn:
@@ -1158,7 +1217,7 @@ components:
               x-insertionOrder: false
               uniqueItems: true
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/AppBlockBuilder_Tag'
             VpcConfig:
               $ref: '#/components/schemas/VpcConfig'
             EnableDefaultInternetAccess:
@@ -1211,7 +1270,7 @@ components:
                 type: string
               x-insertionOrder: false
             IconS3Location:
-              $ref: '#/components/schemas/S3Location'
+              $ref: '#/components/schemas/Application_S3Location'
             Arn:
               $ref: '#/components/schemas/Arn'
             AppBlockArn:
@@ -1363,7 +1422,7 @@ components:
             Description:
               type: string
             VpcConfig:
-              $ref: '#/components/schemas/VpcConfig'
+              $ref: '#/components/schemas/ImageBuilder_VpcConfig'
             EnableDefaultInternetAccess:
               type: boolean
             DomainJoinInfo:
@@ -1384,7 +1443,7 @@ components:
               type: array
               uniqueItems: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ImageBuilder_Tag'
             StreamingUrl:
               type: string
             ImageArn:
@@ -1515,7 +1574,7 @@ components:
       id: awscc.appstream.app_block_builders
       x-cfn-schema-name: AppBlockBuilder
       x-cfn-type-name: AWS::AppStream::AppBlockBuilder
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -1625,8 +1684,7 @@ components:
       id: awscc.appstream.app_block_builders_list_only
       x-cfn-schema-name: AppBlockBuilder
       x-cfn-type-name: AWS::AppStream::AppBlockBuilder
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1915,7 +1973,7 @@ components:
       id: awscc.appstream.directory_configs
       x-cfn-schema-name: DirectoryConfig
       x-cfn-type-name: AWS::AppStream::DirectoryConfig
-      x-identifiers:
+      x-identifiers: &ref_1
         - DirectoryName
       x-type: cloud_control
       methods:
@@ -2007,8 +2065,7 @@ components:
       id: awscc.appstream.directory_configs_list_only
       x-cfn-schema-name: DirectoryConfig
       x-cfn-type-name: AWS::AppStream::DirectoryConfig
-      x-identifiers:
-        - DirectoryName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2137,7 +2194,7 @@ components:
       id: awscc.appstream.image_builders
       x-cfn-schema-name: ImageBuilder
       x-cfn-type-name: AWS::AppStream::ImageBuilder
-      x-identifiers:
+      x-identifiers: &ref_2
         - Name
       x-type: cloud_control
       methods:
@@ -2232,8 +2289,7 @@ components:
       id: awscc.appstream.image_builders_list_only
       x-cfn-schema-name: ImageBuilder
       x-cfn-type-name: AWS::AppStream::ImageBuilder
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/appsync.yaml b/openapi/src/awscc/v00.00.00000/services/appsync.yaml
index 707af8e2e..e79261a2d 100644
--- a/openapi/src/awscc/v00.00.00000/services/appsync.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/appsync.yaml
@@ -418,6 +418,7 @@ components:
         AuthType:
           $ref: '#/components/schemas/AuthenticationType'
     AuthModes:
+      description: A list of auth modes for the AppSync API.
       type: array
       x-insertionOrder: false
       items:
@@ -432,23 +433,20 @@ components:
         - OPENID_CONNECT
         - AWS_LAMBDA
     OpenIDConnectConfig:
+      description: The OpenID Connect configuration.
       type: object
       additionalProperties: false
       properties:
         ClientId:
-          description: The client identifier of the Relying party at the OpenID identity provider.
           type: string
         AuthTTL:
-          description: The number of milliseconds that a token is valid after being authenticated.
           type: number
         Issuer:
-          description: 'The issuer for the OIDC configuration. '
           type: string
         IatTTL:
-          description: |+
-            The number of milliseconds that a token is valid after it's issued to a user.
-
           type: number
+      required:
+        - Issuer
     CognitoConfig:
       description: Optional authorization configuration for using Amazon Cognito user pools with your API endpoint.
       type: object
@@ -464,18 +462,20 @@ components:
         - UserPoolId
         - AwsRegion
     LambdaAuthorizerConfig:
+      description: A LambdaAuthorizerConfig holds configuration on how to authorize AWS AppSync API access when using the AWS_LAMBDA authorizer mode. Be aware that an AWS AppSync API may have only one Lambda authorizer configured at a time.
       type: object
       additionalProperties: false
       properties:
-        IdentityValidationExpression:
-          description: A regular expression for validation of tokens before the Lambda function is called.
-          type: string
-        AuthorizerUri:
-          description: The ARN of the Lambda function to be called for authorization.
-          type: string
         AuthorizerResultTtlInSeconds:
-          description: The number of seconds a response should be cached for.
           type: integer
+          minimum: 0
+          maximum: 3600
+        AuthorizerUri:
+          type: string
+        IdentityValidationExpression:
+          type: string
+      required:
+        - AuthorizerUri
     AuthProviders:
       description: A list of auth providers for the AppSync API.
       type: array
@@ -498,18 +498,27 @@ components:
       required:
         - AuthType
     Tag:
+      description: An arbitrary set of tags (key-value pairs) for this AppSync API.
       type: object
-      additionalProperties: false
       properties:
-        Value:
-          type: string
         Key:
+          description: A string used to identify this tag. You can specify a maximum of 128 characters for a tag key.
+          type: string
+          minLength: 1
+          maxLength: 128
+          pattern: ^(?!aws:)[ a-zA-Z+-=._:/]+$
+        Value:
+          description: A string containing the value for this tag. You can specify a maximum of 256 characters for a tag value.
           type: string
+          minLength: 0
+          maxLength: 256
+          pattern: ^[\s\w+-=\.:/@]*$
       required:
-        - Value
         - Key
+        - Value
+      additionalProperties: false
     Tags:
-      description: An arbitrary set of tags (key-value pairs) for this Domain Name.
+      description: An arbitrary set of tags (key-value pairs) for this AppSync API.
       type: array
       uniqueItems: true
       x-insertionOrder: false
@@ -626,6 +635,11 @@ components:
       minLength: 1
       maxLength: 50
       pattern: ([A-Za-z0-9](?:[A-Za-z0-9\-]{0,48}[A-Za-z0-9])?)
+    ChannelNamespace_AuthModes:
+      type: array
+      x-insertionOrder: false
+      items:
+        $ref: '#/components/schemas/AuthMode'
     Code:
       description: String of APPSYNC_JS code to be used by the handlers.
       type: string
@@ -683,11 +697,10 @@ components:
       type: object
       additionalProperties: false
       properties:
-        LambdaFunctionArn:
-          description: The ARN for the Lambda function.
-          type: string
+        InvokeType:
+          $ref: '#/components/schemas/InvokeType'
       required:
-        - LambdaFunctionArn
+        - InvokeType
     ChannelNamespace:
       type: object
       properties:
@@ -698,10 +711,10 @@ components:
           $ref: '#/components/schemas/Namespace'
         SubscribeAuthModes:
           description: List of AuthModes supported for Subscribe operations.
-          $ref: '#/components/schemas/AuthModes'
+          $ref: '#/components/schemas/ChannelNamespace_AuthModes'
         PublishAuthModes:
           description: List of AuthModes supported for Publish operations.
-          $ref: '#/components/schemas/AuthModes'
+          $ref: '#/components/schemas/ChannelNamespace_AuthModes'
         CodeHandlers:
           $ref: '#/components/schemas/Code'
         CodeS3Location:
@@ -868,6 +881,15 @@ components:
           $ref: '#/components/schemas/AuthorizationConfig'
       required:
         - Endpoint
+    DataSource_LambdaConfig:
+      type: object
+      additionalProperties: false
+      properties:
+        LambdaFunctionArn:
+          description: The ARN for the Lambda function.
+          type: string
+      required:
+        - LambdaFunctionArn
     ElasticsearchConfig:
       type: object
       additionalProperties: false
@@ -928,7 +950,7 @@ components:
           $ref: '#/components/schemas/HttpConfig'
         LambdaConfig:
           description: An ARN of a Lambda function in valid ARN format. This can be the ARN of a Lambda function that exists in the current account or in another account.
-          $ref: '#/components/schemas/LambdaConfig'
+          $ref: '#/components/schemas/DataSource_LambdaConfig'
         Name:
           description: Friendly name for you to identify your AppSync data source after creation.
           type: string
@@ -988,6 +1010,33 @@ components:
           - appsync:GetDataSource
         list:
           - appsync:ListDataSources
+    DomainName_Tag:
+      description: An arbitrary set of tags (key-value pairs) for this Domain Name.
+      type: object
+      properties:
+        Key:
+          description: 'A string used to identify this tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+          minLength: 1
+          maxLength: 128
+          pattern: ^(?!aws:)[ a-zA-Z+-=._:/]+$
+        Value:
+          description: A string containing the value for this tag. You can specify a maximum of 256 characters for a tag value.
+          type: string
+          minLength: 0
+          maxLength: 256
+          pattern: ^[\s\w+-=\.:/@]*$
+      required:
+        - Key
+        - Value
+      additionalProperties: false
+    DomainName_Tags:
+      description: An arbitrary set of tags (key-value pairs) for this Domain Name.
+      type: array
+      uniqueItems: true
+      x-insertionOrder: false
+      items:
+        $ref: '#/components/schemas/DomainName_Tag'
     DomainName:
       type: object
       properties:
@@ -1013,7 +1062,7 @@ components:
           type: string
           description: The Amazon Resource Name (ARN) for the Domain Name.
         Tags:
-          $ref: '#/components/schemas/Tags'
+          $ref: '#/components/schemas/DomainName_Tags'
       required:
         - DomainName
         - CertificateArn
@@ -1106,47 +1155,37 @@ components:
         read:
           - appsync:GetApiAssociation
     AppSyncRuntime:
+      description: Describes a runtime used by an AWS AppSync pipeline resolver or AWS AppSync function. Specifies the name and version of the runtime to use. Note that if a runtime is specified, code must also be specified.
       type: object
       additionalProperties: false
       properties:
-        RuntimeVersion:
-          type: string
-          description: The ``version`` of the runtime to use. Currently, the only allowed version is ``1.0.0``.
         Name:
           type: string
-          description: The ``name`` of the runtime to use. Currently, the only allowed value is ``APPSYNC_JS``.
+          description: The name of the runtime to use. Currently, the only allowed value is APPSYNC_JS.
+        RuntimeVersion:
+          type: string
+          description: The version of the runtime to use. Currently, the only allowed version is 1.0.0.
       required:
-        - RuntimeVersion
         - Name
-      description: Describes a runtime used by an APSYlong resolver or APSYlong function. Specifies the name and version of the runtime to use. Note that if a runtime is specified, code must also be specified.
+        - RuntimeVersion
     SyncConfig:
+      description: Describes a Sync configuration for a resolver. Specifies which Conflict Detection strategy and Resolution strategy to use when the resolver is invoked.
       type: object
       additionalProperties: false
       properties:
-        ConflictHandler:
-          type: string
-          description: |-
-            The Conflict Resolution strategy to perform in the event of a conflict.
-              +  *OPTIMISTIC_CONCURRENCY*: Resolve conflicts by rejecting mutations when versions don't match the latest version at the server.
-              +  *AUTOMERGE*: Resolve conflicts with the Automerge conflict resolution strategy.
-              +  *LAMBDA*: Resolve conflicts with an LAMlong function supplied in the ``LambdaConflictHandlerConfig``.
         ConflictDetection:
           type: string
-          description: |-
-            The Conflict Detection strategy to use.
-              +  *VERSION*: Detect conflicts based on object versions for this resolver.
-              +  *NONE*: Do not detect conflicts when invoking this resolver.
+          description: The Conflict Detection strategy to use.
+        ConflictHandler:
+          type: string
+          description: The Conflict Resolution strategy to perform in the event of a conflict.
         LambdaConflictHandlerConfig:
           $ref: '#/components/schemas/LambdaConflictHandlerConfig'
-          description: The ``LambdaConflictHandlerConfig`` when configuring ``LAMBDA`` as the Conflict Handler.
       required:
         - ConflictDetection
-      description: |-
-        Describes a Sync configuration for a resolver.
-         Specifies which Conflict Detection strategy and Resolution strategy to use when the resolver is invoked.
     LambdaConflictHandlerConfig:
       type: object
-      description: The ``LambdaConflictHandlerConfig`` when configuring LAMBDA as the Conflict Handler.
+      description: The LambdaConflictHandlerConfig when configuring LAMBDA as the Conflict Handler.
       additionalProperties: false
       properties:
         LambdaConflictHandlerArn:
@@ -1243,6 +1282,24 @@ components:
           - appsync:DeleteFunction
         list:
           - appsync:ListFunctions
+    GraphQLApi_OpenIDConnectConfig:
+      type: object
+      additionalProperties: false
+      properties:
+        ClientId:
+          description: The client identifier of the Relying party at the OpenID identity provider.
+          type: string
+        AuthTTL:
+          description: The number of milliseconds that a token is valid after being authenticated.
+          type: number
+        Issuer:
+          description: 'The issuer for the OIDC configuration. '
+          type: string
+        IatTTL:
+          description: |+
+            The number of milliseconds that a token is valid after it's issued to a user.
+
+          type: number
     EnhancedMetricsConfig:
       type: object
       additionalProperties: false
@@ -1279,6 +1336,30 @@ components:
         AwsRegion:
           description: The AWS Region in which the user pool was created.
           type: string
+    GraphQLApi_LambdaAuthorizerConfig:
+      type: object
+      additionalProperties: false
+      properties:
+        IdentityValidationExpression:
+          description: A regular expression for validation of tokens before the Lambda function is called.
+          type: string
+        AuthorizerUri:
+          description: The ARN of the Lambda function to be called for authorization.
+          type: string
+        AuthorizerResultTtlInSeconds:
+          description: The number of seconds a response should be cached for.
+          type: integer
+    GraphQLApi_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Value:
+          type: string
+        Key:
+          type: string
+      required:
+        - Value
+        - Key
     UserPoolConfig:
       type: object
       additionalProperties: false
@@ -1300,9 +1381,9 @@ components:
       additionalProperties: false
       properties:
         LambdaAuthorizerConfig:
-          $ref: '#/components/schemas/LambdaAuthorizerConfig'
+          $ref: '#/components/schemas/GraphQLApi_LambdaAuthorizerConfig'
         OpenIDConnectConfig:
-          $ref: '#/components/schemas/OpenIDConnectConfig'
+          $ref: '#/components/schemas/GraphQLApi_OpenIDConnectConfig'
         UserPoolConfig:
           $ref: '#/components/schemas/CognitoUserPoolConfig'
         AuthenticationType:
@@ -1368,7 +1449,7 @@ components:
           type: string
         LambdaAuthorizerConfig:
           description: A LambdaAuthorizerConfig holds configuration on how to authorize AWS AppSync API access when using the AWS_LAMBDA authorizer mode. Be aware that an AWS AppSync API may have only one Lambda authorizer configured at a time.
-          $ref: '#/components/schemas/LambdaAuthorizerConfig'
+          $ref: '#/components/schemas/GraphQLApi_LambdaAuthorizerConfig'
         LogConfig:
           description: The Amazon CloudWatch Logs configuration.
           $ref: '#/components/schemas/LogConfig'
@@ -1380,7 +1461,7 @@ components:
           type: string
         OpenIDConnectConfig:
           description: The OpenID Connect configuration.
-          $ref: '#/components/schemas/OpenIDConnectConfig'
+          $ref: '#/components/schemas/GraphQLApi_OpenIDConnectConfig'
         OwnerContact:
           description: The owner contact information for an API resource.
           type: string
@@ -1403,7 +1484,7 @@ components:
           type: array
           uniqueItems: true
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/GraphQLApi_Tag'
         UserPoolConfig:
           description: |+
             Optional authorization configuration for using Amazon Cognito user pools with your GraphQL endpoint.
@@ -1463,6 +1544,20 @@ components:
           - appsync:DeleteGraphqlApi
         list:
           - appsync:ListGraphqlApis
+    Resolver_AppSyncRuntime:
+      type: object
+      additionalProperties: false
+      properties:
+        RuntimeVersion:
+          type: string
+          description: The ``version`` of the runtime to use. Currently, the only allowed version is ``1.0.0``.
+        Name:
+          type: string
+          description: The ``name`` of the runtime to use. Currently, the only allowed value is ``APPSYNC_JS``.
+      required:
+        - RuntimeVersion
+        - Name
+      description: Describes a runtime used by an APSYlong resolver or APSYlong function. Specifies the name and version of the runtime to use. Note that if a runtime is specified, code must also be specified.
     PipelineConfig:
       type: object
       additionalProperties: false
@@ -1498,6 +1593,39 @@ components:
       required:
         - Ttl
       description: The caching configuration for a resolver that has caching activated.
+    Resolver_SyncConfig:
+      type: object
+      additionalProperties: false
+      properties:
+        ConflictHandler:
+          type: string
+          description: |-
+            The Conflict Resolution strategy to perform in the event of a conflict.
+              +  *OPTIMISTIC_CONCURRENCY*: Resolve conflicts by rejecting mutations when versions don't match the latest version at the server.
+              +  *AUTOMERGE*: Resolve conflicts with the Automerge conflict resolution strategy.
+              +  *LAMBDA*: Resolve conflicts with an LAMlong function supplied in the ``LambdaConflictHandlerConfig``.
+        ConflictDetection:
+          type: string
+          description: |-
+            The Conflict Detection strategy to use.
+              +  *VERSION*: Detect conflicts based on object versions for this resolver.
+              +  *NONE*: Do not detect conflicts when invoking this resolver.
+        LambdaConflictHandlerConfig:
+          $ref: '#/components/schemas/Resolver_LambdaConflictHandlerConfig'
+          description: The ``LambdaConflictHandlerConfig`` when configuring ``LAMBDA`` as the Conflict Handler.
+      required:
+        - ConflictDetection
+      description: |-
+        Describes a Sync configuration for a resolver.
+         Specifies which Conflict Detection strategy and Resolution strategy to use when the resolver is invoked.
+    Resolver_LambdaConflictHandlerConfig:
+      type: object
+      description: The ``LambdaConflictHandlerConfig`` when configuring LAMBDA as the Conflict Handler.
+      additionalProperties: false
+      properties:
+        LambdaConflictHandlerArn:
+          type: string
+          description: The Amazon Resource Name (ARN) for the Lambda function to use as the Conflict Handler.
     Resolver:
       type: object
       properties:
@@ -1549,10 +1677,10 @@ components:
           type: string
           description: The location of a response mapping template in an S3 bucket. Use this if you want to provision with a template file in S3 rather than embedding it in your CFNshort template.
         Runtime:
-          $ref: '#/components/schemas/AppSyncRuntime'
+          $ref: '#/components/schemas/Resolver_AppSyncRuntime'
           description: Describes a runtime used by an APSYlong resolver or APSYlong function. Specifies the name and version of the runtime to use. Note that if a runtime is specified, code must also be specified.
         SyncConfig:
-          $ref: '#/components/schemas/SyncConfig'
+          $ref: '#/components/schemas/Resolver_SyncConfig'
           description: The ``SyncConfig`` for a resolver attached to a versioned data source.
         TypeName:
           type: string
@@ -1769,10 +1897,10 @@ components:
               $ref: '#/components/schemas/Namespace'
             SubscribeAuthModes:
               description: List of AuthModes supported for Subscribe operations.
-              $ref: '#/components/schemas/AuthModes'
+              $ref: '#/components/schemas/ChannelNamespace_AuthModes'
             PublishAuthModes:
               description: List of AuthModes supported for Publish operations.
-              $ref: '#/components/schemas/AuthModes'
+              $ref: '#/components/schemas/ChannelNamespace_AuthModes'
             CodeHandlers:
               $ref: '#/components/schemas/Code'
             CodeS3Location:
@@ -1823,7 +1951,7 @@ components:
               $ref: '#/components/schemas/HttpConfig'
             LambdaConfig:
               description: An ARN of a Lambda function in valid ARN format. This can be the ARN of a Lambda function that exists in the current account or in another account.
-              $ref: '#/components/schemas/LambdaConfig'
+              $ref: '#/components/schemas/DataSource_LambdaConfig'
             Name:
               description: Friendly name for you to identify your AppSync data source after creation.
               type: string
@@ -1887,7 +2015,7 @@ components:
               type: string
               description: The Amazon Resource Name (ARN) for the Domain Name.
             Tags:
-              $ref: '#/components/schemas/Tags'
+              $ref: '#/components/schemas/DomainName_Tags'
           x-stackQL-stringOnly: true
       x-title: CreateDomainNameRequest
       type: object
@@ -2038,7 +2166,7 @@ components:
               type: string
             LambdaAuthorizerConfig:
               description: A LambdaAuthorizerConfig holds configuration on how to authorize AWS AppSync API access when using the AWS_LAMBDA authorizer mode. Be aware that an AWS AppSync API may have only one Lambda authorizer configured at a time.
-              $ref: '#/components/schemas/LambdaAuthorizerConfig'
+              $ref: '#/components/schemas/GraphQLApi_LambdaAuthorizerConfig'
             LogConfig:
               description: The Amazon CloudWatch Logs configuration.
               $ref: '#/components/schemas/LogConfig'
@@ -2050,7 +2178,7 @@ components:
               type: string
             OpenIDConnectConfig:
               description: The OpenID Connect configuration.
-              $ref: '#/components/schemas/OpenIDConnectConfig'
+              $ref: '#/components/schemas/GraphQLApi_OpenIDConnectConfig'
             OwnerContact:
               description: The owner contact information for an API resource.
               type: string
@@ -2073,7 +2201,7 @@ components:
               type: array
               uniqueItems: true
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/GraphQLApi_Tag'
             UserPoolConfig:
               description: |+
                 Optional authorization configuration for using Amazon Cognito user pools with your GraphQL endpoint.
@@ -2152,10 +2280,10 @@ components:
               type: string
               description: The location of a response mapping template in an S3 bucket. Use this if you want to provision with a template file in S3 rather than embedding it in your CFNshort template.
             Runtime:
-              $ref: '#/components/schemas/AppSyncRuntime'
+              $ref: '#/components/schemas/Resolver_AppSyncRuntime'
               description: Describes a runtime used by an APSYlong resolver or APSYlong function. Specifies the name and version of the runtime to use. Note that if a runtime is specified, code must also be specified.
             SyncConfig:
-              $ref: '#/components/schemas/SyncConfig'
+              $ref: '#/components/schemas/Resolver_SyncConfig'
               description: The ``SyncConfig`` for a resolver attached to a versioned data source.
             TypeName:
               type: string
@@ -2251,7 +2379,7 @@ components:
       id: awscc.appsync.apis
       x-cfn-schema-name: Api
       x-cfn-type-name: AWS::AppSync::Api
-      x-identifiers:
+      x-identifiers: &ref_0
         - ApiArn
       x-type: cloud_control
       methods:
@@ -2349,8 +2477,7 @@ components:
       id: awscc.appsync.apis_list_only
       x-cfn-schema-name: Api
       x-cfn-type-name: AWS::AppSync::Api
-      x-identifiers:
-        - ApiArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2380,7 +2507,7 @@ components:
       id: awscc.appsync.channel_namespaces
       x-cfn-schema-name: ChannelNamespace
       x-cfn-type-name: AWS::AppSync::ChannelNamespace
-      x-identifiers:
+      x-identifiers: &ref_1
         - ChannelNamespaceArn
       x-type: cloud_control
       methods:
@@ -2482,8 +2609,7 @@ components:
       id: awscc.appsync.channel_namespaces_list_only
       x-cfn-schema-name: ChannelNamespace
       x-cfn-type-name: AWS::AppSync::ChannelNamespace
-      x-identifiers:
-        - ChannelNamespaceArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2513,7 +2639,7 @@ components:
       id: awscc.appsync.data_sources
       x-cfn-schema-name: DataSource
       x-cfn-type-name: AWS::AppSync::DataSource
-      x-identifiers:
+      x-identifiers: &ref_2
         - DataSourceArn
       x-type: cloud_control
       methods:
@@ -2625,8 +2751,7 @@ components:
       id: awscc.appsync.data_sources_list_only
       x-cfn-schema-name: DataSource
       x-cfn-type-name: AWS::AppSync::DataSource
-      x-identifiers:
-        - DataSourceArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2656,7 +2781,7 @@ components:
       id: awscc.appsync.domain_names
       x-cfn-schema-name: DomainName
       x-cfn-type-name: AWS::AppSync::DomainName
-      x-identifiers:
+      x-identifiers: &ref_3
         - DomainName
       x-type: cloud_control
       methods:
@@ -2754,8 +2879,7 @@ components:
       id: awscc.appsync.domain_names_list_only
       x-cfn-schema-name: DomainName
       x-cfn-type-name: AWS::AppSync::DomainName
-      x-identifiers:
-        - DomainName
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2875,7 +2999,7 @@ components:
       id: awscc.appsync.function_configurations
       x-cfn-schema-name: FunctionConfiguration
       x-cfn-type-name: AWS::AppSync::FunctionConfiguration
-      x-identifiers:
+      x-identifiers: &ref_4
         - FunctionArn
       x-type: cloud_control
       methods:
@@ -2991,8 +3115,7 @@ components:
       id: awscc.appsync.function_configurations_list_only
       x-cfn-schema-name: FunctionConfiguration
       x-cfn-type-name: AWS::AppSync::FunctionConfiguration
-      x-identifiers:
-        - FunctionArn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3022,7 +3145,7 @@ components:
       id: awscc.appsync.graphql_apis
       x-cfn-schema-name: GraphQLApi
       x-cfn-type-name: AWS::AppSync::GraphQLApi
-      x-identifiers:
+      x-identifiers: &ref_5
         - ApiId
       x-type: cloud_control
       methods:
@@ -3156,8 +3279,7 @@ components:
       id: awscc.appsync.graphql_apis_list_only
       x-cfn-schema-name: GraphQLApi
       x-cfn-type-name: AWS::AppSync::GraphQLApi
-      x-identifiers:
-        - ApiId
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3187,7 +3309,7 @@ components:
       id: awscc.appsync.resolvers
       x-cfn-schema-name: Resolver
       x-cfn-type-name: AWS::AppSync::Resolver
-      x-identifiers:
+      x-identifiers: &ref_6
         - ResolverArn
       x-type: cloud_control
       methods:
@@ -3307,8 +3429,7 @@ components:
       id: awscc.appsync.resolvers_list_only
       x-cfn-schema-name: Resolver
       x-cfn-type-name: AWS::AppSync::Resolver
-      x-identifiers:
-        - ResolverArn
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3338,7 +3459,7 @@ components:
       id: awscc.appsync.source_api_associations
       x-cfn-schema-name: SourceApiAssociation
       x-cfn-type-name: AWS::AppSync::SourceApiAssociation
-      x-identifiers:
+      x-identifiers: &ref_7
         - AssociationArn
       x-type: cloud_control
       methods:
@@ -3448,8 +3569,7 @@ components:
       id: awscc.appsync.source_api_associations_list_only
       x-cfn-schema-name: SourceApiAssociation
       x-cfn-type-name: AWS::AppSync::SourceApiAssociation
-      x-identifiers:
-        - AssociationArn
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/apptest.yaml b/openapi/src/awscc/v00.00.00000/services/apptest.yaml
index 1dc48e006..4f1075e47 100644
--- a/openapi/src/awscc/v00.00.00000/services/apptest.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/apptest.yaml
@@ -938,7 +938,7 @@ components:
       id: awscc.apptest.test_cases
       x-cfn-schema-name: TestCase
       x-cfn-type-name: AWS::AppTest::TestCase
-      x-identifiers:
+      x-identifiers: &ref_0
         - TestCaseId
       x-type: cloud_control
       methods:
@@ -1044,8 +1044,7 @@ components:
       id: awscc.apptest.test_cases_list_only
       x-cfn-schema-name: TestCase
       x-cfn-type-name: AWS::AppTest::TestCase
-      x-identifiers:
-        - TestCaseId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/aps.yaml b/openapi/src/awscc/v00.00.00000/services/aps.yaml
index e410c1de3..bd869cab8 100644
--- a/openapi/src/awscc/v00.00.00000/services/aps.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/aps.yaml
@@ -1144,7 +1144,7 @@ components:
       id: awscc.aps.resource_policies
       x-cfn-schema-name: ResourcePolicy
       x-cfn-type-name: AWS::APS::ResourcePolicy
-      x-identifiers:
+      x-identifiers: &ref_0
         - WorkspaceArn
       x-type: cloud_control
       methods:
@@ -1232,8 +1232,7 @@ components:
       id: awscc.aps.resource_policies_list_only
       x-cfn-schema-name: ResourcePolicy
       x-cfn-type-name: AWS::APS::ResourcePolicy
-      x-identifiers:
-        - WorkspaceArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1263,7 +1262,7 @@ components:
       id: awscc.aps.rule_groups_namespaces
       x-cfn-schema-name: RuleGroupsNamespace
       x-cfn-type-name: AWS::APS::RuleGroupsNamespace
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -1357,8 +1356,7 @@ components:
       id: awscc.aps.rule_groups_namespaces_list_only
       x-cfn-schema-name: RuleGroupsNamespace
       x-cfn-type-name: AWS::APS::RuleGroupsNamespace
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1388,7 +1386,7 @@ components:
       id: awscc.aps.scrapers
       x-cfn-schema-name: Scraper
       x-cfn-type-name: AWS::APS::Scraper
-      x-identifiers:
+      x-identifiers: &ref_2
         - Arn
       x-type: cloud_control
       methods:
@@ -1490,8 +1488,7 @@ components:
       id: awscc.aps.scrapers_list_only
       x-cfn-schema-name: Scraper
       x-cfn-type-name: AWS::APS::Scraper
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1521,7 +1518,7 @@ components:
       id: awscc.aps.workspaces
       x-cfn-schema-name: Workspace
       x-cfn-type-name: AWS::APS::Workspace
-      x-identifiers:
+      x-identifiers: &ref_3
         - Arn
       x-type: cloud_control
       methods:
@@ -1625,8 +1622,7 @@ components:
       id: awscc.aps.workspaces_list_only
       x-cfn-schema-name: Workspace
       x-cfn-type-name: AWS::APS::Workspace
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/arcregionswitch.yaml b/openapi/src/awscc/v00.00.00000/services/arcregionswitch.yaml
index b95017533..269eb3386 100644
--- a/openapi/src/awscc/v00.00.00000/services/arcregionswitch.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/arcregionswitch.yaml
@@ -1275,7 +1275,7 @@ components:
       id: awscc.arcregionswitch.plans
       x-cfn-schema-name: Plan
       x-cfn-type-name: AWS::ARCRegionSwitch::Plan
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -1391,8 +1391,7 @@ components:
       id: awscc.arcregionswitch.plans_list_only
       x-cfn-schema-name: Plan
       x-cfn-type-name: AWS::ARCRegionSwitch::Plan
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/arczonalshift.yaml b/openapi/src/awscc/v00.00.00000/services/arczonalshift.yaml
index 30f915eec..73a63848d 100644
--- a/openapi/src/awscc/v00.00.00000/services/arczonalshift.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/arczonalshift.yaml
@@ -400,11 +400,15 @@ components:
       pattern: ^[a-z0-9-]*$
       maxLength: 30
       minLength: 5
+    AutoshiftObserverNotificationStatus_AutoshiftObserverNotificationStatus:
+      type: string
+      enum:
+        - ENABLED
     AutoshiftObserverNotificationStatus:
       type: object
       properties:
         Status:
-          $ref: '#/components/schemas/AutoshiftObserverNotificationStatus'
+          $ref: '#/components/schemas/AutoshiftObserverNotificationStatus_AutoshiftObserverNotificationStatus'
         AccountId:
           $ref: '#/components/schemas/AccountId'
         Region:
@@ -553,7 +557,7 @@ components:
           type: object
           properties:
             Status:
-              $ref: '#/components/schemas/AutoshiftObserverNotificationStatus'
+              $ref: '#/components/schemas/AutoshiftObserverNotificationStatus_AutoshiftObserverNotificationStatus'
             AccountId:
               $ref: '#/components/schemas/AccountId'
             Region:
@@ -600,7 +604,7 @@ components:
       id: awscc.arczonalshift.autoshift_observer_notification_statuses
       x-cfn-schema-name: AutoshiftObserverNotificationStatus
       x-cfn-type-name: AWS::ARCZonalShift::AutoshiftObserverNotificationStatus
-      x-identifiers:
+      x-identifiers: &ref_0
         - AccountId
         - Region
       x-type: cloud_control
@@ -674,9 +678,7 @@ components:
       id: awscc.arczonalshift.autoshift_observer_notification_statuses_list_only
       x-cfn-schema-name: AutoshiftObserverNotificationStatus
       x-cfn-type-name: AWS::ARCZonalShift::AutoshiftObserverNotificationStatus
-      x-identifiers:
-        - AccountId
-        - Region
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -708,7 +710,7 @@ components:
       id: awscc.arczonalshift.zonal_autoshift_configurations
       x-cfn-schema-name: ZonalAutoshiftConfiguration
       x-cfn-type-name: AWS::ARCZonalShift::ZonalAutoshiftConfiguration
-      x-identifiers:
+      x-identifiers: &ref_1
         - ResourceIdentifier
       x-type: cloud_control
       methods:
@@ -798,8 +800,7 @@ components:
       id: awscc.arczonalshift.zonal_autoshift_configurations_list_only
       x-cfn-schema-name: ZonalAutoshiftConfiguration
       x-cfn-type-name: AWS::ARCZonalShift::ZonalAutoshiftConfiguration
-      x-identifiers:
-        - ResourceIdentifier
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/athena.yaml b/openapi/src/awscc/v00.00.00000/services/athena.yaml
index 561fc5c66..967b1df48 100644
--- a/openapi/src/awscc/v00.00.00000/services/athena.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/athena.yaml
@@ -1349,7 +1349,7 @@ components:
       id: awscc.athena.capacity_reservations
       x-cfn-schema-name: CapacityReservation
       x-cfn-type-name: AWS::Athena::CapacityReservation
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -1451,8 +1451,7 @@ components:
       id: awscc.athena.capacity_reservations_list_only
       x-cfn-schema-name: CapacityReservation
       x-cfn-type-name: AWS::Athena::CapacityReservation
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1482,7 +1481,7 @@ components:
       id: awscc.athena.data_catalogs
       x-cfn-schema-name: DataCatalog
       x-cfn-type-name: AWS::Athena::DataCatalog
-      x-identifiers:
+      x-identifiers: &ref_1
         - Name
       x-type: cloud_control
       methods:
@@ -1582,8 +1581,7 @@ components:
       id: awscc.athena.data_catalogs_list_only
       x-cfn-schema-name: DataCatalog
       x-cfn-type-name: AWS::Athena::DataCatalog
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1613,7 +1611,7 @@ components:
       id: awscc.athena.named_queries
       x-cfn-schema-name: NamedQuery
       x-cfn-type-name: AWS::Athena::NamedQuery
-      x-identifiers:
+      x-identifiers: &ref_2
         - NamedQueryId
       x-type: cloud_control
       methods:
@@ -1692,8 +1690,7 @@ components:
       id: awscc.athena.named_queries_list_only
       x-cfn-schema-name: NamedQuery
       x-cfn-type-name: AWS::Athena::NamedQuery
-      x-identifiers:
-        - NamedQueryId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1723,7 +1720,7 @@ components:
       id: awscc.athena.prepared_statements
       x-cfn-schema-name: PreparedStatement
       x-cfn-type-name: AWS::Athena::PreparedStatement
-      x-identifiers:
+      x-identifiers: &ref_3
         - StatementName
         - WorkGroup
       x-type: cloud_control
@@ -1816,9 +1813,7 @@ components:
       id: awscc.athena.prepared_statements_list_only
       x-cfn-schema-name: PreparedStatement
       x-cfn-type-name: AWS::Athena::PreparedStatement
-      x-identifiers:
-        - StatementName
-        - WorkGroup
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1850,7 +1845,7 @@ components:
       id: awscc.athena.work_groups
       x-cfn-schema-name: WorkGroup
       x-cfn-type-name: AWS::Athena::WorkGroup
-      x-identifiers:
+      x-identifiers: &ref_4
         - Name
       x-type: cloud_control
       methods:
@@ -1950,8 +1945,7 @@ components:
       id: awscc.athena.work_groups_list_only
       x-cfn-schema-name: WorkGroup
       x-cfn-type-name: AWS::Athena::WorkGroup
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/auditmanager.yaml b/openapi/src/awscc/v00.00.00000/services/auditmanager.yaml
index 98d5b2758..d03a9ae79 100644
--- a/openapi/src/awscc/v00.00.00000/services/auditmanager.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/auditmanager.yaml
@@ -736,7 +736,7 @@ components:
       id: awscc.auditmanager.assessments
       x-cfn-schema-name: Assessment
       x-cfn-type-name: AWS::AuditManager::Assessment
-      x-identifiers:
+      x-identifiers: &ref_0
         - AssessmentId
       x-type: cloud_control
       methods:
@@ -846,8 +846,7 @@ components:
       id: awscc.auditmanager.assessments_list_only
       x-cfn-schema-name: Assessment
       x-cfn-type-name: AWS::AuditManager::Assessment
-      x-identifiers:
-        - AssessmentId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/autoscaling.yaml b/openapi/src/awscc/v00.00.00000/services/autoscaling.yaml
index 434b229f3..dfbd63168 100644
--- a/openapi/src/awscc/v00.00.00000/services/autoscaling.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/autoscaling.yaml
@@ -2664,7 +2664,7 @@ components:
       id: awscc.autoscaling.auto_scaling_groups
       x-cfn-schema-name: AutoScalingGroup
       x-cfn-type-name: AWS::AutoScaling::AutoScalingGroup
-      x-identifiers:
+      x-identifiers: &ref_0
         - AutoScalingGroupName
       x-type: cloud_control
       methods:
@@ -2820,8 +2820,7 @@ components:
       id: awscc.autoscaling.auto_scaling_groups_list_only
       x-cfn-schema-name: AutoScalingGroup
       x-cfn-type-name: AWS::AutoScaling::AutoScalingGroup
-      x-identifiers:
-        - AutoScalingGroupName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2851,7 +2850,7 @@ components:
       id: awscc.autoscaling.launch_configurations
       x-cfn-schema-name: LaunchConfiguration
       x-cfn-type-name: AWS::AutoScaling::LaunchConfiguration
-      x-identifiers:
+      x-identifiers: &ref_1
         - LaunchConfigurationName
       x-type: cloud_control
       methods:
@@ -2956,8 +2955,7 @@ components:
       id: awscc.autoscaling.launch_configurations_list_only
       x-cfn-schema-name: LaunchConfiguration
       x-cfn-type-name: AWS::AutoScaling::LaunchConfiguration
-      x-identifiers:
-        - LaunchConfigurationName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2987,7 +2985,7 @@ components:
       id: awscc.autoscaling.lifecycle_hooks
       x-cfn-schema-name: LifecycleHook
       x-cfn-type-name: AWS::AutoScaling::LifecycleHook
-      x-identifiers:
+      x-identifiers: &ref_2
         - AutoScalingGroupName
         - LifecycleHookName
       x-type: cloud_control
@@ -3088,9 +3086,7 @@ components:
       id: awscc.autoscaling.lifecycle_hooks_list_only
       x-cfn-schema-name: LifecycleHook
       x-cfn-type-name: AWS::AutoScaling::LifecycleHook
-      x-identifiers:
-        - AutoScalingGroupName
-        - LifecycleHookName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3122,7 +3118,7 @@ components:
       id: awscc.autoscaling.scaling_policies
       x-cfn-schema-name: ScalingPolicy
       x-cfn-type-name: AWS::AutoScaling::ScalingPolicy
-      x-identifiers:
+      x-identifiers: &ref_3
         - Arn
       x-type: cloud_control
       methods:
@@ -3232,8 +3228,7 @@ components:
       id: awscc.autoscaling.scaling_policies_list_only
       x-cfn-schema-name: ScalingPolicy
       x-cfn-type-name: AWS::AutoScaling::ScalingPolicy
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3263,7 +3258,7 @@ components:
       id: awscc.autoscaling.scheduled_actions
       x-cfn-schema-name: ScheduledAction
       x-cfn-type-name: AWS::AutoScaling::ScheduledAction
-      x-identifiers:
+      x-identifiers: &ref_4
         - ScheduledActionName
         - AutoScalingGroupName
       x-type: cloud_control
@@ -3366,9 +3361,7 @@ components:
       id: awscc.autoscaling.scheduled_actions_list_only
       x-cfn-schema-name: ScheduledAction
       x-cfn-type-name: AWS::AutoScaling::ScheduledAction
-      x-identifiers:
-        - ScheduledActionName
-        - AutoScalingGroupName
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3400,7 +3393,7 @@ components:
       id: awscc.autoscaling.warm_pools
       x-cfn-schema-name: WarmPool
       x-cfn-type-name: AWS::AutoScaling::WarmPool
-      x-identifiers:
+      x-identifiers: &ref_5
         - AutoScalingGroupName
       x-type: cloud_control
       methods:
@@ -3494,8 +3487,7 @@ components:
       id: awscc.autoscaling.warm_pools_list_only
       x-cfn-schema-name: WarmPool
       x-cfn-type-name: AWS::AutoScaling::WarmPool
-      x-identifiers:
-        - AutoScalingGroupName
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/b2bi.yaml b/openapi/src/awscc/v00.00.00000/services/b2bi.yaml
index be6996cdb..cbf7300f0 100644
--- a/openapi/src/awscc/v00.00.00000/services/b2bi.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/b2bi.yaml
@@ -1928,7 +1928,7 @@ components:
       id: awscc.b2bi.capabilities
       x-cfn-schema-name: Capability
       x-cfn-type-name: AWS::B2BI::Capability
-      x-identifiers:
+      x-identifiers: &ref_0
         - CapabilityId
       x-type: cloud_control
       methods:
@@ -2030,8 +2030,7 @@ components:
       id: awscc.b2bi.capabilities_list_only
       x-cfn-schema-name: Capability
       x-cfn-type-name: AWS::B2BI::Capability
-      x-identifiers:
-        - CapabilityId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2061,7 +2060,7 @@ components:
       id: awscc.b2bi.partnerships
       x-cfn-schema-name: Partnership
       x-cfn-type-name: AWS::B2BI::Partnership
-      x-identifiers:
+      x-identifiers: &ref_1
         - PartnershipId
       x-type: cloud_control
       methods:
@@ -2169,8 +2168,7 @@ components:
       id: awscc.b2bi.partnerships_list_only
       x-cfn-schema-name: Partnership
       x-cfn-type-name: AWS::B2BI::Partnership
-      x-identifiers:
-        - PartnershipId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2200,7 +2198,7 @@ components:
       id: awscc.b2bi.profiles
       x-cfn-schema-name: Profile
       x-cfn-type-name: AWS::B2BI::Profile
-      x-identifiers:
+      x-identifiers: &ref_2
         - ProfileId
       x-type: cloud_control
       methods:
@@ -2306,8 +2304,7 @@ components:
       id: awscc.b2bi.profiles_list_only
       x-cfn-schema-name: Profile
       x-cfn-type-name: AWS::B2BI::Profile
-      x-identifiers:
-        - ProfileId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2337,7 +2334,7 @@ components:
       id: awscc.b2bi.transformers
       x-cfn-schema-name: Transformer
       x-cfn-type-name: AWS::B2BI::Transformer
-      x-identifiers:
+      x-identifiers: &ref_3
         - TransformerId
       x-type: cloud_control
       methods:
@@ -2451,8 +2448,7 @@ components:
       id: awscc.b2bi.transformers_list_only
       x-cfn-schema-name: Transformer
       x-cfn-type-name: AWS::B2BI::Transformer
-      x-identifiers:
-        - TransformerId
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/backup.yaml b/openapi/src/awscc/v00.00.00000/services/backup.yaml
index 623878cf8..cca158eea 100644
--- a/openapi/src/awscc/v00.00.00000/services/backup.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/backup.yaml
@@ -843,22 +843,20 @@ components:
         - ParameterName
         - ParameterValue
     Tag:
-      additionalProperties: false
       type: object
+      description: A key-value pair to associate with a resource.
       properties:
-        Value:
-          minLength: 0
-          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
-          type: string
-          maxLength: 256
         Key:
-          minLength: 1
-          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
           type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
           maxLength: 128
-      required:
-        - Key
-        - Value
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      additionalProperties: false
     Framework:
       type: object
       properties:
@@ -1198,6 +1196,23 @@ components:
         - Algorithm
         - RecoveryPointTypes
         - IncludeVaults
+    RestoreTestingPlan_Tag:
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          minLength: 0
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+          maxLength: 256
+        Key:
+          minLength: 1
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+          maxLength: 128
+      required:
+        - Key
+        - Value
     RestoreTestingRecoveryPointSelectionAlgorithm:
       type: string
       enum:
@@ -1228,7 +1243,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/RestoreTestingPlan_Tag'
       required:
         - RecoveryPointSelection
         - ScheduleExpression
@@ -1692,7 +1707,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/RestoreTestingPlan_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateRestoreTestingPlanRequest
       type: object
@@ -1746,7 +1761,7 @@ components:
       id: awscc.backup.backup_plans
       x-cfn-schema-name: BackupPlan
       x-cfn-type-name: AWS::Backup::BackupPlan
-      x-identifiers:
+      x-identifiers: &ref_0
         - BackupPlanId
       x-type: cloud_control
       methods:
@@ -1840,8 +1855,7 @@ components:
       id: awscc.backup.backup_plans_list_only
       x-cfn-schema-name: BackupPlan
       x-cfn-type-name: AWS::Backup::BackupPlan
-      x-identifiers:
-        - BackupPlanId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1871,7 +1885,7 @@ components:
       id: awscc.backup.backup_selections
       x-cfn-schema-name: BackupSelection
       x-cfn-type-name: AWS::Backup::BackupSelection
-      x-identifiers:
+      x-identifiers: &ref_1
         - Id
       x-type: cloud_control
       methods:
@@ -1946,8 +1960,7 @@ components:
       id: awscc.backup.backup_selections_list_only
       x-cfn-schema-name: BackupSelection
       x-cfn-type-name: AWS::Backup::BackupSelection
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1977,7 +1990,7 @@ components:
       id: awscc.backup.backup_vaults
       x-cfn-schema-name: BackupVault
       x-cfn-type-name: AWS::Backup::BackupVault
-      x-identifiers:
+      x-identifiers: &ref_2
         - BackupVaultName
       x-type: cloud_control
       methods:
@@ -2075,8 +2088,7 @@ components:
       id: awscc.backup.backup_vaults_list_only
       x-cfn-schema-name: BackupVault
       x-cfn-type-name: AWS::Backup::BackupVault
-      x-identifiers:
-        - BackupVaultName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2106,7 +2118,7 @@ components:
       id: awscc.backup.frameworks
       x-cfn-schema-name: Framework
       x-cfn-type-name: AWS::Backup::Framework
-      x-identifiers:
+      x-identifiers: &ref_3
         - FrameworkArn
       x-type: cloud_control
       methods:
@@ -2206,8 +2218,7 @@ components:
       id: awscc.backup.frameworks_list_only
       x-cfn-schema-name: Framework
       x-cfn-type-name: AWS::Backup::Framework
-      x-identifiers:
-        - FrameworkArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2237,7 +2248,7 @@ components:
       id: awscc.backup.logically_air_gapped_backup_vaults
       x-cfn-schema-name: LogicallyAirGappedBackupVault
       x-cfn-type-name: AWS::Backup::LogicallyAirGappedBackupVault
-      x-identifiers:
+      x-identifiers: &ref_4
         - BackupVaultName
       x-type: cloud_control
       methods:
@@ -2341,8 +2352,7 @@ components:
       id: awscc.backup.logically_air_gapped_backup_vaults_list_only
       x-cfn-schema-name: LogicallyAirGappedBackupVault
       x-cfn-type-name: AWS::Backup::LogicallyAirGappedBackupVault
-      x-identifiers:
-        - BackupVaultName
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2372,7 +2382,7 @@ components:
       id: awscc.backup.report_plans
       x-cfn-schema-name: ReportPlan
       x-cfn-type-name: AWS::Backup::ReportPlan
-      x-identifiers:
+      x-identifiers: &ref_5
         - ReportPlanArn
       x-type: cloud_control
       methods:
@@ -2468,8 +2478,7 @@ components:
       id: awscc.backup.report_plans_list_only
       x-cfn-schema-name: ReportPlan
       x-cfn-type-name: AWS::Backup::ReportPlan
-      x-identifiers:
-        - ReportPlanArn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2499,7 +2508,7 @@ components:
       id: awscc.backup.restore_testing_plans
       x-cfn-schema-name: RestoreTestingPlan
       x-cfn-type-name: AWS::Backup::RestoreTestingPlan
-      x-identifiers:
+      x-identifiers: &ref_6
         - RestoreTestingPlanName
       x-type: cloud_control
       methods:
@@ -2597,8 +2606,7 @@ components:
       id: awscc.backup.restore_testing_plans_list_only
       x-cfn-schema-name: RestoreTestingPlan
       x-cfn-type-name: AWS::Backup::RestoreTestingPlan
-      x-identifiers:
-        - RestoreTestingPlanName
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2628,7 +2636,7 @@ components:
       id: awscc.backup.restore_testing_selections
       x-cfn-schema-name: RestoreTestingSelection
       x-cfn-type-name: AWS::Backup::RestoreTestingSelection
-      x-identifiers:
+      x-identifiers: &ref_7
         - RestoreTestingPlanName
         - RestoreTestingSelectionName
       x-type: cloud_control
@@ -2729,9 +2737,7 @@ components:
       id: awscc.backup.restore_testing_selections_list_only
       x-cfn-schema-name: RestoreTestingSelection
       x-cfn-type-name: AWS::Backup::RestoreTestingSelection
-      x-identifiers:
-        - RestoreTestingPlanName
-        - RestoreTestingSelectionName
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/backupgateway.yaml b/openapi/src/awscc/v00.00.00000/services/backupgateway.yaml
index 096994aab..c6a6bf776 100644
--- a/openapi/src/awscc/v00.00.00000/services/backupgateway.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/backupgateway.yaml
@@ -585,7 +585,7 @@ components:
       id: awscc.backupgateway.hypervisors
       x-cfn-schema-name: Hypervisor
       x-cfn-type-name: AWS::BackupGateway::Hypervisor
-      x-identifiers:
+      x-identifiers: &ref_0
         - HypervisorArn
       x-type: cloud_control
       methods:
@@ -685,8 +685,7 @@ components:
       id: awscc.backupgateway.hypervisors_list_only
       x-cfn-schema-name: Hypervisor
       x-cfn-type-name: AWS::BackupGateway::Hypervisor
-      x-identifiers:
-        - HypervisorArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/batch.yaml b/openapi/src/awscc/v00.00.00000/services/batch.yaml
index 7ecd2357f..a4b5042bd 100644
--- a/openapi/src/awscc/v00.00.00000/services/batch.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/batch.yaml
@@ -641,7 +641,7 @@ components:
         list:
           - Batch:DescribeComputeEnvironments
     ResourceArn:
-      description: ARN of the Scheduling Policy.
+      description: ARN of the Consumable Resource.
       type: string
     ResourceType:
       description: Type of Consumable Resource.
@@ -1659,6 +1659,9 @@ components:
           - Iam:PassRole
         list:
           - Batch:DescribeJobDefinitions
+    JobQueue_ResourceArn:
+      type: string
+      pattern: arn:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{0,63}:[a-z0-9-\.]{0,63}:[a-z0-9-\.]{0,63}:[^/].{0,1023}
     ComputeEnvironmentOrder:
       type: object
       additionalProperties: false
@@ -1713,7 +1716,7 @@ components:
           minLength: 1
           maxLength: 128
         JobQueueArn:
-          $ref: '#/components/schemas/ResourceArn'
+          $ref: '#/components/schemas/JobQueue_ResourceArn'
         JobQueueType:
           type: string
         ComputeEnvironmentOrder:
@@ -1744,7 +1747,7 @@ components:
             - DISABLED
             - ENABLED
         SchedulingPolicyArn:
-          $ref: '#/components/schemas/ResourceArn'
+          $ref: '#/components/schemas/JobQueue_ResourceArn'
         Tags:
           type: object
           description: A key-value pair to associate with a resource.
@@ -1794,6 +1797,9 @@ components:
           - Batch:DeleteJobQueue
         list:
           - Batch:DescribeJobQueues
+    SchedulingPolicy_ResourceArn:
+      description: ARN of the Scheduling Policy.
+      type: string
     FairsharePolicy:
       description: Fair Share Policy for the Job Queue.
       type: object
@@ -1833,7 +1839,7 @@ components:
           type: string
           pattern: ''
         Arn:
-          $ref: '#/components/schemas/ResourceArn'
+          $ref: '#/components/schemas/SchedulingPolicy_ResourceArn'
         FairsharePolicy:
           $ref: '#/components/schemas/FairsharePolicy'
         Tags:
@@ -2131,7 +2137,7 @@ components:
               minLength: 1
               maxLength: 128
             JobQueueArn:
-              $ref: '#/components/schemas/ResourceArn'
+              $ref: '#/components/schemas/JobQueue_ResourceArn'
             JobQueueType:
               type: string
             ComputeEnvironmentOrder:
@@ -2162,7 +2168,7 @@ components:
                 - DISABLED
                 - ENABLED
             SchedulingPolicyArn:
-              $ref: '#/components/schemas/ResourceArn'
+              $ref: '#/components/schemas/JobQueue_ResourceArn'
             Tags:
               type: object
               description: A key-value pair to associate with a resource.
@@ -2192,7 +2198,7 @@ components:
               type: string
               pattern: ''
             Arn:
-              $ref: '#/components/schemas/ResourceArn'
+              $ref: '#/components/schemas/SchedulingPolicy_ResourceArn'
             FairsharePolicy:
               $ref: '#/components/schemas/FairsharePolicy'
             Tags:
@@ -2253,7 +2259,7 @@ components:
       id: awscc.batch.compute_environments
       x-cfn-schema-name: ComputeEnvironment
       x-cfn-type-name: AWS::Batch::ComputeEnvironment
-      x-identifiers:
+      x-identifiers: &ref_0
         - ComputeEnvironmentArn
       x-type: cloud_control
       methods:
@@ -2361,8 +2367,7 @@ components:
       id: awscc.batch.compute_environments_list_only
       x-cfn-schema-name: ComputeEnvironment
       x-cfn-type-name: AWS::Batch::ComputeEnvironment
-      x-identifiers:
-        - ComputeEnvironmentArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2392,7 +2397,7 @@ components:
       id: awscc.batch.consumable_resources
       x-cfn-schema-name: ConsumableResource
       x-cfn-type-name: AWS::Batch::ConsumableResource
-      x-identifiers:
+      x-identifiers: &ref_1
         - ConsumableResourceArn
       x-type: cloud_control
       methods:
@@ -2492,8 +2497,7 @@ components:
       id: awscc.batch.consumable_resources_list_only
       x-cfn-schema-name: ConsumableResource
       x-cfn-type-name: AWS::Batch::ConsumableResource
-      x-identifiers:
-        - ConsumableResourceArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2523,7 +2527,7 @@ components:
       id: awscc.batch.job_definitions
       x-cfn-schema-name: JobDefinition
       x-cfn-type-name: AWS::Batch::JobDefinition
-      x-identifiers:
+      x-identifiers: &ref_2
         - JobDefinitionName
       x-type: cloud_control
       methods:
@@ -2637,8 +2641,7 @@ components:
       id: awscc.batch.job_definitions_list_only
       x-cfn-schema-name: JobDefinition
       x-cfn-type-name: AWS::Batch::JobDefinition
-      x-identifiers:
-        - JobDefinitionName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2668,7 +2671,7 @@ components:
       id: awscc.batch.job_queues
       x-cfn-schema-name: JobQueue
       x-cfn-type-name: AWS::Batch::JobQueue
-      x-identifiers:
+      x-identifiers: &ref_3
         - JobQueueArn
       x-type: cloud_control
       methods:
@@ -2772,8 +2775,7 @@ components:
       id: awscc.batch.job_queues_list_only
       x-cfn-schema-name: JobQueue
       x-cfn-type-name: AWS::Batch::JobQueue
-      x-identifiers:
-        - JobQueueArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2803,7 +2805,7 @@ components:
       id: awscc.batch.scheduling_policies
       x-cfn-schema-name: SchedulingPolicy
       x-cfn-type-name: AWS::Batch::SchedulingPolicy
-      x-identifiers:
+      x-identifiers: &ref_4
         - Arn
       x-type: cloud_control
       methods:
@@ -2895,8 +2897,7 @@ components:
       id: awscc.batch.scheduling_policies_list_only
       x-cfn-schema-name: SchedulingPolicy
       x-cfn-type-name: AWS::Batch::SchedulingPolicy
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2926,7 +2927,7 @@ components:
       id: awscc.batch.service_environments
       x-cfn-schema-name: ServiceEnvironment
       x-cfn-type-name: AWS::Batch::ServiceEnvironment
-      x-identifiers:
+      x-identifiers: &ref_5
         - ServiceEnvironmentArn
       x-type: cloud_control
       methods:
@@ -3022,8 +3023,7 @@ components:
       id: awscc.batch.service_environments_list_only
       x-cfn-schema-name: ServiceEnvironment
       x-cfn-type-name: AWS::Batch::ServiceEnvironment
-      x-identifiers:
-        - ServiceEnvironmentArn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/bcmdataexports.yaml b/openapi/src/awscc/v00.00.00000/services/bcmdataexports.yaml
index 7dc081b4e..e5cfd9fc8 100644
--- a/openapi/src/awscc/v00.00.00000/services/bcmdataexports.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/bcmdataexports.yaml
@@ -416,68 +416,36 @@ components:
       required:
         - S3Destination
       additionalProperties: false
-    Export:
+    Export_Export:
       type: object
       properties:
-        Export:
-          $ref: '#/components/schemas/Export'
         ExportArn:
           type: string
           maxLength: 2048
           minLength: 20
           pattern: ^arn:aws[-a-z0-9]*:[-a-z0-9]+:[-a-z0-9]*:[0-9]{12}:[-a-zA-Z0-9/:_]+$
-        Tags:
-          type: array
-          items:
-            $ref: '#/components/schemas/ResourceTag'
-          maxItems: 200
-          minItems: 0
+        Name:
+          type: string
+          maxLength: 128
+          minLength: 1
+          pattern: ^[0-9A-Za-z\-_]+$
+        Description:
+          type: string
+          maxLength: 1024
+          minLength: 0
+          pattern: ^[\S\s]*$
+        DataQuery:
+          $ref: '#/components/schemas/DataQuery'
+        DestinationConfigurations:
+          $ref: '#/components/schemas/DestinationConfigurations'
+        RefreshCadence:
+          $ref: '#/components/schemas/RefreshCadence'
       required:
-        - Export
-      x-stackql-resource-name: export
-      description: Definition of AWS::BCMDataExports::Export Resource Type
-      x-type-name: AWS::BCMDataExports::Export
-      x-documentation-url: https://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_DataExports_CreateExport.html#API_DataExports_CreateExport_RequestSyntax
-      x-stackql-primary-identifier:
-        - ExportArn
-      x-create-only-properties:
-        - Export/Name
-        - Export/DataQuery/TableConfigurations
-        - Export/RefreshCadence
-      x-read-only-properties:
-        - ExportArn
-      x-required-properties:
-        - Export
-      x-tagging:
-        taggable: true
-        tagOnCreate: true
-        tagUpdatable: true
-        cloudFormationSystemTags: false
-        tagProperty: /properties/Tags
-        permissions:
-          - bcm-data-exports:ListTagsForResource
-          - bcm-data-exports:TagResource
-          - bcm-data-exports:UntagResource
-      x-required-permissions:
-        create:
-          - bcm-data-exports:CreateExport
-          - bcm-data-exports:GetExport
-          - bcm-data-exports:ListTagsForResource
-          - bcm-data-exports:TagResource
-          - cur:PutReportDefinition
-        read:
-          - bcm-data-exports:GetExport
-          - bcm-data-exports:ListTagsForResource
-        update:
-          - bcm-data-exports:UpdateExport
-          - bcm-data-exports:TagResource
-          - bcm-data-exports:UntagResource
-          - bcm-data-exports:GetExport
-          - bcm-data-exports:ListTagsForResource
-        delete:
-          - bcm-data-exports:DeleteExport
-        list:
-          - bcm-data-exports:ListExports
+        - DataQuery
+        - DestinationConfigurations
+        - Name
+        - RefreshCadence
+      additionalProperties: false
     FormatOption:
       type: string
       enum:
@@ -577,6 +545,68 @@ components:
           minLength: 0
           pattern: ^[\S\s]*$
       additionalProperties: false
+    Export:
+      type: object
+      properties:
+        Export:
+          $ref: '#/components/schemas/Export_Export'
+        ExportArn:
+          type: string
+          maxLength: 2048
+          minLength: 20
+          pattern: ^arn:aws[-a-z0-9]*:[-a-z0-9]+:[-a-z0-9]*:[0-9]{12}:[-a-zA-Z0-9/:_]+$
+        Tags:
+          type: array
+          items:
+            $ref: '#/components/schemas/ResourceTag'
+          maxItems: 200
+          minItems: 0
+      required:
+        - Export
+      x-stackql-resource-name: export
+      description: Definition of AWS::BCMDataExports::Export Resource Type
+      x-type-name: AWS::BCMDataExports::Export
+      x-documentation-url: https://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_DataExports_CreateExport.html#API_DataExports_CreateExport_RequestSyntax
+      x-stackql-primary-identifier:
+        - ExportArn
+      x-create-only-properties:
+        - Export/Name
+        - Export/DataQuery/TableConfigurations
+        - Export/RefreshCadence
+      x-read-only-properties:
+        - ExportArn
+      x-required-properties:
+        - Export
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: false
+        tagProperty: /properties/Tags
+        permissions:
+          - bcm-data-exports:ListTagsForResource
+          - bcm-data-exports:TagResource
+          - bcm-data-exports:UntagResource
+      x-required-permissions:
+        create:
+          - bcm-data-exports:CreateExport
+          - bcm-data-exports:GetExport
+          - bcm-data-exports:ListTagsForResource
+          - bcm-data-exports:TagResource
+          - cur:PutReportDefinition
+        read:
+          - bcm-data-exports:GetExport
+          - bcm-data-exports:ListTagsForResource
+        update:
+          - bcm-data-exports:UpdateExport
+          - bcm-data-exports:TagResource
+          - bcm-data-exports:UntagResource
+          - bcm-data-exports:GetExport
+          - bcm-data-exports:ListTagsForResource
+        delete:
+          - bcm-data-exports:DeleteExport
+        list:
+          - bcm-data-exports:ListExports
     CreateExportRequest:
       properties:
         ClientToken:
@@ -591,7 +621,7 @@ components:
           type: object
           properties:
             Export:
-              $ref: '#/components/schemas/Export'
+              $ref: '#/components/schemas/Export_Export'
             ExportArn:
               type: string
               maxLength: 2048
@@ -620,7 +650,7 @@ components:
       id: awscc.bcmdataexports.exports
       x-cfn-schema-name: Export
       x-cfn-type-name: AWS::BCMDataExports::Export
-      x-identifiers:
+      x-identifiers: &ref_0
         - ExportArn
       x-type: cloud_control
       methods:
@@ -710,8 +740,7 @@ components:
       id: awscc.bcmdataexports.exports_list_only
       x-cfn-schema-name: Export
       x-cfn-type-name: AWS::BCMDataExports::Export
-      x-identifiers:
-        - ExportArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/bedrock.yaml b/openapi/src/awscc/v00.00.00000/services/bedrock.yaml
index cbfbc7216..a02ec7028 100644
--- a/openapi/src/awscc/v00.00.00000/services/bedrock.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/bedrock.yaml
@@ -446,7 +446,7 @@ components:
         - DISABLED
     AdditionalModelRequestFields:
       type: object
-      description: Contains model-specific configurations
+      description: Additional Model Request Fields for Prompt Configuration
     AgentActionGroup:
       type: object
       description: Contains the information of an Agent Action Group
@@ -601,7 +601,7 @@ components:
       additionalProperties: false
     GuardrailConfiguration:
       type: object
-      description: Configuration for a guardrail
+      description: Configuration for a guardrail.
       properties:
         GuardrailIdentifier:
           type: string
@@ -1392,12 +1392,10 @@ components:
       pattern: ^[0-9a-zA-Z-_ ]+$
       minLength: 1
       maxLength: 256
-      description: The name inherited from the policy
     Description:
       type: string
       pattern: ^[\s\S]+$
       maxLength: 1024
-      description: The description inherited from the policy
     PolicyDefinitionRule:
       type: object
       properties:
@@ -1530,12 +1528,10 @@ components:
       pattern: ^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:automated-reasoning-policy\/[a-z0-9]{12}$
       minLength: 1
       maxLength: 2048
-      description: 'Arn of the policy '
     Version:
       type: string
-      pattern: ^([1-9][0-9]{0,11})$
-      maxLength: 12
-      description: The version of the policy
+      pattern: ^(([1-9][0-9]{0,11})|(DRAFT))$
+      description: Version of the policy that was created. This will always be `DRAFT`
     DefinitionHash:
       type: string
       pattern: ^[0-9a-z]{128}$
@@ -1545,7 +1541,7 @@ components:
     CreatedAt:
       type: string
       format: date-time
-      description: Time this policy version was created
+      description: Time this policy was created
     UpdatedAt:
       type: string
       format: date-time
@@ -1555,7 +1551,7 @@ components:
       pattern: ^[a-z0-9]{12}$
       minLength: 1
       maxLength: 2048
-      description: The id of the associated policy
+      description: The id of the policy
     Tags:
       type: array
       x-insertionOrder: false
@@ -1633,27 +1629,59 @@ components:
           - bedrock:GetAutomatedReasoningPolicy
         list:
           - bedrock:ListAutomatedReasoningPolicies
+    AutomatedReasoningPolicyVersion_PolicyArn:
+      type: string
+      pattern: ^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:automated-reasoning-policy\/[a-z0-9]{12}$
+      minLength: 1
+      maxLength: 2048
+      description: 'Arn of the policy '
+    AutomatedReasoningPolicyVersion_Name:
+      type: string
+      pattern: ^[0-9a-zA-Z-_ ]+$
+      minLength: 1
+      maxLength: 256
+      description: The name inherited from the policy
+    AutomatedReasoningPolicyVersion_Description:
+      type: string
+      pattern: ^[\s\S]+$
+      maxLength: 1024
+      description: The description inherited from the policy
+    AutomatedReasoningPolicyVersion_Version:
+      type: string
+      pattern: ^([1-9][0-9]{0,11})$
+      maxLength: 12
+      description: The version of the policy
+    AutomatedReasoningPolicyVersion_CreatedAt:
+      type: string
+      format: date-time
+      description: Time this policy version was created
+    AutomatedReasoningPolicyVersion_PolicyId:
+      type: string
+      pattern: ^[a-z0-9]{12}$
+      minLength: 1
+      maxLength: 2048
+      description: The id of the associated policy
     AutomatedReasoningPolicyVersion:
       type: object
       properties:
         PolicyArn:
-          $ref: '#/components/schemas/PolicyArn'
+          $ref: '#/components/schemas/AutomatedReasoningPolicyVersion_PolicyArn'
         Name:
-          $ref: '#/components/schemas/Name'
+          $ref: '#/components/schemas/AutomatedReasoningPolicyVersion_Name'
         Description:
-          $ref: '#/components/schemas/Description'
+          $ref: '#/components/schemas/AutomatedReasoningPolicyVersion_Description'
         Version:
-          $ref: '#/components/schemas/Version'
+          $ref: '#/components/schemas/AutomatedReasoningPolicyVersion_Version'
         DefinitionHash:
           $ref: '#/components/schemas/DefinitionHash'
         LastUpdatedDefinitionHash:
           $ref: '#/components/schemas/DefinitionHash'
         CreatedAt:
-          $ref: '#/components/schemas/CreatedAt'
+          $ref: '#/components/schemas/AutomatedReasoningPolicyVersion_CreatedAt'
         UpdatedAt:
           $ref: '#/components/schemas/UpdatedAt'
         PolicyId:
-          $ref: '#/components/schemas/PolicyId'
+          $ref: '#/components/schemas/AutomatedReasoningPolicyVersion_PolicyId'
         Tags:
           $ref: '#/components/schemas/Tags'
       required:
@@ -1706,6 +1734,26 @@ components:
           - bedrock:GetAutomatedReasoningPolicy
         list:
           - bedrock:ListAutomatedReasoningPolicies
+    Blueprint_Tag:
+      type: object
+      description: Definition of the key/value pair for a tag
+      properties:
+        Key:
+          type: string
+          description: Key for the tag
+          minLength: 1
+          maxLength: 128
+          pattern: ^[a-zA-Z0-9\s._:/=+@-]*$
+        Value:
+          type: string
+          description: Value for the tag
+          minLength: 0
+          maxLength: 256
+          pattern: ^[a-zA-Z0-9\s._:/=+@-]*$
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     Blueprint:
       type: object
       properties:
@@ -1767,7 +1815,7 @@ components:
           minItems: 0
           maxItems: 200
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Blueprint_Tag'
       required:
         - BlueprintName
         - Schema
@@ -1829,6 +1877,26 @@ components:
           - kms:Decrypt
         list:
           - bedrock:ListBlueprints
+    DataAutomationProject_Tag:
+      type: object
+      description: Definition of the key/value pair for a tag
+      properties:
+        Key:
+          type: string
+          description: Key for the tag
+          minLength: 1
+          maxLength: 128
+          pattern: ^[a-zA-Z0-9\s._:/=+@-]*$
+        Value:
+          type: string
+          description: Value for the tag
+          minLength: 0
+          maxLength: 256
+          pattern: ^[a-zA-Z0-9\s._:/=+@-]*$
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     AudioExtractionCategory:
       type: object
       properties:
@@ -2296,7 +2364,7 @@ components:
           minItems: 0
           maxItems: 200
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/DataAutomationProject_Tag'
       required:
         - ProjectName
       x-stackql-resource-name: data_automation_project
@@ -3279,7 +3347,7 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/FlowNodeInput'
-          maxItems: 5
+          maxItems: 20
           description: List of node inputs in a flow
           x-insertionOrder: true
         Outputs:
@@ -3368,14 +3436,6 @@ components:
           required:
             - Storage
           additionalProperties: false
-        - type: object
-          title: Retrieval
-          properties:
-            Retrieval:
-              $ref: '#/components/schemas/RetrievalFlowNodeConfiguration'
-          required:
-            - Retrieval
-          additionalProperties: false
         - type: object
           title: Iterator
           properties:
@@ -3392,6 +3452,14 @@ components:
           required:
             - Collector
           additionalProperties: false
+        - type: object
+          title: Retrieval
+          properties:
+            Retrieval:
+              $ref: '#/components/schemas/RetrievalFlowNodeConfiguration'
+          required:
+            - Retrieval
+          additionalProperties: false
         - type: object
           title: InlineCode
           properties:
@@ -3455,6 +3523,8 @@ components:
           maxLength: 64
           minLength: 1
           description: Expression for a node input in a flow
+        Category:
+          $ref: '#/components/schemas/FlowNodeInputCategory'
       required:
         - Expression
         - Name
@@ -3486,10 +3556,10 @@ components:
         - Prompt
         - LambdaFunction
         - Agent
-        - Iterator
-        - Collector
         - Storage
         - Retrieval
+        - Iterator
+        - Collector
         - InlineCode
         - Loop
         - LoopInput
@@ -3534,7 +3604,7 @@ components:
           pattern: ^(arn:aws(-[^:]{1,12})?:(bedrock|sagemaker):[a-z0-9-]{1,20}:([0-9]{12})?:([a-z-]+/)?)?([a-zA-Z0-9.-]{1,63}){0,2}(([:][a-z0-9-]{1,63}){0,2})?(/[a-z0-9]{1,12})?$
           description: ARN or Id of a Bedrock Foundational Model or Inference Profile, or the ARN of a imported model, or a provisioned throughput ARN for custom models.
         GuardrailConfiguration:
-          $ref: '#/components/schemas/GuardrailConfiguration'
+          $ref: '#/components/schemas/Flow_GuardrailConfiguration'
         NumberOfResults:
           type: number
           maximum: 100
@@ -3600,7 +3670,7 @@ components:
         SourceConfiguration:
           $ref: '#/components/schemas/PromptFlowNodeSourceConfiguration'
         GuardrailConfiguration:
-          $ref: '#/components/schemas/GuardrailConfiguration'
+          $ref: '#/components/schemas/Flow_GuardrailConfiguration'
       required:
         - SourceConfiguration
       additionalProperties: false
@@ -3772,20 +3842,35 @@ components:
           required:
             - Text
           additionalProperties: false
-        - type: object
-          title: Chat
-          properties:
-            Chat:
-              $ref: '#/components/schemas/ChatPromptTemplateConfiguration'
-          required:
-            - Chat
-          additionalProperties: false
     PromptTemplateType:
       type: string
       description: Prompt template type
       enum:
         - TEXT
-        - CHAT
+    Flow_S3Location:
+      type: object
+      description: A bucket, key and optional version pointing to an S3 object containing a UTF-8 encoded JSON string Definition with the same schema as the Definition property of this resource
+      properties:
+        Bucket:
+          type: string
+          maxLength: 63
+          minLength: 3
+          pattern: ^[a-z0-9][\.\-a-z0-9]{1,61}[a-z0-9]$
+          description: A bucket in S3
+        Key:
+          type: string
+          maxLength: 1024
+          minLength: 1
+          description: A object key in S3
+        Version:
+          type: string
+          maxLength: 1024
+          minLength: 1
+          description: The version of the the S3 object to use
+      required:
+        - Bucket
+        - Key
+      additionalProperties: false
     DefinitionSubstitutions:
       type: object
       description: When supplied with DefinitionString or DefinitionS3Location, substrings in the definition matching ${keyname} will be replaced with the associated value from this map
@@ -3815,11 +3900,23 @@ components:
           minItems: 0
           description: List of input variables
           x-insertionOrder: true
-        CachePoint:
-          $ref: '#/components/schemas/CachePointBlock'
       required:
         - Text
       additionalProperties: false
+    Flow_GuardrailConfiguration:
+      type: object
+      description: Configuration for a guardrail
+      properties:
+        GuardrailIdentifier:
+          type: string
+          maxLength: 2048
+          pattern: ^(([a-z0-9]+)|(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:guardrail/[a-z0-9]+))$
+          description: Identifier for the guardrail, could be the id or the arn
+        GuardrailVersion:
+          type: string
+          pattern: ^(([0-9]{1,8})|(DRAFT))$
+          description: Version of the guardrail
+      additionalProperties: false
     LoopFlowNodeConfiguration:
       type: object
       description: Loop node config, contains loop's internal definition
@@ -3873,6 +3970,8 @@ components:
       minLength: 1
       pattern: ^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}::foundation-model/(.*))?$
       description: Arn of a Bedrock Reranking model
+    Flow_AdditionalModelRequestFields:
+      type: object
     VectorSearchRerankingConfigurationType:
       type: string
       description: Enum of Rerank Configuration Types
@@ -3941,7 +4040,7 @@ components:
         ModelArn:
           $ref: '#/components/schemas/BedrockRerankingModelArn'
         AdditionalModelRequestFields:
-          $ref: '#/components/schemas/AdditionalModelRequestFields'
+          $ref: '#/components/schemas/Flow_AdditionalModelRequestFields'
       required:
         - ModelArn
       additionalProperties: false
@@ -4007,7 +4106,7 @@ components:
         InferenceConfig:
           $ref: '#/components/schemas/PromptInferenceConfiguration'
         AdditionalModelRequestFields:
-          $ref: '#/components/schemas/AdditionalModelRequestFields'
+          $ref: '#/components/schemas/Flow_AdditionalModelRequestFields'
         PerformanceConfig:
           $ref: '#/components/schemas/PerformanceConfiguration'
       additionalProperties: false
@@ -4031,7 +4130,7 @@ components:
           description: A JSON string containing a Definition with the same schema as the Definition property of this resource
           maxLength: 512000
         DefinitionS3Location:
-          $ref: '#/components/schemas/S3Location'
+          $ref: '#/components/schemas/Flow_S3Location'
         DefinitionSubstitutions:
           $ref: '#/components/schemas/DefinitionSubstitutions'
         Description:
@@ -4285,6 +4384,346 @@ components:
           - bedrock:DeleteFlowAlias
         list:
           - bedrock:ListFlowAliases
+    FlowVersion_FlowDefinition:
+      type: object
+      description: Flow definition
+      properties:
+        Nodes:
+          type: array
+          items:
+            $ref: '#/components/schemas/FlowVersion_FlowNode'
+          maxItems: 40
+          description: List of nodes in a flow
+          x-insertionOrder: true
+        Connections:
+          type: array
+          items:
+            $ref: '#/components/schemas/FlowConnection'
+          maxItems: 100
+          description: List of connections
+          x-insertionOrder: true
+      additionalProperties: false
+    FlowVersion_FlowNode:
+      type: object
+      description: Internal mixin for flow node
+      properties:
+        Name:
+          type: string
+          pattern: ^[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}$
+          description: Name of a node in a flow
+        Type:
+          $ref: '#/components/schemas/FlowVersion_FlowNodeType'
+        Configuration:
+          $ref: '#/components/schemas/FlowVersion_FlowNodeConfiguration'
+        Inputs:
+          type: array
+          items:
+            $ref: '#/components/schemas/FlowVersion_FlowNodeInput'
+          maxItems: 5
+          description: List of node inputs in a flow
+          x-insertionOrder: true
+        Outputs:
+          type: array
+          items:
+            $ref: '#/components/schemas/FlowNodeOutput'
+          maxItems: 5
+          description: List of node outputs in a flow
+          x-insertionOrder: true
+      required:
+        - Name
+        - Type
+      additionalProperties: false
+    FlowVersion_FlowNodeConfiguration:
+      description: Node configuration in a flow
+      oneOf:
+        - type: object
+          title: Input
+          properties:
+            Input:
+              $ref: '#/components/schemas/InputFlowNodeConfiguration'
+          required:
+            - Input
+          additionalProperties: false
+        - type: object
+          title: Output
+          properties:
+            Output:
+              $ref: '#/components/schemas/OutputFlowNodeConfiguration'
+          required:
+            - Output
+          additionalProperties: false
+        - type: object
+          title: KnowledgeBase
+          properties:
+            KnowledgeBase:
+              $ref: '#/components/schemas/FlowVersion_KnowledgeBaseFlowNodeConfiguration'
+          required:
+            - KnowledgeBase
+          additionalProperties: false
+        - type: object
+          title: Condition
+          properties:
+            Condition:
+              $ref: '#/components/schemas/ConditionFlowNodeConfiguration'
+          required:
+            - Condition
+          additionalProperties: false
+        - type: object
+          title: Lex
+          properties:
+            Lex:
+              $ref: '#/components/schemas/LexFlowNodeConfiguration'
+          required:
+            - Lex
+          additionalProperties: false
+        - type: object
+          title: Prompt
+          properties:
+            Prompt:
+              $ref: '#/components/schemas/FlowVersion_PromptFlowNodeConfiguration'
+          required:
+            - Prompt
+          additionalProperties: false
+        - type: object
+          title: LambdaFunction
+          properties:
+            LambdaFunction:
+              $ref: '#/components/schemas/LambdaFunctionFlowNodeConfiguration'
+          required:
+            - LambdaFunction
+          additionalProperties: false
+        - type: object
+          title: Agent
+          properties:
+            Agent:
+              $ref: '#/components/schemas/AgentFlowNodeConfiguration'
+          required:
+            - Agent
+          additionalProperties: false
+        - type: object
+          title: Storage
+          properties:
+            Storage:
+              $ref: '#/components/schemas/StorageFlowNodeConfiguration'
+          required:
+            - Storage
+          additionalProperties: false
+        - type: object
+          title: Retrieval
+          properties:
+            Retrieval:
+              $ref: '#/components/schemas/RetrievalFlowNodeConfiguration'
+          required:
+            - Retrieval
+          additionalProperties: false
+        - type: object
+          title: Iterator
+          properties:
+            Iterator:
+              $ref: '#/components/schemas/IteratorFlowNodeConfiguration'
+          required:
+            - Iterator
+          additionalProperties: false
+        - type: object
+          title: Collector
+          properties:
+            Collector:
+              $ref: '#/components/schemas/CollectorFlowNodeConfiguration'
+          required:
+            - Collector
+          additionalProperties: false
+        - type: object
+          title: InlineCode
+          properties:
+            InlineCode:
+              $ref: '#/components/schemas/InlineCodeFlowNodeConfiguration'
+          required:
+            - InlineCode
+          additionalProperties: false
+        - type: object
+          title: Loop
+          properties:
+            Loop:
+              $ref: '#/components/schemas/FlowVersion_LoopFlowNodeConfiguration'
+          required:
+            - Loop
+          additionalProperties: false
+        - type: object
+          title: LoopInput
+          properties:
+            LoopInput:
+              $ref: '#/components/schemas/LoopInputFlowNodeConfiguration'
+          required:
+            - LoopInput
+          additionalProperties: false
+        - type: object
+          title: LoopController
+          properties:
+            LoopController:
+              $ref: '#/components/schemas/LoopControllerFlowNodeConfiguration'
+          required:
+            - LoopController
+          additionalProperties: false
+    FlowVersion_FlowNodeInput:
+      type: object
+      description: Input to a node in a flow
+      properties:
+        Name:
+          type: string
+          pattern: ^[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}$
+          description: Name of a node input in a flow
+        Type:
+          $ref: '#/components/schemas/FlowNodeIODataType'
+        Expression:
+          type: string
+          maxLength: 64
+          minLength: 1
+          description: Expression for a node input in a flow
+      required:
+        - Expression
+        - Name
+        - Type
+      additionalProperties: false
+    FlowVersion_FlowNodeType:
+      type: string
+      description: Flow node types
+      enum:
+        - Input
+        - Output
+        - KnowledgeBase
+        - Condition
+        - Lex
+        - Prompt
+        - LambdaFunction
+        - Agent
+        - Iterator
+        - Collector
+        - Storage
+        - Retrieval
+        - InlineCode
+        - Loop
+        - LoopInput
+        - LoopController
+    FlowVersion_KnowledgeBaseFlowNodeConfiguration:
+      type: object
+      description: Knowledge base flow node configuration
+      properties:
+        KnowledgeBaseId:
+          type: string
+          maxLength: 10
+          pattern: ^[0-9a-zA-Z]+$
+          description: Identifier of the KnowledgeBase
+        ModelId:
+          type: string
+          maxLength: 2048
+          minLength: 1
+          pattern: ^(arn:aws(-[^:]{1,12})?:(bedrock|sagemaker):[a-z0-9-]{1,20}:([0-9]{12})?:([a-z-]+/)?)?([a-zA-Z0-9.-]{1,63}){0,2}(([:][a-z0-9-]{1,63}){0,2})?(/[a-z0-9]{1,12})?$
+          description: ARN or Id of a Bedrock Foundational Model or Inference Profile, or the ARN of a imported model, or a provisioned throughput ARN for custom models.
+        GuardrailConfiguration:
+          $ref: '#/components/schemas/FlowVersion_GuardrailConfiguration'
+        NumberOfResults:
+          type: number
+          maximum: 100
+          minimum: 1
+          description: Number Of Results to Retrieve
+        PromptTemplate:
+          $ref: '#/components/schemas/KnowledgeBasePromptTemplate'
+        InferenceConfiguration:
+          $ref: '#/components/schemas/PromptInferenceConfiguration'
+        OrchestrationConfiguration:
+          $ref: '#/components/schemas/FlowVersion_KnowledgeBaseOrchestrationConfiguration'
+        RerankingConfiguration:
+          $ref: '#/components/schemas/FlowVersion_VectorSearchRerankingConfiguration'
+      required:
+        - KnowledgeBaseId
+      additionalProperties: false
+    FlowVersion_PromptFlowNodeConfiguration:
+      type: object
+      description: Prompt flow node configuration
+      properties:
+        SourceConfiguration:
+          $ref: '#/components/schemas/PromptFlowNodeSourceConfiguration'
+        GuardrailConfiguration:
+          $ref: '#/components/schemas/FlowVersion_GuardrailConfiguration'
+      required:
+        - SourceConfiguration
+      additionalProperties: false
+    FlowVersion_GuardrailConfiguration:
+      type: object
+      description: Configuration for a guardrail
+      properties:
+        GuardrailIdentifier:
+          type: string
+          maxLength: 2048
+          pattern: ^(([a-z0-9]+)|(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:guardrail/[a-z0-9]+))$
+          description: Identifier for the guardrail, could be the id or the arn
+        GuardrailVersion:
+          type: string
+          pattern: ^(([0-9]{1,8})|(DRAFT))$
+          description: Version of the guardrail
+      additionalProperties: false
+    FlowVersion_LoopFlowNodeConfiguration:
+      type: object
+      description: Loop node config, contains loop's internal definition
+      properties:
+        Definition:
+          $ref: '#/components/schemas/FlowVersion_FlowDefinition'
+      required:
+        - Definition
+      additionalProperties: false
+    FlowVersion_AdditionalModelRequestFields:
+      type: object
+    FlowVersion_VectorSearchBedrockRerankingModelConfiguration:
+      type: object
+      x-title: VectorSearchBedrockRerankingModelConfiguration
+      properties:
+        ModelArn:
+          $ref: '#/components/schemas/BedrockRerankingModelArn'
+        AdditionalModelRequestFields:
+          $ref: '#/components/schemas/FlowVersion_AdditionalModelRequestFields'
+      required:
+        - ModelArn
+      additionalProperties: false
+    FlowVersion_VectorSearchBedrockRerankingConfiguration:
+      type: object
+      x-title: VectorSearchBedrockRerankingConfiguration
+      properties:
+        ModelConfiguration:
+          $ref: '#/components/schemas/FlowVersion_VectorSearchBedrockRerankingModelConfiguration'
+        NumberOfRerankedResults:
+          type: number
+          maximum: 100
+          minimum: 1
+          description: Number Of Results For Reranking
+        MetadataConfiguration:
+          $ref: '#/components/schemas/MetadataConfigurationForReranking'
+      required:
+        - ModelConfiguration
+      additionalProperties: false
+    FlowVersion_VectorSearchRerankingConfiguration:
+      type: object
+      x-title: VectorSearchRerankingConfiguration
+      properties:
+        Type:
+          $ref: '#/components/schemas/VectorSearchRerankingConfigurationType'
+        BedrockRerankingConfiguration:
+          $ref: '#/components/schemas/FlowVersion_VectorSearchBedrockRerankingConfiguration'
+      required:
+        - Type
+      additionalProperties: false
+    FlowVersion_KnowledgeBaseOrchestrationConfiguration:
+      type: object
+      x-title: KnowledgeBaseOrchestrationConfiguration
+      properties:
+        PromptTemplate:
+          $ref: '#/components/schemas/KnowledgeBasePromptTemplate'
+        InferenceConfig:
+          $ref: '#/components/schemas/PromptInferenceConfiguration'
+        AdditionalModelRequestFields:
+          $ref: '#/components/schemas/FlowVersion_AdditionalModelRequestFields'
+        PerformanceConfig:
+          $ref: '#/components/schemas/PerformanceConfiguration'
+      additionalProperties: false
     FlowVersion:
       type: object
       properties:
@@ -4297,7 +4736,7 @@ components:
           description: Time Stamp.
           format: date-time
         Definition:
-          $ref: '#/components/schemas/FlowDefinition'
+          $ref: '#/components/schemas/FlowVersion_FlowDefinition'
         Description:
           type: string
           maxLength: 200
@@ -6076,6 +6515,12 @@ components:
           - bedrock:ListDataSources
         list:
           - bedrock:ListKnowledgeBases
+    Prompt_PromptTemplateType:
+      type: string
+      description: Prompt template type
+      enum:
+        - TEXT
+        - CHAT
     PromptVariant:
       type: object
       description: Prompt variant
@@ -6085,9 +6530,9 @@ components:
           pattern: ^([0-9a-zA-Z][_-]?){1,100}$
           description: Name for a variant.
         TemplateType:
-          $ref: '#/components/schemas/PromptTemplateType'
+          $ref: '#/components/schemas/Prompt_PromptTemplateType'
         TemplateConfiguration:
-          $ref: '#/components/schemas/PromptTemplateConfiguration'
+          $ref: '#/components/schemas/Prompt_PromptTemplateConfiguration'
         ModelId:
           type: string
           maxLength: 2048
@@ -6095,11 +6540,11 @@ components:
           pattern: ^(arn:aws(-[^:]{1,12})?:(bedrock|sagemaker):[a-z0-9-]{1,20}:([0-9]{12})?:([a-z-]+/)?)?([a-zA-Z0-9.-]{1,63}){0,2}(([:][a-z0-9-]{1,63}){0,2})?(/[a-z0-9]{1,12})?$
           description: ARN or Id of a Bedrock Foundational Model or Inference Profile, or the ARN of a imported model, or a provisioned throughput ARN for custom models.
         InferenceConfiguration:
-          $ref: '#/components/schemas/PromptInferenceConfiguration'
+          $ref: '#/components/schemas/Prompt_PromptInferenceConfiguration'
         GenAiResource:
           $ref: '#/components/schemas/PromptGenAiResource'
         AdditionalModelRequestFields:
-          $ref: '#/components/schemas/AdditionalModelRequestFields'
+          $ref: '#/components/schemas/Prompt_AdditionalModelRequestFields'
         Metadata:
           $ref: '#/components/schemas/PromptMetadataList'
       required:
@@ -6107,6 +6552,29 @@ components:
         - TemplateType
         - TemplateConfiguration
       additionalProperties: false
+    Prompt_TextPromptTemplateConfiguration:
+      type: object
+      description: Configuration for text prompt template
+      properties:
+        Text:
+          type: string
+          maxLength: 200000
+          minLength: 1
+          description: Prompt content for String prompt template
+        TextS3Location:
+          $ref: '#/components/schemas/TextS3Location'
+        InputVariables:
+          type: array
+          items:
+            $ref: '#/components/schemas/PromptInputVariable'
+          maxItems: 20
+          minItems: 0
+          description: List of input variables
+          x-insertionOrder: true
+        CachePoint:
+          $ref: '#/components/schemas/CachePointBlock'
+      required: []
+      additionalProperties: false
     ChatPromptTemplateConfiguration:
       type: object
       description: Configuration for chat prompt template
@@ -6138,6 +6606,25 @@ components:
       required:
         - Messages
       additionalProperties: false
+    Prompt_PromptTemplateConfiguration:
+      description: Prompt template configuration
+      oneOf:
+        - type: object
+          title: Text
+          properties:
+            Text:
+              $ref: '#/components/schemas/Prompt_TextPromptTemplateConfiguration'
+          required:
+            - Text
+          additionalProperties: false
+        - type: object
+          title: Chat
+          properties:
+            Chat:
+              $ref: '#/components/schemas/ChatPromptTemplateConfiguration'
+          required:
+            - Chat
+          additionalProperties: false
     TextS3Location:
       type: object
       description: The identifier for the S3 resource.
@@ -6341,6 +6828,45 @@ components:
       required:
         - Tools
       additionalProperties: false
+    Prompt_PromptModelInferenceConfiguration:
+      type: object
+      description: Prompt model inference configuration
+      properties:
+        Temperature:
+          type: number
+          maximum: 1
+          minimum: 0
+          description: Controls randomness, higher values increase diversity
+        TopP:
+          type: number
+          maximum: 1
+          minimum: 0
+          description: Cumulative probability cutoff for token selection
+        MaxTokens:
+          type: number
+          maximum: 512000
+          minimum: 0
+          description: Maximum length of output
+        StopSequences:
+          type: array
+          items:
+            type: string
+          maxItems: 4
+          minItems: 0
+          description: List of stop sequences
+          x-insertionOrder: true
+      additionalProperties: false
+    Prompt_PromptInferenceConfiguration:
+      description: Model inference configuration
+      oneOf:
+        - type: object
+          title: Text
+          properties:
+            Text:
+              $ref: '#/components/schemas/Prompt_PromptModelInferenceConfiguration'
+          required:
+            - Text
+          additionalProperties: false
     PromptAgentResource:
       description: Target Agent to invoke with Prompt
       type: object
@@ -6378,6 +6904,9 @@ components:
       type: string
       enum:
         - default
+    Prompt_AdditionalModelRequestFields:
+      type: object
+      description: Contains model-specific configurations
     PromptMetadataList:
       type: array
       description: List of metadata to associate with the prompt variant.
@@ -6522,6 +7051,87 @@ components:
           - bedrock:GetPrompt
         list:
           - bedrock:ListPrompts
+    PromptVersion_PromptTemplateType:
+      type: string
+      description: Prompt template type
+      enum:
+        - TEXT
+        - CHAT
+    PromptVersion_PromptVariant:
+      type: object
+      description: Prompt variant
+      properties:
+        Name:
+          type: string
+          pattern: ^([0-9a-zA-Z][_-]?){1,100}$
+          description: Name for a variant.
+        TemplateType:
+          $ref: '#/components/schemas/PromptVersion_PromptTemplateType'
+        TemplateConfiguration:
+          $ref: '#/components/schemas/PromptVersion_PromptTemplateConfiguration'
+        ModelId:
+          type: string
+          maxLength: 2048
+          minLength: 1
+          pattern: ^(arn:aws(-[^:]{1,12})?:(bedrock|sagemaker):[a-z0-9-]{1,20}:([0-9]{12})?:([a-z-]+/)?)?([a-zA-Z0-9.-]{1,63}){0,2}(([:][a-z0-9-]{1,63}){0,2})?(/[a-z0-9]{1,12})?$
+          description: ARN or Id of a Bedrock Foundational Model or Inference Profile, or the ARN of a imported model, or a provisioned throughput ARN for custom models.
+        InferenceConfiguration:
+          $ref: '#/components/schemas/PromptInferenceConfiguration'
+        GenAiResource:
+          $ref: '#/components/schemas/PromptGenAiResource'
+        AdditionalModelRequestFields:
+          $ref: '#/components/schemas/PromptVersion_AdditionalModelRequestFields'
+        Metadata:
+          $ref: '#/components/schemas/PromptMetadataList'
+      required:
+        - Name
+        - TemplateType
+        - TemplateConfiguration
+      additionalProperties: false
+    PromptVersion_TextPromptTemplateConfiguration:
+      type: object
+      description: Configuration for text prompt template
+      properties:
+        Text:
+          type: string
+          maxLength: 200000
+          minLength: 1
+          description: Prompt content for String prompt template
+        InputVariables:
+          type: array
+          items:
+            $ref: '#/components/schemas/PromptInputVariable'
+          maxItems: 20
+          minItems: 0
+          description: List of input variables
+          x-insertionOrder: true
+        CachePoint:
+          $ref: '#/components/schemas/CachePointBlock'
+      required:
+        - Text
+      additionalProperties: false
+    PromptVersion_PromptTemplateConfiguration:
+      description: Prompt template configuration
+      oneOf:
+        - type: object
+          title: Text
+          properties:
+            Text:
+              $ref: '#/components/schemas/PromptVersion_TextPromptTemplateConfiguration'
+          required:
+            - Text
+          additionalProperties: false
+        - type: object
+          title: Chat
+          properties:
+            Chat:
+              $ref: '#/components/schemas/ChatPromptTemplateConfiguration'
+          required:
+            - Chat
+          additionalProperties: false
+    PromptVersion_AdditionalModelRequestFields:
+      type: object
+      description: Contains model-specific configurations
     PromptVersion:
       type: object
       properties:
@@ -6558,7 +7168,7 @@ components:
         Variants:
           type: array
           items:
-            $ref: '#/components/schemas/PromptVariant'
+            $ref: '#/components/schemas/PromptVersion_PromptVariant'
           maxItems: 1
           minItems: 1
           description: List of prompt variants
@@ -6957,23 +7567,23 @@ components:
           type: object
           properties:
             PolicyArn:
-              $ref: '#/components/schemas/PolicyArn'
+              $ref: '#/components/schemas/AutomatedReasoningPolicyVersion_PolicyArn'
             Name:
-              $ref: '#/components/schemas/Name'
+              $ref: '#/components/schemas/AutomatedReasoningPolicyVersion_Name'
             Description:
-              $ref: '#/components/schemas/Description'
+              $ref: '#/components/schemas/AutomatedReasoningPolicyVersion_Description'
             Version:
-              $ref: '#/components/schemas/Version'
+              $ref: '#/components/schemas/AutomatedReasoningPolicyVersion_Version'
             DefinitionHash:
               $ref: '#/components/schemas/DefinitionHash'
             LastUpdatedDefinitionHash:
               $ref: '#/components/schemas/DefinitionHash'
             CreatedAt:
-              $ref: '#/components/schemas/CreatedAt'
+              $ref: '#/components/schemas/AutomatedReasoningPolicyVersion_CreatedAt'
             UpdatedAt:
               $ref: '#/components/schemas/UpdatedAt'
             PolicyId:
-              $ref: '#/components/schemas/PolicyId'
+              $ref: '#/components/schemas/AutomatedReasoningPolicyVersion_PolicyId'
             Tags:
               $ref: '#/components/schemas/Tags'
           x-stackQL-stringOnly: true
@@ -7051,7 +7661,7 @@ components:
               minItems: 0
               maxItems: 200
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Blueprint_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateBlueprintRequest
       type: object
@@ -7123,7 +7733,7 @@ components:
               minItems: 0
               maxItems: 200
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/DataAutomationProject_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateDataAutomationProjectRequest
       type: object
@@ -7217,7 +7827,7 @@ components:
               description: A JSON string containing a Definition with the same schema as the Definition property of this resource
               maxLength: 512000
             DefinitionS3Location:
-              $ref: '#/components/schemas/S3Location'
+              $ref: '#/components/schemas/Flow_S3Location'
             DefinitionSubstitutions:
               $ref: '#/components/schemas/DefinitionSubstitutions'
             Description:
@@ -7354,7 +7964,7 @@ components:
               description: Time Stamp.
               format: date-time
             Definition:
-              $ref: '#/components/schemas/FlowDefinition'
+              $ref: '#/components/schemas/FlowVersion_FlowDefinition'
             Description:
               type: string
               maxLength: 200
@@ -7778,7 +8388,7 @@ components:
             Variants:
               type: array
               items:
-                $ref: '#/components/schemas/PromptVariant'
+                $ref: '#/components/schemas/PromptVersion_PromptVariant'
               maxItems: 1
               minItems: 1
               description: List of prompt variants
@@ -7821,7 +8431,7 @@ components:
       id: awscc.bedrock.agents
       x-cfn-schema-name: Agent
       x-cfn-type-name: AWS::Bedrock::Agent
-      x-identifiers:
+      x-identifiers: &ref_0
         - AgentId
       x-type: cloud_control
       methods:
@@ -7963,8 +8573,7 @@ components:
       id: awscc.bedrock.agents_list_only
       x-cfn-schema-name: Agent
       x-cfn-type-name: AWS::Bedrock::Agent
-      x-identifiers:
-        - AgentId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7994,7 +8603,7 @@ components:
       id: awscc.bedrock.agent_aliases
       x-cfn-schema-name: AgentAlias
       x-cfn-type-name: AWS::Bedrock::AgentAlias
-      x-identifiers:
+      x-identifiers: &ref_1
         - AgentId
         - AgentAliasId
       x-type: cloud_control
@@ -8101,9 +8710,7 @@ components:
       id: awscc.bedrock.agent_aliases_list_only
       x-cfn-schema-name: AgentAlias
       x-cfn-type-name: AWS::Bedrock::AgentAlias
-      x-identifiers:
-        - AgentId
-        - AgentAliasId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -8135,7 +8742,7 @@ components:
       id: awscc.bedrock.application_inference_profiles
       x-cfn-schema-name: ApplicationInferenceProfile
       x-cfn-type-name: AWS::Bedrock::ApplicationInferenceProfile
-      x-identifiers:
+      x-identifiers: &ref_2
         - InferenceProfileIdentifier
       x-type: cloud_control
       methods:
@@ -8243,8 +8850,7 @@ components:
       id: awscc.bedrock.application_inference_profiles_list_only
       x-cfn-schema-name: ApplicationInferenceProfile
       x-cfn-type-name: AWS::Bedrock::ApplicationInferenceProfile
-      x-identifiers:
-        - InferenceProfileIdentifier
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -8274,7 +8880,7 @@ components:
       id: awscc.bedrock.automated_reasoning_policies
       x-cfn-schema-name: AutomatedReasoningPolicy
       x-cfn-type-name: AWS::Bedrock::AutomatedReasoningPolicy
-      x-identifiers:
+      x-identifiers: &ref_3
         - PolicyArn
       x-type: cloud_control
       methods:
@@ -8378,8 +8984,7 @@ components:
       id: awscc.bedrock.automated_reasoning_policies_list_only
       x-cfn-schema-name: AutomatedReasoningPolicy
       x-cfn-type-name: AWS::Bedrock::AutomatedReasoningPolicy
-      x-identifiers:
-        - PolicyArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -8409,7 +9014,7 @@ components:
       id: awscc.bedrock.automated_reasoning_policy_versions
       x-cfn-schema-name: AutomatedReasoningPolicyVersion
       x-cfn-type-name: AWS::Bedrock::AutomatedReasoningPolicyVersion
-      x-identifiers:
+      x-identifiers: &ref_4
         - PolicyArn
         - Version
       x-type: cloud_control
@@ -8497,9 +9102,7 @@ components:
       id: awscc.bedrock.automated_reasoning_policy_versions_list_only
       x-cfn-schema-name: AutomatedReasoningPolicyVersion
       x-cfn-type-name: AWS::Bedrock::AutomatedReasoningPolicyVersion
-      x-identifiers:
-        - PolicyArn
-        - Version
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -8531,7 +9134,7 @@ components:
       id: awscc.bedrock.blueprints
       x-cfn-schema-name: Blueprint
       x-cfn-type-name: AWS::Bedrock::Blueprint
-      x-identifiers:
+      x-identifiers: &ref_5
         - BlueprintArn
       x-type: cloud_control
       methods:
@@ -8635,8 +9238,7 @@ components:
       id: awscc.bedrock.blueprints_list_only
       x-cfn-schema-name: Blueprint
       x-cfn-type-name: AWS::Bedrock::Blueprint
-      x-identifiers:
-        - BlueprintArn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -8666,7 +9268,7 @@ components:
       id: awscc.bedrock.data_automation_projects
       x-cfn-schema-name: DataAutomationProject
       x-cfn-type-name: AWS::Bedrock::DataAutomationProject
-      x-identifiers:
+      x-identifiers: &ref_6
         - ProjectArn
       x-type: cloud_control
       methods:
@@ -8776,8 +9378,7 @@ components:
       id: awscc.bedrock.data_automation_projects_list_only
       x-cfn-schema-name: DataAutomationProject
       x-cfn-type-name: AWS::Bedrock::DataAutomationProject
-      x-identifiers:
-        - ProjectArn
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -8807,7 +9408,7 @@ components:
       id: awscc.bedrock.data_sources
       x-cfn-schema-name: DataSource
       x-cfn-type-name: AWS::Bedrock::DataSource
-      x-identifiers:
+      x-identifiers: &ref_7
         - KnowledgeBaseId
         - DataSourceId
       x-type: cloud_control
@@ -8916,9 +9517,7 @@ components:
       id: awscc.bedrock.data_sources_list_only
       x-cfn-schema-name: DataSource
       x-cfn-type-name: AWS::Bedrock::DataSource
-      x-identifiers:
-        - KnowledgeBaseId
-        - DataSourceId
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -8950,7 +9549,7 @@ components:
       id: awscc.bedrock.flows
       x-cfn-schema-name: Flow
       x-cfn-type-name: AWS::Bedrock::Flow
-      x-identifiers:
+      x-identifiers: &ref_8
         - Arn
       x-type: cloud_control
       methods:
@@ -9068,8 +9667,7 @@ components:
       id: awscc.bedrock.flows_list_only
       x-cfn-schema-name: Flow
       x-cfn-type-name: AWS::Bedrock::Flow
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -9099,7 +9697,7 @@ components:
       id: awscc.bedrock.flow_aliases
       x-cfn-schema-name: FlowAlias
       x-cfn-type-name: AWS::Bedrock::FlowAlias
-      x-identifiers:
+      x-identifiers: &ref_9
         - Arn
         - FlowArn
       x-type: cloud_control
@@ -9206,9 +9804,7 @@ components:
       id: awscc.bedrock.flow_aliases_list_only
       x-cfn-schema-name: FlowAlias
       x-cfn-type-name: AWS::Bedrock::FlowAlias
-      x-identifiers:
-        - Arn
-        - FlowArn
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -9240,7 +9836,7 @@ components:
       id: awscc.bedrock.flow_versions
       x-cfn-schema-name: FlowVersion
       x-cfn-type-name: AWS::Bedrock::FlowVersion
-      x-identifiers:
+      x-identifiers: &ref_10
         - FlowArn
         - Version
       x-type: cloud_control
@@ -9345,9 +9941,7 @@ components:
       id: awscc.bedrock.flow_versions_list_only
       x-cfn-schema-name: FlowVersion
       x-cfn-type-name: AWS::Bedrock::FlowVersion
-      x-identifiers:
-        - FlowArn
-        - Version
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -9379,7 +9973,7 @@ components:
       id: awscc.bedrock.guardrails
       x-cfn-schema-name: Guardrail
       x-cfn-type-name: AWS::Bedrock::Guardrail
-      x-identifiers:
+      x-identifiers: &ref_11
         - GuardrailArn
       x-type: cloud_control
       methods:
@@ -9503,8 +10097,7 @@ components:
       id: awscc.bedrock.guardrails_list_only
       x-cfn-schema-name: Guardrail
       x-cfn-type-name: AWS::Bedrock::Guardrail
-      x-identifiers:
-        - GuardrailArn
+      x-identifiers: *ref_11
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -9612,7 +10205,7 @@ components:
       id: awscc.bedrock.intelligent_prompt_routers
       x-cfn-schema-name: IntelligentPromptRouter
       x-cfn-type-name: AWS::Bedrock::IntelligentPromptRouter
-      x-identifiers:
+      x-identifiers: &ref_12
         - PromptRouterArn
       x-type: cloud_control
       methods:
@@ -9718,8 +10311,7 @@ components:
       id: awscc.bedrock.intelligent_prompt_routers_list_only
       x-cfn-schema-name: IntelligentPromptRouter
       x-cfn-type-name: AWS::Bedrock::IntelligentPromptRouter
-      x-identifiers:
-        - PromptRouterArn
+      x-identifiers: *ref_12
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -9749,7 +10341,7 @@ components:
       id: awscc.bedrock.knowledge_bases
       x-cfn-schema-name: KnowledgeBase
       x-cfn-type-name: AWS::Bedrock::KnowledgeBase
-      x-identifiers:
+      x-identifiers: &ref_13
         - KnowledgeBaseId
       x-type: cloud_control
       methods:
@@ -9857,8 +10449,7 @@ components:
       id: awscc.bedrock.knowledge_bases_list_only
       x-cfn-schema-name: KnowledgeBase
       x-cfn-type-name: AWS::Bedrock::KnowledgeBase
-      x-identifiers:
-        - KnowledgeBaseId
+      x-identifiers: *ref_13
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -9888,7 +10479,7 @@ components:
       id: awscc.bedrock.prompts
       x-cfn-schema-name: Prompt
       x-cfn-type-name: AWS::Bedrock::Prompt
-      x-identifiers:
+      x-identifiers: &ref_14
         - Arn
       x-type: cloud_control
       methods:
@@ -9994,8 +10585,7 @@ components:
       id: awscc.bedrock.prompts_list_only
       x-cfn-schema-name: Prompt
       x-cfn-type-name: AWS::Bedrock::Prompt
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_14
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -10025,7 +10615,7 @@ components:
       id: awscc.bedrock.prompt_versions
       x-cfn-schema-name: PromptVersion
       x-cfn-type-name: AWS::Bedrock::PromptVersion
-      x-identifiers:
+      x-identifiers: &ref_15
         - Arn
       x-type: cloud_control
       methods:
@@ -10116,8 +10706,7 @@ components:
       id: awscc.bedrock.prompt_versions_list_only
       x-cfn-schema-name: PromptVersion
       x-cfn-type-name: AWS::Bedrock::PromptVersion
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_15
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/billing.yaml b/openapi/src/awscc/v00.00.00000/services/billing.yaml
index 2513435be..5fb0e4cfc 100644
--- a/openapi/src/awscc/v00.00.00000/services/billing.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/billing.yaml
@@ -650,7 +650,7 @@ components:
       id: awscc.billing.billing_views
       x-cfn-schema-name: BillingView
       x-cfn-type-name: AWS::Billing::BillingView
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -754,8 +754,7 @@ components:
       id: awscc.billing.billing_views_list_only
       x-cfn-schema-name: BillingView
       x-cfn-type-name: AWS::Billing::BillingView
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/billingconductor.yaml b/openapi/src/awscc/v00.00.00000/services/billingconductor.yaml
index c378f9eae..1d1f310d5 100644
--- a/openapi/src/awscc/v00.00.00000/services/billingconductor.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/billingconductor.yaml
@@ -1269,7 +1269,7 @@ components:
       id: awscc.billingconductor.billing_groups
       x-cfn-schema-name: BillingGroup
       x-cfn-type-name: AWS::BillingConductor::BillingGroup
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -1377,8 +1377,7 @@ components:
       id: awscc.billingconductor.billing_groups_list_only
       x-cfn-schema-name: BillingGroup
       x-cfn-type-name: AWS::BillingConductor::BillingGroup
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1408,7 +1407,7 @@ components:
       id: awscc.billingconductor.custom_line_items
       x-cfn-schema-name: CustomLineItem
       x-cfn-type-name: AWS::BillingConductor::CustomLineItem
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -1518,8 +1517,7 @@ components:
       id: awscc.billingconductor.custom_line_items_list_only
       x-cfn-schema-name: CustomLineItem
       x-cfn-type-name: AWS::BillingConductor::CustomLineItem
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1549,7 +1547,7 @@ components:
       id: awscc.billingconductor.pricing_plans
       x-cfn-schema-name: PricingPlan
       x-cfn-type-name: AWS::BillingConductor::PricingPlan
-      x-identifiers:
+      x-identifiers: &ref_2
         - Arn
       x-type: cloud_control
       methods:
@@ -1649,8 +1647,7 @@ components:
       id: awscc.billingconductor.pricing_plans_list_only
       x-cfn-schema-name: PricingPlan
       x-cfn-type-name: AWS::BillingConductor::PricingPlan
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1680,7 +1677,7 @@ components:
       id: awscc.billingconductor.pricing_rules
       x-cfn-schema-name: PricingRule
       x-cfn-type-name: AWS::BillingConductor::PricingRule
-      x-identifiers:
+      x-identifiers: &ref_3
         - Arn
       x-type: cloud_control
       methods:
@@ -1794,8 +1791,7 @@ components:
       id: awscc.billingconductor.pricing_rules_list_only
       x-cfn-schema-name: PricingRule
       x-cfn-type-name: AWS::BillingConductor::PricingRule
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/budgets.yaml b/openapi/src/awscc/v00.00.00000/services/budgets.yaml
index b0c816dcc..f06a0aefb 100644
--- a/openapi/src/awscc/v00.00.00000/services/budgets.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/budgets.yaml
@@ -662,7 +662,7 @@ components:
       id: awscc.budgets.budgets_actions
       x-cfn-schema-name: BudgetsAction
       x-cfn-type-name: AWS::Budgets::BudgetsAction
-      x-identifiers:
+      x-identifiers: &ref_0
         - ActionId
         - BudgetName
       x-type: cloud_control
@@ -767,9 +767,7 @@ components:
       id: awscc.budgets.budgets_actions_list_only
       x-cfn-schema-name: BudgetsAction
       x-cfn-type-name: AWS::Budgets::BudgetsAction
-      x-identifiers:
-        - ActionId
-        - BudgetName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/cassandra.yaml b/openapi/src/awscc/v00.00.00000/services/cassandra.yaml
index 5633dfd6c..cc56de484 100644
--- a/openapi/src/awscc/v00.00.00000/services/cassandra.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/cassandra.yaml
@@ -391,7 +391,6 @@ components:
       type: object
   schemas:
     Tag:
-      description: A key-value pair to apply to the resource
       type: object
       additionalProperties: false
       properties:
@@ -587,6 +586,22 @@ components:
       required:
         - Mode
       additionalProperties: false
+    Table_Tag:
+      description: A key-value pair to apply to the resource
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          minLength: 1
+          maxLength: 256
+      required:
+        - Value
+        - Key
     EncryptionSpecification:
       description: Represents the settings used to enable server-side encryption
       type: object
@@ -686,7 +701,7 @@ components:
           type: array
           uniqueItems: true
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Table_Tag'
           minItems: 0
           maxItems: 50
       required:
@@ -753,7 +768,7 @@ components:
           type: array
           uniqueItems: true
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Table_Tag'
           minItems: 0
           maxItems: 50
         DefaultTimeToLive:
@@ -1064,7 +1079,7 @@ components:
               type: array
               uniqueItems: true
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Table_Tag'
               minItems: 0
               maxItems: 50
             DefaultTimeToLive:
@@ -1154,7 +1169,7 @@ components:
       id: awscc.cassandra.keyspaces
       x-cfn-schema-name: Keyspace
       x-cfn-type-name: AWS::Cassandra::Keyspace
-      x-identifiers:
+      x-identifiers: &ref_0
         - KeyspaceName
       x-type: cloud_control
       methods:
@@ -1246,8 +1261,7 @@ components:
       id: awscc.cassandra.keyspaces_list_only
       x-cfn-schema-name: Keyspace
       x-cfn-type-name: AWS::Cassandra::Keyspace
-      x-identifiers:
-        - KeyspaceName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1277,7 +1291,7 @@ components:
       id: awscc.cassandra.tables
       x-cfn-schema-name: Table
       x-cfn-type-name: AWS::Cassandra::Table
-      x-identifiers:
+      x-identifiers: &ref_1
         - KeyspaceName
         - TableName
       x-type: cloud_control
@@ -1390,9 +1404,7 @@ components:
       id: awscc.cassandra.tables_list_only
       x-cfn-schema-name: Table
       x-cfn-type-name: AWS::Cassandra::Table
-      x-identifiers:
-        - KeyspaceName
-        - TableName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1424,7 +1436,7 @@ components:
       id: awscc.cassandra.types
       x-cfn-schema-name: Type
       x-cfn-type-name: AWS::Cassandra::Type
-      x-identifiers:
+      x-identifiers: &ref_2
         - KeyspaceName
         - TypeName
       x-type: cloud_control
@@ -1508,9 +1520,7 @@ components:
       id: awscc.cassandra.types_list_only
       x-cfn-schema-name: Type
       x-cfn-type-name: AWS::Cassandra::Type
-      x-identifiers:
-        - KeyspaceName
-        - TypeName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/ce.yaml b/openapi/src/awscc/v00.00.00000/services/ce.yaml
index 7558e5c21..367e79306 100644
--- a/openapi/src/awscc/v00.00.00000/services/ce.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/ce.yaml
@@ -391,7 +391,7 @@ components:
       type: object
   schemas:
     Arn:
-      description: Subscription ARN
+      description: Monitor ARN
       type: string
       pattern: ^arn:aws[-a-z0-9]*:[a-z0-9]+:[-a-z0-9]*:[0-9]{12}:[-a-zA-Z0-9/:_]+$
     ResourceTag:
@@ -509,6 +509,10 @@ components:
           - ce:DeleteAnomalyMonitor
         list:
           - ce:GetAnomalyMonitors
+    AnomalySubscription_Arn:
+      description: Subscription ARN
+      type: string
+      pattern: ^arn:aws[-a-z0-9]*:[a-z0-9]+:[-a-z0-9]*:[0-9]{12}:[-a-zA-Z0-9/:_]+$
     Subscriber:
       type: object
       properties:
@@ -533,7 +537,7 @@ components:
       type: object
       properties:
         SubscriptionArn:
-          $ref: '#/components/schemas/Arn'
+          $ref: '#/components/schemas/AnomalySubscription_Arn'
         SubscriptionName:
           description: The name of the subscription.
           type: string
@@ -550,7 +554,7 @@ components:
           type: array
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Arn'
+            $ref: '#/components/schemas/AnomalySubscription_Arn'
         Subscribers:
           description: A list of subscriber
           type: array
@@ -787,7 +791,7 @@ components:
           type: object
           properties:
             SubscriptionArn:
-              $ref: '#/components/schemas/Arn'
+              $ref: '#/components/schemas/AnomalySubscription_Arn'
             SubscriptionName:
               description: The name of the subscription.
               type: string
@@ -804,7 +808,7 @@ components:
               type: array
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Arn'
+                $ref: '#/components/schemas/AnomalySubscription_Arn'
             Subscribers:
               description: A list of subscriber
               type: array
@@ -900,7 +904,7 @@ components:
       id: awscc.ce.anomaly_monitors
       x-cfn-schema-name: AnomalyMonitor
       x-cfn-type-name: AWS::CE::AnomalyMonitor
-      x-identifiers:
+      x-identifiers: &ref_0
         - MonitorArn
       x-type: cloud_control
       methods:
@@ -1004,8 +1008,7 @@ components:
       id: awscc.ce.anomaly_monitors_list_only
       x-cfn-schema-name: AnomalyMonitor
       x-cfn-type-name: AWS::CE::AnomalyMonitor
-      x-identifiers:
-        - MonitorArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1035,7 +1038,7 @@ components:
       id: awscc.ce.anomaly_subscriptions
       x-cfn-schema-name: AnomalySubscription
       x-cfn-type-name: AWS::CE::AnomalySubscription
-      x-identifiers:
+      x-identifiers: &ref_1
         - SubscriptionArn
       x-type: cloud_control
       methods:
@@ -1137,8 +1140,7 @@ components:
       id: awscc.ce.anomaly_subscriptions_list_only
       x-cfn-schema-name: AnomalySubscription
       x-cfn-type-name: AWS::CE::AnomalySubscription
-      x-identifiers:
-        - SubscriptionArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1168,7 +1170,7 @@ components:
       id: awscc.ce.cost_categories
       x-cfn-schema-name: CostCategory
       x-cfn-type-name: AWS::CE::CostCategory
-      x-identifiers:
+      x-identifiers: &ref_2
         - Arn
       x-type: cloud_control
       methods:
@@ -1268,8 +1270,7 @@ components:
       id: awscc.ce.cost_categories_list_only
       x-cfn-schema-name: CostCategory
       x-cfn-type-name: AWS::CE::CostCategory
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/chatbot.yaml b/openapi/src/awscc/v00.00.00000/services/chatbot.yaml
index ffcbca2c0..6e7702301 100644
--- a/openapi/src/awscc/v00.00.00000/services/chatbot.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/chatbot.yaml
@@ -453,15 +453,19 @@ components:
       additionalProperties: false
     Tag:
       type: object
-      additionalProperties: false
       properties:
-        Value:
-          type: string
         Key:
           type: string
+          maxLength: 128
+          minLength: 1
+        Value:
+          type: string
+          maxLength: 256
+          minLength: 0
       required:
-        - Value
         - Key
+        - Value
+      additionalProperties: false
     CustomAction:
       type: object
       properties:
@@ -538,6 +542,17 @@ components:
           - chatbot:DeleteCustomAction
         list:
           - chatbot:ListCustomActions
+    MicrosoftTeamsChannelConfiguration_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Value:
+          type: string
+        Key:
+          type: string
+      required:
+        - Value
+        - Key
     MicrosoftTeamsChannelConfiguration:
       type: object
       properties:
@@ -608,7 +623,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/MicrosoftTeamsChannelConfiguration_Tag'
         CustomizationResourceArns:
           description: ARNs of Custom Actions to associate with notifications in the provided chat channel.
           type: array
@@ -677,6 +692,17 @@ components:
         list:
           - chatbot:ListMicrosoftTeamsChannelConfigurations
           - chatbot:ListAssociations
+    SlackChannelConfiguration_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Value:
+          type: string
+        Key:
+          type: string
+      required:
+        - Value
+        - Key
     SlackChannelConfiguration:
       type: object
       properties:
@@ -731,7 +757,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/SlackChannelConfiguration_Tag'
         UserRoleRequired:
           description: Enables use of a user role requirement in your chat configuration
           type: boolean
@@ -926,7 +952,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/MicrosoftTeamsChannelConfiguration_Tag'
             CustomizationResourceArns:
               description: ARNs of Custom Actions to associate with notifications in the provided chat channel.
               type: array
@@ -1002,7 +1028,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/SlackChannelConfiguration_Tag'
             UserRoleRequired:
               description: Enables use of a user role requirement in your chat configuration
               type: boolean
@@ -1031,7 +1057,7 @@ components:
       id: awscc.chatbot.custom_actions
       x-cfn-schema-name: CustomAction
       x-cfn-type-name: AWS::Chatbot::CustomAction
-      x-identifiers:
+      x-identifiers: &ref_0
         - CustomActionArn
       x-type: cloud_control
       methods:
@@ -1127,8 +1153,7 @@ components:
       id: awscc.chatbot.custom_actions_list_only
       x-cfn-schema-name: CustomAction
       x-cfn-type-name: AWS::Chatbot::CustomAction
-      x-identifiers:
-        - CustomActionArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1158,7 +1183,7 @@ components:
       id: awscc.chatbot.microsoft_teams_channel_configurations
       x-cfn-schema-name: MicrosoftTeamsChannelConfiguration
       x-cfn-type-name: AWS::Chatbot::MicrosoftTeamsChannelConfiguration
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -1268,8 +1293,7 @@ components:
       id: awscc.chatbot.microsoft_teams_channel_configurations_list_only
       x-cfn-schema-name: MicrosoftTeamsChannelConfiguration
       x-cfn-type-name: AWS::Chatbot::MicrosoftTeamsChannelConfiguration
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1299,7 +1323,7 @@ components:
       id: awscc.chatbot.slack_channel_configurations
       x-cfn-schema-name: SlackChannelConfiguration
       x-cfn-type-name: AWS::Chatbot::SlackChannelConfiguration
-      x-identifiers:
+      x-identifiers: &ref_2
         - Arn
       x-type: cloud_control
       methods:
@@ -1405,8 +1429,7 @@ components:
       id: awscc.chatbot.slack_channel_configurations_list_only
       x-cfn-schema-name: SlackChannelConfiguration
       x-cfn-type-name: AWS::Chatbot::SlackChannelConfiguration
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/cleanrooms.yaml b/openapi/src/awscc/v00.00.00000/services/cleanrooms.yaml
index 1bf9bc586..faa4c012c 100644
--- a/openapi/src/awscc/v00.00.00000/services/cleanrooms.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/cleanrooms.yaml
@@ -1766,6 +1766,21 @@ components:
       required:
         - IdMappingTableInputSource
       additionalProperties: false
+    IdMappingTable_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          maxLength: 128
+          minLength: 1
+        Value:
+          type: string
+          maxLength: 256
+          minLength: 1
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     IdMappingTable:
       type: object
       properties:
@@ -1804,7 +1819,7 @@ components:
           type: array
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/IdMappingTable_Tag'
           uniqueItems: true
       required:
         - MembershipIdentifier
@@ -1894,6 +1909,21 @@ components:
         - InputReferenceArn
         - ManageResourcePolicies
       additionalProperties: false
+    IdNamespaceAssociation_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          maxLength: 128
+          minLength: 1
+        Value:
+          type: string
+          maxLength: 256
+          minLength: 1
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     IdMappingConfig:
       type: object
       properties:
@@ -1941,7 +1971,7 @@ components:
           type: array
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/IdNamespaceAssociation_Tag'
           uniqueItems: true
         Name:
           type: string
@@ -2722,7 +2752,7 @@ components:
               type: array
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/IdMappingTable_Tag'
               uniqueItems: true
           x-stackQL-stringOnly: true
       x-title: CreateIdMappingTableRequest
@@ -2762,7 +2792,7 @@ components:
               type: array
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/IdNamespaceAssociation_Tag'
               uniqueItems: true
             Name:
               type: string
@@ -2920,7 +2950,7 @@ components:
       id: awscc.cleanrooms.analysis_templates
       x-cfn-schema-name: AnalysisTemplate
       x-cfn-type-name: AWS::CleanRooms::AnalysisTemplate
-      x-identifiers:
+      x-identifiers: &ref_0
         - AnalysisTemplateIdentifier
         - MembershipIdentifier
       x-type: cloud_control
@@ -3033,9 +3063,7 @@ components:
       id: awscc.cleanrooms.analysis_templates_list_only
       x-cfn-schema-name: AnalysisTemplate
       x-cfn-type-name: AWS::CleanRooms::AnalysisTemplate
-      x-identifiers:
-        - AnalysisTemplateIdentifier
-        - MembershipIdentifier
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3067,7 +3095,7 @@ components:
       id: awscc.cleanrooms.collaborations
       x-cfn-schema-name: Collaboration
       x-cfn-type-name: AWS::CleanRooms::Collaboration
-      x-identifiers:
+      x-identifiers: &ref_1
         - CollaborationIdentifier
       x-type: cloud_control
       methods:
@@ -3179,8 +3207,7 @@ components:
       id: awscc.cleanrooms.collaborations_list_only
       x-cfn-schema-name: Collaboration
       x-cfn-type-name: AWS::CleanRooms::Collaboration
-      x-identifiers:
-        - CollaborationIdentifier
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3210,7 +3237,7 @@ components:
       id: awscc.cleanrooms.configured_tables
       x-cfn-schema-name: ConfiguredTable
       x-cfn-type-name: AWS::CleanRooms::ConfiguredTable
-      x-identifiers:
+      x-identifiers: &ref_2
         - ConfiguredTableIdentifier
       x-type: cloud_control
       methods:
@@ -3314,8 +3341,7 @@ components:
       id: awscc.cleanrooms.configured_tables_list_only
       x-cfn-schema-name: ConfiguredTable
       x-cfn-type-name: AWS::CleanRooms::ConfiguredTable
-      x-identifiers:
-        - ConfiguredTableIdentifier
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3345,7 +3371,7 @@ components:
       id: awscc.cleanrooms.configured_table_associations
       x-cfn-schema-name: ConfiguredTableAssociation
       x-cfn-type-name: AWS::CleanRooms::ConfiguredTableAssociation
-      x-identifiers:
+      x-identifiers: &ref_3
         - ConfiguredTableAssociationIdentifier
         - MembershipIdentifier
       x-type: cloud_control
@@ -3448,9 +3474,7 @@ components:
       id: awscc.cleanrooms.configured_table_associations_list_only
       x-cfn-schema-name: ConfiguredTableAssociation
       x-cfn-type-name: AWS::CleanRooms::ConfiguredTableAssociation
-      x-identifiers:
-        - ConfiguredTableAssociationIdentifier
-        - MembershipIdentifier
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3482,7 +3506,7 @@ components:
       id: awscc.cleanrooms.id_mapping_tables
       x-cfn-schema-name: IdMappingTable
       x-cfn-type-name: AWS::CleanRooms::IdMappingTable
-      x-identifiers:
+      x-identifiers: &ref_4
         - IdMappingTableIdentifier
         - MembershipIdentifier
       x-type: cloud_control
@@ -3591,9 +3615,7 @@ components:
       id: awscc.cleanrooms.id_mapping_tables_list_only
       x-cfn-schema-name: IdMappingTable
       x-cfn-type-name: AWS::CleanRooms::IdMappingTable
-      x-identifiers:
-        - IdMappingTableIdentifier
-        - MembershipIdentifier
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3625,7 +3647,7 @@ components:
       id: awscc.cleanrooms.id_namespace_associations
       x-cfn-schema-name: IdNamespaceAssociation
       x-cfn-type-name: AWS::CleanRooms::IdNamespaceAssociation
-      x-identifiers:
+      x-identifiers: &ref_5
         - IdNamespaceAssociationIdentifier
         - MembershipIdentifier
       x-type: cloud_control
@@ -3734,9 +3756,7 @@ components:
       id: awscc.cleanrooms.id_namespace_associations_list_only
       x-cfn-schema-name: IdNamespaceAssociation
       x-cfn-type-name: AWS::CleanRooms::IdNamespaceAssociation
-      x-identifiers:
-        - IdNamespaceAssociationIdentifier
-        - MembershipIdentifier
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3768,7 +3788,7 @@ components:
       id: awscc.cleanrooms.memberships
       x-cfn-schema-name: Membership
       x-cfn-type-name: AWS::CleanRooms::Membership
-      x-identifiers:
+      x-identifiers: &ref_6
         - MembershipIdentifier
       x-type: cloud_control
       methods:
@@ -3874,8 +3894,7 @@ components:
       id: awscc.cleanrooms.memberships_list_only
       x-cfn-schema-name: Membership
       x-cfn-type-name: AWS::CleanRooms::Membership
-      x-identifiers:
-        - MembershipIdentifier
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3905,7 +3924,7 @@ components:
       id: awscc.cleanrooms.privacy_budget_templates
       x-cfn-schema-name: PrivacyBudgetTemplate
       x-cfn-type-name: AWS::CleanRooms::PrivacyBudgetTemplate
-      x-identifiers:
+      x-identifiers: &ref_7
         - PrivacyBudgetTemplateIdentifier
         - MembershipIdentifier
       x-type: cloud_control
@@ -4010,9 +4029,7 @@ components:
       id: awscc.cleanrooms.privacy_budget_templates_list_only
       x-cfn-schema-name: PrivacyBudgetTemplate
       x-cfn-type-name: AWS::CleanRooms::PrivacyBudgetTemplate
-      x-identifiers:
-        - PrivacyBudgetTemplateIdentifier
-        - MembershipIdentifier
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/cleanroomsml.yaml b/openapi/src/awscc/v00.00.00000/services/cleanroomsml.yaml
index a6bb07afe..d63e3ef1f 100644
--- a/openapi/src/awscc/v00.00.00000/services/cleanroomsml.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/cleanroomsml.yaml
@@ -644,7 +644,7 @@ components:
       id: awscc.cleanroomsml.training_datasets
       x-cfn-schema-name: TrainingDataset
       x-cfn-type-name: AWS::CleanRoomsML::TrainingDataset
-      x-identifiers:
+      x-identifiers: &ref_0
         - TrainingDatasetArn
       x-type: cloud_control
       methods:
@@ -742,8 +742,7 @@ components:
       id: awscc.cleanroomsml.training_datasets_list_only
       x-cfn-schema-name: TrainingDataset
       x-cfn-type-name: AWS::CleanRoomsML::TrainingDataset
-      x-identifiers:
-        - TrainingDatasetArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/cloudformation.yaml b/openapi/src/awscc/v00.00.00000/services/cloudformation.yaml
index 6acb89613..34a9efacc 100644
--- a/openapi/src/awscc/v00.00.00000/services/cloudformation.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/cloudformation.yaml
@@ -1492,24 +1492,16 @@ components:
         list:
           - cloudformation:ListTypes
     Tag:
-      description: Tag type enables you to specify a key-value pair that can be used to store information about an AWS CloudFormation StackSet.
       type: object
+      additionalProperties: false
       properties:
         Key:
-          description: A string used to identify this tag. You can specify a maximum of 127 characters for a tag key.
           type: string
-          minLength: 1
-          maxLength: 128
-          pattern: ^(?!aws:.*)[a-zA-Z0-9\s\:\_\.\/\=\+\-]+$
         Value:
-          description: A string containing the value for this tag. You can specify a maximum of 256 characters for a tag value.
           type: string
-          minLength: 1
-          maxLength: 256
       required:
-        - Key
         - Value
-      additionalProperties: false
+        - Key
     Output:
       type: object
       additionalProperties: false
@@ -1674,6 +1666,25 @@ components:
           - cloudformation:GetTemplate
         list:
           - cloudformation:ListStacks
+    StackSet_Tag:
+      description: Tag type enables you to specify a key-value pair that can be used to store information about an AWS CloudFormation StackSet.
+      type: object
+      properties:
+        Key:
+          description: A string used to identify this tag. You can specify a maximum of 127 characters for a tag key.
+          type: string
+          minLength: 1
+          maxLength: 128
+          pattern: ^(?!aws:.*)[a-zA-Z0-9\s\:\_\.\/\=\+\-]+$
+        Value:
+          description: A string containing the value for this tag. You can specify a maximum of 256 characters for a tag value.
+          type: string
+          minLength: 1
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     AutoDeployment:
       type: object
       properties:
@@ -1880,7 +1891,7 @@ components:
           x-insertionOrder: false
           maxItems: 50
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/StackSet_Tag'
         TemplateBody:
           description: The structure that contains the template body, with a minimum length of 1 byte and a maximum length of 51,200 bytes.
           type: string
@@ -3038,7 +3049,7 @@ components:
               x-insertionOrder: false
               maxItems: 50
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/StackSet_Tag'
             TemplateBody:
               description: The structure that contains the template body, with a minimum length of 1 byte and a maximum length of 51,200 bytes.
               type: string
@@ -3151,7 +3162,7 @@ components:
       id: awscc.cloudformation.guard_hooks
       x-cfn-schema-name: GuardHook
       x-cfn-type-name: AWS::CloudFormation::GuardHook
-      x-identifiers:
+      x-identifiers: &ref_0
         - HookArn
       x-type: cloud_control
       methods:
@@ -3257,8 +3268,7 @@ components:
       id: awscc.cloudformation.guard_hooks_list_only
       x-cfn-schema-name: GuardHook
       x-cfn-type-name: AWS::CloudFormation::GuardHook
-      x-identifiers:
-        - HookArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3288,7 +3298,7 @@ components:
       id: awscc.cloudformation.hook_default_versions
       x-cfn-schema-name: HookDefaultVersion
       x-cfn-type-name: AWS::CloudFormation::HookDefaultVersion
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -3363,8 +3373,7 @@ components:
       id: awscc.cloudformation.hook_default_versions_list_only
       x-cfn-schema-name: HookDefaultVersion
       x-cfn-type-name: AWS::CloudFormation::HookDefaultVersion
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3394,7 +3403,7 @@ components:
       id: awscc.cloudformation.hook_type_configs
       x-cfn-schema-name: HookTypeConfig
       x-cfn-type-name: AWS::CloudFormation::HookTypeConfig
-      x-identifiers:
+      x-identifiers: &ref_2
         - ConfigurationArn
       x-type: cloud_control
       methods:
@@ -3488,8 +3497,7 @@ components:
       id: awscc.cloudformation.hook_type_configs_list_only
       x-cfn-schema-name: HookTypeConfig
       x-cfn-type-name: AWS::CloudFormation::HookTypeConfig
-      x-identifiers:
-        - ConfigurationArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3519,7 +3527,7 @@ components:
       id: awscc.cloudformation.hook_versions
       x-cfn-schema-name: HookVersion
       x-cfn-type-name: AWS::CloudFormation::HookVersion
-      x-identifiers:
+      x-identifiers: &ref_3
         - Arn
       x-type: cloud_control
       methods:
@@ -3604,8 +3612,7 @@ components:
       id: awscc.cloudformation.hook_versions_list_only
       x-cfn-schema-name: HookVersion
       x-cfn-type-name: AWS::CloudFormation::HookVersion
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3635,7 +3642,7 @@ components:
       id: awscc.cloudformation.lambda_hooks
       x-cfn-schema-name: LambdaHook
       x-cfn-type-name: AWS::CloudFormation::LambdaHook
-      x-identifiers:
+      x-identifiers: &ref_4
         - HookArn
       x-type: cloud_control
       methods:
@@ -3737,8 +3744,7 @@ components:
       id: awscc.cloudformation.lambda_hooks_list_only
       x-cfn-schema-name: LambdaHook
       x-cfn-type-name: AWS::CloudFormation::LambdaHook
-      x-identifiers:
-        - HookArn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3768,7 +3774,7 @@ components:
       id: awscc.cloudformation.module_default_versions
       x-cfn-schema-name: ModuleDefaultVersion
       x-cfn-type-name: AWS::CloudFormation::ModuleDefaultVersion
-      x-identifiers:
+      x-identifiers: &ref_5
         - Arn
       x-type: cloud_control
       methods:
@@ -3824,8 +3830,7 @@ components:
       id: awscc.cloudformation.module_default_versions_list_only
       x-cfn-schema-name: ModuleDefaultVersion
       x-cfn-type-name: AWS::CloudFormation::ModuleDefaultVersion
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3942,7 +3947,7 @@ components:
       id: awscc.cloudformation.public_type_versions
       x-cfn-schema-name: PublicTypeVersion
       x-cfn-type-name: AWS::CloudFormation::PublicTypeVersion
-      x-identifiers:
+      x-identifiers: &ref_6
         - PublicTypeArn
       x-type: cloud_control
       methods:
@@ -4008,8 +4013,7 @@ components:
       id: awscc.cloudformation.public_type_versions_list_only
       x-cfn-schema-name: PublicTypeVersion
       x-cfn-type-name: AWS::CloudFormation::PublicTypeVersion
-      x-identifiers:
-        - PublicTypeArn
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4039,7 +4043,7 @@ components:
       id: awscc.cloudformation.publishers
       x-cfn-schema-name: Publisher
       x-cfn-type-name: AWS::CloudFormation::Publisher
-      x-identifiers:
+      x-identifiers: &ref_7
         - PublisherId
       x-type: cloud_control
       methods:
@@ -4101,8 +4105,7 @@ components:
       id: awscc.cloudformation.publishers_list_only
       x-cfn-schema-name: Publisher
       x-cfn-type-name: AWS::CloudFormation::Publisher
-      x-identifiers:
-        - PublisherId
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4132,7 +4135,7 @@ components:
       id: awscc.cloudformation.resource_default_versions
       x-cfn-schema-name: ResourceDefaultVersion
       x-cfn-type-name: AWS::CloudFormation::ResourceDefaultVersion
-      x-identifiers:
+      x-identifiers: &ref_8
         - Arn
       x-type: cloud_control
       methods:
@@ -4224,8 +4227,7 @@ components:
       id: awscc.cloudformation.resource_default_versions_list_only
       x-cfn-schema-name: ResourceDefaultVersion
       x-cfn-type-name: AWS::CloudFormation::ResourceDefaultVersion
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4255,7 +4257,7 @@ components:
       id: awscc.cloudformation.resource_versions
       x-cfn-schema-name: ResourceVersion
       x-cfn-type-name: AWS::CloudFormation::ResourceVersion
-      x-identifiers:
+      x-identifiers: &ref_9
         - Arn
       x-type: cloud_control
       methods:
@@ -4342,8 +4344,7 @@ components:
       id: awscc.cloudformation.resource_versions_list_only
       x-cfn-schema-name: ResourceVersion
       x-cfn-type-name: AWS::CloudFormation::ResourceVersion
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4373,7 +4374,7 @@ components:
       id: awscc.cloudformation.stacks
       x-cfn-schema-name: Stack
       x-cfn-type-name: AWS::CloudFormation::Stack
-      x-identifiers:
+      x-identifiers: &ref_10
         - StackId
       x-type: cloud_control
       methods:
@@ -4503,8 +4504,7 @@ components:
       id: awscc.cloudformation.stacks_list_only
       x-cfn-schema-name: Stack
       x-cfn-type-name: AWS::CloudFormation::Stack
-      x-identifiers:
-        - StackId
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4534,7 +4534,7 @@ components:
       id: awscc.cloudformation.stack_sets
       x-cfn-schema-name: StackSet
       x-cfn-type-name: AWS::CloudFormation::StackSet
-      x-identifiers:
+      x-identifiers: &ref_11
         - StackSetId
       x-type: cloud_control
       methods:
@@ -4650,8 +4650,7 @@ components:
       id: awscc.cloudformation.stack_sets_list_only
       x-cfn-schema-name: StackSet
       x-cfn-type-name: AWS::CloudFormation::StackSet
-      x-identifiers:
-        - StackSetId
+      x-identifiers: *ref_11
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4681,7 +4680,7 @@ components:
       id: awscc.cloudformation.type_activations
       x-cfn-schema-name: TypeActivation
       x-cfn-type-name: AWS::CloudFormation::TypeActivation
-      x-identifiers:
+      x-identifiers: &ref_12
         - Arn
       x-type: cloud_control
       methods:
@@ -4787,8 +4786,7 @@ components:
       id: awscc.cloudformation.type_activations_list_only
       x-cfn-schema-name: TypeActivation
       x-cfn-type-name: AWS::CloudFormation::TypeActivation
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_12
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/cloudfront.yaml b/openapi/src/awscc/v00.00.00000/services/cloudfront.yaml
index 03515b7c9..50a7b9c0f 100644
--- a/openapi/src/awscc/v00.00.00000/services/cloudfront.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/cloudfront.yaml
@@ -390,11 +390,84 @@ components:
           $ref: '#/components/x-cloud-control-schemas/ProgressEvent'
       type: object
   schemas:
+    AnycastIpList_AnycastIpList:
+      additionalProperties: false
+      properties:
+        AnycastIps:
+          items:
+            type: string
+          type: array
+          description: The static IP addresses that are allocated to the Anycast static IP list.
+        Arn:
+          type: string
+          description: The Amazon Resource Name (ARN) of the Anycast static IP list.
+        Id:
+          type: string
+          description: The ID of the Anycast static IP list.
+        IpCount:
+          type: integer
+          description: The number of IP addresses in the Anycast static IP list.
+        LastModifiedTime:
+          format: date-time
+          type: string
+          description: The last time the Anycast static IP list was modified.
+        Name:
+          maxLength: 64
+          minLength: 1
+          pattern: ^[a-zA-Z0-9-_]{1,64}$
+          type: string
+          description: The name of the Anycast static IP list.
+        Status:
+          type: string
+          description: 'The status of the Anycast static IP list. Valid values: ``Deployed``, ``Deploying``, or ``Failed``.'
+      required:
+        - AnycastIps
+        - Arn
+        - Id
+        - IpCount
+        - LastModifiedTime
+        - Name
+        - Status
+      type: object
+      description: An Anycast static IP list. For more information, see [Request Anycast static IPs to use for allowlisting](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/request-static-ips.html) in the *Amazon CloudFront Developer Guide*.
+    Tag:
+      additionalProperties: false
+      properties:
+        Key:
+          maxLength: 128
+          minLength: 1
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+          type: string
+          description: |-
+            A string that contains ``Tag`` key.
+             The string length should be between 1 and 128 characters. Valid characters include ``a-z``, ``A-Z``, ``0-9``, space, and the special characters ``_ - . : / = + @``.
+        Value:
+          maxLength: 256
+          minLength: 0
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+          type: string
+          description: |-
+            A string that contains an optional ``Tag`` value.
+             The string length should be between 0 and 256 characters. Valid characters include ``a-z``, ``A-Z``, ``0-9``, space, and the special characters ``_ - . : / = + @``.
+      required:
+        - Key
+      type: object
+      description: A complex type that contains ``Tag`` key and ``Tag`` value.
+    Tags:
+      additionalProperties: false
+      properties:
+        Items:
+          items:
+            $ref: '#/components/schemas/Tag'
+          type: array
+          description: A complex type that contains ``Tag`` elements.
+      type: object
+      description: A complex type that contains zero or more ``Tag`` elements.
     AnycastIpList:
       type: object
       properties:
         AnycastIpList:
-          $ref: '#/components/schemas/AnycastIpList'
+          $ref: '#/components/schemas/AnycastIpList_AnycastIpList'
           description: ''
         ETag:
           type: string
@@ -454,34 +527,6 @@ components:
         read:
           - cloudfront:GetAnycastIpList
           - cloudfront:ListTagsForResource
-    Tag:
-      additionalProperties: false
-      properties:
-        Key:
-          type: string
-          description: |-
-            A string that contains ``Tag`` key.
-             The string length should be between 1 and 128 characters. Valid characters include ``a-z``, ``A-Z``, ``0-9``, space, and the special characters ``_ - . : / = + @``.
-        Value:
-          type: string
-          description: |-
-            A string that contains an optional ``Tag`` value.
-             The string length should be between 0 and 256 characters. Valid characters include ``a-z``, ``A-Z``, ``0-9``, space, and the special characters ``_ - . : / = + @``.
-      required:
-        - Value
-        - Key
-      type: object
-      description: A complex type that contains ``Tag`` key and ``Tag`` value.
-    Tags:
-      additionalProperties: false
-      properties:
-        Items:
-          items:
-            $ref: '#/components/schemas/Tag'
-          type: array
-          description: A complex type that contains ``Tag`` elements.
-      type: object
-      description: A complex type that contains zero or more ``Tag`` elements.
     CachePolicyConfig:
       additionalProperties: false
       properties:
@@ -533,14 +578,14 @@ components:
       additionalProperties: false
       properties:
         CookieBehavior:
-          pattern: ^(none|whitelist|all|allExcept)$
+          pattern: ^(none|whitelist|allExcept|all)$
           type: string
           description: |-
-            Determines whether cookies in viewer requests are included in requests that CloudFront sends to the origin. Valid values are:
-              +  ``none`` – No cookies in viewer requests are included in requests that CloudFront sends to the origin. Even when this field is set to ``none``, any cookies that are listed in a ``CachePolicy``*are* included in origin requests.
-              +  ``whitelist`` – Only the cookies in viewer requests that are listed in the ``CookieNames`` type are included in requests that CloudFront sends to the origin.
-              +  ``all`` – All cookies in viewer requests are included in requests that CloudFront sends to the origin.
-              +  ``allExcept`` – All cookies in viewer requests are included in requests that CloudFront sends to the origin, *except* for those listed in the ``CookieNames`` type, which are not included.
+            Determines whether any cookies in viewer requests are included in the cache key and in requests that CloudFront sends to the origin. Valid values are:
+              +  ``none`` – No cookies in viewer requests are included in the cache key or in requests that CloudFront sends to the origin. Even when this field is set to ``none``, any cookies that are listed in an ``OriginRequestPolicy``*are* included in origin requests.
+              +  ``whitelist`` – Only the cookies in viewer requests that are listed in the ``CookieNames`` type are included in the cache key and in requests that CloudFront sends to the origin.
+              +  ``allExcept`` – All cookies in viewer requests are included in the cache key and in requests that CloudFront sends to the origin, *except* for those that are listed in the ``CookieNames`` type, which are not included.
+              +  ``all`` – All cookies in viewer requests are included in the cache key and in requests that CloudFront sends to the origin.
         Cookies:
           items:
             type: string
@@ -550,20 +595,17 @@ components:
       required:
         - CookieBehavior
       type: object
-      description: An object that determines whether any cookies in viewer requests (and if so, which cookies) are included in requests that CloudFront sends to the origin.
+      description: An object that determines whether any cookies in viewer requests (and if so, which cookies) are included in the cache key and in requests that CloudFront sends to the origin.
     HeadersConfig:
       additionalProperties: false
       properties:
         HeaderBehavior:
-          pattern: ^(none|whitelist|allViewer|allViewerAndWhitelistCloudFront|allExcept)$
+          pattern: ^(none|whitelist)$
           type: string
           description: |-
-            Determines whether any HTTP headers are included in requests that CloudFront sends to the origin. Valid values are:
-              +  ``none`` – No HTTP headers in viewer requests are included in requests that CloudFront sends to the origin. Even when this field is set to ``none``, any headers that are listed in a ``CachePolicy``*are* included in origin requests.
-              +  ``whitelist`` – Only the HTTP headers that are listed in the ``Headers`` type are included in requests that CloudFront sends to the origin.
-              +  ``allViewer`` – All HTTP headers in viewer requests are included in requests that CloudFront sends to the origin.
-              +  ``allViewerAndWhitelistCloudFront`` – All HTTP headers in viewer requests and the additional CloudFront headers that are listed in the ``Headers`` type are included in requests that CloudFront sends to the origin. The additional headers are added by CloudFront.
-              +  ``allExcept`` – All HTTP headers in viewer requests are included in requests that CloudFront sends to the origin, *except* for those listed in the ``Headers`` type, which are not included.
+            Determines whether any HTTP headers are included in the cache key and in requests that CloudFront sends to the origin. Valid values are:
+              +  ``none`` – No HTTP headers are included in the cache key or in requests that CloudFront sends to the origin. Even when this field is set to ``none``, any headers that are listed in an ``OriginRequestPolicy``*are* included in origin requests.
+              +  ``whitelist`` – Only the HTTP headers that are listed in the ``Headers`` type are included in the cache key and in requests that CloudFront sends to the origin.
         Headers:
           items:
             type: string
@@ -573,7 +615,7 @@ components:
       required:
         - HeaderBehavior
       type: object
-      description: An object that determines whether any HTTP headers (and if so, which headers) are included in requests that CloudFront sends to the origin.
+      description: An object that determines whether any HTTP headers (and if so, which headers) are included in the cache key and in requests that CloudFront sends to the origin.
     ParametersInCacheKeyAndForwardedToOrigin:
       additionalProperties: false
       properties:
@@ -623,14 +665,14 @@ components:
       additionalProperties: false
       properties:
         QueryStringBehavior:
-          pattern: ^(none|whitelist|all|allExcept)$
+          pattern: ^(none|whitelist|allExcept|all)$
           type: string
           description: |-
-            Determines whether any URL query strings in viewer requests are included in requests that CloudFront sends to the origin. Valid values are:
-              +  ``none`` – No query strings in viewer requests are included in requests that CloudFront sends to the origin. Even when this field is set to ``none``, any query strings that are listed in a ``CachePolicy``*are* included in origin requests.
-              +  ``whitelist`` – Only the query strings in viewer requests that are listed in the ``QueryStringNames`` type are included in requests that CloudFront sends to the origin.
-              +  ``all`` – All query strings in viewer requests are included in requests that CloudFront sends to the origin.
-              +  ``allExcept`` – All query strings in viewer requests are included in requests that CloudFront sends to the origin, *except* for those listed in the ``QueryStringNames`` type, which are not included.
+            Determines whether any URL query strings in viewer requests are included in the cache key and in requests that CloudFront sends to the origin. Valid values are:
+              +  ``none`` – No query strings in viewer requests are included in the cache key or in requests that CloudFront sends to the origin. Even when this field is set to ``none``, any query strings that are listed in an ``OriginRequestPolicy``*are* included in origin requests.
+              +  ``whitelist`` – Only the query strings in viewer requests that are listed in the ``QueryStringNames`` type are included in the cache key and in requests that CloudFront sends to the origin.
+              +  ``allExcept`` – All query strings in viewer requests are included in the cache key and in requests that CloudFront sends to the origin, *except* those that are listed in the ``QueryStringNames`` type, which are not included.
+              +  ``all`` – All query strings in viewer requests are included in the cache key and in requests that CloudFront sends to the origin.
         QueryStrings:
           items:
             type: string
@@ -640,7 +682,7 @@ components:
       required:
         - QueryStringBehavior
       type: object
-      description: An object that determines whether any URL query strings in viewer requests (and if so, which query strings) are included in requests that CloudFront sends to the origin.
+      description: An object that determines whether any URL query strings in viewer requests (and if so, which query strings) are included in the cache key and in requests that CloudFront sends to the origin.
     CachePolicy:
       type: object
       properties:
@@ -741,6 +783,24 @@ components:
         update:
           - cloudfront:UpdateCloudFrontOriginAccessIdentity
           - cloudfront:GetCloudFrontOriginAccessIdentity
+    ConnectionGroup_Tag:
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: |-
+            A string that contains ``Tag`` key.
+             The string length should be between 1 and 128 characters. Valid characters include ``a-z``, ``A-Z``, ``0-9``, space, and the special characters ``_ - . : / = + @``.
+        Value:
+          type: string
+          description: |-
+            A string that contains an optional ``Tag`` value.
+             The string length should be between 0 and 256 characters. Valid characters include ``a-z``, ``A-Z``, ``0-9``, space, and the special characters ``_ - . : / = + @``.
+      required:
+        - Value
+        - Key
+      type: object
+      description: A complex type that contains ``Tag`` key and ``Tag`` value.
     ConnectionGroup:
       type: object
       properties:
@@ -763,7 +823,7 @@ components:
           description: ''
         Tags:
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ConnectionGroup_Tag'
           type: array
           uniqueItems: false
           description: A complex type that contains zero or more ``Tag`` elements.
@@ -2068,6 +2128,24 @@ components:
         - Items
       type: object
       description: A complex data type for the status codes that you specify that, when returned by a primary origin, trigger CloudFront to failover to a second origin.
+    Distribution_Tag:
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: |-
+            A string that contains ``Tag`` key.
+             The string length should be between 1 and 128 characters. Valid characters include ``a-z``, ``A-Z``, ``0-9``, space, and the special characters ``_ - . : / = + @``.
+        Value:
+          type: string
+          description: |-
+            A string that contains an optional ``Tag`` value.
+             The string length should be between 0 and 256 characters. Valid characters include ``a-z``, ``A-Z``, ``0-9``, space, and the special characters ``_ - . : / = + @``.
+      required:
+        - Value
+        - Key
+      type: object
+      description: A complex type that contains ``Tag`` key and ``Tag`` value.
     ViewerCertificate:
       additionalProperties: false
       properties:
@@ -2166,7 +2244,7 @@ components:
           description: ''
         Tags:
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Distribution_Tag'
           type: array
           uniqueItems: false
           description: A complex type that contains zero or more ``Tag`` elements.
@@ -2313,6 +2391,24 @@ components:
           description: The parameter value.
       type: object
       description: A list of parameter values to add to the resource. A parameter is specified as a key-value pair. A valid parameter value must exist for any parameter that is marked as required in the multi-tenant distribution.
+    DistributionTenant_Tag:
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: |-
+            A string that contains ``Tag`` key.
+             The string length should be between 1 and 128 characters. Valid characters include ``a-z``, ``A-Z``, ``0-9``, space, and the special characters ``_ - . : / = + @``.
+        Value:
+          type: string
+          description: |-
+            A string that contains an optional ``Tag`` value.
+             The string length should be between 0 and 256 characters. Valid characters include ``a-z``, ``A-Z``, ``0-9``, space, and the special characters ``_ - . : / = + @``.
+      required:
+        - Value
+        - Key
+      type: object
+      description: A complex type that contains ``Tag`` key and ``Tag`` value.
     WebAclCustomization:
       additionalProperties: false
       properties:
@@ -2350,7 +2446,7 @@ components:
           description: ''
         Tags:
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/DistributionTenant_Tag'
           type: array
           uniqueItems: false
           description: A complex type that contains zero or more ``Tag`` elements.
@@ -2709,6 +2805,27 @@ components:
         update:
           - cloudfront:UpdateKeyValueStore
           - cloudfront:DescribeKeyValueStore
+    MonitoringSubscription_MonitoringSubscription:
+      additionalProperties: false
+      properties:
+        RealtimeMetricsSubscriptionConfig:
+          $ref: '#/components/schemas/RealtimeMetricsSubscriptionConfig'
+          description: A subscription configuration for additional CloudWatch metrics.
+      type: object
+      description: A monitoring subscription. This structure contains information about whether additional CloudWatch metrics are enabled for a given CloudFront distribution.
+    RealtimeMetricsSubscriptionConfig:
+      additionalProperties: false
+      properties:
+        RealtimeMetricsSubscriptionStatus:
+          enum:
+            - Enabled
+            - Disabled
+          type: string
+          description: A flag that indicates whether additional CloudWatch metrics are enabled for a given CloudFront distribution.
+      required:
+        - RealtimeMetricsSubscriptionStatus
+      type: object
+      description: A subscription configuration for additional CloudWatch metrics.
     MonitoringSubscription:
       type: object
       properties:
@@ -2716,7 +2833,7 @@ components:
           type: string
           description: The ID of the distribution that you are enabling metrics for.
         MonitoringSubscription:
-          $ref: '#/components/schemas/MonitoringSubscription'
+          $ref: '#/components/schemas/MonitoringSubscription_MonitoringSubscription'
           description: A subscription configuration for additional CloudWatch metrics.
       required:
         - DistributionId
@@ -2743,19 +2860,6 @@ components:
           - cloudfront:DeleteMonitoringSubscription
         read:
           - cloudfront:GetMonitoringSubscription
-    RealtimeMetricsSubscriptionConfig:
-      additionalProperties: false
-      properties:
-        RealtimeMetricsSubscriptionStatus:
-          enum:
-            - Enabled
-            - Disabled
-          type: string
-          description: A flag that indicates whether additional CloudWatch metrics are enabled for a given CloudFront distribution.
-      required:
-        - RealtimeMetricsSubscriptionStatus
-      type: object
-      description: A subscription configuration for additional CloudWatch metrics.
     OriginAccessControlConfig:
       additionalProperties: false
       properties:
@@ -2833,6 +2937,51 @@ components:
         update:
           - cloudfront:UpdateOriginAccessControl
           - cloudfront:GetOriginAccessControl
+    OriginRequestPolicy_CookiesConfig:
+      additionalProperties: false
+      properties:
+        CookieBehavior:
+          pattern: ^(none|whitelist|all|allExcept)$
+          type: string
+          description: |-
+            Determines whether cookies in viewer requests are included in requests that CloudFront sends to the origin. Valid values are:
+              +  ``none`` – No cookies in viewer requests are included in requests that CloudFront sends to the origin. Even when this field is set to ``none``, any cookies that are listed in a ``CachePolicy``*are* included in origin requests.
+              +  ``whitelist`` – Only the cookies in viewer requests that are listed in the ``CookieNames`` type are included in requests that CloudFront sends to the origin.
+              +  ``all`` – All cookies in viewer requests are included in requests that CloudFront sends to the origin.
+              +  ``allExcept`` – All cookies in viewer requests are included in requests that CloudFront sends to the origin, *except* for those listed in the ``CookieNames`` type, which are not included.
+        Cookies:
+          items:
+            type: string
+          type: array
+          uniqueItems: false
+          description: Contains a list of cookie names.
+      required:
+        - CookieBehavior
+      type: object
+      description: An object that determines whether any cookies in viewer requests (and if so, which cookies) are included in requests that CloudFront sends to the origin.
+    OriginRequestPolicy_HeadersConfig:
+      additionalProperties: false
+      properties:
+        HeaderBehavior:
+          pattern: ^(none|whitelist|allViewer|allViewerAndWhitelistCloudFront|allExcept)$
+          type: string
+          description: |-
+            Determines whether any HTTP headers are included in requests that CloudFront sends to the origin. Valid values are:
+              +  ``none`` – No HTTP headers in viewer requests are included in requests that CloudFront sends to the origin. Even when this field is set to ``none``, any headers that are listed in a ``CachePolicy``*are* included in origin requests.
+              +  ``whitelist`` – Only the HTTP headers that are listed in the ``Headers`` type are included in requests that CloudFront sends to the origin.
+              +  ``allViewer`` – All HTTP headers in viewer requests are included in requests that CloudFront sends to the origin.
+              +  ``allViewerAndWhitelistCloudFront`` – All HTTP headers in viewer requests and the additional CloudFront headers that are listed in the ``Headers`` type are included in requests that CloudFront sends to the origin. The additional headers are added by CloudFront.
+              +  ``allExcept`` – All HTTP headers in viewer requests are included in requests that CloudFront sends to the origin, *except* for those listed in the ``Headers`` type, which are not included.
+        Headers:
+          items:
+            type: string
+          type: array
+          uniqueItems: false
+          description: Contains a list of HTTP header names.
+      required:
+        - HeaderBehavior
+      type: object
+      description: An object that determines whether any HTTP headers (and if so, which headers) are included in requests that CloudFront sends to the origin.
     OriginRequestPolicyConfig:
       additionalProperties: false
       properties:
@@ -2840,16 +2989,16 @@ components:
           type: string
           description: A comment to describe the origin request policy. The comment cannot be longer than 128 characters.
         CookiesConfig:
-          $ref: '#/components/schemas/CookiesConfig'
+          $ref: '#/components/schemas/OriginRequestPolicy_CookiesConfig'
           description: The cookies from viewer requests to include in origin requests.
         HeadersConfig:
-          $ref: '#/components/schemas/HeadersConfig'
+          $ref: '#/components/schemas/OriginRequestPolicy_HeadersConfig'
           description: The HTTP headers to include in origin requests. These can include headers from viewer requests and additional headers added by CloudFront.
         Name:
           type: string
           description: A unique name to identify the origin request policy.
         QueryStringsConfig:
-          $ref: '#/components/schemas/QueryStringsConfig'
+          $ref: '#/components/schemas/OriginRequestPolicy_QueryStringsConfig'
           description: The URL query strings from viewer requests to include in origin requests.
       required:
         - Name
@@ -2865,6 +3014,28 @@ components:
           +  All HTTP headers, cookies, and URL query strings that are specified in the cache policy or the origin request policy. These can include items from the viewer request and, in the case of headers, additional ones that are added by CloudFront.
           
          CloudFront sends a request when it can't find an object in its cache that matches the request. If you want to send values to the origin and also include them in the cache key, use ``CachePolicy``.
+    OriginRequestPolicy_QueryStringsConfig:
+      additionalProperties: false
+      properties:
+        QueryStringBehavior:
+          pattern: ^(none|whitelist|all|allExcept)$
+          type: string
+          description: |-
+            Determines whether any URL query strings in viewer requests are included in requests that CloudFront sends to the origin. Valid values are:
+              +  ``none`` – No query strings in viewer requests are included in requests that CloudFront sends to the origin. Even when this field is set to ``none``, any query strings that are listed in a ``CachePolicy``*are* included in origin requests.
+              +  ``whitelist`` – Only the query strings in viewer requests that are listed in the ``QueryStringNames`` type are included in requests that CloudFront sends to the origin.
+              +  ``all`` – All query strings in viewer requests are included in requests that CloudFront sends to the origin.
+              +  ``allExcept`` – All query strings in viewer requests are included in requests that CloudFront sends to the origin, *except* for those listed in the ``QueryStringNames`` type, which are not included.
+        QueryStrings:
+          items:
+            type: string
+          type: array
+          uniqueItems: false
+          description: Contains a list of query string names.
+      required:
+        - QueryStringBehavior
+      type: object
+      description: An object that determines whether any URL query strings in viewer requests (and if so, which query strings) are included in requests that CloudFront sends to the origin.
     OriginRequestPolicy:
       type: object
       properties:
@@ -3503,6 +3674,24 @@ components:
         update:
           - cloudfront:UpdateResponseHeadersPolicy
           - cloudfront:GetResponseHeadersPolicy
+    VpcOrigin_Tag:
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: |-
+            A string that contains ``Tag`` key.
+             The string length should be between 1 and 128 characters. Valid characters include ``a-z``, ``A-Z``, ``0-9``, space, and the special characters ``_ - . : / = + @``.
+        Value:
+          type: string
+          description: |-
+            A string that contains an optional ``Tag`` value.
+             The string length should be between 0 and 256 characters. Valid characters include ``a-z``, ``A-Z``, ``0-9``, space, and the special characters ``_ - . : / = + @``.
+      required:
+        - Value
+        - Key
+      type: object
+      description: A complex type that contains ``Tag`` key and ``Tag`` value.
     VpcOriginEndpointConfig:
       additionalProperties: false
       properties:
@@ -3560,7 +3749,7 @@ components:
           description: ''
         Tags:
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/VpcOrigin_Tag'
           type: array
           uniqueItems: false
           description: A complex type that contains zero or more ``Tag`` elements.
@@ -3640,7 +3829,7 @@ components:
           type: object
           properties:
             AnycastIpList:
-              $ref: '#/components/schemas/AnycastIpList'
+              $ref: '#/components/schemas/AnycastIpList_AnycastIpList'
               description: ''
             ETag:
               type: string
@@ -3748,7 +3937,7 @@ components:
               description: ''
             Tags:
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ConnectionGroup_Tag'
               type: array
               uniqueItems: false
               description: A complex type that contains zero or more ``Tag`` elements.
@@ -3827,7 +4016,7 @@ components:
               description: ''
             Tags:
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Distribution_Tag'
               type: array
               uniqueItems: false
               description: A complex type that contains zero or more ``Tag`` elements.
@@ -3868,7 +4057,7 @@ components:
               description: ''
             Tags:
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/DistributionTenant_Tag'
               type: array
               uniqueItems: false
               description: A complex type that contains zero or more ``Tag`` elements.
@@ -4030,7 +4219,7 @@ components:
               type: string
               description: The ID of the distribution that you are enabling metrics for.
             MonitoringSubscription:
-              $ref: '#/components/schemas/MonitoringSubscription'
+              $ref: '#/components/schemas/MonitoringSubscription_MonitoringSubscription'
               description: A subscription configuration for additional CloudWatch metrics.
           x-stackQL-stringOnly: true
       x-title: CreateMonitoringSubscriptionRequest
@@ -4212,7 +4401,7 @@ components:
               description: ''
             Tags:
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/VpcOrigin_Tag'
               type: array
               uniqueItems: false
               description: A complex type that contains zero or more ``Tag`` elements.
@@ -4236,7 +4425,7 @@ components:
       id: awscc.cloudfront.anycast_ip_lists
       x-cfn-schema-name: AnycastIpList
       x-cfn-type-name: AWS::CloudFront::AnycastIpList
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
       x-type: cloud_control
       methods:
@@ -4315,8 +4504,7 @@ components:
       id: awscc.cloudfront.anycast_ip_lists_list_only
       x-cfn-schema-name: AnycastIpList
       x-cfn-type-name: AWS::CloudFront::AnycastIpList
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4346,7 +4534,7 @@ components:
       id: awscc.cloudfront.cache_policies
       x-cfn-schema-name: CachePolicy
       x-cfn-type-name: AWS::CloudFront::CachePolicy
-      x-identifiers:
+      x-identifiers: &ref_1
         - Id
       x-type: cloud_control
       methods:
@@ -4436,8 +4624,7 @@ components:
       id: awscc.cloudfront.cache_policies_list_only
       x-cfn-schema-name: CachePolicy
       x-cfn-type-name: AWS::CloudFront::CachePolicy
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4467,7 +4654,7 @@ components:
       id: awscc.cloudfront.cloud_front_origin_access_identities
       x-cfn-schema-name: CloudFrontOriginAccessIdentity
       x-cfn-type-name: AWS::CloudFront::CloudFrontOriginAccessIdentity
-      x-identifiers:
+      x-identifiers: &ref_2
         - Id
       x-type: cloud_control
       methods:
@@ -4557,8 +4744,7 @@ components:
       id: awscc.cloudfront.cloud_front_origin_access_identities_list_only
       x-cfn-schema-name: CloudFrontOriginAccessIdentity
       x-cfn-type-name: AWS::CloudFront::CloudFrontOriginAccessIdentity
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4588,7 +4774,7 @@ components:
       id: awscc.cloudfront.connection_groups
       x-cfn-schema-name: ConnectionGroup
       x-cfn-type-name: AWS::CloudFront::ConnectionGroup
-      x-identifiers:
+      x-identifiers: &ref_3
         - Id
       x-type: cloud_control
       methods:
@@ -4698,8 +4884,7 @@ components:
       id: awscc.cloudfront.connection_groups_list_only
       x-cfn-schema-name: ConnectionGroup
       x-cfn-type-name: AWS::CloudFront::ConnectionGroup
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4729,7 +4914,7 @@ components:
       id: awscc.cloudfront.continuous_deployment_policies
       x-cfn-schema-name: ContinuousDeploymentPolicy
       x-cfn-type-name: AWS::CloudFront::ContinuousDeploymentPolicy
-      x-identifiers:
+      x-identifiers: &ref_4
         - Id
       x-type: cloud_control
       methods:
@@ -4819,8 +5004,7 @@ components:
       id: awscc.cloudfront.continuous_deployment_policies_list_only
       x-cfn-schema-name: ContinuousDeploymentPolicy
       x-cfn-type-name: AWS::CloudFront::ContinuousDeploymentPolicy
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4850,7 +5034,7 @@ components:
       id: awscc.cloudfront.distributions
       x-cfn-schema-name: Distribution
       x-cfn-type-name: AWS::CloudFront::Distribution
-      x-identifiers:
+      x-identifiers: &ref_5
         - Id
       x-type: cloud_control
       methods:
@@ -4942,8 +5126,7 @@ components:
       id: awscc.cloudfront.distributions_list_only
       x-cfn-schema-name: Distribution
       x-cfn-type-name: AWS::CloudFront::Distribution
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4973,7 +5156,7 @@ components:
       id: awscc.cloudfront.distribution_tenants
       x-cfn-schema-name: DistributionTenant
       x-cfn-type-name: AWS::CloudFront::DistributionTenant
-      x-identifiers:
+      x-identifiers: &ref_6
         - Id
       x-type: cloud_control
       methods:
@@ -5089,8 +5272,7 @@ components:
       id: awscc.cloudfront.distribution_tenants_list_only
       x-cfn-schema-name: DistributionTenant
       x-cfn-type-name: AWS::CloudFront::DistributionTenant
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5120,7 +5302,7 @@ components:
       id: awscc.cloudfront.functions
       x-cfn-schema-name: Function
       x-cfn-type-name: AWS::CloudFront::Function
-      x-identifiers:
+      x-identifiers: &ref_7
         - FunctionARN
       x-type: cloud_control
       methods:
@@ -5218,8 +5400,7 @@ components:
       id: awscc.cloudfront.functions_list_only
       x-cfn-schema-name: Function
       x-cfn-type-name: AWS::CloudFront::Function
-      x-identifiers:
-        - FunctionARN
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5249,7 +5430,7 @@ components:
       id: awscc.cloudfront.key_groups
       x-cfn-schema-name: KeyGroup
       x-cfn-type-name: AWS::CloudFront::KeyGroup
-      x-identifiers:
+      x-identifiers: &ref_8
         - Id
       x-type: cloud_control
       methods:
@@ -5339,8 +5520,7 @@ components:
       id: awscc.cloudfront.key_groups_list_only
       x-cfn-schema-name: KeyGroup
       x-cfn-type-name: AWS::CloudFront::KeyGroup
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5370,7 +5550,7 @@ components:
       id: awscc.cloudfront.key_value_stores
       x-cfn-schema-name: KeyValueStore
       x-cfn-type-name: AWS::CloudFront::KeyValueStore
-      x-identifiers:
+      x-identifiers: &ref_9
         - Name
       x-type: cloud_control
       methods:
@@ -5466,8 +5646,7 @@ components:
       id: awscc.cloudfront.key_value_stores_list_only
       x-cfn-schema-name: KeyValueStore
       x-cfn-type-name: AWS::CloudFront::KeyValueStore
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5568,7 +5747,7 @@ components:
       id: awscc.cloudfront.origin_access_controls
       x-cfn-schema-name: OriginAccessControl
       x-cfn-type-name: AWS::CloudFront::OriginAccessControl
-      x-identifiers:
+      x-identifiers: &ref_10
         - Id
       x-type: cloud_control
       methods:
@@ -5656,8 +5835,7 @@ components:
       id: awscc.cloudfront.origin_access_controls_list_only
       x-cfn-schema-name: OriginAccessControl
       x-cfn-type-name: AWS::CloudFront::OriginAccessControl
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5687,7 +5865,7 @@ components:
       id: awscc.cloudfront.origin_request_policies
       x-cfn-schema-name: OriginRequestPolicy
       x-cfn-type-name: AWS::CloudFront::OriginRequestPolicy
-      x-identifiers:
+      x-identifiers: &ref_11
         - Id
       x-type: cloud_control
       methods:
@@ -5777,8 +5955,7 @@ components:
       id: awscc.cloudfront.origin_request_policies_list_only
       x-cfn-schema-name: OriginRequestPolicy
       x-cfn-type-name: AWS::CloudFront::OriginRequestPolicy
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_11
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5808,7 +5985,7 @@ components:
       id: awscc.cloudfront.public_keys
       x-cfn-schema-name: PublicKey
       x-cfn-type-name: AWS::CloudFront::PublicKey
-      x-identifiers:
+      x-identifiers: &ref_12
         - Id
       x-type: cloud_control
       methods:
@@ -5898,8 +6075,7 @@ components:
       id: awscc.cloudfront.public_keys_list_only
       x-cfn-schema-name: PublicKey
       x-cfn-type-name: AWS::CloudFront::PublicKey
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_12
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5929,7 +6105,7 @@ components:
       id: awscc.cloudfront.realtime_log_configs
       x-cfn-schema-name: RealtimeLogConfig
       x-cfn-type-name: AWS::CloudFront::RealtimeLogConfig
-      x-identifiers:
+      x-identifiers: &ref_13
         - Arn
       x-type: cloud_control
       methods:
@@ -6023,8 +6199,7 @@ components:
       id: awscc.cloudfront.realtime_log_configs_list_only
       x-cfn-schema-name: RealtimeLogConfig
       x-cfn-type-name: AWS::CloudFront::RealtimeLogConfig
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_13
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6054,7 +6229,7 @@ components:
       id: awscc.cloudfront.response_headers_policies
       x-cfn-schema-name: ResponseHeadersPolicy
       x-cfn-type-name: AWS::CloudFront::ResponseHeadersPolicy
-      x-identifiers:
+      x-identifiers: &ref_14
         - Id
       x-type: cloud_control
       methods:
@@ -6144,8 +6319,7 @@ components:
       id: awscc.cloudfront.response_headers_policies_list_only
       x-cfn-schema-name: ResponseHeadersPolicy
       x-cfn-type-name: AWS::CloudFront::ResponseHeadersPolicy
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_14
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6175,7 +6349,7 @@ components:
       id: awscc.cloudfront.vpc_origins
       x-cfn-schema-name: VpcOrigin
       x-cfn-type-name: AWS::CloudFront::VpcOrigin
-      x-identifiers:
+      x-identifiers: &ref_15
         - Id
       x-type: cloud_control
       methods:
@@ -6273,8 +6447,7 @@ components:
       id: awscc.cloudfront.vpc_origins_list_only
       x-cfn-schema-name: VpcOrigin
       x-cfn-type-name: AWS::CloudFront::VpcOrigin
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_15
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/cloudtrail.yaml b/openapi/src/awscc/v00.00.00000/services/cloudtrail.yaml
index f3d973364..929fbf5ce 100644
--- a/openapi/src/awscc/v00.00.00000/services/cloudtrail.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/cloudtrail.yaml
@@ -429,19 +429,23 @@ components:
       maxLength: 128
       pattern: (^[a-zA-Z0-9._\-]+$)
     Tag:
-      description: An arbitrary set of tags (key-value pairs) for this trail.
-      additionalProperties: false
+      description: A key-value pair to associate with a resource.
       type: object
       properties:
-        Value:
-          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
-          type: string
         Key:
-          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
           type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
       required:
-        - Value
         - Key
+        - Value
+      additionalProperties: false
     Channel:
       type: object
       properties:
@@ -578,6 +582,20 @@ components:
               pattern: ^[a-zA-Z0-9._\- ]+$
       required:
         - QueryStatement
+    Dashboard_Tag:
+      description: An arbitrary set of tags (key-value pairs) for this dashboard.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+        Value:
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+      required:
+        - Value
+        - Key
     Dashboard:
       type: object
       properties:
@@ -628,7 +646,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Dashboard_Tag'
       required: []
       x-stackql-resource-name: dashboard
       description: The Amazon CloudTrail dashboard resource allows customers to manage managed dashboards and create custom dashboards. You can manually refresh custom and managed dashboards. For custom dashboards, you can also set up an automatic refresh schedule and modify dashboard widgets.
@@ -774,13 +792,27 @@ components:
           maxLength: 1000
       required:
         - FieldSelectors
-    InsightSelector:
-      description: A string that contains insight types that are logged on a trail.
+    EventDataStore_Tag:
+      description: An arbitrary set of tags (key-value pairs) for this event data store.
+      type: object
       additionalProperties: false
+      properties:
+        Key:
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+        Value:
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+      required:
+        - Value
+        - Key
+    InsightSelector:
+      description: A string that contains Insights types that are logged on an event data store.
       type: object
+      additionalProperties: false
       properties:
         InsightType:
-          description: The type of insight to log on a trail.
+          description: The type of Insights to log on an event data store.
           type: string
     ContextKeySelector:
       description: An object that contains information types to be included in CloudTrail enriched events.
@@ -862,7 +894,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/EventDataStore_Tag'
         InsightSelectors:
           description: Lets you enable Insights event logging by specifying the Insights selectors that you want to enable on an existing event data store. Both InsightSelectors and InsightsDestination need to have a value in order to enable Insights events on an event data store.
           type: array
@@ -1009,6 +1041,14 @@ components:
           - CloudTrail:GetResourcePolicy
         delete:
           - CloudTrail:DeleteResourcePolicy
+    Trail_InsightSelector:
+      description: A string that contains insight types that are logged on a trail.
+      additionalProperties: false
+      type: object
+      properties:
+        InsightType:
+          description: The type of insight to log on a trail.
+          type: string
     EventSelector:
       description: The type of email sending events to publish to the event destination.
       additionalProperties: false
@@ -1054,6 +1094,20 @@ components:
             type: string
       required:
         - Type
+    Trail_Tag:
+      description: An arbitrary set of tags (key-value pairs) for this trail.
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+        Key:
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+      required:
+        - Value
+        - Key
     Trail:
       type: object
       properties:
@@ -1101,7 +1155,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/InsightSelector'
+            $ref: '#/components/schemas/Trail_InsightSelector'
         CloudWatchLogsLogGroupArn:
           description: Specifies a log group name using an Amazon Resource Name (ARN), a unique identifier that represents the log group to which CloudTrail logs will be delivered. Not required unless you specify CloudWatchLogsRoleArn.
           type: string
@@ -1129,7 +1183,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Trail_Tag'
         IsLogging:
           description: Whether the CloudTrail is currently logging AWS API calls.
           type: boolean
@@ -1305,7 +1359,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Dashboard_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateDashboardRequest
       type: object
@@ -1374,7 +1428,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/EventDataStore_Tag'
             InsightSelectors:
               description: Lets you enable Insights event logging by specifying the Insights selectors that you want to enable on an existing event data store. Both InsightSelectors and InsightsDestination need to have a value in order to enable Insights events on an event data store.
               type: array
@@ -1486,7 +1540,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/InsightSelector'
+                $ref: '#/components/schemas/Trail_InsightSelector'
             CloudWatchLogsLogGroupArn:
               description: Specifies a log group name using an Amazon Resource Name (ARN), a unique identifier that represents the log group to which CloudTrail logs will be delivered. Not required unless you specify CloudWatchLogsRoleArn.
               type: string
@@ -1514,7 +1568,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Trail_Tag'
             IsLogging:
               description: Whether the CloudTrail is currently logging AWS API calls.
               type: boolean
@@ -1535,7 +1589,7 @@ components:
       id: awscc.cloudtrail.channels
       x-cfn-schema-name: Channel
       x-cfn-type-name: AWS::CloudTrail::Channel
-      x-identifiers:
+      x-identifiers: &ref_0
         - ChannelArn
       x-type: cloud_control
       methods:
@@ -1629,8 +1683,7 @@ components:
       id: awscc.cloudtrail.channels_list_only
       x-cfn-schema-name: Channel
       x-cfn-type-name: AWS::CloudTrail::Channel
-      x-identifiers:
-        - ChannelArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1660,7 +1713,7 @@ components:
       id: awscc.cloudtrail.dashboards
       x-cfn-schema-name: Dashboard
       x-cfn-type-name: AWS::CloudTrail::Dashboard
-      x-identifiers:
+      x-identifiers: &ref_1
         - DashboardArn
       x-type: cloud_control
       methods:
@@ -1764,8 +1817,7 @@ components:
       id: awscc.cloudtrail.dashboards_list_only
       x-cfn-schema-name: Dashboard
       x-cfn-type-name: AWS::CloudTrail::Dashboard
-      x-identifiers:
-        - DashboardArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1795,7 +1847,7 @@ components:
       id: awscc.cloudtrail.event_data_stores
       x-cfn-schema-name: EventDataStore
       x-cfn-type-name: AWS::CloudTrail::EventDataStore
-      x-identifiers:
+      x-identifiers: &ref_2
         - EventDataStoreArn
       x-type: cloud_control
       methods:
@@ -1919,8 +1971,7 @@ components:
       id: awscc.cloudtrail.event_data_stores_list_only
       x-cfn-schema-name: EventDataStore
       x-cfn-type-name: AWS::CloudTrail::EventDataStore
-      x-identifiers:
-        - EventDataStoreArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2038,7 +2089,7 @@ components:
       id: awscc.cloudtrail.trails
       x-cfn-schema-name: Trail
       x-cfn-type-name: AWS::CloudTrail::Trail
-      x-identifiers:
+      x-identifiers: &ref_3
         - TrailName
       x-type: cloud_control
       methods:
@@ -2158,8 +2209,7 @@ components:
       id: awscc.cloudtrail.trails_list_only
       x-cfn-schema-name: Trail
       x-cfn-type-name: AWS::CloudTrail::Trail
-      x-identifiers:
-        - TrailName
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/cloudwatch.yaml b/openapi/src/awscc/v00.00.00000/services/cloudwatch.yaml
index 0fecec113..2084a3b4f 100644
--- a/openapi/src/awscc/v00.00.00000/services/cloudwatch.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/cloudwatch.yaml
@@ -491,19 +491,19 @@ components:
       required:
         - Id
     Tag:
-      description: Metadata that you can assign to a Metric Stream, consisting of a key-value pair.
+      description: One of the key-value pairs associated with the alarm. Tags can help you organize and categorize your resources.
       type: object
       additionalProperties: false
       properties:
         Key:
-          description: A unique identifier for the tag.
+          description: A string that you can use to assign a value. The combination of tag keys and values can help you organize and categorize your resources.
           type: string
           minLength: 1
           maxLength: 128
         Value:
-          description: String which you can use to describe or define the tag.
+          description: The value for the specified tag key.
           type: string
-          minLength: 0
+          minLength: 1
           maxLength: 256
       required:
         - Key
@@ -677,6 +677,24 @@ components:
       description: Amazon Resource Name (ARN) of the action
       minLength: 1
       maxLength: 1024
+    CompositeAlarm_Tag:
+      description: Metadata that you can assign to a composite alarm, Tags can help you organize and categorize your resources.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          description: A unique identifier for the tag. The combination of tag keys and values can help you organize and categorize your resources.
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          description: The value for the specified tag key.
+          type: string
+          minLength: 1
+          maxLength: 256
+      required:
+        - Key
+        - Value
     CompositeAlarm:
       type: object
       properties:
@@ -749,7 +767,7 @@ components:
           maxItems: 50
           uniqueItems: true
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/CompositeAlarm_Tag'
       required:
         - AlarmRule
       x-stackql-resource-name: composite_alarm
@@ -889,6 +907,24 @@ components:
       required:
         - MetricName
         - Namespace
+    MetricStream_Tag:
+      description: Metadata that you can assign to a Metric Stream, consisting of a key-value pair.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          description: A unique identifier for the tag.
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          description: String which you can use to describe or define the tag.
+          type: string
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
     MetricStream:
       type: object
       properties:
@@ -961,7 +997,7 @@ components:
           maxItems: 50
           uniqueItems: true
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/MetricStream_Tag'
         IncludeLinkedAccountsMetrics:
           description: If you are creating a metric stream in a monitoring account, specify true to include metrics from source accounts that are linked to this monitoring account, in the metric stream. The default is false.
           type: boolean
@@ -1221,7 +1257,7 @@ components:
               maxItems: 50
               uniqueItems: true
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/CompositeAlarm_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateCompositeAlarmRequest
       type: object
@@ -1331,7 +1367,7 @@ components:
               maxItems: 50
               uniqueItems: true
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/MetricStream_Tag'
             IncludeLinkedAccountsMetrics:
               description: If you are creating a metric stream in a monitoring account, specify true to include metrics from source accounts that are linked to this monitoring account, in the metric stream. The default is false.
               type: boolean
@@ -1352,7 +1388,7 @@ components:
       id: awscc.cloudwatch.alarms
       x-cfn-schema-name: Alarm
       x-cfn-type-name: AWS::CloudWatch::Alarm
-      x-identifiers:
+      x-identifiers: &ref_0
         - AlarmName
       x-type: cloud_control
       methods:
@@ -1482,8 +1518,7 @@ components:
       id: awscc.cloudwatch.alarms_list_only
       x-cfn-schema-name: Alarm
       x-cfn-type-name: AWS::CloudWatch::Alarm
-      x-identifiers:
-        - AlarmName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1513,7 +1548,7 @@ components:
       id: awscc.cloudwatch.composite_alarms
       x-cfn-schema-name: CompositeAlarm
       x-cfn-type-name: AWS::CloudWatch::CompositeAlarm
-      x-identifiers:
+      x-identifiers: &ref_1
         - AlarmName
       x-type: cloud_control
       methods:
@@ -1621,8 +1656,7 @@ components:
       id: awscc.cloudwatch.composite_alarms_list_only
       x-cfn-schema-name: CompositeAlarm
       x-cfn-type-name: AWS::CloudWatch::CompositeAlarm
-      x-identifiers:
-        - AlarmName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1652,7 +1686,7 @@ components:
       id: awscc.cloudwatch.dashboards
       x-cfn-schema-name: Dashboard
       x-cfn-type-name: AWS::CloudWatch::Dashboard
-      x-identifiers:
+      x-identifiers: &ref_2
         - DashboardName
       x-type: cloud_control
       methods:
@@ -1740,8 +1774,7 @@ components:
       id: awscc.cloudwatch.dashboards_list_only
       x-cfn-schema-name: Dashboard
       x-cfn-type-name: AWS::CloudWatch::Dashboard
-      x-identifiers:
-        - DashboardName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1771,7 +1804,7 @@ components:
       id: awscc.cloudwatch.metric_streams
       x-cfn-schema-name: MetricStream
       x-cfn-type-name: AWS::CloudWatch::MetricStream
-      x-identifiers:
+      x-identifiers: &ref_3
         - Name
       x-type: cloud_control
       methods:
@@ -1881,8 +1914,7 @@ components:
       id: awscc.cloudwatch.metric_streams_list_only
       x-cfn-schema-name: MetricStream
       x-cfn-type-name: AWS::CloudWatch::MetricStream
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/codeartifact.yaml b/openapi/src/awscc/v00.00.00000/services/codeartifact.yaml
index f6d56882d..abe40a0cb 100644
--- a/openapi/src/awscc/v00.00.00000/services/codeartifact.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/codeartifact.yaml
@@ -932,7 +932,7 @@ components:
       id: awscc.codeartifact.domains
       x-cfn-schema-name: Domain
       x-cfn-type-name: AWS::CodeArtifact::Domain
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -1030,8 +1030,7 @@ components:
       id: awscc.codeartifact.domains_list_only
       x-cfn-schema-name: Domain
       x-cfn-type-name: AWS::CodeArtifact::Domain
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1061,7 +1060,7 @@ components:
       id: awscc.codeartifact.package_groups
       x-cfn-schema-name: PackageGroup
       x-cfn-type-name: AWS::CodeArtifact::PackageGroup
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -1161,8 +1160,7 @@ components:
       id: awscc.codeartifact.package_groups_list_only
       x-cfn-schema-name: PackageGroup
       x-cfn-type-name: AWS::CodeArtifact::PackageGroup
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1192,7 +1190,7 @@ components:
       id: awscc.codeartifact.repositories
       x-cfn-schema-name: Repository
       x-cfn-type-name: AWS::CodeArtifact::Repository
-      x-identifiers:
+      x-identifiers: &ref_2
         - Arn
       x-type: cloud_control
       methods:
@@ -1296,8 +1294,7 @@ components:
       id: awscc.codeartifact.repositories_list_only
       x-cfn-schema-name: Repository
       x-cfn-type-name: AWS::CodeArtifact::Repository
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/codebuild.yaml b/openapi/src/awscc/v00.00.00000/services/codebuild.yaml
index f7af7720b..d7cdc48a9 100644
--- a/openapi/src/awscc/v00.00.00000/services/codebuild.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/codebuild.yaml
@@ -677,7 +677,7 @@ components:
       id: awscc.codebuild.fleets
       x-cfn-schema-name: Fleet
       x-cfn-type-name: AWS::CodeBuild::Fleet
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -787,8 +787,7 @@ components:
       id: awscc.codebuild.fleets_list_only
       x-cfn-schema-name: Fleet
       x-cfn-type-name: AWS::CodeBuild::Fleet
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/codeconnections.yaml b/openapi/src/awscc/v00.00.00000/services/codeconnections.yaml
index b15d70795..9c6f5a266 100644
--- a/openapi/src/awscc/v00.00.00000/services/codeconnections.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/codeconnections.yaml
@@ -554,7 +554,7 @@ components:
       id: awscc.codeconnections.connections
       x-cfn-schema-name: Connection
       x-cfn-type-name: AWS::CodeConnections::Connection
-      x-identifiers:
+      x-identifiers: &ref_0
         - ConnectionArn
       x-type: cloud_control
       methods:
@@ -652,8 +652,7 @@ components:
       id: awscc.codeconnections.connections_list_only
       x-cfn-schema-name: Connection
       x-cfn-type-name: AWS::CodeConnections::Connection
-      x-identifiers:
-        - ConnectionArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/codedeploy.yaml b/openapi/src/awscc/v00.00.00000/services/codedeploy.yaml
index 380d360d9..13bec862c 100644
--- a/openapi/src/awscc/v00.00.00000/services/codedeploy.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/codedeploy.yaml
@@ -637,7 +637,7 @@ components:
       id: awscc.codedeploy.applications
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::CodeDeploy::Application
-      x-identifiers:
+      x-identifiers: &ref_0
         - ApplicationName
       x-type: cloud_control
       methods:
@@ -727,8 +727,7 @@ components:
       id: awscc.codedeploy.applications_list_only
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::CodeDeploy::Application
-      x-identifiers:
-        - ApplicationName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -758,7 +757,7 @@ components:
       id: awscc.codedeploy.deployment_configs
       x-cfn-schema-name: DeploymentConfig
       x-cfn-type-name: AWS::CodeDeploy::DeploymentConfig
-      x-identifiers:
+      x-identifiers: &ref_1
         - DeploymentConfigName
       x-type: cloud_control
       methods:
@@ -835,8 +834,7 @@ components:
       id: awscc.codedeploy.deployment_configs_list_only
       x-cfn-schema-name: DeploymentConfig
       x-cfn-type-name: AWS::CodeDeploy::DeploymentConfig
-      x-identifiers:
-        - DeploymentConfigName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/codeguruprofiler.yaml b/openapi/src/awscc/v00.00.00000/services/codeguruprofiler.yaml
index ae1fb411d..4c2d1bfd6 100644
--- a/openapi/src/awscc/v00.00.00000/services/codeguruprofiler.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/codeguruprofiler.yaml
@@ -602,7 +602,7 @@ components:
       id: awscc.codeguruprofiler.profiling_groups
       x-cfn-schema-name: ProfilingGroup
       x-cfn-type-name: AWS::CodeGuruProfiler::ProfilingGroup
-      x-identifiers:
+      x-identifiers: &ref_0
         - ProfilingGroupName
       x-type: cloud_control
       methods:
@@ -698,8 +698,7 @@ components:
       id: awscc.codeguruprofiler.profiling_groups_list_only
       x-cfn-schema-name: ProfilingGroup
       x-cfn-type-name: AWS::CodeGuruProfiler::ProfilingGroup
-      x-identifiers:
-        - ProfilingGroupName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/codegurureviewer.yaml b/openapi/src/awscc/v00.00.00000/services/codegurureviewer.yaml
index f4566d52c..21ec81edb 100644
--- a/openapi/src/awscc/v00.00.00000/services/codegurureviewer.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/codegurureviewer.yaml
@@ -582,7 +582,7 @@ components:
       id: awscc.codegurureviewer.repository_associations
       x-cfn-schema-name: RepositoryAssociation
       x-cfn-type-name: AWS::CodeGuruReviewer::RepositoryAssociation
-      x-identifiers:
+      x-identifiers: &ref_0
         - AssociationArn
       x-type: cloud_control
       methods:
@@ -663,8 +663,7 @@ components:
       id: awscc.codegurureviewer.repository_associations_list_only
       x-cfn-schema-name: RepositoryAssociation
       x-cfn-type-name: AWS::CodeGuruReviewer::RepositoryAssociation
-      x-identifiers:
-        - AssociationArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/codepipeline.yaml b/openapi/src/awscc/v00.00.00000/services/codepipeline.yaml
index 2d661ecef..0a7ddfdca 100644
--- a/openapi/src/awscc/v00.00.00000/services/codepipeline.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/codepipeline.yaml
@@ -455,15 +455,12 @@ components:
           description: The URL of a sign-up page where users can sign up for an external service and perform initial configuration of the action provided by that service.
           type: string
     Tag:
-      description: A tag is a key-value pair that is used to manage the resource.
       type: object
       additionalProperties: false
       properties:
         Value:
-          description: The tag's value.
           type: string
         Key:
-          description: The tag's key.
           type: string
       required:
         - Value
@@ -883,6 +880,20 @@ components:
           uniqueItems: true
           items:
             type: string
+    Pipeline_Tag:
+      description: A tag is a key-value pair that is used to manage the resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Value:
+          description: The tag's value.
+          type: string
+        Key:
+          description: The tag's key.
+          type: string
+      required:
+        - Value
+        - Key
     GitBranchFilterCriteria:
       description: The Git repository branches specified as filter criteria to start the pipeline.
       type: object
@@ -1112,7 +1123,7 @@ components:
           type: array
           uniqueItems: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Pipeline_Tag'
       required:
         - Stages
         - RoleArn
@@ -1426,7 +1437,7 @@ components:
               type: array
               uniqueItems: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Pipeline_Tag'
           x-stackQL-stringOnly: true
       x-title: CreatePipelineRequest
       type: object
@@ -1508,7 +1519,7 @@ components:
       id: awscc.codepipeline.custom_action_types
       x-cfn-schema-name: CustomActionType
       x-cfn-type-name: AWS::CodePipeline::CustomActionType
-      x-identifiers:
+      x-identifiers: &ref_0
         - Category
         - Provider
         - Version
@@ -1612,10 +1623,7 @@ components:
       id: awscc.codepipeline.custom_action_types_list_only
       x-cfn-schema-name: CustomActionType
       x-cfn-type-name: AWS::CodePipeline::CustomActionType
-      x-identifiers:
-        - Category
-        - Provider
-        - Version
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1649,7 +1657,7 @@ components:
       id: awscc.codepipeline.pipelines
       x-cfn-schema-name: Pipeline
       x-cfn-type-name: AWS::CodePipeline::Pipeline
-      x-identifiers:
+      x-identifiers: &ref_1
         - Name
       x-type: cloud_control
       methods:
@@ -1759,8 +1767,7 @@ components:
       id: awscc.codepipeline.pipelines_list_only
       x-cfn-schema-name: Pipeline
       x-cfn-type-name: AWS::CodePipeline::Pipeline
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1790,7 +1797,7 @@ components:
       id: awscc.codepipeline.webhooks
       x-cfn-schema-name: Webhook
       x-cfn-type-name: AWS::CodePipeline::Webhook
-      x-identifiers:
+      x-identifiers: &ref_2
         - Id
       x-type: cloud_control
       methods:
@@ -1894,8 +1901,7 @@ components:
       id: awscc.codepipeline.webhooks_list_only
       x-cfn-schema-name: Webhook
       x-cfn-type-name: AWS::CodePipeline::Webhook
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/codestarconnections.yaml b/openapi/src/awscc/v00.00.00000/services/codestarconnections.yaml
index 4a17c8cfe..773bcb9a2 100644
--- a/openapi/src/awscc/v00.00.00000/services/codestarconnections.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/codestarconnections.yaml
@@ -396,12 +396,12 @@ components:
       properties:
         Key:
           type: string
-          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, , ., /, =, +, and -. '
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
           minLength: 1
           maxLength: 128
         Value:
           type: string
-          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, , ., /, =, +, and -. '
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
           minLength: 0
           maxLength: 256
       required:
@@ -489,6 +489,24 @@ components:
         list:
           - codestar-connections:ListConnections
           - codestar-connections:ListTagsForResource
+    RepositoryLink_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, , ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, , ., /, =, +, and -. '
+          minLength: 0
+          maxLength: 256
+      required:
+        - Value
+        - Key
+      additionalProperties: false
     RepositoryLink:
       type: object
       properties:
@@ -530,7 +548,7 @@ components:
           type: array
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/RepositoryLink_Tag'
       required:
         - RepositoryName
         - ConnectionArn
@@ -791,7 +809,7 @@ components:
               type: array
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/RepositoryLink_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateRepositoryLinkRequest
       type: object
@@ -875,7 +893,7 @@ components:
       id: awscc.codestarconnections.connections
       x-cfn-schema-name: Connection
       x-cfn-type-name: AWS::CodeStarConnections::Connection
-      x-identifiers:
+      x-identifiers: &ref_0
         - ConnectionArn
       x-type: cloud_control
       methods:
@@ -973,8 +991,7 @@ components:
       id: awscc.codestarconnections.connections_list_only
       x-cfn-schema-name: Connection
       x-cfn-type-name: AWS::CodeStarConnections::Connection
-      x-identifiers:
-        - ConnectionArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1004,7 +1021,7 @@ components:
       id: awscc.codestarconnections.repository_links
       x-cfn-schema-name: RepositoryLink
       x-cfn-type-name: AWS::CodeStarConnections::RepositoryLink
-      x-identifiers:
+      x-identifiers: &ref_1
         - RepositoryLinkArn
       x-type: cloud_control
       methods:
@@ -1104,8 +1121,7 @@ components:
       id: awscc.codestarconnections.repository_links_list_only
       x-cfn-schema-name: RepositoryLink
       x-cfn-type-name: AWS::CodeStarConnections::RepositoryLink
-      x-identifiers:
-        - RepositoryLinkArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1135,7 +1151,7 @@ components:
       id: awscc.codestarconnections.sync_configurations
       x-cfn-schema-name: SyncConfiguration
       x-cfn-type-name: AWS::CodeStarConnections::SyncConfiguration
-      x-identifiers:
+      x-identifiers: &ref_2
         - ResourceName
         - SyncType
       x-type: cloud_control
@@ -1242,9 +1258,7 @@ components:
       id: awscc.codestarconnections.sync_configurations_list_only
       x-cfn-schema-name: SyncConfiguration
       x-cfn-type-name: AWS::CodeStarConnections::SyncConfiguration
-      x-identifiers:
-        - ResourceName
-        - SyncType
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/codestarnotifications.yaml b/openapi/src/awscc/v00.00.00000/services/codestarnotifications.yaml
index 39d73477d..eda90aa9e 100644
--- a/openapi/src/awscc/v00.00.00000/services/codestarnotifications.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/codestarnotifications.yaml
@@ -576,7 +576,7 @@ components:
       id: awscc.codestarnotifications.notification_rules
       x-cfn-schema-name: NotificationRule
       x-cfn-type-name: AWS::CodeStarNotifications::NotificationRule
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -682,8 +682,7 @@ components:
       id: awscc.codestarnotifications.notification_rules_list_only
       x-cfn-schema-name: NotificationRule
       x-cfn-type-name: AWS::CodeStarNotifications::NotificationRule
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/cognito.yaml b/openapi/src/awscc/v00.00.00000/services/cognito.yaml
index 1f61c1cd5..de07d5637 100644
--- a/openapi/src/awscc/v00.00.00000/services/cognito.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/cognito.yaml
@@ -2629,7 +2629,7 @@ components:
       id: awscc.cognito.identity_pools
       x-cfn-schema-name: IdentityPool
       x-cfn-type-name: AWS::Cognito::IdentityPool
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
       x-type: cloud_control
       methods:
@@ -2741,8 +2741,7 @@ components:
       id: awscc.cognito.identity_pools_list_only
       x-cfn-schema-name: IdentityPool
       x-cfn-type-name: AWS::Cognito::IdentityPool
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2772,7 +2771,7 @@ components:
       id: awscc.cognito.identity_pool_principal_tags
       x-cfn-schema-name: IdentityPoolPrincipalTag
       x-cfn-type-name: AWS::Cognito::IdentityPoolPrincipalTag
-      x-identifiers:
+      x-identifiers: &ref_1
         - IdentityPoolId
         - IdentityProviderName
       x-type: cloud_control
@@ -2865,9 +2864,7 @@ components:
       id: awscc.cognito.identity_pool_principal_tags_list_only
       x-cfn-schema-name: IdentityPoolPrincipalTag
       x-cfn-type-name: AWS::Cognito::IdentityPoolPrincipalTag
-      x-identifiers:
-        - IdentityPoolId
-        - IdentityProviderName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2899,7 +2896,7 @@ components:
       id: awscc.cognito.identity_pool_role_attachments
       x-cfn-schema-name: IdentityPoolRoleAttachment
       x-cfn-type-name: AWS::Cognito::IdentityPoolRoleAttachment
-      x-identifiers:
+      x-identifiers: &ref_2
         - Id
       x-type: cloud_control
       methods:
@@ -2991,8 +2988,7 @@ components:
       id: awscc.cognito.identity_pool_role_attachments_list_only
       x-cfn-schema-name: IdentityPoolRoleAttachment
       x-cfn-type-name: AWS::Cognito::IdentityPoolRoleAttachment
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3211,7 +3207,7 @@ components:
       id: awscc.cognito.user_pools
       x-cfn-schema-name: UserPool
       x-cfn-type-name: AWS::Cognito::UserPool
-      x-identifiers:
+      x-identifiers: &ref_3
         - UserPoolId
       x-type: cloud_control
       methods:
@@ -3361,8 +3357,7 @@ components:
       id: awscc.cognito.user_pools_list_only
       x-cfn-schema-name: UserPool
       x-cfn-type-name: AWS::Cognito::UserPool
-      x-identifiers:
-        - UserPoolId
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3392,7 +3387,7 @@ components:
       id: awscc.cognito.user_pool_clients
       x-cfn-schema-name: UserPoolClient
       x-cfn-type-name: AWS::Cognito::UserPoolClient
-      x-identifiers:
+      x-identifiers: &ref_4
         - UserPoolId
         - ClientId
       x-type: cloud_control
@@ -3529,9 +3524,7 @@ components:
       id: awscc.cognito.user_pool_clients_list_only
       x-cfn-schema-name: UserPoolClient
       x-cfn-type-name: AWS::Cognito::UserPoolClient
-      x-identifiers:
-        - UserPoolId
-        - ClientId
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3658,7 +3651,7 @@ components:
       id: awscc.cognito.user_pool_groups
       x-cfn-schema-name: UserPoolGroup
       x-cfn-type-name: AWS::Cognito::UserPoolGroup
-      x-identifiers:
+      x-identifiers: &ref_5
         - UserPoolId
         - GroupName
       x-type: cloud_control
@@ -3753,9 +3746,7 @@ components:
       id: awscc.cognito.user_pool_groups_list_only
       x-cfn-schema-name: UserPoolGroup
       x-cfn-type-name: AWS::Cognito::UserPoolGroup
-      x-identifiers:
-        - UserPoolId
-        - GroupName
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3787,7 +3778,7 @@ components:
       id: awscc.cognito.user_pool_identity_providers
       x-cfn-schema-name: UserPoolIdentityProvider
       x-cfn-type-name: AWS::Cognito::UserPoolIdentityProvider
-      x-identifiers:
+      x-identifiers: &ref_6
         - UserPoolId
         - ProviderName
       x-type: cloud_control
@@ -3884,9 +3875,7 @@ components:
       id: awscc.cognito.user_pool_identity_providers_list_only
       x-cfn-schema-name: UserPoolIdentityProvider
       x-cfn-type-name: AWS::Cognito::UserPoolIdentityProvider
-      x-identifiers:
-        - UserPoolId
-        - ProviderName
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3918,7 +3907,7 @@ components:
       id: awscc.cognito.user_pool_resource_servers
       x-cfn-schema-name: UserPoolResourceServer
       x-cfn-type-name: AWS::Cognito::UserPoolResourceServer
-      x-identifiers:
+      x-identifiers: &ref_7
         - UserPoolId
         - Identifier
       x-type: cloud_control
@@ -4011,9 +4000,7 @@ components:
       id: awscc.cognito.user_pool_resource_servers_list_only
       x-cfn-schema-name: UserPoolResourceServer
       x-cfn-type-name: AWS::Cognito::UserPoolResourceServer
-      x-identifiers:
-        - UserPoolId
-        - Identifier
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4231,7 +4218,7 @@ components:
       id: awscc.cognito.user_pool_users
       x-cfn-schema-name: UserPoolUser
       x-cfn-type-name: AWS::Cognito::UserPoolUser
-      x-identifiers:
+      x-identifiers: &ref_8
         - UserPoolId
         - Username
       x-type: cloud_control
@@ -4315,9 +4302,7 @@ components:
       id: awscc.cognito.user_pool_users_list_only
       x-cfn-schema-name: UserPoolUser
       x-cfn-type-name: AWS::Cognito::UserPoolUser
-      x-identifiers:
-        - UserPoolId
-        - Username
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/comprehend.yaml b/openapi/src/awscc/v00.00.00000/services/comprehend.yaml
index a93612643..db61eb0ce 100644
--- a/openapi/src/awscc/v00.00.00000/services/comprehend.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/comprehend.yaml
@@ -971,7 +971,7 @@ components:
       id: awscc.comprehend.document_classifiers
       x-cfn-schema-name: DocumentClassifier
       x-cfn-type-name: AWS::Comprehend::DocumentClassifier
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -1081,8 +1081,7 @@ components:
       id: awscc.comprehend.document_classifiers_list_only
       x-cfn-schema-name: DocumentClassifier
       x-cfn-type-name: AWS::Comprehend::DocumentClassifier
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1112,7 +1111,7 @@ components:
       id: awscc.comprehend.flywheels
       x-cfn-schema-name: Flywheel
       x-cfn-type-name: AWS::Comprehend::Flywheel
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -1214,8 +1213,7 @@ components:
       id: awscc.comprehend.flywheels_list_only
       x-cfn-schema-name: Flywheel
       x-cfn-type-name: AWS::Comprehend::Flywheel
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/config.yaml b/openapi/src/awscc/v00.00.00000/services/config.yaml
index ba0722018..9e391b30c 100644
--- a/openapi/src/awscc/v00.00.00000/services/config.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/config.yaml
@@ -393,6 +393,7 @@ components:
     Tag:
       description: A key-value pair to associate with a resource.
       type: object
+      additionalProperties: false
       properties:
         Key:
           type: string
@@ -401,13 +402,12 @@ components:
           maxLength: 128
         Value:
           type: string
-          description: 'The value for the tag. You can specify a value that is 0 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
           minLength: 0
           maxLength: 256
-      additionalProperties: false
       required:
-        - Value
         - Key
+        - Value
     AggregationAuthorization:
       type: object
       properties:
@@ -702,6 +702,24 @@ components:
           type: string
       required:
         - RoleArn
+    ConfigurationAggregator_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 0
+          maxLength: 256
+      required:
+        - Value
+        - Key
     ConfigurationAggregator:
       type: object
       properties:
@@ -727,7 +745,7 @@ components:
           maxItems: 50
           uniqueItems: true
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ConfigurationAggregator_Tag'
       x-stackql-resource-name: configuration_aggregator
       description: Resource Type definition for AWS::Config::ConfigurationAggregator
       x-type-name: AWS::Config::ConfigurationAggregator
@@ -773,16 +791,19 @@ components:
         list:
           - config:DescribeConfigurationAggregators
     ParameterName:
+      description: Key part of key-value pair with value being parameter value
       type: string
       minLength: 0
       maxLength: 255
     ParameterValue:
+      description: Value part of key-value pair with key being parameter Name
       type: string
       minLength: 0
       maxLength: 4096
     ConformancePackInputParameter:
       description: Input parameters in the form of key-value pairs for the conformance pack.
       type: object
+      additionalProperties: false
       properties:
         ParameterName:
           $ref: '#/components/schemas/ParameterName'
@@ -886,6 +907,25 @@ components:
           - config:DescribeConformancePackStatus
         list:
           - config:DescribeConformancePacks
+    OrganizationConformancePack_ConformancePackInputParameter:
+      description: Input parameters in the form of key-value pairs for the conformance pack.
+      type: object
+      properties:
+        ParameterName:
+          $ref: '#/components/schemas/OrganizationConformancePack_ParameterName'
+        ParameterValue:
+          $ref: '#/components/schemas/OrganizationConformancePack_ParameterValue'
+      required:
+        - ParameterName
+        - ParameterValue
+    OrganizationConformancePack_ParameterName:
+      type: string
+      minLength: 0
+      maxLength: 255
+    OrganizationConformancePack_ParameterValue:
+      type: string
+      minLength: 0
+      maxLength: 4096
     AccountId:
       type: string
     OrganizationConformancePack:
@@ -922,7 +962,7 @@ components:
           description: A list of ConformancePackInputParameter objects.
           type: array
           items:
-            $ref: '#/components/schemas/ConformancePackInputParameter'
+            $ref: '#/components/schemas/OrganizationConformancePack_ConformancePackInputParameter'
           minItems: 0
           maxItems: 60
         ExcludedAccounts:
@@ -984,6 +1024,24 @@ components:
           - organizations:EnableAWSServiceAccess
         list:
           - config:DescribeOrganizationConformancePacks
+    StoredQuery_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 0
+          maxLength: 256
+      additionalProperties: false
+      required:
+        - Value
+        - Key
     StoredQuery:
       type: object
       properties:
@@ -1017,7 +1075,7 @@ components:
           maxItems: 50
           uniqueItems: true
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/StoredQuery_Tag'
       required:
         - QueryName
         - QueryExpression
@@ -1198,7 +1256,7 @@ components:
               maxItems: 50
               uniqueItems: true
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ConfigurationAggregator_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateConfigurationAggregatorRequest
       type: object
@@ -1311,7 +1369,7 @@ components:
               description: A list of ConformancePackInputParameter objects.
               type: array
               items:
-                $ref: '#/components/schemas/ConformancePackInputParameter'
+                $ref: '#/components/schemas/OrganizationConformancePack_ConformancePackInputParameter'
               minItems: 0
               maxItems: 60
             ExcludedAccounts:
@@ -1368,7 +1426,7 @@ components:
               maxItems: 50
               uniqueItems: true
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/StoredQuery_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateStoredQueryRequest
       type: object
@@ -1386,7 +1444,7 @@ components:
       id: awscc.config.aggregation_authorizations
       x-cfn-schema-name: AggregationAuthorization
       x-cfn-type-name: AWS::Config::AggregationAuthorization
-      x-identifiers:
+      x-identifiers: &ref_0
         - AuthorizedAccountId
         - AuthorizedAwsRegion
       x-type: cloud_control
@@ -1479,9 +1537,7 @@ components:
       id: awscc.config.aggregation_authorizations_list_only
       x-cfn-schema-name: AggregationAuthorization
       x-cfn-type-name: AWS::Config::AggregationAuthorization
-      x-identifiers:
-        - AuthorizedAccountId
-        - AuthorizedAwsRegion
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1513,7 +1569,7 @@ components:
       id: awscc.config.config_rules
       x-cfn-schema-name: ConfigRule
       x-cfn-type-name: AWS::Config::ConfigRule
-      x-identifiers:
+      x-identifiers: &ref_1
         - ConfigRuleName
       x-type: cloud_control
       methods:
@@ -1617,8 +1673,7 @@ components:
       id: awscc.config.config_rules_list_only
       x-cfn-schema-name: ConfigRule
       x-cfn-type-name: AWS::Config::ConfigRule
-      x-identifiers:
-        - ConfigRuleName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1648,7 +1703,7 @@ components:
       id: awscc.config.configuration_aggregators
       x-cfn-schema-name: ConfigurationAggregator
       x-cfn-type-name: AWS::Config::ConfigurationAggregator
-      x-identifiers:
+      x-identifiers: &ref_2
         - ConfigurationAggregatorName
       x-type: cloud_control
       methods:
@@ -1742,8 +1797,7 @@ components:
       id: awscc.config.configuration_aggregators_list_only
       x-cfn-schema-name: ConfigurationAggregator
       x-cfn-type-name: AWS::Config::ConfigurationAggregator
-      x-identifiers:
-        - ConfigurationAggregatorName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1773,7 +1827,7 @@ components:
       id: awscc.config.conformance_packs
       x-cfn-schema-name: ConformancePack
       x-cfn-type-name: AWS::Config::ConformancePack
-      x-identifiers:
+      x-identifiers: &ref_3
         - ConformancePackName
       x-type: cloud_control
       methods:
@@ -1871,8 +1925,7 @@ components:
       id: awscc.config.conformance_packs_list_only
       x-cfn-schema-name: ConformancePack
       x-cfn-type-name: AWS::Config::ConformancePack
-      x-identifiers:
-        - ConformancePackName
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1902,7 +1955,7 @@ components:
       id: awscc.config.organization_conformance_packs
       x-cfn-schema-name: OrganizationConformancePack
       x-cfn-type-name: AWS::Config::OrganizationConformancePack
-      x-identifiers:
+      x-identifiers: &ref_4
         - OrganizationConformancePackName
       x-type: cloud_control
       methods:
@@ -2000,8 +2053,7 @@ components:
       id: awscc.config.organization_conformance_packs_list_only
       x-cfn-schema-name: OrganizationConformancePack
       x-cfn-type-name: AWS::Config::OrganizationConformancePack
-      x-identifiers:
-        - OrganizationConformancePackName
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2031,7 +2083,7 @@ components:
       id: awscc.config.stored_queries
       x-cfn-schema-name: StoredQuery
       x-cfn-type-name: AWS::Config::StoredQuery
-      x-identifiers:
+      x-identifiers: &ref_5
         - QueryName
       x-type: cloud_control
       methods:
@@ -2127,8 +2179,7 @@ components:
       id: awscc.config.stored_queries_list_only
       x-cfn-schema-name: StoredQuery
       x-cfn-type-name: AWS::Config::StoredQuery
-      x-identifiers:
-        - QueryName
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/connect.yaml b/openapi/src/awscc/v00.00.00000/services/connect.yaml
index 28b121a4f..1aac68f6e 100644
--- a/openapi/src/awscc/v00.00.00000/services/connect.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/connect.yaml
@@ -393,21 +393,21 @@ components:
     Tag:
       description: A key-value pair to associate with a resource.
       type: object
-      additionalProperties: false
       properties:
         Key:
           type: string
-          description: The key name of the tag. You can specify a value that is 1 to 128 Unicode characters
-          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
           minLength: 1
           maxLength: 128
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
         Value:
           type: string
-          description: The value for the tag. . You can specify a value that is maximum of 256 Unicode characters
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
           maxLength: 256
       required:
         - Key
         - Value
+      additionalProperties: false
     AgentStatus:
       type: object
       properties:
@@ -554,6 +554,24 @@ components:
           - connect:ListApprovedOrigins
         list:
           - connect:ListApprovedOrigins
+    ContactFlow_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. . You can specify a value that is maximum of 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          maxLength: 256
+      required:
+        - Key
+        - Value
     ContactFlow:
       type: object
       properties:
@@ -610,7 +628,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ContactFlow_Tag'
       required:
         - InstanceArn
         - Content
@@ -656,6 +674,24 @@ components:
           - connect:UntagResource
         list:
           - connect:ListContactFlows
+    ContactFlowModule_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is maximum of 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
     ContactFlowModule:
       type: object
       properties:
@@ -702,7 +738,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ContactFlowModule_Tag'
       required:
         - InstanceArn
         - Name
@@ -806,6 +842,23 @@ components:
           - connect:ListContactFlowVersions
         update:
           - connect:DescribeContactFlow
+    EmailAddress_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     EmailAddress:
       type: object
       properties:
@@ -844,7 +897,7 @@ components:
           x-insertionOrder: false
           description: One or more tags.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/EmailAddress_Tag'
       required:
         - InstanceArn
         - EmailAddress
@@ -1212,6 +1265,24 @@ components:
       required:
         - MinValue
         - MaxValue
+    EvaluationForm_Tag:
+      description: A key-value pair to associate with a resource.
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -'
+          type: string
+          maxLength: 256
+        Key:
+          minLength: 1
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -'
+          type: string
+          maxLength: 128
+      required:
+        - Key
+        - Value
     EvaluationFormSingleSelectQuestionOption:
       description: Information about the automation configuration in single select questions.
       additionalProperties: false
@@ -1318,7 +1389,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/EvaluationForm_Tag'
       required:
         - Title
         - InstanceArn
@@ -1410,6 +1481,24 @@ components:
         - Day
         - StartTime
         - EndTime
+    HoursOfOperation_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is maximum of 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          maxLength: 256
+      required:
+        - Key
+        - Value
     OverrideTimeSlice:
       description: The start time or end time for an an hours of operation override.
       type: object
@@ -1545,7 +1634,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/HoursOfOperation_Tag'
         HoursOfOperationOverrides:
           description: One or more hours of operation overrides assigned to an hour of operation.
           type: array
@@ -1667,6 +1756,24 @@ components:
       required:
         - InboundCalls
         - OutboundCalls
+    Instance_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     Instance:
       type: object
       properties:
@@ -1719,7 +1826,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Instance_Tag'
       required:
         - IdentityManagementType
         - Attributes
@@ -2103,10 +2210,118 @@ components:
           - connect:ListBots
           - connect:ListLambdaFunctions
           - connect:ListIntegrationAssociations
+    PhoneNumber_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          maxLength: 256
+      required:
+        - Key
+        - Value
     PhoneNumber:
-      description: The phone number in E.164 format.
-      type: string
-      pattern: ^\+[1-9]\d{1,14}$
+      type: object
+      properties:
+        TargetArn:
+          description: The ARN of the target the phone number is claimed to.
+          type: string
+          pattern: ^arn:aws[-a-z0-9]*:connect:[-a-z0-9]*:[0-9]{12}:(instance|traffic-distribution-group)/[-a-zA-Z0-9]*$
+        PhoneNumberArn:
+          description: The phone number ARN
+          type: string
+          pattern: ^arn:aws[-a-z0-9]*:connect:[-a-z0-9]*:[0-9]{12}:phone-number/[-a-zA-Z0-9]*$
+        Description:
+          description: The description of the phone number.
+          type: string
+          minLength: 1
+          maxLength: 500
+        Type:
+          description: The phone number type
+          type: string
+          pattern: TOLL_FREE|DID|UIFN|SHARED|THIRD_PARTY_DID|THIRD_PARTY_TF|SHORT_CODE
+        CountryCode:
+          description: The phone number country code.
+          type: string
+          pattern: ^[A-Z]{2}
+        Prefix:
+          description: The phone number prefix.
+          type: string
+          pattern: ^\+[0-9]{1,15}
+        Address:
+          description: The phone number e164 address.
+          type: string
+          pattern: ^\+[0-9]{2,15}
+        Tags:
+          type: array
+          maxItems: 50
+          uniqueItems: true
+          x-insertionOrder: false
+          description: One or more tags.
+          items:
+            $ref: '#/components/schemas/PhoneNumber_Tag'
+        SourcePhoneNumberArn:
+          description: The source phone number arn.
+          type: string
+      required:
+        - TargetArn
+      x-stackql-resource-name: phone_number
+      description: Resource Type definition for AWS::Connect::PhoneNumber
+      x-type-name: AWS::Connect::PhoneNumber
+      x-stackql-primary-identifier:
+        - PhoneNumberArn
+      x-create-only-properties:
+        - Type
+        - CountryCode
+        - Prefix
+        - SourcePhoneNumberArn
+      x-write-only-properties:
+        - Prefix
+      x-read-only-properties:
+        - PhoneNumberArn
+        - Address
+      x-required-properties:
+        - TargetArn
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: true
+        tagProperty: /properties/Tags
+        permissions:
+          - connect:UntagResource
+          - connect:TagResource
+      x-required-permissions:
+        create:
+          - connect:ClaimPhoneNumber
+          - connect:SearchAvailablePhoneNumbers
+          - connect:DescribePhoneNumber
+          - connect:TagResource
+          - connect:ImportPhoneNumber
+          - sms-voice:DescribePhoneNumbers
+          - social-messaging:GetLinkedWhatsAppBusinessAccountPhoneNumber
+          - social-messaging:TagResource
+        read:
+          - connect:DescribePhoneNumber
+        delete:
+          - connect:ReleasePhoneNumber
+          - connect:UntagResource
+        update:
+          - connect:UpdatePhoneNumber
+          - connect:UpdatePhoneNumberMetadata
+          - connect:DescribePhoneNumber
+          - connect:TagResource
+          - connect:UntagResource
+        list:
+          - connect:ListPhoneNumbersV2
     StringList:
       description: Predefined attribute values of type string list.
       type: array
@@ -2116,10 +2331,10 @@ components:
       items:
         $ref: '#/components/schemas/Value'
     Value:
+      description: Textual or numeric value that describes an attribute.
       type: string
-      description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
-      minLength: 0
-      maxLength: 256
+      minLength: 1
+      maxLength: 100
     Purpose:
       description: A label allowing customers to categorize a predefined attribute.
       type: string
@@ -2201,6 +2416,24 @@ components:
           - connect:UpdatePredefinedAttribute
         list:
           - connect:ListPredefinedAttributes
+    Prompt_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     Prompt:
       type: object
       properties:
@@ -2234,7 +2467,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Prompt_Tag'
       required:
         - InstanceArn
         - Name
@@ -2295,11 +2528,29 @@ components:
       description: The email address connect resource ID.
       type: string
       pattern: ^arn:aws[-a-z0-9]*:connect:[-a-z0-9]*:[0-9]{12}:instance/[-a-zA-Z0-9]*/email-address/[-a-zA-Z0-9]*$
+    Queue_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          $ref: '#/components/schemas/Key'
+        Value:
+          $ref: '#/components/schemas/Queue_Value'
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     Key:
-      description: A valid security key in PEM format.
       type: string
+      description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
       minLength: 1
-      maxLength: 1024
+      maxLength: 128
+      pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+    Queue_Value:
+      type: string
+      description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+      minLength: 0
+      maxLength: 256
     OutboundCallerConfig:
       description: The outbound caller ID name, number, and outbound whisper flow.
       type: object
@@ -2377,7 +2628,7 @@ components:
           x-insertionOrder: false
           description: An array of key-value pairs to apply to this resource.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Queue_Tag'
         Type:
           type: string
           description: The type of queue.
@@ -2433,25 +2684,29 @@ components:
         list:
           - connect:ListQueues
           - connect:ListQueueQuickConnects
+    QuickConnect_PhoneNumber:
+      description: The phone number in E.164 format.
+      type: string
+      pattern: ^\+[1-9]\d{1,14}$
     ContactFlowArn:
       description: The identifier of the contact flow.
       type: string
       pattern: ^arn:aws[-a-z0-9]*:connect:[-a-z0-9]*:[0-9]{12}:instance/[-a-zA-Z0-9]*/contact-flow/[-a-zA-Z0-9]*$
     QueueArn:
-      description: The Amazon Resource Name (ARN) for the queue.
+      description: The identifier for the queue.
       type: string
       pattern: ^arn:aws[-a-z0-9]*:connect:[-a-z0-9]*:[0-9]{12}:instance/[-a-zA-Z0-9]*/queue/[-a-zA-Z0-9]*$
     UserArn:
-      description: The Amazon Resource Name (ARN) of the user or a dynamic recipient string starting with '$.'.
+      description: The identifier of the user.
       type: string
-      pattern: ^$|arn:aws[-a-z0-9]*:connect:[-a-z0-9]*:[0-9]{12}:instance/[-a-zA-Z0-9]*/agent/[-a-zA-Z0-9]*$|^\$\..+$
+      pattern: ^arn:aws[-a-z0-9]*:connect:[-a-z0-9]*:[0-9]{12}:instance/[-a-zA-Z0-9]*/agent/[-a-zA-Z0-9]*$
     PhoneNumberQuickConnectConfig:
       description: The phone configuration. This is required only if QuickConnectType is PHONE_NUMBER.
       type: object
       additionalProperties: false
       properties:
         PhoneNumber:
-          $ref: '#/components/schemas/PhoneNumber'
+          $ref: '#/components/schemas/QuickConnect_PhoneNumber'
       required:
         - PhoneNumber
     QueueQuickConnectConfig:
@@ -2500,6 +2755,24 @@ components:
         - PHONE_NUMBER
         - QUEUE
         - USER
+    QuickConnect_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is maximum of 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          maxLength: 256
+      required:
+        - Key
+        - Value
     QuickConnect:
       type: object
       properties:
@@ -2531,7 +2804,7 @@ components:
           x-insertionOrder: false
           description: One or more tags.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/QuickConnect_Tag'
         QuickConnectType:
           description: 'The type of quick connect. In the Amazon Connect console, when you create a quick connect, you are prompted to assign one of the following types: Agent (USER), External (PHONE_NUMBER), or Queue (QUEUE).'
           type: string
@@ -2632,6 +2905,10 @@ components:
       type: integer
       minimum: 1
       maximum: 99
+    RoutingProfile_QueueArn:
+      description: The Amazon Resource Name (ARN) for the queue.
+      type: string
+      pattern: ^arn:aws[-a-z0-9]*:connect:[-a-z0-9]*:[0-9]{12}:instance/[-a-zA-Z0-9]*/queue/[-a-zA-Z0-9]*$
     RoutingProfileQueueReference:
       description: Contains the channel and queue identifier for a routing profile.
       type: object
@@ -2640,7 +2917,7 @@ components:
         Channel:
           $ref: '#/components/schemas/Channel'
         QueueArn:
-          $ref: '#/components/schemas/QueueArn'
+          $ref: '#/components/schemas/RoutingProfile_QueueArn'
       required:
         - Channel
         - QueueArn
@@ -2764,33 +3041,38 @@ components:
           - connect:ListRoutingProfiles
           - connect:ListRoutingProfileQueues
     FieldValue:
-      description: the default value for the task template's field
-      type: string
-      minLength: 1
-      maxLength: 4096
+      description: Object for case field values.
+      type: object
+      properties:
+        StringValue:
+          type: string
+          description: ''
+        BooleanValue:
+          type: boolean
+          description: ''
+        DoubleValue:
+          type: number
+          description: ''
+        EmptyValue:
+          type: object
+          description: ''
+      additionalProperties: false
     Field:
-      description: A task template field object.
+      description: ''
       type: object
       properties:
         Id:
-          $ref: '#/components/schemas/FieldIdentifier'
-        Description:
-          description: The description of the task template's field
+          description: ''
           type: string
-          minLength: 0
-          maxLength: 255
-        Type:
-          $ref: '#/components/schemas/FieldType'
-        SingleSelectOptions:
-          description: list of field options to be used with single select
-          type: array
-          maxItems: 50
-          items:
-            $ref: '#/components/schemas/FieldOption'
-      additionalProperties: false
+          minLength: 1
+          maxLength: 500
+        Value:
+          $ref: '#/components/schemas/FieldValue'
+          description: ''
       required:
         - Id
-        - Type
+        - Value
+      additionalProperties: false
     Fields:
       description: An array of case fields
       type: array
@@ -2800,6 +3082,10 @@ components:
         $ref: '#/components/schemas/Field'
       minItems: 1
       maxItems: 100
+    Rule_UserArn:
+      description: The Amazon Resource Name (ARN) of the user or a dynamic recipient string starting with '$.'.
+      type: string
+      pattern: ^$|arn:aws[-a-z0-9]*:connect:[-a-z0-9]*:[0-9]{12}:instance/[-a-zA-Z0-9]*/agent/[-a-zA-Z0-9]*$|^\$\..+$
     NotificationRecipientType:
       description: The type of notification recipient.
       type: object
@@ -2818,7 +3104,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/UserArn'
+            $ref: '#/components/schemas/Rule_UserArn'
       additionalProperties: false
     Reference:
       description: Information about the reference when the ``referenceType`` is ``URL``. Otherwise, null. (Supports variable injection in the ``Value`` field.)
@@ -3090,6 +3376,24 @@ components:
           $ref: '#/components/schemas/SubmitAutoEvaluationActions'
           description: ''
       additionalProperties: false
+    Rule_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -'
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -'
+          maxLength: 256
+      required:
+        - Key
+        - Value
     Rule:
       type: object
       properties:
@@ -3129,7 +3433,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Rule_Tag'
       required:
         - Name
         - InstanceArn
@@ -3182,11 +3486,16 @@ components:
           - cases:ListFieldOptions
           - connect:TagResource
           - connect:UntagResource
+    SecurityKey_Key:
+      description: A valid security key in PEM format.
+      type: string
+      minLength: 1
+      maxLength: 1024
     SecurityKey:
       type: object
       properties:
         Key:
-          $ref: '#/components/schemas/Key'
+          $ref: '#/components/schemas/SecurityKey_Key'
         InstanceId:
           $ref: '#/components/schemas/InstanceId'
         AssociationId:
@@ -3259,6 +3568,25 @@ components:
         - ApplicationPermissions
         - Namespace
       additionalProperties: false
+    SecurityProfile_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     SecurityProfile:
       type: object
       properties:
@@ -3269,7 +3597,7 @@ components:
           x-insertionOrder: false
           description: The list of tags that a security profile uses to restrict access to resources in Amazon Connect.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/SecurityProfile_Tag'
         Description:
           type: string
           minLength: 0
@@ -3334,7 +3662,7 @@ components:
           x-insertionOrder: false
           description: The tags used to organize, track, or control access for this resource.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/SecurityProfile_Tag'
         LastModifiedRegion:
           type: string
           pattern: '[a-z]{2}(-[a-z]+){1,2}(-[0-9])?'
@@ -3428,6 +3756,29 @@ components:
       pattern: ^[A-Za-z0-9](?:[A-Za-z0-9_.,\s-]*[A-Za-z0-9_.,-])?$
       minLength: 1
       maxLength: 100
+    TaskTemplate_Field:
+      description: A task template field object.
+      type: object
+      properties:
+        Id:
+          $ref: '#/components/schemas/FieldIdentifier'
+        Description:
+          description: The description of the task template's field
+          type: string
+          minLength: 0
+          maxLength: 255
+        Type:
+          $ref: '#/components/schemas/FieldType'
+        SingleSelectOptions:
+          description: list of field options to be used with single select
+          type: array
+          maxItems: 50
+          items:
+            $ref: '#/components/schemas/FieldOption'
+      additionalProperties: false
+      required:
+        - Id
+        - Type
     InvisibleFieldInfo:
       description: Invisible field info
       type: object
@@ -3473,6 +3824,11 @@ components:
       maxItems: 50
       items:
         $ref: '#/components/schemas/RequiredFieldInfo'
+    TaskTemplate_FieldValue:
+      description: the default value for the task template's field
+      type: string
+      minLength: 1
+      maxLength: 4096
     DefaultFieldValue:
       description: the default value for the task template's field
       type: object
@@ -3480,7 +3836,7 @@ components:
         Id:
           $ref: '#/components/schemas/FieldIdentifier'
         DefaultValue:
-          $ref: '#/components/schemas/FieldValue'
+          $ref: '#/components/schemas/TaskTemplate_FieldValue'
       additionalProperties: false
       required:
         - Id
@@ -3489,6 +3845,24 @@ components:
       description: the client token string in uuid format
       type: string
       pattern: ^$|[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$
+    TaskTemplate_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. . You can specify a value that is maximum of 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          maxLength: 256
+      required:
+        - Key
+        - Value
     TaskTemplate:
       type: object
       properties:
@@ -3540,7 +3914,7 @@ components:
           type: array
           maxItems: 50
           items:
-            $ref: '#/components/schemas/Field'
+            $ref: '#/components/schemas/TaskTemplate_Field'
         Status:
           $ref: '#/components/schemas/Status'
         ClientToken:
@@ -3552,7 +3926,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/TaskTemplate_Tag'
       required:
         - InstanceArn
       x-stackql-resource-name: task_template
@@ -3590,6 +3964,24 @@ components:
           - connect:DeleteTaskTemplate
           - connect:UntagResource
           - connect:GetTaskTemplate
+    TrafficDistributionGroup_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     TrafficDistributionGroup:
       type: object
       properties:
@@ -3632,7 +4024,7 @@ components:
           x-insertionOrder: false
           description: One or more tags.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/TrafficDistributionGroup_Tag'
         IsDefault:
           description: If this is the default traffic distribution group.
           type: boolean
@@ -3751,6 +4143,24 @@ components:
           $ref: '#/components/schemas/PersistentConnection'
       required:
         - PhoneType
+    User_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is maximum of 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          maxLength: 256
+      required:
+        - Key
+        - Value
     UserProficiency:
       description: Proficiency of a user.
       type: object
@@ -3835,7 +4245,7 @@ components:
           x-insertionOrder: false
           description: One or more tags.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/User_Tag'
         UserProficiencies:
           description: One or more predefined attributes assigned to a user, with a level that indicates how skilled they are.
           type: array
@@ -3900,6 +4310,24 @@ components:
       description: The Amazon Resource Name (ARN) for the User hierarchy group.
       type: string
       pattern: ^arn:aws[-a-z0-9]*:connect:[-a-z0-9]*:[0-9]{12}:instance/[-a-zA-Z0-9]*/agent-group/[-a-zA-Z0-9]*$
+    UserHierarchyGroup_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is maximum of 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          maxLength: 256
+      required:
+        - Key
+        - Value
     UserHierarchyGroup:
       type: object
       properties:
@@ -3925,7 +4353,7 @@ components:
           x-insertionOrder: false
           description: One or more tags.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/UserHierarchyGroup_Tag'
       required:
         - Name
         - InstanceArn
@@ -4093,6 +4521,24 @@ components:
           - connect:UpdateUserHierarchyStructure
         update:
           - connect:UpdateUserHierarchyStructure
+    View_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: The key name of the tag. You can specify a value that is 1 to 128 Unicode characters
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: The value for the tag. . You can specify a value that is maximum of 256 Unicode characters
+          maxLength: 256
+      required:
+        - Key
+        - Value
     View:
       type: object
       properties:
@@ -4150,7 +4596,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/View_Tag'
       required:
         - InstanceArn
         - Template
@@ -4413,7 +4859,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ContactFlow_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateContactFlowRequest
       type: object
@@ -4474,7 +4920,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ContactFlowModule_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateContactFlowModuleRequest
       type: object
@@ -4569,7 +5015,7 @@ components:
               x-insertionOrder: false
               description: One or more tags.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/EmailAddress_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateEmailAddressRequest
       type: object
@@ -4639,7 +5085,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/EvaluationForm_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateEvaluationFormRequest
       type: object
@@ -4693,7 +5139,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/HoursOfOperation_Tag'
             HoursOfOperationOverrides:
               description: One or more hours of operation overrides assigned to an hour of operation.
               type: array
@@ -4767,7 +5213,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Instance_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateInstanceRequest
       type: object
@@ -4832,6 +5278,63 @@ components:
       x-title: CreateIntegrationAssociationRequest
       type: object
       required: []
+    CreatePhoneNumberRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            TargetArn:
+              description: The ARN of the target the phone number is claimed to.
+              type: string
+              pattern: ^arn:aws[-a-z0-9]*:connect:[-a-z0-9]*:[0-9]{12}:(instance|traffic-distribution-group)/[-a-zA-Z0-9]*$
+            PhoneNumberArn:
+              description: The phone number ARN
+              type: string
+              pattern: ^arn:aws[-a-z0-9]*:connect:[-a-z0-9]*:[0-9]{12}:phone-number/[-a-zA-Z0-9]*$
+            Description:
+              description: The description of the phone number.
+              type: string
+              minLength: 1
+              maxLength: 500
+            Type:
+              description: The phone number type
+              type: string
+              pattern: TOLL_FREE|DID|UIFN|SHARED|THIRD_PARTY_DID|THIRD_PARTY_TF|SHORT_CODE
+            CountryCode:
+              description: The phone number country code.
+              type: string
+              pattern: ^[A-Z]{2}
+            Prefix:
+              description: The phone number prefix.
+              type: string
+              pattern: ^\+[0-9]{1,15}
+            Address:
+              description: The phone number e164 address.
+              type: string
+              pattern: ^\+[0-9]{2,15}
+            Tags:
+              type: array
+              maxItems: 50
+              uniqueItems: true
+              x-insertionOrder: false
+              description: One or more tags.
+              items:
+                $ref: '#/components/schemas/PhoneNumber_Tag'
+            SourcePhoneNumberArn:
+              description: The source phone number arn.
+              type: string
+          x-stackQL-stringOnly: true
+      x-title: CreatePhoneNumberRequest
+      type: object
+      required: []
     CreatePredefinedAttributeRequest:
       properties:
         ClientToken:
@@ -4934,7 +5437,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Prompt_Tag'
           x-stackQL-stringOnly: true
       x-title: CreatePromptRequest
       type: object
@@ -5004,7 +5507,7 @@ components:
               x-insertionOrder: false
               description: An array of key-value pairs to apply to this resource.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Queue_Tag'
             Type:
               type: string
               description: The type of queue.
@@ -5056,7 +5559,7 @@ components:
               x-insertionOrder: false
               description: One or more tags.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/QuickConnect_Tag'
             QuickConnectType:
               description: 'The type of quick connect. In the Amazon Connect console, when you create a quick connect, you are prompted to assign one of the following types: Agent (USER), External (PHONE_NUMBER), or Queue (QUEUE).'
               type: string
@@ -5183,7 +5686,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Rule_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateRuleRequest
       type: object
@@ -5202,7 +5705,7 @@ components:
           type: object
           properties:
             Key:
-              $ref: '#/components/schemas/Key'
+              $ref: '#/components/schemas/SecurityKey_Key'
             InstanceId:
               $ref: '#/components/schemas/InstanceId'
             AssociationId:
@@ -5231,7 +5734,7 @@ components:
               x-insertionOrder: false
               description: The list of tags that a security profile uses to restrict access to resources in Amazon Connect.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/SecurityProfile_Tag'
             Description:
               type: string
               minLength: 0
@@ -5296,7 +5799,7 @@ components:
               x-insertionOrder: false
               description: The tags used to organize, track, or control access for this resource.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/SecurityProfile_Tag'
             LastModifiedRegion:
               type: string
               pattern: '[a-z]{2}(-[a-z]+){1,2}(-[0-9])?'
@@ -5369,7 +5872,7 @@ components:
               type: array
               maxItems: 50
               items:
-                $ref: '#/components/schemas/Field'
+                $ref: '#/components/schemas/TaskTemplate_Field'
             Status:
               $ref: '#/components/schemas/Status'
             ClientToken:
@@ -5381,7 +5884,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/TaskTemplate_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateTaskTemplateRequest
       type: object
@@ -5438,7 +5941,7 @@ components:
               x-insertionOrder: false
               description: One or more tags.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/TrafficDistributionGroup_Tag'
             IsDefault:
               description: If this is the default traffic distribution group.
               type: boolean
@@ -5510,7 +6013,7 @@ components:
               x-insertionOrder: false
               description: One or more tags.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/User_Tag'
             UserProficiencies:
               description: One or more predefined attributes assigned to a user, with a level that indicates how skilled they are.
               type: array
@@ -5556,7 +6059,7 @@ components:
               x-insertionOrder: false
               description: One or more tags.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/UserHierarchyGroup_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateUserHierarchyGroupRequest
       type: object
@@ -5668,7 +6171,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/View_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateViewRequest
       type: object
@@ -5730,7 +6233,7 @@ components:
       id: awscc.connect.agent_statuses
       x-cfn-schema-name: AgentStatus
       x-cfn-type-name: AWS::Connect::AgentStatus
-      x-identifiers:
+      x-identifiers: &ref_0
         - AgentStatusArn
       x-type: cloud_control
       methods:
@@ -5819,8 +6322,7 @@ components:
       id: awscc.connect.agent_statuses_list_only
       x-cfn-schema-name: AgentStatus
       x-cfn-type-name: AWS::Connect::AgentStatus
-      x-identifiers:
-        - AgentStatusArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5850,7 +6352,7 @@ components:
       id: awscc.connect.approved_origins
       x-cfn-schema-name: ApprovedOrigin
       x-cfn-type-name: AWS::Connect::ApprovedOrigin
-      x-identifiers:
+      x-identifiers: &ref_1
         - InstanceId
         - Origin
       x-type: cloud_control
@@ -5922,9 +6424,7 @@ components:
       id: awscc.connect.approved_origins_list_only
       x-cfn-schema-name: ApprovedOrigin
       x-cfn-type-name: AWS::Connect::ApprovedOrigin
-      x-identifiers:
-        - InstanceId
-        - Origin
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5956,7 +6456,7 @@ components:
       id: awscc.connect.contact_flows
       x-cfn-schema-name: ContactFlow
       x-cfn-type-name: AWS::Connect::ContactFlow
-      x-identifiers:
+      x-identifiers: &ref_2
         - ContactFlowArn
       x-type: cloud_control
       methods:
@@ -6056,8 +6556,7 @@ components:
       id: awscc.connect.contact_flows_list_only
       x-cfn-schema-name: ContactFlow
       x-cfn-type-name: AWS::Connect::ContactFlow
-      x-identifiers:
-        - ContactFlowArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6087,7 +6586,7 @@ components:
       id: awscc.connect.contact_flow_modules
       x-cfn-schema-name: ContactFlowModule
       x-cfn-type-name: AWS::Connect::ContactFlowModule
-      x-identifiers:
+      x-identifiers: &ref_3
         - ContactFlowModuleArn
       x-type: cloud_control
       methods:
@@ -6187,8 +6686,7 @@ components:
       id: awscc.connect.contact_flow_modules_list_only
       x-cfn-schema-name: ContactFlowModule
       x-cfn-type-name: AWS::Connect::ContactFlowModule
-      x-identifiers:
-        - ContactFlowModuleArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6218,7 +6716,7 @@ components:
       id: awscc.connect.contact_flow_versions
       x-cfn-schema-name: ContactFlowVersion
       x-cfn-type-name: AWS::Connect::ContactFlowVersion
-      x-identifiers:
+      x-identifiers: &ref_4
         - ContactFlowVersionARN
       x-type: cloud_control
       methods:
@@ -6312,8 +6810,7 @@ components:
       id: awscc.connect.contact_flow_versions_list_only
       x-cfn-schema-name: ContactFlowVersion
       x-cfn-type-name: AWS::Connect::ContactFlowVersion
-      x-identifiers:
-        - ContactFlowVersionARN
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6343,7 +6840,7 @@ components:
       id: awscc.connect.email_addresses
       x-cfn-schema-name: EmailAddress
       x-cfn-type-name: AWS::Connect::EmailAddress
-      x-identifiers:
+      x-identifiers: &ref_5
         - EmailAddressArn
       x-type: cloud_control
       methods:
@@ -6439,8 +6936,7 @@ components:
       id: awscc.connect.email_addresses_list_only
       x-cfn-schema-name: EmailAddress
       x-cfn-type-name: AWS::Connect::EmailAddress
-      x-identifiers:
-        - EmailAddressArn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6470,7 +6966,7 @@ components:
       id: awscc.connect.evaluation_forms
       x-cfn-schema-name: EvaluationForm
       x-cfn-type-name: AWS::Connect::EvaluationForm
-      x-identifiers:
+      x-identifiers: &ref_6
         - EvaluationFormArn
       x-type: cloud_control
       methods:
@@ -6572,8 +7068,7 @@ components:
       id: awscc.connect.evaluation_forms_list_only
       x-cfn-schema-name: EvaluationForm
       x-cfn-type-name: AWS::Connect::EvaluationForm
-      x-identifiers:
-        - EvaluationFormArn
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6603,7 +7098,7 @@ components:
       id: awscc.connect.hours_of_operations
       x-cfn-schema-name: HoursOfOperation
       x-cfn-type-name: AWS::Connect::HoursOfOperation
-      x-identifiers:
+      x-identifiers: &ref_7
         - HoursOfOperationArn
       x-type: cloud_control
       methods:
@@ -6703,8 +7198,7 @@ components:
       id: awscc.connect.hours_of_operations_list_only
       x-cfn-schema-name: HoursOfOperation
       x-cfn-type-name: AWS::Connect::HoursOfOperation
-      x-identifiers:
-        - HoursOfOperationArn
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6734,7 +7228,7 @@ components:
       id: awscc.connect.instances
       x-cfn-schema-name: Instance
       x-cfn-type-name: AWS::Connect::Instance
-      x-identifiers:
+      x-identifiers: &ref_8
         - Arn
       x-type: cloud_control
       methods:
@@ -6838,8 +7332,7 @@ components:
       id: awscc.connect.instances_list_only
       x-cfn-schema-name: Instance
       x-cfn-type-name: AWS::Connect::Instance
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6869,7 +7362,7 @@ components:
       id: awscc.connect.instance_storage_configs
       x-cfn-schema-name: InstanceStorageConfig
       x-cfn-type-name: AWS::Connect::InstanceStorageConfig
-      x-identifiers:
+      x-identifiers: &ref_9
         - InstanceArn
         - AssociationId
         - ResourceType
@@ -6971,10 +7464,7 @@ components:
       id: awscc.connect.instance_storage_configs_list_only
       x-cfn-schema-name: InstanceStorageConfig
       x-cfn-type-name: AWS::Connect::InstanceStorageConfig
-      x-identifiers:
-        - InstanceArn
-        - AssociationId
-        - ResourceType
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7008,7 +7498,7 @@ components:
       id: awscc.connect.integration_associations
       x-cfn-schema-name: IntegrationAssociation
       x-cfn-type-name: AWS::Connect::IntegrationAssociation
-      x-identifiers:
+      x-identifiers: &ref_10
         - InstanceId
         - IntegrationType
         - IntegrationArn
@@ -7085,10 +7575,7 @@ components:
       id: awscc.connect.integration_associations_list_only
       x-cfn-schema-name: IntegrationAssociation
       x-cfn-type-name: AWS::Connect::IntegrationAssociation
-      x-identifiers:
-        - InstanceId
-        - IntegrationType
-        - IntegrationArn
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7117,12 +7604,144 @@ components:
                 json_extract_path_text(Properties, 'IntegrationArn') as integration_arn
                 FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Connect::IntegrationAssociation'
                 AND region = 'us-east-1'
+    phone_numbers:
+      name: phone_numbers
+      id: awscc.connect.phone_numbers
+      x-cfn-schema-name: PhoneNumber
+      x-cfn-type-name: AWS::Connect::PhoneNumber
+      x-identifiers: &ref_11
+        - PhoneNumberArn
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__PhoneNumber&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::Connect::PhoneNumber"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::Connect::PhoneNumber"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::Connect::PhoneNumber"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/phone_numbers/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/phone_numbers/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/phone_numbers/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.TargetArn') as target_arn,
+              JSON_EXTRACT(Properties, '$.PhoneNumberArn') as phone_number_arn,
+              JSON_EXTRACT(Properties, '$.Description') as description,
+              JSON_EXTRACT(Properties, '$.Type') as type,
+              JSON_EXTRACT(Properties, '$.CountryCode') as country_code,
+              JSON_EXTRACT(Properties, '$.Prefix') as prefix,
+              JSON_EXTRACT(Properties, '$.Address') as address,
+              JSON_EXTRACT(Properties, '$.Tags') as tags,
+              JSON_EXTRACT(Properties, '$.SourcePhoneNumberArn') as source_phone_number_arn
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::Connect::PhoneNumber'
+              AND Identifier = '<PhoneNumberArn>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'TargetArn') as target_arn,
+                json_extract_path_text(Properties, 'PhoneNumberArn') as phone_number_arn,
+                json_extract_path_text(Properties, 'Description') as description,
+                json_extract_path_text(Properties, 'Type') as type,
+                json_extract_path_text(Properties, 'CountryCode') as country_code,
+                json_extract_path_text(Properties, 'Prefix') as prefix,
+                json_extract_path_text(Properties, 'Address') as address,
+                json_extract_path_text(Properties, 'Tags') as tags,
+                json_extract_path_text(Properties, 'SourcePhoneNumberArn') as source_phone_number_arn
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::Connect::PhoneNumber'
+                AND Identifier = '<PhoneNumberArn>'
+                AND region = 'us-east-1'
+    phone_numbers_list_only:
+      name: phone_numbers_list_only
+      id: awscc.connect.phone_numbers_list_only
+      x-cfn-schema-name: PhoneNumber
+      x-cfn-type-name: AWS::Connect::PhoneNumber
+      x-identifiers: *ref_11
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.PhoneNumberArn') as phone_number_arn
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Connect::PhoneNumber'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'PhoneNumberArn') as phone_number_arn
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Connect::PhoneNumber'
+                AND region = 'us-east-1'
     predefined_attributes:
       name: predefined_attributes
       id: awscc.connect.predefined_attributes
       x-cfn-schema-name: PredefinedAttribute
       x-cfn-type-name: AWS::Connect::PredefinedAttribute
-      x-identifiers:
+      x-identifiers: &ref_12
         - InstanceArn
         - Name
       x-type: cloud_control
@@ -7221,9 +7840,7 @@ components:
       id: awscc.connect.predefined_attributes_list_only
       x-cfn-schema-name: PredefinedAttribute
       x-cfn-type-name: AWS::Connect::PredefinedAttribute
-      x-identifiers:
-        - InstanceArn
-        - Name
+      x-identifiers: *ref_12
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7255,7 +7872,7 @@ components:
       id: awscc.connect.prompts
       x-cfn-schema-name: Prompt
       x-cfn-type-name: AWS::Connect::Prompt
-      x-identifiers:
+      x-identifiers: &ref_13
         - PromptArn
       x-type: cloud_control
       methods:
@@ -7351,8 +7968,7 @@ components:
       id: awscc.connect.prompts_list_only
       x-cfn-schema-name: Prompt
       x-cfn-type-name: AWS::Connect::Prompt
-      x-identifiers:
-        - PromptArn
+      x-identifiers: *ref_13
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7382,7 +7998,7 @@ components:
       id: awscc.connect.queues
       x-cfn-schema-name: Queue
       x-cfn-type-name: AWS::Connect::Queue
-      x-identifiers:
+      x-identifiers: &ref_14
         - QueueArn
       x-type: cloud_control
       methods:
@@ -7490,8 +8106,7 @@ components:
       id: awscc.connect.queues_list_only
       x-cfn-schema-name: Queue
       x-cfn-type-name: AWS::Connect::Queue
-      x-identifiers:
-        - QueueArn
+      x-identifiers: *ref_14
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7521,7 +8136,7 @@ components:
       id: awscc.connect.quick_connects
       x-cfn-schema-name: QuickConnect
       x-cfn-type-name: AWS::Connect::QuickConnect
-      x-identifiers:
+      x-identifiers: &ref_15
         - QuickConnectArn
       x-type: cloud_control
       methods:
@@ -7619,8 +8234,7 @@ components:
       id: awscc.connect.quick_connects_list_only
       x-cfn-schema-name: QuickConnect
       x-cfn-type-name: AWS::Connect::QuickConnect
-      x-identifiers:
-        - QuickConnectArn
+      x-identifiers: *ref_15
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7650,7 +8264,7 @@ components:
       id: awscc.connect.routing_profiles
       x-cfn-schema-name: RoutingProfile
       x-cfn-type-name: AWS::Connect::RoutingProfile
-      x-identifiers:
+      x-identifiers: &ref_16
         - RoutingProfileArn
       x-type: cloud_control
       methods:
@@ -7752,8 +8366,7 @@ components:
       id: awscc.connect.routing_profiles_list_only
       x-cfn-schema-name: RoutingProfile
       x-cfn-type-name: AWS::Connect::RoutingProfile
-      x-identifiers:
-        - RoutingProfileArn
+      x-identifiers: *ref_16
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7883,7 +8496,7 @@ components:
       id: awscc.connect.security_keys
       x-cfn-schema-name: SecurityKey
       x-cfn-type-name: AWS::Connect::SecurityKey
-      x-identifiers:
+      x-identifiers: &ref_17
         - InstanceId
         - AssociationId
       x-type: cloud_control
@@ -7957,9 +8570,7 @@ components:
       id: awscc.connect.security_keys_list_only
       x-cfn-schema-name: SecurityKey
       x-cfn-type-name: AWS::Connect::SecurityKey
-      x-identifiers:
-        - InstanceId
-        - AssociationId
+      x-identifiers: *ref_17
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7991,7 +8602,7 @@ components:
       id: awscc.connect.security_profiles
       x-cfn-schema-name: SecurityProfile
       x-cfn-type-name: AWS::Connect::SecurityProfile
-      x-identifiers:
+      x-identifiers: &ref_18
         - SecurityProfileArn
       x-type: cloud_control
       methods:
@@ -8101,8 +8712,7 @@ components:
       id: awscc.connect.security_profiles_list_only
       x-cfn-schema-name: SecurityProfile
       x-cfn-type-name: AWS::Connect::SecurityProfile
-      x-identifiers:
-        - SecurityProfileArn
+      x-identifiers: *ref_18
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -8132,7 +8742,7 @@ components:
       id: awscc.connect.task_templates
       x-cfn-schema-name: TaskTemplate
       x-cfn-type-name: AWS::Connect::TaskTemplate
-      x-identifiers:
+      x-identifiers: &ref_19
         - Arn
       x-type: cloud_control
       methods:
@@ -8240,8 +8850,7 @@ components:
       id: awscc.connect.task_templates_list_only
       x-cfn-schema-name: TaskTemplate
       x-cfn-type-name: AWS::Connect::TaskTemplate
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_19
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -8271,7 +8880,7 @@ components:
       id: awscc.connect.traffic_distribution_groups
       x-cfn-schema-name: TrafficDistributionGroup
       x-cfn-type-name: AWS::Connect::TrafficDistributionGroup
-      x-identifiers:
+      x-identifiers: &ref_20
         - TrafficDistributionGroupArn
       x-type: cloud_control
       methods:
@@ -8369,8 +8978,7 @@ components:
       id: awscc.connect.traffic_distribution_groups_list_only
       x-cfn-schema-name: TrafficDistributionGroup
       x-cfn-type-name: AWS::Connect::TrafficDistributionGroup
-      x-identifiers:
-        - TrafficDistributionGroupArn
+      x-identifiers: *ref_20
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -8400,7 +9008,7 @@ components:
       id: awscc.connect.users
       x-cfn-schema-name: User
       x-cfn-type-name: AWS::Connect::User
-      x-identifiers:
+      x-identifiers: &ref_21
         - UserArn
       x-type: cloud_control
       methods:
@@ -8508,8 +9116,7 @@ components:
       id: awscc.connect.users_list_only
       x-cfn-schema-name: User
       x-cfn-type-name: AWS::Connect::User
-      x-identifiers:
-        - UserArn
+      x-identifiers: *ref_21
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -8539,7 +9146,7 @@ components:
       id: awscc.connect.user_hierarchy_groups
       x-cfn-schema-name: UserHierarchyGroup
       x-cfn-type-name: AWS::Connect::UserHierarchyGroup
-      x-identifiers:
+      x-identifiers: &ref_22
         - UserHierarchyGroupArn
       x-type: cloud_control
       methods:
@@ -8633,8 +9240,7 @@ components:
       id: awscc.connect.user_hierarchy_groups_list_only
       x-cfn-schema-name: UserHierarchyGroup
       x-cfn-type-name: AWS::Connect::UserHierarchyGroup
-      x-identifiers:
-        - UserHierarchyGroupArn
+      x-identifiers: *ref_22
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -8754,7 +9360,7 @@ components:
       id: awscc.connect.views
       x-cfn-schema-name: View
       x-cfn-type-name: AWS::Connect::View
-      x-identifiers:
+      x-identifiers: &ref_23
         - ViewArn
       x-type: cloud_control
       methods:
@@ -8856,8 +9462,7 @@ components:
       id: awscc.connect.views_list_only
       x-cfn-schema-name: View
       x-cfn-type-name: AWS::Connect::View
-      x-identifiers:
-        - ViewArn
+      x-identifiers: *ref_23
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -8887,7 +9492,7 @@ components:
       id: awscc.connect.view_versions
       x-cfn-schema-name: ViewVersion
       x-cfn-type-name: AWS::Connect::ViewVersion
-      x-identifiers:
+      x-identifiers: &ref_24
         - ViewVersionArn
       x-type: cloud_control
       methods:
@@ -8964,8 +9569,7 @@ components:
       id: awscc.connect.view_versions_list_only
       x-cfn-schema-name: ViewVersion
       x-cfn-type-name: AWS::Connect::ViewVersion
-      x-identifiers:
-        - ViewVersionArn
+      x-identifiers: *ref_24
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -9596,6 +10200,48 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
+  /?Action=CreateResource&Version=2021-09-30&__PhoneNumber&__detailTransformed=true:
+    parameters:
+      - $ref: '#/components/parameters/X-Amz-Content-Sha256'
+      - $ref: '#/components/parameters/X-Amz-Date'
+      - $ref: '#/components/parameters/X-Amz-Algorithm'
+      - $ref: '#/components/parameters/X-Amz-Credential'
+      - $ref: '#/components/parameters/X-Amz-Security-Token'
+      - $ref: '#/components/parameters/X-Amz-Signature'
+      - $ref: '#/components/parameters/X-Amz-SignedHeaders'
+    post:
+      operationId: CreatePhoneNumber
+      parameters:
+        - description: Action Header
+          in: header
+          name: X-Amz-Target
+          required: false
+          schema:
+            default: CloudApiService.CreateResource
+            enum:
+              - CloudApiService.CreateResource
+            type: string
+        - in: header
+          name: Content-Type
+          required: false
+          schema:
+            default: application/x-amz-json-1.0
+            enum:
+              - application/x-amz-json-1.0
+            type: string
+      requestBody:
+        content:
+          application/x-amz-json-1.0:
+            schema:
+              $ref: '#/components/schemas/CreatePhoneNumberRequest'
+        required: true
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
+          description: Success
   /?Action=CreateResource&Version=2021-09-30&__PredefinedAttribute&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
diff --git a/openapi/src/awscc/v00.00.00000/services/connectcampaigns.yaml b/openapi/src/awscc/v00.00.00000/services/connectcampaigns.yaml
index 3864de871..aa461d314 100644
--- a/openapi/src/awscc/v00.00.00000/services/connectcampaigns.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/connectcampaigns.yaml
@@ -648,7 +648,7 @@ components:
       id: awscc.connectcampaigns.campaigns
       x-cfn-schema-name: Campaign
       x-cfn-type-name: AWS::ConnectCampaigns::Campaign
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -744,8 +744,7 @@ components:
       id: awscc.connectcampaigns.campaigns_list_only
       x-cfn-schema-name: Campaign
       x-cfn-type-name: AWS::ConnectCampaigns::Campaign
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/connectcampaignsv2.yaml b/openapi/src/awscc/v00.00.00000/services/connectcampaignsv2.yaml
index 4790c130f..73f59e6bc 100644
--- a/openapi/src/awscc/v00.00.00000/services/connectcampaignsv2.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/connectcampaignsv2.yaml
@@ -1021,7 +1021,7 @@ components:
       id: awscc.connectcampaignsv2.campaigns
       x-cfn-schema-name: Campaign
       x-cfn-type-name: AWS::ConnectCampaignsV2::Campaign
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -1125,8 +1125,7 @@ components:
       id: awscc.connectcampaignsv2.campaigns_list_only
       x-cfn-schema-name: Campaign
       x-cfn-type-name: AWS::ConnectCampaignsV2::Campaign
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/controltower.yaml b/openapi/src/awscc/v00.00.00000/services/controltower.yaml
index 69b515a16..73721acd3 100644
--- a/openapi/src/awscc/v00.00.00000/services/controltower.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/controltower.yaml
@@ -598,6 +598,24 @@ components:
         - Value
         - Key
       additionalProperties: false
+    EnabledControl_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:.
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:.
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     EnabledControl:
       type: object
       properties:
@@ -625,7 +643,7 @@ components:
           type: array
           maxItems: 50
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/EnabledControl_Tag'
           minItems: 1
           x-insertionOrder: false
       required:
@@ -952,7 +970,7 @@ components:
               type: array
               maxItems: 50
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/EnabledControl_Tag'
               minItems: 1
               x-insertionOrder: false
           x-stackQL-stringOnly: true
@@ -1015,7 +1033,7 @@ components:
       id: awscc.controltower.enabled_baselines
       x-cfn-schema-name: EnabledBaseline
       x-cfn-type-name: AWS::ControlTower::EnabledBaseline
-      x-identifiers:
+      x-identifiers: &ref_0
         - EnabledBaselineIdentifier
       x-type: cloud_control
       methods:
@@ -1111,8 +1129,7 @@ components:
       id: awscc.controltower.enabled_baselines_list_only
       x-cfn-schema-name: EnabledBaseline
       x-cfn-type-name: AWS::ControlTower::EnabledBaseline
-      x-identifiers:
-        - EnabledBaselineIdentifier
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1142,7 +1159,7 @@ components:
       id: awscc.controltower.enabled_controls
       x-cfn-schema-name: EnabledControl
       x-cfn-type-name: AWS::ControlTower::EnabledControl
-      x-identifiers:
+      x-identifiers: &ref_1
         - TargetIdentifier
         - ControlIdentifier
       x-type: cloud_control
@@ -1235,9 +1252,7 @@ components:
       id: awscc.controltower.enabled_controls_list_only
       x-cfn-schema-name: EnabledControl
       x-cfn-type-name: AWS::ControlTower::EnabledControl
-      x-identifiers:
-        - TargetIdentifier
-        - ControlIdentifier
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1269,7 +1284,7 @@ components:
       id: awscc.controltower.landing_zones
       x-cfn-schema-name: LandingZone
       x-cfn-type-name: AWS::ControlTower::LandingZone
-      x-identifiers:
+      x-identifiers: &ref_2
         - LandingZoneIdentifier
       x-type: cloud_control
       methods:
@@ -1369,8 +1384,7 @@ components:
       id: awscc.controltower.landing_zones_list_only
       x-cfn-schema-name: LandingZone
       x-cfn-type-name: AWS::ControlTower::LandingZone
-      x-identifiers:
-        - LandingZoneIdentifier
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/cur.yaml b/openapi/src/awscc/v00.00.00000/services/cur.yaml
index 6c6011e35..260de675a 100644
--- a/openapi/src/awscc/v00.00.00000/services/cur.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/cur.yaml
@@ -642,7 +642,7 @@ components:
       id: awscc.cur.report_definitions
       x-cfn-schema-name: ReportDefinition
       x-cfn-type-name: AWS::CUR::ReportDefinition
-      x-identifiers:
+      x-identifiers: &ref_0
         - ReportName
       x-type: cloud_control
       methods:
@@ -750,8 +750,7 @@ components:
       id: awscc.cur.report_definitions_list_only
       x-cfn-schema-name: ReportDefinition
       x-cfn-type-name: AWS::CUR::ReportDefinition
-      x-identifiers:
-        - ReportName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/customerprofiles.yaml b/openapi/src/awscc/v00.00.00000/services/customerprofiles.yaml
index 8ce63db92..c11a15f02 100644
--- a/openapi/src/awscc/v00.00.00000/services/customerprofiles.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/customerprofiles.yaml
@@ -409,7 +409,7 @@ components:
       minLength: 1
       maxLength: 255
     Description:
-      description: The description of the event trigger.
+      description: The description of the calculated attribute.
       type: string
       minLength: 1
       maxLength: 1000
@@ -577,7 +577,6 @@ components:
       properties:
         Key:
           type: string
-          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
           description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
           minLength: 1
           maxLength: 128
@@ -689,6 +688,22 @@ components:
           - profile:DeleteCalculatedAttributeDefinition
         list:
           - profile:ListCalculatedAttributeDefinitions
+    Domain_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          minLength: 0
+          maxLength: 256
+      additionalProperties: false
+      required:
+        - Key
+        - Value
     DomainStats:
       type: object
       description: Usage-specific statistics about the domain.
@@ -965,7 +980,7 @@ components:
           description: The tags (keys and values) associated with the domain
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Domain_Tag'
           minItems: 0
           maxItems: 50
         CreatedAt:
@@ -1028,6 +1043,25 @@ components:
       enum:
         - HEALTHY
         - UNHEALTHY
+    EventStream_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     EventStream:
       type: object
       properties:
@@ -1056,7 +1090,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/EventStream_Tag'
           minItems: 0
           maxItems: 50
         CreatedAt:
@@ -1144,6 +1178,11 @@ components:
       pattern: ^[a-zA-Z_][a-zA-Z_0-9-]*$
       minLength: 1
       maxLength: 255
+    EventTrigger_Description:
+      description: The description of the event trigger.
+      type: string
+      minLength: 1
+      maxLength: 1000
     EventTriggerConditions:
       description: A list of conditions that determine when an event should trigger the destination.
       type: array
@@ -1310,7 +1349,7 @@ components:
         ObjectTypeName:
           $ref: '#/components/schemas/ObjectTypeName'
         Description:
-          $ref: '#/components/schemas/Description'
+          $ref: '#/components/schemas/EventTrigger_Description'
         EventTriggerConditions:
           $ref: '#/components/schemas/EventTriggerConditions'
         EventTriggerLimits:
@@ -1372,6 +1411,22 @@ components:
           - profile:DeleteEventTrigger
         list:
           - profile:ListEventTriggers
+    Integration_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          minLength: 0
+          maxLength: 256
+      additionalProperties: false
+      required:
+        - Key
+        - Value
     Object:
       type: string
       maxLength: 512
@@ -1818,7 +1873,7 @@ components:
           description: The tags (keys and values) associated with the integration
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Integration_Tag'
           minItems: 0
           maxItems: 50
         ObjectTypeNames:
@@ -1909,6 +1964,22 @@ components:
           - ds:DescribeDirectories
         list:
           - profile:ListIntegrations
+    ObjectType_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          minLength: 0
+          maxLength: 256
+      additionalProperties: false
+      required:
+        - Key
+        - Value
     FieldMap:
       type: object
       properties:
@@ -2047,7 +2118,7 @@ components:
           description: The tags (keys and values) associated with the integration.
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ObjectType_Tag'
           minItems: 0
           maxItems: 50
         TemplateId:
@@ -2119,6 +2190,25 @@ components:
           - profile:ListProfileObjectTypes
           - kms:GenerateDataKey
           - kms:Decrypt
+    SegmentDefinition_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     ConditionOverrides:
       description: Overrides the condition block within the original calculated attribute definition.
       type: object
@@ -2494,7 +2584,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/SegmentDefinition_Tag'
           minItems: 0
           maxItems: 50
       required:
@@ -2641,7 +2731,7 @@ components:
               description: The tags (keys and values) associated with the domain
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Domain_Tag'
               minItems: 0
               maxItems: 50
             CreatedAt:
@@ -2692,7 +2782,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/EventStream_Tag'
               minItems: 0
               maxItems: 50
             CreatedAt:
@@ -2740,7 +2830,7 @@ components:
             ObjectTypeName:
               $ref: '#/components/schemas/ObjectTypeName'
             Description:
-              $ref: '#/components/schemas/Description'
+              $ref: '#/components/schemas/EventTrigger_Description'
             EventTriggerConditions:
               $ref: '#/components/schemas/EventTriggerConditions'
             EventTriggerLimits:
@@ -2801,7 +2891,7 @@ components:
               description: The tags (keys and values) associated with the integration
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Integration_Tag'
               minItems: 0
               maxItems: 50
             ObjectTypeNames:
@@ -2894,7 +2984,7 @@ components:
               description: The tags (keys and values) associated with the integration.
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ObjectType_Tag'
               minItems: 0
               maxItems: 50
             TemplateId:
@@ -2968,7 +3058,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/SegmentDefinition_Tag'
               minItems: 0
               maxItems: 50
           x-stackQL-stringOnly: true
@@ -2988,7 +3078,7 @@ components:
       id: awscc.customerprofiles.calculated_attribute_definitions
       x-cfn-schema-name: CalculatedAttributeDefinition
       x-cfn-type-name: AWS::CustomerProfiles::CalculatedAttributeDefinition
-      x-identifiers:
+      x-identifiers: &ref_0
         - DomainName
         - CalculatedAttributeName
       x-type: cloud_control
@@ -3099,9 +3189,7 @@ components:
       id: awscc.customerprofiles.calculated_attribute_definitions_list_only
       x-cfn-schema-name: CalculatedAttributeDefinition
       x-cfn-type-name: AWS::CustomerProfiles::CalculatedAttributeDefinition
-      x-identifiers:
-        - DomainName
-        - CalculatedAttributeName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3133,7 +3221,7 @@ components:
       id: awscc.customerprofiles.domains
       x-cfn-schema-name: Domain
       x-cfn-type-name: AWS::CustomerProfiles::Domain
-      x-identifiers:
+      x-identifiers: &ref_1
         - DomainName
       x-type: cloud_control
       methods:
@@ -3237,8 +3325,7 @@ components:
       id: awscc.customerprofiles.domains_list_only
       x-cfn-schema-name: Domain
       x-cfn-type-name: AWS::CustomerProfiles::Domain
-      x-identifiers:
-        - DomainName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3268,7 +3355,7 @@ components:
       id: awscc.customerprofiles.event_streams
       x-cfn-schema-name: EventStream
       x-cfn-type-name: AWS::CustomerProfiles::EventStream
-      x-identifiers:
+      x-identifiers: &ref_2
         - DomainName
         - EventStreamName
       x-type: cloud_control
@@ -3369,9 +3456,7 @@ components:
       id: awscc.customerprofiles.event_streams_list_only
       x-cfn-schema-name: EventStream
       x-cfn-type-name: AWS::CustomerProfiles::EventStream
-      x-identifiers:
-        - DomainName
-        - EventStreamName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3403,7 +3488,7 @@ components:
       id: awscc.customerprofiles.event_triggers
       x-cfn-schema-name: EventTrigger
       x-cfn-type-name: AWS::CustomerProfiles::EventTrigger
-      x-identifiers:
+      x-identifiers: &ref_3
         - DomainName
         - EventTriggerName
       x-type: cloud_control
@@ -3508,9 +3593,7 @@ components:
       id: awscc.customerprofiles.event_triggers_list_only
       x-cfn-schema-name: EventTrigger
       x-cfn-type-name: AWS::CustomerProfiles::EventTrigger
-      x-identifiers:
-        - DomainName
-        - EventTriggerName
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3542,7 +3625,7 @@ components:
       id: awscc.customerprofiles.integrations
       x-cfn-schema-name: Integration
       x-cfn-type-name: AWS::CustomerProfiles::Integration
-      x-identifiers:
+      x-identifiers: &ref_4
         - DomainName
         - Uri
       x-type: cloud_control
@@ -3645,9 +3728,7 @@ components:
       id: awscc.customerprofiles.integrations_list_only
       x-cfn-schema-name: Integration
       x-cfn-type-name: AWS::CustomerProfiles::Integration
-      x-identifiers:
-        - DomainName
-        - Uri
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3679,7 +3760,7 @@ components:
       id: awscc.customerprofiles.object_types
       x-cfn-schema-name: ObjectType
       x-cfn-type-name: AWS::CustomerProfiles::ObjectType
-      x-identifiers:
+      x-identifiers: &ref_5
         - DomainName
         - ObjectTypeName
       x-type: cloud_control
@@ -3794,9 +3875,7 @@ components:
       id: awscc.customerprofiles.object_types_list_only
       x-cfn-schema-name: ObjectType
       x-cfn-type-name: AWS::CustomerProfiles::ObjectType
-      x-identifiers:
-        - DomainName
-        - ObjectTypeName
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3828,7 +3907,7 @@ components:
       id: awscc.customerprofiles.segment_definitions
       x-cfn-schema-name: SegmentDefinition
       x-cfn-type-name: AWS::CustomerProfiles::SegmentDefinition
-      x-identifiers:
+      x-identifiers: &ref_6
         - DomainName
         - SegmentDefinitionName
       x-type: cloud_control
@@ -3929,9 +4008,7 @@ components:
       id: awscc.customerprofiles.segment_definitions_list_only
       x-cfn-schema-name: SegmentDefinition
       x-cfn-type-name: AWS::CustomerProfiles::SegmentDefinition
-      x-identifiers:
-        - DomainName
-        - SegmentDefinitionName
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/databrew.yaml b/openapi/src/awscc/v00.00.00000/services/databrew.yaml
index 231459767..8758cf944 100644
--- a/openapi/src/awscc/v00.00.00000/services/databrew.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/databrew.yaml
@@ -465,6 +465,8 @@ components:
           type: string
         Key:
           type: string
+        BucketOwner:
+          $ref: '#/components/schemas/BucketOwner'
       additionalProperties: false
       required:
         - Bucket
@@ -747,6 +749,21 @@ components:
           - databrew:ListDatasets
           - databrew:ListTagsForResource
           - iam:ListRoles
+    Job_S3Location:
+      description: S3 Output location
+      type: object
+      properties:
+        Bucket:
+          type: string
+        Key:
+          type: string
+        BucketOwner:
+          type: string
+          minLength: 12
+          maxLength: 12
+      additionalProperties: false
+      required:
+        - Bucket
     CsvOutputOptions:
       description: Output Csv options
       type: object
@@ -813,7 +830,7 @@ components:
           items:
             type: string
         Location:
-          $ref: '#/components/schemas/S3Location'
+          $ref: '#/components/schemas/Job_S3Location'
         Overwrite:
           type: boolean
         MaxOutputFiles:
@@ -852,7 +869,7 @@ components:
       type: object
       properties:
         Location:
-          $ref: '#/components/schemas/S3Location'
+          $ref: '#/components/schemas/Job_S3Location'
       additionalProperties: false
       required:
         - Location
@@ -860,7 +877,7 @@ components:
       type: object
       properties:
         TempDirectory:
-          $ref: '#/components/schemas/S3Location'
+          $ref: '#/components/schemas/Job_S3Location'
         TableName:
           type: string
           minLength: 1
@@ -885,74 +902,18 @@ components:
       required:
         - GlueConnectionName
         - DatabaseOptions
-    Recipe:
+    Job_Recipe:
       type: object
       properties:
-        Description:
-          description: Description of the recipe
-          minLength: 0
-          maxLength: 1024
-          type: string
         Name:
           description: Recipe name
           type: string
-          minLength: 1
-          maxLength: 255
-        Steps:
-          type: array
-          x-insertionOrder: true
-          items:
-            type: object
-            $ref: '#/components/schemas/RecipeStep'
-        Tags:
-          type: array
-          x-insertionOrder: false
-          uniqueItems: false
-          items:
-            $ref: '#/components/schemas/Tag'
+        Version:
+          description: Recipe version
+          type: string
+      additionalProperties: false
       required:
         - Name
-        - Steps
-      x-stackql-resource-name: recipe
-      description: Resource schema for AWS::DataBrew::Recipe.
-      x-type-name: AWS::DataBrew::Recipe
-      x-stackql-primary-identifier:
-        - Name
-      x-create-only-properties:
-        - Name
-      x-required-properties:
-        - Name
-        - Steps
-      x-tagging:
-        taggable: true
-        tagOnCreate: true
-        tagUpdatable: true
-        cloudFormationSystemTags: true
-        tagProperty: /properties/Tags
-        permissions:
-          - databrew:TagResource
-          - databrew:UntagResource
-          - databrew:ListTagsForResource
-      x-required-permissions:
-        create:
-          - databrew:CreateRecipe
-          - databrew:DescribeRecipe
-          - databrew:TagResource
-          - databrew:UntagResource
-          - iam:PassRole
-        read:
-          - databrew:DescribeRecipe
-          - databrew:ListTagsForResource
-          - iam:ListRoles
-        delete:
-          - databrew:DeleteRecipeVersion
-        list:
-          - databrew:ListRecipes
-          - iam:ListRoles
-        update:
-          - databrew:UpdateRecipe
-          - databrew:TagResource
-          - databrew:UntagResource
     SampleMode:
       description: Sample configuration mode for profile jobs.
       enum:
@@ -1052,16 +1013,13 @@ components:
           minItems: 1
       additionalProperties: false
     ColumnSelector:
-      description: Selector of a column from a dataset for profile job configuration. One selector includes either a column name or a regular expression
       type: object
       properties:
         Regex:
-          description: A regular expression for selecting a column from a dataset
           type: string
           minLength: 1
           maxLength: 255
         Name:
-          description: The name of a column from a dataset
           type: string
           minLength: 1
           maxLength: 255
@@ -1172,7 +1130,7 @@ components:
           minLength: 1
           maxLength: 255
         Recipe:
-          $ref: '#/components/schemas/Recipe'
+          $ref: '#/components/schemas/Job_Recipe'
         RoleArn:
           description: Role arn
           type: string
@@ -1346,15 +1304,41 @@ components:
       type: object
       properties:
         S3InputDefinition:
-          $ref: '#/components/schemas/S3Location'
+          $ref: '#/components/schemas/Recipe_S3Location'
         DataCatalogInputDefinition:
-          $ref: '#/components/schemas/DataCatalogInputDefinition'
+          $ref: '#/components/schemas/Recipe_DataCatalogInputDefinition'
       oneOf:
         - required:
             - S3InputDefinition
         - required:
             - DataCatalogInputDefinition
       additionalProperties: false
+    Recipe_S3Location:
+      description: Input location
+      type: object
+      properties:
+        Bucket:
+          type: string
+        Key:
+          type: string
+      additionalProperties: false
+      required:
+        - Bucket
+    Recipe_DataCatalogInputDefinition:
+      type: object
+      properties:
+        CatalogId:
+          description: Catalog id
+          type: string
+        DatabaseName:
+          description: Database name
+          type: string
+        TableName:
+          description: Table name
+          type: string
+        TempDirectory:
+          $ref: '#/components/schemas/Recipe_S3Location'
+      additionalProperties: false
     RecipeStep:
       type: object
       properties:
@@ -1621,15 +1605,83 @@ components:
           type: object
           properties:
             S3InputDefinition:
-              $ref: '#/components/schemas/S3Location'
+              $ref: '#/components/schemas/Recipe_S3Location'
             DataCatalogInputDefinition:
-              $ref: '#/components/schemas/DataCatalogInputDefinition'
+              $ref: '#/components/schemas/Recipe_DataCatalogInputDefinition'
           oneOf:
             - required:
                 - S3InputDefinition
             - required:
                 - DataCatalogInputDefinition
           additionalProperties: false
+    Recipe:
+      type: object
+      properties:
+        Description:
+          description: Description of the recipe
+          minLength: 0
+          maxLength: 1024
+          type: string
+        Name:
+          description: Recipe name
+          type: string
+          minLength: 1
+          maxLength: 255
+        Steps:
+          type: array
+          x-insertionOrder: true
+          items:
+            type: object
+            $ref: '#/components/schemas/RecipeStep'
+        Tags:
+          type: array
+          x-insertionOrder: false
+          uniqueItems: false
+          items:
+            $ref: '#/components/schemas/Tag'
+      required:
+        - Name
+        - Steps
+      x-stackql-resource-name: recipe
+      description: Resource schema for AWS::DataBrew::Recipe.
+      x-type-name: AWS::DataBrew::Recipe
+      x-stackql-primary-identifier:
+        - Name
+      x-create-only-properties:
+        - Name
+      x-required-properties:
+        - Name
+        - Steps
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: true
+        tagProperty: /properties/Tags
+        permissions:
+          - databrew:TagResource
+          - databrew:UntagResource
+          - databrew:ListTagsForResource
+      x-required-permissions:
+        create:
+          - databrew:CreateRecipe
+          - databrew:DescribeRecipe
+          - databrew:TagResource
+          - databrew:UntagResource
+          - iam:PassRole
+        read:
+          - databrew:DescribeRecipe
+          - databrew:ListTagsForResource
+          - iam:ListRoles
+        delete:
+          - databrew:DeleteRecipeVersion
+        list:
+          - databrew:ListRecipes
+          - iam:ListRoles
+        update:
+          - databrew:UpdateRecipe
+          - databrew:TagResource
+          - databrew:UntagResource
     Expression:
       description: Expression with rule conditions
       type: string
@@ -1689,6 +1741,21 @@ components:
       required:
         - Value
       additionalProperties: false
+    Ruleset_ColumnSelector:
+      description: Selector of a column from a dataset for profile job configuration. One selector includes either a column name or a regular expression
+      type: object
+      properties:
+        Regex:
+          description: A regular expression for selecting a column from a dataset
+          type: string
+          minLength: 1
+          maxLength: 255
+        Name:
+          description: The name of a column from a dataset
+          type: string
+          minLength: 1
+          maxLength: 255
+      additionalProperties: false
     Disabled:
       description: Boolean value to disable/enable a rule
       type: boolean
@@ -1713,12 +1780,28 @@ components:
           type: array
           x-insertionOrder: true
           items:
-            $ref: '#/components/schemas/ColumnSelector'
+            $ref: '#/components/schemas/Ruleset_ColumnSelector'
           minItems: 1
       required:
         - Name
         - CheckExpression
       additionalProperties: false
+    Ruleset_Tag:
+      description: A key-value pair to associate with a resource
+      type: object
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          minLength: 0
+          maxLength: 256
+      additionalProperties: false
+      required:
+        - Value
+        - Key
     Ruleset:
       type: object
       properties:
@@ -1748,7 +1831,7 @@ components:
           x-insertionOrder: false
           uniqueItems: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Ruleset_Tag'
       required:
         - Name
         - TargetArn
@@ -1921,45 +2004,6 @@ components:
       x-title: CreateDatasetRequest
       type: object
       required: []
-    CreateRecipeRequest:
-      properties:
-        ClientToken:
-          type: string
-        RoleArn:
-          type: string
-        TypeName:
-          type: string
-        TypeVersionId:
-          type: string
-        DesiredState:
-          type: object
-          properties:
-            Description:
-              description: Description of the recipe
-              minLength: 0
-              maxLength: 1024
-              type: string
-            Name:
-              description: Recipe name
-              type: string
-              minLength: 1
-              maxLength: 255
-            Steps:
-              type: array
-              x-insertionOrder: true
-              items:
-                type: object
-                $ref: '#/components/schemas/RecipeStep'
-            Tags:
-              type: array
-              x-insertionOrder: false
-              uniqueItems: false
-              items:
-                $ref: '#/components/schemas/Tag'
-          x-stackQL-stringOnly: true
-      x-title: CreateRecipeRequest
-      type: object
-      required: []
     CreateJobRequest:
       properties:
         ClientToken:
@@ -2036,7 +2080,7 @@ components:
               minLength: 1
               maxLength: 255
             Recipe:
-              $ref: '#/components/schemas/Recipe'
+              $ref: '#/components/schemas/Job_Recipe'
             RoleArn:
               description: Role arn
               type: string
@@ -2109,7 +2153,7 @@ components:
       x-title: CreateProjectRequest
       type: object
       required: []
-    CreateRulesetRequest:
+    CreateRecipeRequest:
       properties:
         ClientToken:
           type: string
@@ -2122,13 +2166,52 @@ components:
         DesiredState:
           type: object
           properties:
+            Description:
+              description: Description of the recipe
+              minLength: 0
+              maxLength: 1024
+              type: string
             Name:
-              description: Name of the Ruleset
+              description: Recipe name
               type: string
               minLength: 1
               maxLength: 255
-            Description:
-              description: Description of the Ruleset
+            Steps:
+              type: array
+              x-insertionOrder: true
+              items:
+                type: object
+                $ref: '#/components/schemas/RecipeStep'
+            Tags:
+              type: array
+              x-insertionOrder: false
+              uniqueItems: false
+              items:
+                $ref: '#/components/schemas/Tag'
+          x-stackQL-stringOnly: true
+      x-title: CreateRecipeRequest
+      type: object
+      required: []
+    CreateRulesetRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            Name:
+              description: Name of the Ruleset
+              type: string
+              minLength: 1
+              maxLength: 255
+            Description:
+              description: Description of the Ruleset
               type: string
               maxLength: 1024
             TargetArn:
@@ -2148,7 +2231,7 @@ components:
               x-insertionOrder: false
               uniqueItems: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Ruleset_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateRulesetRequest
       type: object
@@ -2205,7 +2288,7 @@ components:
       id: awscc.databrew.datasets
       x-cfn-schema-name: Dataset
       x-cfn-type-name: AWS::DataBrew::Dataset
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -2303,8 +2386,7 @@ components:
       id: awscc.databrew.datasets_list_only
       x-cfn-schema-name: Dataset
       x-cfn-type-name: AWS::DataBrew::Dataset
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2329,12 +2411,12 @@ components:
                 json_extract_path_text(Properties, 'Name') as name
                 FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::DataBrew::Dataset'
                 AND region = 'us-east-1'
-    recipes:
-      name: recipes
-      id: awscc.databrew.recipes
-      x-cfn-schema-name: Recipe
-      x-cfn-type-name: AWS::DataBrew::Recipe
-      x-identifiers:
+    jobs:
+      name: jobs
+      id: awscc.databrew.jobs
+      x-cfn-schema-name: Job
+      x-cfn-type-name: AWS::DataBrew::Job
+      x-identifiers: &ref_1
         - Name
       x-type: cloud_control
       methods:
@@ -2343,12 +2425,12 @@ components:
             requestBodyTranslate:
               algorithm: naive_DesiredState
           operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Recipe&__detailTransformed=true/post'
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Job&__detailTransformed=true/post'
           request:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::DataBrew::Recipe"
+                "TypeName": "AWS::DataBrew::Job"
               }
           response:
             mediaType: application/json
@@ -2364,7 +2446,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::DataBrew::Recipe"
+                "TypeName": "AWS::DataBrew::Job"
               }
           response:
             mediaType: application/json
@@ -2380,7 +2462,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::DataBrew::Recipe"
+                "TypeName": "AWS::DataBrew::Job"
               }
           response:
             mediaType: application/json
@@ -2388,11 +2470,11 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/recipes/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/jobs/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/recipes/methods/delete_resource'
+          - $ref: '#/components/x-stackQL-resources/jobs/methods/delete_resource'
         update:
-          - $ref: '#/components/x-stackQL-resources/recipes/methods/update_resource'
+          - $ref: '#/components/x-stackQL-resources/jobs/methods/update_resource'
       config:
         views:
           select:
@@ -2401,11 +2483,27 @@ components:
               SELECT
               region,
               Identifier,
-              JSON_EXTRACT(Properties, '$.Description') as description,
+              JSON_EXTRACT(Properties, '$.DatasetName') as dataset_name,
+              JSON_EXTRACT(Properties, '$.EncryptionKeyArn') as encryption_key_arn,
+              JSON_EXTRACT(Properties, '$.EncryptionMode') as encryption_mode,
               JSON_EXTRACT(Properties, '$.Name') as name,
-              JSON_EXTRACT(Properties, '$.Steps') as steps,
-              JSON_EXTRACT(Properties, '$.Tags') as tags
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::DataBrew::Recipe'
+              JSON_EXTRACT(Properties, '$.Type') as type,
+              JSON_EXTRACT(Properties, '$.LogSubscription') as log_subscription,
+              JSON_EXTRACT(Properties, '$.MaxCapacity') as max_capacity,
+              JSON_EXTRACT(Properties, '$.MaxRetries') as max_retries,
+              JSON_EXTRACT(Properties, '$.Outputs') as outputs,
+              JSON_EXTRACT(Properties, '$.DataCatalogOutputs') as data_catalog_outputs,
+              JSON_EXTRACT(Properties, '$.DatabaseOutputs') as database_outputs,
+              JSON_EXTRACT(Properties, '$.OutputLocation') as output_location,
+              JSON_EXTRACT(Properties, '$.ProjectName') as project_name,
+              JSON_EXTRACT(Properties, '$.Recipe') as recipe,
+              JSON_EXTRACT(Properties, '$.RoleArn') as role_arn,
+              JSON_EXTRACT(Properties, '$.Tags') as tags,
+              JSON_EXTRACT(Properties, '$.Timeout') as timeout,
+              JSON_EXTRACT(Properties, '$.JobSample') as job_sample,
+              JSON_EXTRACT(Properties, '$.ProfileConfiguration') as profile_configuration,
+              JSON_EXTRACT(Properties, '$.ValidationConfigurations') as validation_configurations
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::DataBrew::Job'
               AND Identifier = '<Name>'
               AND region = 'us-east-1'
             fallback:
@@ -2414,20 +2512,35 @@ components:
                 SELECT
                 region,
                 Identifier,
-                json_extract_path_text(Properties, 'Description') as description,
+                json_extract_path_text(Properties, 'DatasetName') as dataset_name,
+                json_extract_path_text(Properties, 'EncryptionKeyArn') as encryption_key_arn,
+                json_extract_path_text(Properties, 'EncryptionMode') as encryption_mode,
                 json_extract_path_text(Properties, 'Name') as name,
-                json_extract_path_text(Properties, 'Steps') as steps,
-                json_extract_path_text(Properties, 'Tags') as tags
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::DataBrew::Recipe'
+                json_extract_path_text(Properties, 'Type') as type,
+                json_extract_path_text(Properties, 'LogSubscription') as log_subscription,
+                json_extract_path_text(Properties, 'MaxCapacity') as max_capacity,
+                json_extract_path_text(Properties, 'MaxRetries') as max_retries,
+                json_extract_path_text(Properties, 'Outputs') as outputs,
+                json_extract_path_text(Properties, 'DataCatalogOutputs') as data_catalog_outputs,
+                json_extract_path_text(Properties, 'DatabaseOutputs') as database_outputs,
+                json_extract_path_text(Properties, 'OutputLocation') as output_location,
+                json_extract_path_text(Properties, 'ProjectName') as project_name,
+                json_extract_path_text(Properties, 'Recipe') as recipe,
+                json_extract_path_text(Properties, 'RoleArn') as role_arn,
+                json_extract_path_text(Properties, 'Tags') as tags,
+                json_extract_path_text(Properties, 'Timeout') as timeout,
+                json_extract_path_text(Properties, 'JobSample') as job_sample,
+                json_extract_path_text(Properties, 'ProfileConfiguration') as profile_configuration,
+                json_extract_path_text(Properties, 'ValidationConfigurations') as validation_configurations
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::DataBrew::Job'
                 AND Identifier = '<Name>'
                 AND region = 'us-east-1'
-    recipes_list_only:
-      name: recipes_list_only
-      id: awscc.databrew.recipes_list_only
-      x-cfn-schema-name: Recipe
-      x-cfn-type-name: AWS::DataBrew::Recipe
-      x-identifiers:
-        - Name
+    jobs_list_only:
+      name: jobs_list_only
+      id: awscc.databrew.jobs_list_only
+      x-cfn-schema-name: Job
+      x-cfn-type-name: AWS::DataBrew::Job
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2442,7 +2555,7 @@ components:
               SELECT
               region,
               JSON_EXTRACT(Properties, '$.Name') as name
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::DataBrew::Recipe'
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::DataBrew::Job'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres"
@@ -2450,14 +2563,14 @@ components:
                 SELECT
                 region,
                 json_extract_path_text(Properties, 'Name') as name
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::DataBrew::Recipe'
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::DataBrew::Job'
                 AND region = 'us-east-1'
-    jobs:
-      name: jobs
-      id: awscc.databrew.jobs
-      x-cfn-schema-name: Job
-      x-cfn-type-name: AWS::DataBrew::Job
-      x-identifiers:
+    projects:
+      name: projects
+      id: awscc.databrew.projects
+      x-cfn-schema-name: Project
+      x-cfn-type-name: AWS::DataBrew::Project
+      x-identifiers: &ref_2
         - Name
       x-type: cloud_control
       methods:
@@ -2466,12 +2579,12 @@ components:
             requestBodyTranslate:
               algorithm: naive_DesiredState
           operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Job&__detailTransformed=true/post'
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Project&__detailTransformed=true/post'
           request:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::DataBrew::Job"
+                "TypeName": "AWS::DataBrew::Project"
               }
           response:
             mediaType: application/json
@@ -2487,7 +2600,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::DataBrew::Job"
+                "TypeName": "AWS::DataBrew::Project"
               }
           response:
             mediaType: application/json
@@ -2503,7 +2616,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::DataBrew::Job"
+                "TypeName": "AWS::DataBrew::Project"
               }
           response:
             mediaType: application/json
@@ -2511,11 +2624,11 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/jobs/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/projects/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/jobs/methods/delete_resource'
+          - $ref: '#/components/x-stackQL-resources/projects/methods/delete_resource'
         update:
-          - $ref: '#/components/x-stackQL-resources/jobs/methods/update_resource'
+          - $ref: '#/components/x-stackQL-resources/projects/methods/update_resource'
       config:
         views:
           select:
@@ -2525,26 +2638,12 @@ components:
               region,
               Identifier,
               JSON_EXTRACT(Properties, '$.DatasetName') as dataset_name,
-              JSON_EXTRACT(Properties, '$.EncryptionKeyArn') as encryption_key_arn,
-              JSON_EXTRACT(Properties, '$.EncryptionMode') as encryption_mode,
               JSON_EXTRACT(Properties, '$.Name') as name,
-              JSON_EXTRACT(Properties, '$.Type') as type,
-              JSON_EXTRACT(Properties, '$.LogSubscription') as log_subscription,
-              JSON_EXTRACT(Properties, '$.MaxCapacity') as max_capacity,
-              JSON_EXTRACT(Properties, '$.MaxRetries') as max_retries,
-              JSON_EXTRACT(Properties, '$.Outputs') as outputs,
-              JSON_EXTRACT(Properties, '$.DataCatalogOutputs') as data_catalog_outputs,
-              JSON_EXTRACT(Properties, '$.DatabaseOutputs') as database_outputs,
-              JSON_EXTRACT(Properties, '$.OutputLocation') as output_location,
-              JSON_EXTRACT(Properties, '$.ProjectName') as project_name,
-              JSON_EXTRACT(Properties, '$.Recipe') as recipe,
+              JSON_EXTRACT(Properties, '$.RecipeName') as recipe_name,
               JSON_EXTRACT(Properties, '$.RoleArn') as role_arn,
-              JSON_EXTRACT(Properties, '$.Tags') as tags,
-              JSON_EXTRACT(Properties, '$.Timeout') as timeout,
-              JSON_EXTRACT(Properties, '$.JobSample') as job_sample,
-              JSON_EXTRACT(Properties, '$.ProfileConfiguration') as profile_configuration,
-              JSON_EXTRACT(Properties, '$.ValidationConfigurations') as validation_configurations
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::DataBrew::Job'
+              JSON_EXTRACT(Properties, '$.Sample') as sample,
+              JSON_EXTRACT(Properties, '$.Tags') as tags
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::DataBrew::Project'
               AND Identifier = '<Name>'
               AND region = 'us-east-1'
             fallback:
@@ -2554,35 +2653,20 @@ components:
                 region,
                 Identifier,
                 json_extract_path_text(Properties, 'DatasetName') as dataset_name,
-                json_extract_path_text(Properties, 'EncryptionKeyArn') as encryption_key_arn,
-                json_extract_path_text(Properties, 'EncryptionMode') as encryption_mode,
                 json_extract_path_text(Properties, 'Name') as name,
-                json_extract_path_text(Properties, 'Type') as type,
-                json_extract_path_text(Properties, 'LogSubscription') as log_subscription,
-                json_extract_path_text(Properties, 'MaxCapacity') as max_capacity,
-                json_extract_path_text(Properties, 'MaxRetries') as max_retries,
-                json_extract_path_text(Properties, 'Outputs') as outputs,
-                json_extract_path_text(Properties, 'DataCatalogOutputs') as data_catalog_outputs,
-                json_extract_path_text(Properties, 'DatabaseOutputs') as database_outputs,
-                json_extract_path_text(Properties, 'OutputLocation') as output_location,
-                json_extract_path_text(Properties, 'ProjectName') as project_name,
-                json_extract_path_text(Properties, 'Recipe') as recipe,
+                json_extract_path_text(Properties, 'RecipeName') as recipe_name,
                 json_extract_path_text(Properties, 'RoleArn') as role_arn,
-                json_extract_path_text(Properties, 'Tags') as tags,
-                json_extract_path_text(Properties, 'Timeout') as timeout,
-                json_extract_path_text(Properties, 'JobSample') as job_sample,
-                json_extract_path_text(Properties, 'ProfileConfiguration') as profile_configuration,
-                json_extract_path_text(Properties, 'ValidationConfigurations') as validation_configurations
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::DataBrew::Job'
+                json_extract_path_text(Properties, 'Sample') as sample,
+                json_extract_path_text(Properties, 'Tags') as tags
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::DataBrew::Project'
                 AND Identifier = '<Name>'
                 AND region = 'us-east-1'
-    jobs_list_only:
-      name: jobs_list_only
-      id: awscc.databrew.jobs_list_only
-      x-cfn-schema-name: Job
-      x-cfn-type-name: AWS::DataBrew::Job
-      x-identifiers:
-        - Name
+    projects_list_only:
+      name: projects_list_only
+      id: awscc.databrew.projects_list_only
+      x-cfn-schema-name: Project
+      x-cfn-type-name: AWS::DataBrew::Project
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2597,7 +2681,7 @@ components:
               SELECT
               region,
               JSON_EXTRACT(Properties, '$.Name') as name
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::DataBrew::Job'
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::DataBrew::Project'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres"
@@ -2605,14 +2689,14 @@ components:
                 SELECT
                 region,
                 json_extract_path_text(Properties, 'Name') as name
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::DataBrew::Job'
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::DataBrew::Project'
                 AND region = 'us-east-1'
-    projects:
-      name: projects
-      id: awscc.databrew.projects
-      x-cfn-schema-name: Project
-      x-cfn-type-name: AWS::DataBrew::Project
-      x-identifiers:
+    recipes:
+      name: recipes
+      id: awscc.databrew.recipes
+      x-cfn-schema-name: Recipe
+      x-cfn-type-name: AWS::DataBrew::Recipe
+      x-identifiers: &ref_3
         - Name
       x-type: cloud_control
       methods:
@@ -2621,12 +2705,12 @@ components:
             requestBodyTranslate:
               algorithm: naive_DesiredState
           operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Project&__detailTransformed=true/post'
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Recipe&__detailTransformed=true/post'
           request:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::DataBrew::Project"
+                "TypeName": "AWS::DataBrew::Recipe"
               }
           response:
             mediaType: application/json
@@ -2642,7 +2726,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::DataBrew::Project"
+                "TypeName": "AWS::DataBrew::Recipe"
               }
           response:
             mediaType: application/json
@@ -2658,7 +2742,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::DataBrew::Project"
+                "TypeName": "AWS::DataBrew::Recipe"
               }
           response:
             mediaType: application/json
@@ -2666,11 +2750,11 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/projects/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/recipes/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/projects/methods/delete_resource'
+          - $ref: '#/components/x-stackQL-resources/recipes/methods/delete_resource'
         update:
-          - $ref: '#/components/x-stackQL-resources/projects/methods/update_resource'
+          - $ref: '#/components/x-stackQL-resources/recipes/methods/update_resource'
       config:
         views:
           select:
@@ -2679,13 +2763,11 @@ components:
               SELECT
               region,
               Identifier,
-              JSON_EXTRACT(Properties, '$.DatasetName') as dataset_name,
+              JSON_EXTRACT(Properties, '$.Description') as description,
               JSON_EXTRACT(Properties, '$.Name') as name,
-              JSON_EXTRACT(Properties, '$.RecipeName') as recipe_name,
-              JSON_EXTRACT(Properties, '$.RoleArn') as role_arn,
-              JSON_EXTRACT(Properties, '$.Sample') as sample,
+              JSON_EXTRACT(Properties, '$.Steps') as steps,
               JSON_EXTRACT(Properties, '$.Tags') as tags
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::DataBrew::Project'
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::DataBrew::Recipe'
               AND Identifier = '<Name>'
               AND region = 'us-east-1'
             fallback:
@@ -2694,22 +2776,19 @@ components:
                 SELECT
                 region,
                 Identifier,
-                json_extract_path_text(Properties, 'DatasetName') as dataset_name,
+                json_extract_path_text(Properties, 'Description') as description,
                 json_extract_path_text(Properties, 'Name') as name,
-                json_extract_path_text(Properties, 'RecipeName') as recipe_name,
-                json_extract_path_text(Properties, 'RoleArn') as role_arn,
-                json_extract_path_text(Properties, 'Sample') as sample,
+                json_extract_path_text(Properties, 'Steps') as steps,
                 json_extract_path_text(Properties, 'Tags') as tags
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::DataBrew::Project'
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::DataBrew::Recipe'
                 AND Identifier = '<Name>'
                 AND region = 'us-east-1'
-    projects_list_only:
-      name: projects_list_only
-      id: awscc.databrew.projects_list_only
-      x-cfn-schema-name: Project
-      x-cfn-type-name: AWS::DataBrew::Project
-      x-identifiers:
-        - Name
+    recipes_list_only:
+      name: recipes_list_only
+      id: awscc.databrew.recipes_list_only
+      x-cfn-schema-name: Recipe
+      x-cfn-type-name: AWS::DataBrew::Recipe
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2724,7 +2803,7 @@ components:
               SELECT
               region,
               JSON_EXTRACT(Properties, '$.Name') as name
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::DataBrew::Project'
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::DataBrew::Recipe'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres"
@@ -2732,14 +2811,14 @@ components:
                 SELECT
                 region,
                 json_extract_path_text(Properties, 'Name') as name
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::DataBrew::Project'
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::DataBrew::Recipe'
                 AND region = 'us-east-1'
     rulesets:
       name: rulesets
       id: awscc.databrew.rulesets
       x-cfn-schema-name: Ruleset
       x-cfn-type-name: AWS::DataBrew::Ruleset
-      x-identifiers:
+      x-identifiers: &ref_4
         - Name
       x-type: cloud_control
       methods:
@@ -2833,8 +2912,7 @@ components:
       id: awscc.databrew.rulesets_list_only
       x-cfn-schema-name: Ruleset
       x-cfn-type-name: AWS::DataBrew::Ruleset
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2864,7 +2942,7 @@ components:
       id: awscc.databrew.schedules
       x-cfn-schema-name: Schedule
       x-cfn-type-name: AWS::DataBrew::Schedule
-      x-identifiers:
+      x-identifiers: &ref_5
         - Name
       x-type: cloud_control
       methods:
@@ -2956,8 +3034,7 @@ components:
       id: awscc.databrew.schedules_list_only
       x-cfn-schema-name: Schedule
       x-cfn-type-name: AWS::DataBrew::Schedule
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3168,7 +3245,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__Recipe&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__Job&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3178,7 +3255,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateRecipe
+      operationId: CreateJob
       parameters:
         - description: Action Header
           in: header
@@ -3201,7 +3278,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateRecipeRequest'
+              $ref: '#/components/schemas/CreateJobRequest'
         required: true
       responses:
         '200':
@@ -3210,7 +3287,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__Job&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__Project&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3220,7 +3297,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateJob
+      operationId: CreateProject
       parameters:
         - description: Action Header
           in: header
@@ -3243,7 +3320,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateJobRequest'
+              $ref: '#/components/schemas/CreateProjectRequest'
         required: true
       responses:
         '200':
@@ -3252,7 +3329,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__Project&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__Recipe&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3262,7 +3339,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateProject
+      operationId: CreateRecipe
       parameters:
         - description: Action Header
           in: header
@@ -3285,7 +3362,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateProjectRequest'
+              $ref: '#/components/schemas/CreateRecipeRequest'
         required: true
       responses:
         '200':
diff --git a/openapi/src/awscc/v00.00.00000/services/datapipeline.yaml b/openapi/src/awscc/v00.00.00000/services/datapipeline.yaml
index d903d9e1f..8013e3b26 100644
--- a/openapi/src/awscc/v00.00.00000/services/datapipeline.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/datapipeline.yaml
@@ -648,7 +648,7 @@ components:
       id: awscc.datapipeline.pipelines
       x-cfn-schema-name: Pipeline
       x-cfn-type-name: AWS::DataPipeline::Pipeline
-      x-identifiers:
+      x-identifiers: &ref_0
         - PipelineId
       x-type: cloud_control
       methods:
@@ -748,8 +748,7 @@ components:
       id: awscc.datapipeline.pipelines_list_only
       x-cfn-schema-name: Pipeline
       x-cfn-type-name: AWS::DataPipeline::Pipeline
-      x-identifiers:
-        - PipelineId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/datasync.yaml b/openapi/src/awscc/v00.00.00000/services/datasync.yaml
index a87f9bbdf..2d9f8e1c0 100644
--- a/openapi/src/awscc/v00.00.00000/services/datasync.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/datasync.yaml
@@ -934,18 +934,20 @@ components:
           - datasync:ListLocations
     Protocol:
       additionalProperties: false
-      description: Configuration settings for an NFS or SMB protocol, currently only support NFS
+      description: Configuration settings for NFS or SMB protocol.
       type: object
       properties:
         NFS:
           $ref: '#/components/schemas/NFS'
+        SMB:
+          $ref: '#/components/schemas/SMB'
     NFS:
       additionalProperties: false
-      description: FSx OpenZFS file system NFS protocol information
+      description: NFS protocol configuration for FSx ONTAP file system.
       type: object
       properties:
         MountOptions:
-          $ref: '#/components/schemas/MountOptions'
+          $ref: '#/components/schemas/NfsMountOptions'
       required:
         - MountOptions
     SMB:
@@ -1106,20 +1108,35 @@ components:
           - datasync:DeleteLocation
         list:
           - datasync:ListLocations
+    LocationFSxOpenZFS_Protocol:
+      additionalProperties: false
+      description: Configuration settings for an NFS or SMB protocol, currently only support NFS
+      type: object
+      properties:
+        NFS:
+          $ref: '#/components/schemas/LocationFSxOpenZFS_NFS'
+    LocationFSxOpenZFS_NFS:
+      additionalProperties: false
+      description: FSx OpenZFS file system NFS protocol information
+      type: object
+      properties:
+        MountOptions:
+          $ref: '#/components/schemas/MountOptions'
+      required:
+        - MountOptions
     MountOptions:
       additionalProperties: false
-      description: The mount options used by DataSync to access the SMB server.
+      description: The NFS mount options that DataSync can use to mount your NFS share.
       type: object
       properties:
         Version:
-          description: The specific SMB version that you want DataSync to use to mount your SMB share.
+          description: The specific NFS version that you want DataSync to use to mount your NFS share.
           type: string
           enum:
             - AUTOMATIC
-            - SMB1
-            - SMB2_0
-            - SMB2
-            - SMB3
+            - NFS3
+            - NFS4_0
+            - NFS4_1
     LocationFSxOpenZFS:
       type: object
       properties:
@@ -1139,7 +1156,7 @@ components:
           minItems: 1
           x-insertionOrder: false
         Protocol:
-          $ref: '#/components/schemas/Protocol'
+          $ref: '#/components/schemas/LocationFSxOpenZFS_Protocol'
         Subdirectory:
           description: A subdirectory in the location's path.
           type: string
@@ -1347,6 +1364,24 @@ components:
       required:
         - Hostname
         - Port
+    LocationHDFS_Tag:
+      additionalProperties: false
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
     QopConfiguration:
       additionalProperties: false
       description: Configuration information for RPC Protection and Data Transfer Protection. These parameters can be set to AUTHENTICATION, INTEGRITY, or PRIVACY. The default value is PRIVACY.
@@ -1434,7 +1469,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/LocationHDFS_Tag'
         AgentArns:
           description: ARN(s) of the agent(s) to use for an HDFS location.
           type: array
@@ -1859,6 +1894,20 @@ components:
           - datasync:DeleteLocation
         list:
           - datasync:ListLocations
+    LocationSMB_MountOptions:
+      additionalProperties: false
+      description: The mount options used by DataSync to access the SMB server.
+      type: object
+      properties:
+        Version:
+          description: The specific SMB version that you want DataSync to use to mount your SMB share.
+          type: string
+          enum:
+            - AUTOMATIC
+            - SMB1
+            - SMB2_0
+            - SMB2
+            - SMB3
     LocationSMB:
       type: object
       properties:
@@ -1878,7 +1927,7 @@ components:
           maxLength: 253
           pattern: ^([A-Za-z0-9]+[A-Za-z0-9-.]*)*[A-Za-z0-9-]*[A-Za-z0-9]$
         MountOptions:
-          $ref: '#/components/schemas/MountOptions'
+          $ref: '#/components/schemas/LocationSMB_MountOptions'
           default:
             Version: AUTOMATIC
         Password:
@@ -2815,7 +2864,7 @@ components:
               minItems: 1
               x-insertionOrder: false
             Protocol:
-              $ref: '#/components/schemas/Protocol'
+              $ref: '#/components/schemas/LocationFSxOpenZFS_Protocol'
             Subdirectory:
               description: A subdirectory in the location's path.
               type: string
@@ -2986,7 +3035,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/LocationHDFS_Tag'
             AgentArns:
               description: ARN(s) of the agent(s) to use for an HDFS location.
               type: array
@@ -3249,7 +3298,7 @@ components:
               maxLength: 253
               pattern: ^([A-Za-z0-9]+[A-Za-z0-9-.]*)*[A-Za-z0-9-]*[A-Za-z0-9]$
             MountOptions:
-              $ref: '#/components/schemas/MountOptions'
+              $ref: '#/components/schemas/LocationSMB_MountOptions'
               default:
                 Version: AUTOMATIC
             Password:
@@ -3430,7 +3479,7 @@ components:
       id: awscc.datasync.agents
       x-cfn-schema-name: Agent
       x-cfn-type-name: AWS::DataSync::Agent
-      x-identifiers:
+      x-identifiers: &ref_0
         - AgentArn
       x-type: cloud_control
       methods:
@@ -3530,8 +3579,7 @@ components:
       id: awscc.datasync.agents_list_only
       x-cfn-schema-name: Agent
       x-cfn-type-name: AWS::DataSync::Agent
-      x-identifiers:
-        - AgentArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3561,7 +3609,7 @@ components:
       id: awscc.datasync.location_azure_blobs
       x-cfn-schema-name: LocationAzureBlob
       x-cfn-type-name: AWS::DataSync::LocationAzureBlob
-      x-identifiers:
+      x-identifiers: &ref_1
         - LocationArn
       x-type: cloud_control
       methods:
@@ -3671,8 +3719,7 @@ components:
       id: awscc.datasync.location_azure_blobs_list_only
       x-cfn-schema-name: LocationAzureBlob
       x-cfn-type-name: AWS::DataSync::LocationAzureBlob
-      x-identifiers:
-        - LocationArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3702,7 +3749,7 @@ components:
       id: awscc.datasync.location_efs
       x-cfn-schema-name: LocationEFS
       x-cfn-type-name: AWS::DataSync::LocationEFS
-      x-identifiers:
+      x-identifiers: &ref_2
         - LocationArn
       x-type: cloud_control
       methods:
@@ -3804,8 +3851,7 @@ components:
       id: awscc.datasync.location_efs_list_only
       x-cfn-schema-name: LocationEFS
       x-cfn-type-name: AWS::DataSync::LocationEFS
-      x-identifiers:
-        - LocationArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3835,7 +3881,7 @@ components:
       id: awscc.datasync.locationf_sx_lustres
       x-cfn-schema-name: LocationFSxLustre
       x-cfn-type-name: AWS::DataSync::LocationFSxLustre
-      x-identifiers:
+      x-identifiers: &ref_3
         - LocationArn
       x-type: cloud_control
       methods:
@@ -3931,8 +3977,7 @@ components:
       id: awscc.datasync.locationf_sx_lustres_list_only
       x-cfn-schema-name: LocationFSxLustre
       x-cfn-type-name: AWS::DataSync::LocationFSxLustre
-      x-identifiers:
-        - LocationArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3962,7 +4007,7 @@ components:
       id: awscc.datasync.locationf_sx_ontaps
       x-cfn-schema-name: LocationFSxONTAP
       x-cfn-type-name: AWS::DataSync::LocationFSxONTAP
-      x-identifiers:
+      x-identifiers: &ref_4
         - LocationArn
       x-type: cloud_control
       methods:
@@ -4062,8 +4107,7 @@ components:
       id: awscc.datasync.locationf_sx_ontaps_list_only
       x-cfn-schema-name: LocationFSxONTAP
       x-cfn-type-name: AWS::DataSync::LocationFSxONTAP
-      x-identifiers:
-        - LocationArn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4093,7 +4137,7 @@ components:
       id: awscc.datasync.locationf_sx_open_zfs
       x-cfn-schema-name: LocationFSxOpenZFS
       x-cfn-type-name: AWS::DataSync::LocationFSxOpenZFS
-      x-identifiers:
+      x-identifiers: &ref_5
         - LocationArn
       x-type: cloud_control
       methods:
@@ -4191,8 +4235,7 @@ components:
       id: awscc.datasync.locationf_sx_open_zfs_list_only
       x-cfn-schema-name: LocationFSxOpenZFS
       x-cfn-type-name: AWS::DataSync::LocationFSxOpenZFS
-      x-identifiers:
-        - LocationArn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4222,7 +4265,7 @@ components:
       id: awscc.datasync.locationf_sx_windows
       x-cfn-schema-name: LocationFSxWindows
       x-cfn-type-name: AWS::DataSync::LocationFSxWindows
-      x-identifiers:
+      x-identifiers: &ref_6
         - LocationArn
       x-type: cloud_control
       methods:
@@ -4324,8 +4367,7 @@ components:
       id: awscc.datasync.locationf_sx_windows_list_only
       x-cfn-schema-name: LocationFSxWindows
       x-cfn-type-name: AWS::DataSync::LocationFSxWindows
-      x-identifiers:
-        - LocationArn
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4355,7 +4397,7 @@ components:
       id: awscc.datasync.location_hdfs
       x-cfn-schema-name: LocationHDFS
       x-cfn-type-name: AWS::DataSync::LocationHDFS
-      x-identifiers:
+      x-identifiers: &ref_7
         - LocationArn
       x-type: cloud_control
       methods:
@@ -4469,8 +4511,7 @@ components:
       id: awscc.datasync.location_hdfs_list_only
       x-cfn-schema-name: LocationHDFS
       x-cfn-type-name: AWS::DataSync::LocationHDFS
-      x-identifiers:
-        - LocationArn
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4500,7 +4541,7 @@ components:
       id: awscc.datasync.location_nfs
       x-cfn-schema-name: LocationNFS
       x-cfn-type-name: AWS::DataSync::LocationNFS
-      x-identifiers:
+      x-identifiers: &ref_8
         - LocationArn
       x-type: cloud_control
       methods:
@@ -4598,8 +4639,7 @@ components:
       id: awscc.datasync.location_nfs_list_only
       x-cfn-schema-name: LocationNFS
       x-cfn-type-name: AWS::DataSync::LocationNFS
-      x-identifiers:
-        - LocationArn
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4629,7 +4669,7 @@ components:
       id: awscc.datasync.location_object_storages
       x-cfn-schema-name: LocationObjectStorage
       x-cfn-type-name: AWS::DataSync::LocationObjectStorage
-      x-identifiers:
+      x-identifiers: &ref_9
         - LocationArn
       x-type: cloud_control
       methods:
@@ -4743,8 +4783,7 @@ components:
       id: awscc.datasync.location_object_storages_list_only
       x-cfn-schema-name: LocationObjectStorage
       x-cfn-type-name: AWS::DataSync::LocationObjectStorage
-      x-identifiers:
-        - LocationArn
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4774,7 +4813,7 @@ components:
       id: awscc.datasync.location_s3s
       x-cfn-schema-name: LocationS3
       x-cfn-type-name: AWS::DataSync::LocationS3
-      x-identifiers:
+      x-identifiers: &ref_10
         - LocationArn
       x-type: cloud_control
       methods:
@@ -4872,8 +4911,7 @@ components:
       id: awscc.datasync.location_s3s_list_only
       x-cfn-schema-name: LocationS3
       x-cfn-type-name: AWS::DataSync::LocationS3
-      x-identifiers:
-        - LocationArn
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4903,7 +4941,7 @@ components:
       id: awscc.datasync.location_smbs
       x-cfn-schema-name: LocationSMB
       x-cfn-type-name: AWS::DataSync::LocationSMB
-      x-identifiers:
+      x-identifiers: &ref_11
         - LocationArn
       x-type: cloud_control
       methods:
@@ -5017,8 +5055,7 @@ components:
       id: awscc.datasync.location_smbs_list_only
       x-cfn-schema-name: LocationSMB
       x-cfn-type-name: AWS::DataSync::LocationSMB
-      x-identifiers:
-        - LocationArn
+      x-identifiers: *ref_11
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5048,7 +5085,7 @@ components:
       id: awscc.datasync.tasks
       x-cfn-schema-name: Task
       x-cfn-type-name: AWS::DataSync::Task
-      x-identifiers:
+      x-identifiers: &ref_12
         - TaskArn
       x-type: cloud_control
       methods:
@@ -5164,8 +5201,7 @@ components:
       id: awscc.datasync.tasks_list_only
       x-cfn-schema-name: Task
       x-cfn-type-name: AWS::DataSync::Task
-      x-identifiers:
-        - TaskArn
+      x-identifiers: *ref_12
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/datazone.yaml b/openapi/src/awscc/v00.00.00000/services/datazone.yaml
index 459f186e9..60e8f1e4c 100644
--- a/openapi/src/awscc/v00.00.00000/services/datazone.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/datazone.yaml
@@ -1235,16 +1235,10 @@ components:
             - RedshiftServerlessSource
           additionalProperties: false
     Region:
-      type: object
-      properties:
-        RegionName:
-          type: string
-          maxLength: 16
-          minLength: 4
-          pattern: ^[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]$
-      required:
-        - RegionName
-      additionalProperties: false
+      type: string
+      maxLength: 16
+      minLength: 4
+      pattern: '[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]'
     RelationalFilterConfiguration:
       type: object
       description: The relational filter configuration for the data source.
@@ -1799,11 +1793,14 @@ components:
           - datazone:ListDomainUnitsForParent
     EnvironmentParameter:
       type: object
+      description: The parameter details of an environment.
       properties:
         Name:
           type: string
+          description: The name of an environment parameter.
         Value:
           type: string
+          description: The value of an environment parameter.
       additionalProperties: false
     EnvironmentStatus:
       type: string
@@ -2226,6 +2223,17 @@ components:
         delete:
           - datazone:GetEnvironmentBlueprintConfiguration
           - datazone:DeleteEnvironmentBlueprintConfiguration
+    EnvironmentProfile_EnvironmentParameter:
+      type: object
+      description: The parameter details of an environment profile.
+      properties:
+        Name:
+          type: string
+          description: The name of an environment profile parameter.
+        Value:
+          type: string
+          description: The value of an environment profile parameter.
+      additionalProperties: false
     EnvironmentProfile:
       type: object
       properties:
@@ -2291,7 +2299,7 @@ components:
           type: array
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/EnvironmentParameter'
+            $ref: '#/components/schemas/EnvironmentProfile_EnvironmentParameter'
       required:
         - EnvironmentBlueprintIdentifier
         - ProjectIdentifier
@@ -2983,7 +2991,7 @@ components:
         EnvironmentParameters:
           type: array
           items:
-            $ref: '#/components/schemas/EnvironmentParameter'
+            $ref: '#/components/schemas/Project_EnvironmentParameter'
       additionalProperties: false
     EnvironmentDeploymentDetails:
       type: object
@@ -3011,6 +3019,14 @@ components:
           items:
             $ref: '#/components/schemas/EnvironmentError'
       additionalProperties: false
+    Project_EnvironmentParameter:
+      type: object
+      properties:
+        Name:
+          type: string
+        Value:
+          type: string
+      additionalProperties: false
     EnvironmentResolvedAccount:
       type: object
       properties:
@@ -3312,7 +3328,7 @@ components:
         AwsAccount:
           $ref: '#/components/schemas/AwsAccount'
         AwsRegion:
-          $ref: '#/components/schemas/Region'
+          $ref: '#/components/schemas/ProjectProfile_Region'
         DeploymentOrder:
           type: number
           maximum: 16
@@ -3362,6 +3378,17 @@ components:
       required:
         - Name
       additionalProperties: false
+    ProjectProfile_Region:
+      type: object
+      properties:
+        RegionName:
+          type: string
+          maxLength: 16
+          minLength: 4
+          pattern: ^[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]$
+      required:
+        - RegionName
+      additionalProperties: false
     Status:
       type: string
       enum:
@@ -4406,7 +4433,7 @@ components:
               type: array
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/EnvironmentParameter'
+                $ref: '#/components/schemas/EnvironmentProfile_EnvironmentParameter'
           x-stackQL-stringOnly: true
       x-title: CreateEnvironmentProfileRequest
       type: object
@@ -4839,7 +4866,7 @@ components:
       id: awscc.datazone.connections
       x-cfn-schema-name: Connection
       x-cfn-type-name: AWS::DataZone::Connection
-      x-identifiers:
+      x-identifiers: &ref_0
         - DomainId
         - ConnectionId
       x-type: cloud_control
@@ -4950,9 +4977,7 @@ components:
       id: awscc.datazone.connections_list_only
       x-cfn-schema-name: Connection
       x-cfn-type-name: AWS::DataZone::Connection
-      x-identifiers:
-        - DomainId
-        - ConnectionId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4984,7 +5009,7 @@ components:
       id: awscc.datazone.data_sources
       x-cfn-schema-name: DataSource
       x-cfn-type-name: AWS::DataZone::DataSource
-      x-identifiers:
+      x-identifiers: &ref_1
         - DomainId
         - Id
       x-type: cloud_control
@@ -5117,9 +5142,7 @@ components:
       id: awscc.datazone.data_sources_list_only
       x-cfn-schema-name: DataSource
       x-cfn-type-name: AWS::DataZone::DataSource
-      x-identifiers:
-        - DomainId
-        - Id
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5151,7 +5174,7 @@ components:
       id: awscc.datazone.domains
       x-cfn-schema-name: Domain
       x-cfn-type-name: AWS::DataZone::Domain
-      x-identifiers:
+      x-identifiers: &ref_2
         - Id
       x-type: cloud_control
       methods:
@@ -5267,8 +5290,7 @@ components:
       id: awscc.datazone.domains_list_only
       x-cfn-schema-name: Domain
       x-cfn-type-name: AWS::DataZone::Domain
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5298,7 +5320,7 @@ components:
       id: awscc.datazone.domain_units
       x-cfn-schema-name: DomainUnit
       x-cfn-type-name: AWS::DataZone::DomainUnit
-      x-identifiers:
+      x-identifiers: &ref_3
         - DomainId
         - Id
       x-type: cloud_control
@@ -5403,9 +5425,7 @@ components:
       id: awscc.datazone.domain_units_list_only
       x-cfn-schema-name: DomainUnit
       x-cfn-type-name: AWS::DataZone::DomainUnit
-      x-identifiers:
-        - DomainId
-        - Id
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5437,7 +5457,7 @@ components:
       id: awscc.datazone.environments
       x-cfn-schema-name: Environment
       x-cfn-type-name: AWS::DataZone::Environment
-      x-identifiers:
+      x-identifiers: &ref_4
         - DomainId
         - Id
       x-type: cloud_control
@@ -5566,9 +5586,7 @@ components:
       id: awscc.datazone.environments_list_only
       x-cfn-schema-name: Environment
       x-cfn-type-name: AWS::DataZone::Environment
-      x-identifiers:
-        - DomainId
-        - Id
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5600,7 +5618,7 @@ components:
       id: awscc.datazone.environment_actions
       x-cfn-schema-name: EnvironmentActions
       x-cfn-type-name: AWS::DataZone::EnvironmentActions
-      x-identifiers:
+      x-identifiers: &ref_5
         - DomainId
         - EnvironmentId
         - Id
@@ -5704,10 +5722,7 @@ components:
       id: awscc.datazone.environment_actions_list_only
       x-cfn-schema-name: EnvironmentActions
       x-cfn-type-name: AWS::DataZone::EnvironmentActions
-      x-identifiers:
-        - DomainId
-        - EnvironmentId
-        - Id
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5741,7 +5756,7 @@ components:
       id: awscc.datazone.environment_blueprint_configurations
       x-cfn-schema-name: EnvironmentBlueprintConfiguration
       x-cfn-type-name: AWS::DataZone::EnvironmentBlueprintConfiguration
-      x-identifiers:
+      x-identifiers: &ref_6
         - DomainId
         - EnvironmentBlueprintId
       x-type: cloud_control
@@ -5850,9 +5865,7 @@ components:
       id: awscc.datazone.environment_blueprint_configurations_list_only
       x-cfn-schema-name: EnvironmentBlueprintConfiguration
       x-cfn-type-name: AWS::DataZone::EnvironmentBlueprintConfiguration
-      x-identifiers:
-        - DomainId
-        - EnvironmentBlueprintId
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5884,7 +5897,7 @@ components:
       id: awscc.datazone.environment_profiles
       x-cfn-schema-name: EnvironmentProfile
       x-cfn-type-name: AWS::DataZone::EnvironmentProfile
-      x-identifiers:
+      x-identifiers: &ref_7
         - DomainId
         - Id
       x-type: cloud_control
@@ -5999,9 +6012,7 @@ components:
       id: awscc.datazone.environment_profiles_list_only
       x-cfn-schema-name: EnvironmentProfile
       x-cfn-type-name: AWS::DataZone::EnvironmentProfile
-      x-identifiers:
-        - DomainId
-        - Id
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6033,7 +6044,7 @@ components:
       id: awscc.datazone.group_profiles
       x-cfn-schema-name: GroupProfile
       x-cfn-type-name: AWS::DataZone::GroupProfile
-      x-identifiers:
+      x-identifiers: &ref_8
         - DomainId
         - Id
       x-type: cloud_control
@@ -6130,9 +6141,7 @@ components:
       id: awscc.datazone.group_profiles_list_only
       x-cfn-schema-name: GroupProfile
       x-cfn-type-name: AWS::DataZone::GroupProfile
-      x-identifiers:
-        - DomainId
-        - Id
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6164,7 +6173,7 @@ components:
       id: awscc.datazone.owners
       x-cfn-schema-name: Owner
       x-cfn-type-name: AWS::DataZone::Owner
-      x-identifiers:
+      x-identifiers: &ref_9
         - DomainIdentifier
         - EntityType
         - EntityIdentifier
@@ -6243,12 +6252,7 @@ components:
       id: awscc.datazone.owners_list_only
       x-cfn-schema-name: Owner
       x-cfn-type-name: AWS::DataZone::Owner
-      x-identifiers:
-        - DomainIdentifier
-        - EntityType
-        - EntityIdentifier
-        - OwnerType
-        - OwnerIdentifier
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6286,7 +6290,7 @@ components:
       id: awscc.datazone.policy_grants
       x-cfn-schema-name: PolicyGrant
       x-cfn-type-name: AWS::DataZone::PolicyGrant
-      x-identifiers:
+      x-identifiers: &ref_10
         - DomainIdentifier
         - GrantId
         - EntityIdentifier
@@ -6375,12 +6379,7 @@ components:
       id: awscc.datazone.policy_grants_list_only
       x-cfn-schema-name: PolicyGrant
       x-cfn-type-name: AWS::DataZone::PolicyGrant
-      x-identifiers:
-        - DomainIdentifier
-        - GrantId
-        - EntityIdentifier
-        - EntityType
-        - PolicyType
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6418,7 +6417,7 @@ components:
       id: awscc.datazone.projects
       x-cfn-schema-name: Project
       x-cfn-type-name: AWS::DataZone::Project
-      x-identifiers:
+      x-identifiers: &ref_11
         - DomainId
         - Id
       x-type: cloud_control
@@ -6531,9 +6530,7 @@ components:
       id: awscc.datazone.projects_list_only
       x-cfn-schema-name: Project
       x-cfn-type-name: AWS::DataZone::Project
-      x-identifiers:
-        - DomainId
-        - Id
+      x-identifiers: *ref_11
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6565,7 +6562,7 @@ components:
       id: awscc.datazone.project_memberships
       x-cfn-schema-name: ProjectMembership
       x-cfn-type-name: AWS::DataZone::ProjectMembership
-      x-identifiers:
+      x-identifiers: &ref_12
         - DomainIdentifier
         - MemberIdentifier
         - MemberIdentifierType
@@ -6660,11 +6657,7 @@ components:
       id: awscc.datazone.project_memberships_list_only
       x-cfn-schema-name: ProjectMembership
       x-cfn-type-name: AWS::DataZone::ProjectMembership
-      x-identifiers:
-        - DomainIdentifier
-        - MemberIdentifier
-        - MemberIdentifierType
-        - ProjectIdentifier
+      x-identifiers: *ref_12
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6700,7 +6693,7 @@ components:
       id: awscc.datazone.project_profiles
       x-cfn-schema-name: ProjectProfile
       x-cfn-type-name: AWS::DataZone::ProjectProfile
-      x-identifiers:
+      x-identifiers: &ref_13
         - DomainIdentifier
         - Identifier
       x-type: cloud_control
@@ -6811,9 +6804,7 @@ components:
       id: awscc.datazone.project_profiles_list_only
       x-cfn-schema-name: ProjectProfile
       x-cfn-type-name: AWS::DataZone::ProjectProfile
-      x-identifiers:
-        - DomainIdentifier
-        - Identifier
+      x-identifiers: *ref_13
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6845,7 +6836,7 @@ components:
       id: awscc.datazone.subscription_targets
       x-cfn-schema-name: SubscriptionTarget
       x-cfn-type-name: AWS::DataZone::SubscriptionTarget
-      x-identifiers:
+      x-identifiers: &ref_14
         - DomainId
         - EnvironmentId
         - Id
@@ -6965,10 +6956,7 @@ components:
       id: awscc.datazone.subscription_targets_list_only
       x-cfn-schema-name: SubscriptionTarget
       x-cfn-type-name: AWS::DataZone::SubscriptionTarget
-      x-identifiers:
-        - DomainId
-        - EnvironmentId
-        - Id
+      x-identifiers: *ref_14
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7002,7 +6990,7 @@ components:
       id: awscc.datazone.user_profiles
       x-cfn-schema-name: UserProfile
       x-cfn-type-name: AWS::DataZone::UserProfile
-      x-identifiers:
+      x-identifiers: &ref_15
         - DomainId
         - Id
       x-type: cloud_control
@@ -7103,9 +7091,7 @@ components:
       id: awscc.datazone.user_profiles_list_only
       x-cfn-schema-name: UserProfile
       x-cfn-type-name: AWS::DataZone::UserProfile
-      x-identifiers:
-        - DomainId
-        - Id
+      x-identifiers: *ref_15
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/deadline.yaml b/openapi/src/awscc/v00.00.00000/services/deadline.yaml
index 81156be70..496dc9dff 100644
--- a/openapi/src/awscc/v00.00.00000/services/deadline.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/deadline.yaml
@@ -2305,7 +2305,7 @@ components:
       id: awscc.deadline.farms
       x-cfn-schema-name: Farm
       x-cfn-type-name: AWS::Deadline::Farm
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -2401,8 +2401,7 @@ components:
       id: awscc.deadline.farms_list_only
       x-cfn-schema-name: Farm
       x-cfn-type-name: AWS::Deadline::Farm
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2432,7 +2431,7 @@ components:
       id: awscc.deadline.fleets
       x-cfn-schema-name: Fleet
       x-cfn-type-name: AWS::Deadline::Fleet
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -2546,8 +2545,7 @@ components:
       id: awscc.deadline.fleets_list_only
       x-cfn-schema-name: Fleet
       x-cfn-type-name: AWS::Deadline::Fleet
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2577,7 +2575,7 @@ components:
       id: awscc.deadline.license_endpoints
       x-cfn-schema-name: LicenseEndpoint
       x-cfn-type-name: AWS::Deadline::LicenseEndpoint
-      x-identifiers:
+      x-identifiers: &ref_2
         - Arn
       x-type: cloud_control
       methods:
@@ -2679,8 +2677,7 @@ components:
       id: awscc.deadline.license_endpoints_list_only
       x-cfn-schema-name: LicenseEndpoint
       x-cfn-type-name: AWS::Deadline::LicenseEndpoint
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2710,7 +2707,7 @@ components:
       id: awscc.deadline.limits
       x-cfn-schema-name: Limit
       x-cfn-type-name: AWS::Deadline::Limit
-      x-identifiers:
+      x-identifiers: &ref_3
         - FarmId
         - LimitId
       x-type: cloud_control
@@ -2809,9 +2806,7 @@ components:
       id: awscc.deadline.limits_list_only
       x-cfn-schema-name: Limit
       x-cfn-type-name: AWS::Deadline::Limit
-      x-identifiers:
-        - FarmId
-        - LimitId
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2843,7 +2838,7 @@ components:
       id: awscc.deadline.metered_products
       x-cfn-schema-name: MeteredProduct
       x-cfn-type-name: AWS::Deadline::MeteredProduct
-      x-identifiers:
+      x-identifiers: &ref_4
         - Arn
       x-type: cloud_control
       methods:
@@ -2922,8 +2917,7 @@ components:
       id: awscc.deadline.metered_products_list_only
       x-cfn-schema-name: MeteredProduct
       x-cfn-type-name: AWS::Deadline::MeteredProduct
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2953,7 +2947,7 @@ components:
       id: awscc.deadline.monitors
       x-cfn-schema-name: Monitor
       x-cfn-type-name: AWS::Deadline::Monitor
-      x-identifiers:
+      x-identifiers: &ref_5
         - Arn
       x-type: cloud_control
       methods:
@@ -3055,8 +3049,7 @@ components:
       id: awscc.deadline.monitors_list_only
       x-cfn-schema-name: Monitor
       x-cfn-type-name: AWS::Deadline::Monitor
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3086,7 +3079,7 @@ components:
       id: awscc.deadline.queues
       x-cfn-schema-name: Queue
       x-cfn-type-name: AWS::Deadline::Queue
-      x-identifiers:
+      x-identifiers: &ref_6
         - Arn
       x-type: cloud_control
       methods:
@@ -3194,8 +3187,7 @@ components:
       id: awscc.deadline.queues_list_only
       x-cfn-schema-name: Queue
       x-cfn-type-name: AWS::Deadline::Queue
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3225,7 +3217,7 @@ components:
       id: awscc.deadline.queue_environments
       x-cfn-schema-name: QueueEnvironment
       x-cfn-type-name: AWS::Deadline::QueueEnvironment
-      x-identifiers:
+      x-identifiers: &ref_7
         - FarmId
         - QueueId
         - QueueEnvironmentId
@@ -3325,10 +3317,7 @@ components:
       id: awscc.deadline.queue_environments_list_only
       x-cfn-schema-name: QueueEnvironment
       x-cfn-type-name: AWS::Deadline::QueueEnvironment
-      x-identifiers:
-        - FarmId
-        - QueueId
-        - QueueEnvironmentId
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3362,7 +3351,7 @@ components:
       id: awscc.deadline.queue_fleet_associations
       x-cfn-schema-name: QueueFleetAssociation
       x-cfn-type-name: AWS::Deadline::QueueFleetAssociation
-      x-identifiers:
+      x-identifiers: &ref_8
         - FarmId
         - FleetId
         - QueueId
@@ -3437,10 +3426,7 @@ components:
       id: awscc.deadline.queue_fleet_associations_list_only
       x-cfn-schema-name: QueueFleetAssociation
       x-cfn-type-name: AWS::Deadline::QueueFleetAssociation
-      x-identifiers:
-        - FarmId
-        - FleetId
-        - QueueId
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3474,7 +3460,7 @@ components:
       id: awscc.deadline.queue_limit_associations
       x-cfn-schema-name: QueueLimitAssociation
       x-cfn-type-name: AWS::Deadline::QueueLimitAssociation
-      x-identifiers:
+      x-identifiers: &ref_9
         - FarmId
         - LimitId
         - QueueId
@@ -3549,10 +3535,7 @@ components:
       id: awscc.deadline.queue_limit_associations_list_only
       x-cfn-schema-name: QueueLimitAssociation
       x-cfn-type-name: AWS::Deadline::QueueLimitAssociation
-      x-identifiers:
-        - FarmId
-        - LimitId
-        - QueueId
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3586,7 +3569,7 @@ components:
       id: awscc.deadline.storage_profiles
       x-cfn-schema-name: StorageProfile
       x-cfn-type-name: AWS::Deadline::StorageProfile
-      x-identifiers:
+      x-identifiers: &ref_10
         - FarmId
         - StorageProfileId
       x-type: cloud_control
@@ -3681,9 +3664,7 @@ components:
       id: awscc.deadline.storage_profiles_list_only
       x-cfn-schema-name: StorageProfile
       x-cfn-type-name: AWS::Deadline::StorageProfile
-      x-identifiers:
-        - FarmId
-        - StorageProfileId
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/detective.yaml b/openapi/src/awscc/v00.00.00000/services/detective.yaml
index 8f2304b8e..af3b169ce 100644
--- a/openapi/src/awscc/v00.00.00000/services/detective.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/detective.yaml
@@ -672,7 +672,7 @@ components:
       id: awscc.detective.graphs
       x-cfn-schema-name: Graph
       x-cfn-type-name: AWS::Detective::Graph
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -762,8 +762,7 @@ components:
       id: awscc.detective.graphs_list_only
       x-cfn-schema-name: Graph
       x-cfn-type-name: AWS::Detective::Graph
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -793,7 +792,7 @@ components:
       id: awscc.detective.member_invitations
       x-cfn-schema-name: MemberInvitation
       x-cfn-type-name: AWS::Detective::MemberInvitation
-      x-identifiers:
+      x-identifiers: &ref_1
         - GraphArn
         - MemberId
       x-type: cloud_control
@@ -871,9 +870,7 @@ components:
       id: awscc.detective.member_invitations_list_only
       x-cfn-schema-name: MemberInvitation
       x-cfn-type-name: AWS::Detective::MemberInvitation
-      x-identifiers:
-        - GraphArn
-        - MemberId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -905,7 +902,7 @@ components:
       id: awscc.detective.organization_admins
       x-cfn-schema-name: OrganizationAdmin
       x-cfn-type-name: AWS::Detective::OrganizationAdmin
-      x-identifiers:
+      x-identifiers: &ref_2
         - AccountId
       x-type: cloud_control
       methods:
@@ -976,8 +973,7 @@ components:
       id: awscc.detective.organization_admins_list_only
       x-cfn-schema-name: OrganizationAdmin
       x-cfn-type-name: AWS::Detective::OrganizationAdmin
-      x-identifiers:
-        - AccountId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/devopsguru.yaml b/openapi/src/awscc/v00.00.00000/services/devopsguru.yaml
index e5b041c99..dfcf1dc7e 100644
--- a/openapi/src/awscc/v00.00.00000/services/devopsguru.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/devopsguru.yaml
@@ -698,7 +698,7 @@ components:
       id: awscc.devopsguru.log_anomaly_detection_integrations
       x-cfn-schema-name: LogAnomalyDetectionIntegration
       x-cfn-type-name: AWS::DevOpsGuru::LogAnomalyDetectionIntegration
-      x-identifiers:
+      x-identifiers: &ref_0
         - AccountId
       x-type: cloud_control
       methods:
@@ -784,8 +784,7 @@ components:
       id: awscc.devopsguru.log_anomaly_detection_integrations_list_only
       x-cfn-schema-name: LogAnomalyDetectionIntegration
       x-cfn-type-name: AWS::DevOpsGuru::LogAnomalyDetectionIntegration
-      x-identifiers:
-        - AccountId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -815,7 +814,7 @@ components:
       id: awscc.devopsguru.notification_channels
       x-cfn-schema-name: NotificationChannel
       x-cfn-type-name: AWS::DevOpsGuru::NotificationChannel
-      x-identifiers:
+      x-identifiers: &ref_1
         - Id
       x-type: cloud_control
       methods:
@@ -886,8 +885,7 @@ components:
       id: awscc.devopsguru.notification_channels_list_only
       x-cfn-schema-name: NotificationChannel
       x-cfn-type-name: AWS::DevOpsGuru::NotificationChannel
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -917,7 +915,7 @@ components:
       id: awscc.devopsguru.resource_collections
       x-cfn-schema-name: ResourceCollection
       x-cfn-type-name: AWS::DevOpsGuru::ResourceCollection
-      x-identifiers:
+      x-identifiers: &ref_2
         - ResourceCollectionType
       x-type: cloud_control
       methods:
@@ -1005,8 +1003,7 @@ components:
       id: awscc.devopsguru.resource_collections_list_only
       x-cfn-schema-name: ResourceCollection
       x-cfn-type-name: AWS::DevOpsGuru::ResourceCollection
-      x-identifiers:
-        - ResourceCollectionType
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/directoryservice.yaml b/openapi/src/awscc/v00.00.00000/services/directoryservice.yaml
index 70e39f3ac..c3e0ebbe7 100644
--- a/openapi/src/awscc/v00.00.00000/services/directoryservice.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/directoryservice.yaml
@@ -581,7 +581,7 @@ components:
       id: awscc.directoryservice.simple_ads
       x-cfn-schema-name: SimpleAD
       x-cfn-type-name: AWS::DirectoryService::SimpleAD
-      x-identifiers:
+      x-identifiers: &ref_0
         - DirectoryId
       x-type: cloud_control
       methods:
@@ -687,8 +687,7 @@ components:
       id: awscc.directoryservice.simple_ads_list_only
       x-cfn-schema-name: SimpleAD
       x-cfn-type-name: AWS::DirectoryService::SimpleAD
-      x-identifiers:
-        - DirectoryId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/dms.yaml b/openapi/src/awscc/v00.00.00000/services/dms.yaml
index 6a02c15e8..f7c387631 100644
--- a/openapi/src/awscc/v00.00.00000/services/dms.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/dms.yaml
@@ -391,21 +391,19 @@ components:
       type: object
   schemas:
     Tag:
+      description: A key-value pair to associate with a resource.
       type: object
-      description: |-
-        <p>The key or keys of the key-value pairs for the resource tag or tags assigned to the
-                    resource.</p>
       properties:
         Key:
           type: string
-          maxLength: 128
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
           minLength: 1
-          description: <p>Tag key.</p>
+          maxLength: 128
         Value:
           type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
           maxLength: 256
-          minLength: 1
-          description: <p>Tag value.</p>
       required:
         - Key
         - Value
@@ -1030,6 +1028,24 @@ components:
           - dms:ListInstanceProfiles
           - dms:DescribeInstanceProfiles
           - dms:ListTagsForResource
+    MigrationProject_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, , and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, , and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     DataProviderDescriptor:
       type: object
       description: It is an object that describes Source and Target DataProviders and credentials for connecting to databases that are used in MigrationProject
@@ -1120,7 +1136,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/MigrationProject_Tag'
       x-stackql-resource-name: migration_project
       description: Resource schema for AWS::DMS::MigrationProject
       x-type-name: AWS::DMS::MigrationProject
@@ -1197,6 +1213,26 @@ components:
       required:
         - MaxCapacityUnits
       additionalProperties: false
+    ReplicationConfig_Tag:
+      type: object
+      description: |-
+        <p>The key or keys of the key-value pairs for the resource tag or tags assigned to the
+                    resource.</p>
+      properties:
+        Key:
+          type: string
+          maxLength: 128
+          minLength: 1
+          description: <p>Tag key.</p>
+        Value:
+          type: string
+          maxLength: 256
+          minLength: 1
+          description: <p>Tag value.</p>
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     ReplicationConfig:
       type: object
       properties:
@@ -1237,7 +1273,7 @@ components:
           type: array
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ReplicationConfig_Tag'
           maxItems: 200
           minItems: 1
           description: <p>Contains a map of the key-value pairs for the resource tag or tags assigned to the dataset.</p>
@@ -1842,7 +1878,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/MigrationProject_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateMigrationProjectRequest
       type: object
@@ -1897,7 +1933,7 @@ components:
               type: array
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ReplicationConfig_Tag'
               maxItems: 200
               minItems: 1
               description: <p>Contains a map of the key-value pairs for the resource tag or tags assigned to the dataset.</p>
@@ -1918,7 +1954,7 @@ components:
       id: awscc.dms.data_migrations
       x-cfn-schema-name: DataMigration
       x-cfn-type-name: AWS::DMS::DataMigration
-      x-identifiers:
+      x-identifiers: &ref_0
         - DataMigrationArn
       x-type: cloud_control
       methods:
@@ -2022,8 +2058,7 @@ components:
       id: awscc.dms.data_migrations_list_only
       x-cfn-schema-name: DataMigration
       x-cfn-type-name: AWS::DMS::DataMigration
-      x-identifiers:
-        - DataMigrationArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2053,7 +2088,7 @@ components:
       id: awscc.dms.data_providers
       x-cfn-schema-name: DataProvider
       x-cfn-type-name: AWS::DMS::DataProvider
-      x-identifiers:
+      x-identifiers: &ref_1
         - DataProviderArn
       x-type: cloud_control
       methods:
@@ -2155,8 +2190,7 @@ components:
       id: awscc.dms.data_providers_list_only
       x-cfn-schema-name: DataProvider
       x-cfn-type-name: AWS::DMS::DataProvider
-      x-identifiers:
-        - DataProviderArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2186,7 +2220,7 @@ components:
       id: awscc.dms.instance_profiles
       x-cfn-schema-name: InstanceProfile
       x-cfn-type-name: AWS::DMS::InstanceProfile
-      x-identifiers:
+      x-identifiers: &ref_2
         - InstanceProfileArn
       x-type: cloud_control
       methods:
@@ -2294,8 +2328,7 @@ components:
       id: awscc.dms.instance_profiles_list_only
       x-cfn-schema-name: InstanceProfile
       x-cfn-type-name: AWS::DMS::InstanceProfile
-      x-identifiers:
-        - InstanceProfileArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2325,7 +2358,7 @@ components:
       id: awscc.dms.migration_projects
       x-cfn-schema-name: MigrationProject
       x-cfn-type-name: AWS::DMS::MigrationProject
-      x-identifiers:
+      x-identifiers: &ref_3
         - MigrationProjectArn
       x-type: cloud_control
       methods:
@@ -2435,8 +2468,7 @@ components:
       id: awscc.dms.migration_projects_list_only
       x-cfn-schema-name: MigrationProject
       x-cfn-type-name: AWS::DMS::MigrationProject
-      x-identifiers:
-        - MigrationProjectArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2466,7 +2498,7 @@ components:
       id: awscc.dms.replication_configs
       x-cfn-schema-name: ReplicationConfig
       x-cfn-type-name: AWS::DMS::ReplicationConfig
-      x-identifiers:
+      x-identifiers: &ref_4
         - ReplicationConfigArn
       x-type: cloud_control
       methods:
@@ -2572,8 +2604,7 @@ components:
       id: awscc.dms.replication_configs_list_only
       x-cfn-schema-name: ReplicationConfig
       x-cfn-type-name: AWS::DMS::ReplicationConfig
-      x-identifiers:
-        - ReplicationConfigArn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/docdbelastic.yaml b/openapi/src/awscc/v00.00.00000/services/docdbelastic.yaml
index 365839626..b16b83a00 100644
--- a/openapi/src/awscc/v00.00.00000/services/docdbelastic.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/docdbelastic.yaml
@@ -639,7 +639,7 @@ components:
       id: awscc.docdbelastic.clusters
       x-cfn-schema-name: Cluster
       x-cfn-type-name: AWS::DocDBElastic::Cluster
-      x-identifiers:
+      x-identifiers: &ref_0
         - ClusterArn
       x-type: cloud_control
       methods:
@@ -755,8 +755,7 @@ components:
       id: awscc.docdbelastic.clusters_list_only
       x-cfn-schema-name: Cluster
       x-cfn-type-name: AWS::DocDBElastic::Cluster
-      x-identifiers:
-        - ClusterArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/dsql.yaml b/openapi/src/awscc/v00.00.00000/services/dsql.yaml
index 54d76a332..4365b6bc9 100644
--- a/openapi/src/awscc/v00.00.00000/services/dsql.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/dsql.yaml
@@ -625,7 +625,7 @@ components:
       id: awscc.dsql.clusters
       x-cfn-schema-name: Cluster
       x-cfn-type-name: AWS::DSQL::Cluster
-      x-identifiers:
+      x-identifiers: &ref_0
         - Identifier
       x-type: cloud_control
       methods:
@@ -729,8 +729,7 @@ components:
       id: awscc.dsql.clusters_list_only
       x-cfn-schema-name: Cluster
       x-cfn-type-name: AWS::DSQL::Cluster
-      x-identifiers:
-        - Identifier
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/dynamodb.yaml b/openapi/src/awscc/v00.00.00000/services/dynamodb.yaml
index 28bde7c80..fae86a748 100644
--- a/openapi/src/awscc/v00.00.00000/services/dynamodb.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/dynamodb.yaml
@@ -391,25 +391,18 @@ components:
       type: object
   schemas:
     LocalSecondaryIndex:
-      description: Represents the properties of a local secondary index. A local secondary index can only be created when its parent table is created.
       additionalProperties: false
       type: object
       properties:
         IndexName:
-          description: The name of the local secondary index. The name must be unique among all other indexes on this table.
+          minLength: 3
           type: string
+          maxLength: 255
         Projection:
-          description: Represents attributes that are copied (projected) from the table into the local secondary index. These are in addition to the primary key attributes and index key attributes, which are automatically projected.
           $ref: '#/components/schemas/Projection'
         KeySchema:
+          maxItems: 2
           uniqueItems: true
-          description: |-
-            The complete key schema for the local secondary index, consisting of one or more pairs of attribute names and key types:
-              +  ``HASH`` - partition key
-              +  ``RANGE`` - sort key
-              
-              The partition key of an item is also known as its *hash attribute*. The term "hash attribute" derives from DynamoDB's usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.
-             The sort key of an item is also known as its *range attribute*. The term "range attribute" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.
           type: array
           items:
             $ref: '#/components/schemas/KeySchema'
@@ -458,56 +451,39 @@ components:
       required:
         - Region
     AttributeDefinition:
-      description: Represents an attribute for describing the schema for the table and indexes.
       additionalProperties: false
       type: object
       properties:
         AttributeType:
-          description: |-
-            The data type for the attribute, where:
-              +  ``S`` - the attribute is of type String
-              +  ``N`` - the attribute is of type Number
-              +  ``B`` - the attribute is of type Binary
           type: string
         AttributeName:
-          description: A name for the attribute.
+          minLength: 1
           type: string
+          maxLength: 255
       required:
         - AttributeName
         - AttributeType
     Projection:
-      description: Represents attributes that are copied (projected) from the table into an index. These are in addition to the primary key attributes and index key attributes, which are automatically projected.
       additionalProperties: false
       type: object
       properties:
         NonKeyAttributes:
-          uniqueItems: false
-          description: |-
-            Represents the non-key attribute names which will be projected into the index.
-             For global and local secondary indexes, the total count of ``NonKeyAttributes`` summed across all of the secondary indexes, must not exceed 100. If you project the same attribute into two different indexes, this counts as two distinct attributes when determining the total. This limit only applies when you specify the ProjectionType of ``INCLUDE``. You still can specify the ProjectionType of ``ALL`` to project all attributes from the source table, even if the table has more than 100 attributes.
+          maxItems: 20
+          uniqueItems: true
+          x-insertionOrder: false
           type: array
           items:
             type: string
         ProjectionType:
-          description: |-
-            The set of attributes that are projected into the index:
-              +  ``KEYS_ONLY`` - Only the index and primary keys are projected into the index.
-              +  ``INCLUDE`` - In addition to the attributes described in ``KEYS_ONLY``, the secondary index will include other non-key attributes that you specify.
-              +  ``ALL`` - All of the table attributes are projected into the index.
-              
-             When using the DynamoDB console, ``ALL`` is selected by default.
           type: string
     PointInTimeRecoverySpecification:
-      description: The settings used to enable point in time recovery.
       additionalProperties: false
       type: object
       properties:
         PointInTimeRecoveryEnabled:
-          description: Indicates whether point in time recovery is enabled (true) or disabled (false) on the table.
           type: boolean
         RecoveryPeriodInDays:
           maximum: 35
-          description: The number of preceding days for which continuous backups are taken and maintained. Your table data is only recoverable to any point-in-time from within the configured recovery period. This parameter is optional. If no value is provided, the value will default to 35.
           type: integer
           minimum: 1
       x-dependencies:
@@ -530,42 +506,28 @@ components:
       required:
         - IndexName
     GlobalSecondaryIndex:
-      description: Represents the properties of a global secondary index.
       additionalProperties: false
       type: object
       properties:
         IndexName:
-          description: The name of the global secondary index. The name must be unique among all other indexes on this table.
+          minLength: 3
           type: string
-        OnDemandThroughput:
-          description: The maximum number of read and write units for the specified global secondary index. If you use this parameter, you must specify ``MaxReadRequestUnits``, ``MaxWriteRequestUnits``, or both. You must use either ``OnDemandThroughput`` or ``ProvisionedThroughput`` based on your table's capacity mode.
-          $ref: '#/components/schemas/OnDemandThroughput'
-        ContributorInsightsSpecification:
-          description: The settings used to enable or disable CloudWatch Contributor Insights for the specified global secondary index.
-          $ref: '#/components/schemas/ContributorInsightsSpecification'
+          maxLength: 255
         Projection:
-          description: Represents attributes that are copied (projected) from the table into the global secondary index. These are in addition to the primary key attributes and index key attributes, which are automatically projected.
           $ref: '#/components/schemas/Projection'
-        ProvisionedThroughput:
-          description: |-
-            Represents the provisioned throughput settings for the specified global secondary index. You must use either ``OnDemandThroughput`` or ``ProvisionedThroughput`` based on your table's capacity mode.
-             For current minimum and maximum provisioned throughput values, see [Service, Account, and Table Quotas](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Limits.html) in the *Amazon DynamoDB Developer Guide*.
-          $ref: '#/components/schemas/ProvisionedThroughput'
         KeySchema:
+          minItems: 1
+          maxItems: 2
           uniqueItems: true
-          description: |-
-            The complete key schema for a global secondary index, which consists of one or more pairs of attribute names and key types:
-              +  ``HASH`` - partition key
-              +  ``RANGE`` - sort key
-              
-              The partition key of an item is also known as its *hash attribute*. The term "hash attribute" derives from DynamoDB's usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.
-             The sort key of an item is also known as its *range attribute*. The term "range attribute" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.
           type: array
           items:
             $ref: '#/components/schemas/KeySchema'
         WarmThroughput:
-          description: Represents the warm throughput value (in read units per second and write units per second) for the specified secondary index. If you use this parameter, you must specify ``ReadUnitsPerSecond``, ``WriteUnitsPerSecond``, or both.
           $ref: '#/components/schemas/WarmThroughput'
+        WriteProvisionedThroughputSettings:
+          $ref: '#/components/schemas/WriteProvisionedThroughputSettings'
+        WriteOnDemandThroughputSettings:
+          $ref: '#/components/schemas/WriteOnDemandThroughputSettings'
       required:
         - IndexName
         - Projection
@@ -605,84 +567,46 @@ components:
           type: integer
           minimum: 1
     SSESpecification:
-      description: Represents the settings used to enable server-side encryption.
       additionalProperties: false
       type: object
       properties:
         SSEEnabled:
-          description: Indicates whether server-side encryption is done using an AWS managed key or an AWS owned key. If enabled (true), server-side encryption type is set to ``KMS`` and an AWS managed key is used (KMS charges apply). If disabled (false) or not specified, server-side encryption is set to AWS owned key.
           type: boolean
         SSEType:
-          description: |-
-            Server-side encryption type. The only supported value is:
-              +  ``KMS`` - Server-side encryption that uses KMSlong. The key is stored in your account and is managed by KMS (KMS charges apply).
-          type: string
-        KMSMasterKeyId:
-          anyOf:
-            - relationshipRef:
-                typeName: AWS::KMS::Key
-                propertyPath: /properties/Arn
-            - relationshipRef:
-                typeName: AWS::KMS::Key
-                propertyPath: /properties/KeyId
-            - relationshipRef:
-                typeName: AWS::KMS::Alias
-                propertyPath: /properties/AliasName
-          description: The KMS key that should be used for the KMS encryption. To specify a key, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. Note that you should only provide this parameter if the key is different from the default DynamoDB key ``alias/aws/dynamodb``.
           type: string
       required:
         - SSEEnabled
     KinesisStreamSpecification:
-      description: The Kinesis Data Streams configuration for the specified table.
       additionalProperties: false
       type: object
       properties:
         ApproximateCreationDateTimePrecision:
-          description: The precision for the time and date that the stream was created.
           type: string
           enum:
             - MICROSECOND
             - MILLISECOND
         StreamArn:
-          description: |-
-            The ARN for a specific Kinesis data stream.
-             Length Constraints: Minimum length of 37. Maximum length of 1024.
           type: string
       required:
         - StreamArn
     StreamSpecification:
-      description: Represents the DynamoDB Streams configuration for a table in DynamoDB.
       additionalProperties: false
       type: object
       properties:
         StreamViewType:
-          description: |-
-            When an item in the table is modified, ``StreamViewType`` determines what information is written to the stream for this table. Valid values for ``StreamViewType`` are:
-              +  ``KEYS_ONLY`` - Only the key attributes of the modified item are written to the stream.
-              +  ``NEW_IMAGE`` - The entire item, as it appears after it was modified, is written to the stream.
-              +  ``OLD_IMAGE`` - The entire item, as it appeared before it was modified, is written to the stream.
-              +  ``NEW_AND_OLD_IMAGES`` - Both the new and the old item images of the item are written to the stream.
           type: string
-        ResourcePolicy:
-          description: |-
-            Creates or updates a resource-based policy document that contains the permissions for DDB resources, such as a table's streams. Resource-based policies let you define access permissions by specifying who has access to each resource, and the actions they are allowed to perform on each resource.
-             In a CFNshort template, you can provide the policy in JSON or YAML format because CFNshort converts YAML to JSON before submitting it to DDB. For more information about resource-based policies, see [Using resource-based policies for](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/access-control-resource-based.html) and [Resource-based policy examples](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/rbac-examples.html).
-          $ref: '#/components/schemas/ResourcePolicy'
       required:
         - StreamViewType
     ContributorInsightsSpecification:
-      description: The settings used to enable or disable CloudWatch Contributor Insights.
       additionalProperties: false
       type: object
       properties:
         Mode:
-          description: ''
           type: string
           enum:
             - ACCESSED_AND_THROTTLED_KEYS
             - THROTTLED_KEYS
         Enabled:
-          description: Indicates whether CloudWatch Contributor Insights are to be enabled (true) or disabled (false).
           type: boolean
       required:
         - Enabled
@@ -711,16 +635,13 @@ components:
             - ReadUnitsPerSecond
         - required:
             - WriteUnitsPerSecond
-      description: Provides visibility into the number of read and write operations your table or secondary index can instantaneously support. The settings can be modified using the ``UpdateTable`` operation to meet the throughput requirements of an upcoming peak event.
       additionalProperties: false
       type: object
       properties:
         ReadUnitsPerSecond:
-          description: Represents the number of read operations your base table can instantaneously support.
           type: integer
           minimum: 1
         WriteUnitsPerSecond:
-          description: Represents the number of write operations your base table can instantaneously support.
           type: integer
           minimum: 1
     TargetTrackingScalingPolicyConfiguration:
@@ -759,63 +680,33 @@ components:
       required:
         - KMSMasterKeyId
     ResourcePolicy:
-      description: |-
-        Creates or updates a resource-based policy document that contains the permissions for DDB resources, such as a table, its indexes, and stream. Resource-based policies let you define access permissions by specifying who has access to each resource, and the actions they are allowed to perform on each resource.
-         In a CFNshort template, you can provide the policy in JSON or YAML format because CFNshort converts YAML to JSON before submitting it to DDB. For more information about resource-based policies, see [Using resource-based policies for](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/access-control-resource-based.html) and [Resource-based policy examples](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/rbac-examples.html).
-         While defining resource-based policies in your CFNshort templates, the following considerations apply:
-          +  The maximum size supported for a resource-based policy document in JSON format is 20 KB. DDB counts whitespaces when calculating the size of a policy against this limit. 
-          +  Resource-based policies don't support [drift detection](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-stack-drift.html#). If you update a policy outside of the CFNshort stack template, you'll need to update the CFNshort stack with the changes.
-          +  Resource-based policies don't support out-of-band changes. If you add, update, or delete a policy outside of the CFNshort template, the change won't be overwritten if there are no changes to the policy within the template.
-         For example, say that your template contains a resource-based policy, which you later update outside of the template. If you don't make any changes to the policy in the template, the updated policy in DDB won’t be synced with the policy in the template.
-         Conversely, say that your template doesn’t contain a resource-based policy, but you add a policy outside of the template. This policy won’t be removed from DDB as long as you don’t add it to the template. When you add a policy to the template and update the stack, the existing policy in DDB will be updated to match the one defined in the template.
-          
-         For a full list of all considerations, see [Resource-based policy considerations](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/rbac-considerations.html).
       additionalProperties: false
       type: object
       properties:
         PolicyDocument:
-          description: >-
-            A resource-based policy document that contains permissions to add to the specified DDB table, index, or both. In a CFNshort template, you can provide the policy in JSON or YAML format because CFNshort converts YAML to JSON before submitting it to DDB. For more information about resource-based policies, see [Using resource-based policies for](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/access-control-resource-based.html) and [Resource-based policy
-            examples](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/rbac-examples.html).
           type: object
       required:
         - PolicyDocument
     KeySchema:
-      description: |-
-        Represents *a single element* of a key schema. A key schema specifies the attributes that make up the primary key of a table, or the key attributes of an index.
-         A ``KeySchemaElement`` represents exactly one attribute of the primary key. For example, a simple primary key would be represented by one ``KeySchemaElement`` (for the partition key). A composite primary key would require one ``KeySchemaElement`` for the partition key, and another ``KeySchemaElement`` for the sort key.
-         A ``KeySchemaElement`` must be a scalar, top-level attribute (not a nested attribute). The data type must be one of String, Number, or Binary. The attribute cannot be nested within a List or a Map.
       additionalProperties: false
       type: object
       properties:
         KeyType:
-          description: |-
-            The role that this key attribute will assume:
-              +  ``HASH`` - partition key
-              +  ``RANGE`` - sort key
-              
-              The partition key of an item is also known as its *hash attribute*. The term "hash attribute" derives from DynamoDB's usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.
-             The sort key of an item is also known as its *range attribute*. The term "range attribute" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.
           type: string
         AttributeName:
-          description: The name of a key attribute.
+          minLength: 1
           type: string
+          maxLength: 255
       required:
         - KeyType
         - AttributeName
     Tag:
-      description: |-
-        Describes a tag. A tag is a key-value pair. You can add up to 50 tags to a single DynamoDB table. 
-         AWS-assigned tag names and values are automatically assigned the ``aws:`` prefix, which the user cannot assign. AWS-assigned tag names do not count towards the tag limit of 50. User-assigned tag names have the prefix ``user:`` in the Cost Allocation Report. You cannot backdate the application of a tag.
-         For an overview on tagging DynamoDB resources, see [Tagging for DynamoDB](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Tagging.html) in the *Amazon DynamoDB Developer Guide*.
       additionalProperties: false
       type: object
       properties:
         Value:
-          description: The value of the tag. Tag values are case-sensitive and can be null.
           type: string
         Key:
-          description: The key of the tag. Tag keys are case sensitive. Each DynamoDB table can only have up to one tag with the same key. If you try to add an existing tag (same key), the existing tag value will be updated to the new value.
           type: string
       required:
         - Value
@@ -830,18 +721,12 @@ components:
         ReadCapacityAutoScalingSettings:
           $ref: '#/components/schemas/CapacityAutoScalingSettings'
     TimeToLiveSpecification:
-      description: Represents the settings used to enable or disable Time to Live (TTL) for the specified table.
       additionalProperties: false
       type: object
       properties:
         Enabled:
-          description: Indicates whether TTL is to be enabled (true) or disabled (false) on the table.
           type: boolean
         AttributeName:
-          description: |-
-            The name of the TTL attribute used to store the expiration time for items in the table.
-               +  The ``AttributeName`` property is required when enabling the TTL, or when TTL is already enabled.
-              +  To update this property, you must first disable TTL and then enable TTL with the new attribute name.
           type: string
       required:
         - Enabled
@@ -1064,6 +949,115 @@ components:
              To specify a maximum ``OnDemandThroughput`` on your table, set the value of ``MaxWriteRequestUnits`` as greater than or equal to 1. To remove the maximum ``OnDemandThroughput`` that is currently set on your table, set the value of ``MaxWriteRequestUnits`` to -1.
           type: integer
           minimum: 1
+    Table_LocalSecondaryIndex:
+      description: Represents the properties of a local secondary index. A local secondary index can only be created when its parent table is created.
+      additionalProperties: false
+      type: object
+      properties:
+        IndexName:
+          description: The name of the local secondary index. The name must be unique among all other indexes on this table.
+          type: string
+        Projection:
+          description: Represents attributes that are copied (projected) from the table into the local secondary index. These are in addition to the primary key attributes and index key attributes, which are automatically projected.
+          $ref: '#/components/schemas/Table_Projection'
+        KeySchema:
+          uniqueItems: true
+          description: |-
+            The complete key schema for the local secondary index, consisting of one or more pairs of attribute names and key types:
+              +  ``HASH`` - partition key
+              +  ``RANGE`` - sort key
+              
+              The partition key of an item is also known as its *hash attribute*. The term "hash attribute" derives from DynamoDB's usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.
+             The sort key of an item is also known as its *range attribute*. The term "range attribute" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.
+          type: array
+          items:
+            $ref: '#/components/schemas/Table_KeySchema'
+      required:
+        - IndexName
+        - Projection
+        - KeySchema
+    Table_SSESpecification:
+      description: Represents the settings used to enable server-side encryption.
+      additionalProperties: false
+      type: object
+      properties:
+        SSEEnabled:
+          description: Indicates whether server-side encryption is done using an AWS managed key or an AWS owned key. If enabled (true), server-side encryption type is set to ``KMS`` and an AWS managed key is used (KMS charges apply). If disabled (false) or not specified, server-side encryption is set to AWS owned key.
+          type: boolean
+        SSEType:
+          description: |-
+            Server-side encryption type. The only supported value is:
+              +  ``KMS`` - Server-side encryption that uses KMSlong. The key is stored in your account and is managed by KMS (KMS charges apply).
+          type: string
+        KMSMasterKeyId:
+          anyOf:
+            - relationshipRef:
+                typeName: AWS::KMS::Key
+                propertyPath: /properties/Arn
+            - relationshipRef:
+                typeName: AWS::KMS::Key
+                propertyPath: /properties/KeyId
+            - relationshipRef:
+                typeName: AWS::KMS::Alias
+                propertyPath: /properties/AliasName
+          description: The KMS key that should be used for the KMS encryption. To specify a key, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. Note that you should only provide this parameter if the key is different from the default DynamoDB key ``alias/aws/dynamodb``.
+          type: string
+      required:
+        - SSEEnabled
+    Table_KinesisStreamSpecification:
+      description: The Kinesis Data Streams configuration for the specified table.
+      additionalProperties: false
+      type: object
+      properties:
+        ApproximateCreationDateTimePrecision:
+          description: The precision for the time and date that the stream was created.
+          type: string
+          enum:
+            - MICROSECOND
+            - MILLISECOND
+        StreamArn:
+          description: |-
+            The ARN for a specific Kinesis data stream.
+             Length Constraints: Minimum length of 37. Maximum length of 1024.
+          type: string
+      required:
+        - StreamArn
+    Table_StreamSpecification:
+      description: Represents the DynamoDB Streams configuration for a table in DynamoDB.
+      additionalProperties: false
+      type: object
+      properties:
+        StreamViewType:
+          description: |-
+            When an item in the table is modified, ``StreamViewType`` determines what information is written to the stream for this table. Valid values for ``StreamViewType`` are:
+              +  ``KEYS_ONLY`` - Only the key attributes of the modified item are written to the stream.
+              +  ``NEW_IMAGE`` - The entire item, as it appears after it was modified, is written to the stream.
+              +  ``OLD_IMAGE`` - The entire item, as it appeared before it was modified, is written to the stream.
+              +  ``NEW_AND_OLD_IMAGES`` - Both the new and the old item images of the item are written to the stream.
+          type: string
+        ResourcePolicy:
+          description: |-
+            Creates or updates a resource-based policy document that contains the permissions for DDB resources, such as a table's streams. Resource-based policies let you define access permissions by specifying who has access to each resource, and the actions they are allowed to perform on each resource.
+             In a CFNshort template, you can provide the policy in JSON or YAML format because CFNshort converts YAML to JSON before submitting it to DDB. For more information about resource-based policies, see [Using resource-based policies for](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/access-control-resource-based.html) and [Resource-based policy examples](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/rbac-examples.html).
+          $ref: '#/components/schemas/Table_ResourcePolicy'
+      required:
+        - StreamViewType
+    Table_ContributorInsightsSpecification:
+      description: The settings used to enable or disable CloudWatch Contributor Insights.
+      additionalProperties: false
+      type: object
+      properties:
+        Mode:
+          description: ''
+          type: string
+          enum:
+            - ACCESSED_AND_THROTTLED_KEYS
+            - THROTTLED_KEYS
+        Enabled:
+          description: Indicates whether CloudWatch Contributor Insights are to be enabled (true) or disabled (false).
+          type: boolean
+      required:
+        - Enabled
     InputFormatOptions:
       description: The format options for the data that was imported into the target table. There is one value, CsvOption.
       additionalProperties: false
@@ -1106,6 +1100,62 @@ components:
       required:
         - S3BucketSource
         - InputFormat
+    Table_AttributeDefinition:
+      description: Represents an attribute for describing the schema for the table and indexes.
+      additionalProperties: false
+      type: object
+      properties:
+        AttributeType:
+          description: |-
+            The data type for the attribute, where:
+              +  ``S`` - the attribute is of type String
+              +  ``N`` - the attribute is of type Number
+              +  ``B`` - the attribute is of type Binary
+          type: string
+        AttributeName:
+          description: A name for the attribute.
+          type: string
+      required:
+        - AttributeName
+        - AttributeType
+    Table_Projection:
+      description: Represents attributes that are copied (projected) from the table into an index. These are in addition to the primary key attributes and index key attributes, which are automatically projected.
+      additionalProperties: false
+      type: object
+      properties:
+        NonKeyAttributes:
+          uniqueItems: false
+          description: |-
+            Represents the non-key attribute names which will be projected into the index.
+             For global and local secondary indexes, the total count of ``NonKeyAttributes`` summed across all of the secondary indexes, must not exceed 100. If you project the same attribute into two different indexes, this counts as two distinct attributes when determining the total. This limit only applies when you specify the ProjectionType of ``INCLUDE``. You still can specify the ProjectionType of ``ALL`` to project all attributes from the source table, even if the table has more than 100 attributes.
+          type: array
+          items:
+            type: string
+        ProjectionType:
+          description: |-
+            The set of attributes that are projected into the index:
+              +  ``KEYS_ONLY`` - Only the index and primary keys are projected into the index.
+              +  ``INCLUDE`` - In addition to the attributes described in ``KEYS_ONLY``, the secondary index will include other non-key attributes that you specify.
+              +  ``ALL`` - All of the table attributes are projected into the index.
+              
+             When using the DynamoDB console, ``ALL`` is selected by default.
+          type: string
+    Table_PointInTimeRecoverySpecification:
+      description: The settings used to enable point in time recovery.
+      additionalProperties: false
+      type: object
+      properties:
+        PointInTimeRecoveryEnabled:
+          description: Indicates whether point in time recovery is enabled (true) or disabled (false) on the table.
+          type: boolean
+        RecoveryPeriodInDays:
+          maximum: 35
+          description: The number of preceding days for which continuous backups are taken and maintained. Your table data is only recoverable to any point-in-time from within the configured recovery period. This parameter is optional. If no value is provided, the value will default to 35.
+          type: integer
+          minimum: 1
+      x-dependencies:
+        RecoveryPeriodInDays:
+          - PointInTimeRecoveryEnabled
     ProvisionedThroughput:
       description: Throughput for the specified table, which consists of values for ``ReadCapacityUnits`` and ``WriteCapacityUnits``. For more information about the contents of a provisioned throughput structure, see [Table ProvisionedThroughput](https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_ProvisionedThroughput.html).
       additionalProperties: false
@@ -1124,6 +1174,65 @@ components:
       required:
         - WriteCapacityUnits
         - ReadCapacityUnits
+    Table_WarmThroughput:
+      anyOf:
+        - required:
+            - ReadUnitsPerSecond
+        - required:
+            - WriteUnitsPerSecond
+      description: Provides visibility into the number of read and write operations your table or secondary index can instantaneously support. The settings can be modified using the ``UpdateTable`` operation to meet the throughput requirements of an upcoming peak event.
+      additionalProperties: false
+      type: object
+      properties:
+        ReadUnitsPerSecond:
+          description: Represents the number of read operations your base table can instantaneously support.
+          type: integer
+          minimum: 1
+        WriteUnitsPerSecond:
+          description: Represents the number of write operations your base table can instantaneously support.
+          type: integer
+          minimum: 1
+    Table_GlobalSecondaryIndex:
+      description: Represents the properties of a global secondary index.
+      additionalProperties: false
+      type: object
+      properties:
+        IndexName:
+          description: The name of the global secondary index. The name must be unique among all other indexes on this table.
+          type: string
+        OnDemandThroughput:
+          description: The maximum number of read and write units for the specified global secondary index. If you use this parameter, you must specify ``MaxReadRequestUnits``, ``MaxWriteRequestUnits``, or both. You must use either ``OnDemandThroughput`` or ``ProvisionedThroughput`` based on your table's capacity mode.
+          $ref: '#/components/schemas/OnDemandThroughput'
+        ContributorInsightsSpecification:
+          description: The settings used to enable or disable CloudWatch Contributor Insights for the specified global secondary index.
+          $ref: '#/components/schemas/Table_ContributorInsightsSpecification'
+        Projection:
+          description: Represents attributes that are copied (projected) from the table into the global secondary index. These are in addition to the primary key attributes and index key attributes, which are automatically projected.
+          $ref: '#/components/schemas/Table_Projection'
+        ProvisionedThroughput:
+          description: |-
+            Represents the provisioned throughput settings for the specified global secondary index. You must use either ``OnDemandThroughput`` or ``ProvisionedThroughput`` based on your table's capacity mode.
+             For current minimum and maximum provisioned throughput values, see [Service, Account, and Table Quotas](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Limits.html) in the *Amazon DynamoDB Developer Guide*.
+          $ref: '#/components/schemas/ProvisionedThroughput'
+        KeySchema:
+          uniqueItems: true
+          description: |-
+            The complete key schema for a global secondary index, which consists of one or more pairs of attribute names and key types:
+              +  ``HASH`` - partition key
+              +  ``RANGE`` - sort key
+              
+              The partition key of an item is also known as its *hash attribute*. The term "hash attribute" derives from DynamoDB's usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.
+             The sort key of an item is also known as its *range attribute*. The term "range attribute" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.
+          type: array
+          items:
+            $ref: '#/components/schemas/Table_KeySchema'
+        WarmThroughput:
+          description: Represents the warm throughput value (in read units per second and write units per second) for the specified secondary index. If you use this parameter, you must specify ``ReadUnitsPerSecond``, ``WriteUnitsPerSecond``, or both.
+          $ref: '#/components/schemas/Table_WarmThroughput'
+      required:
+        - IndexName
+        - Projection
+        - KeySchema
     S3BucketSource:
       description: The S3 bucket that is being imported from.
       additionalProperties: false
@@ -1140,6 +1249,28 @@ components:
           type: string
       required:
         - S3Bucket
+    Table_ResourcePolicy:
+      description: |-
+        Creates or updates a resource-based policy document that contains the permissions for DDB resources, such as a table, its indexes, and stream. Resource-based policies let you define access permissions by specifying who has access to each resource, and the actions they are allowed to perform on each resource.
+         In a CFNshort template, you can provide the policy in JSON or YAML format because CFNshort converts YAML to JSON before submitting it to DDB. For more information about resource-based policies, see [Using resource-based policies for](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/access-control-resource-based.html) and [Resource-based policy examples](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/rbac-examples.html).
+         While defining resource-based policies in your CFNshort templates, the following considerations apply:
+          +  The maximum size supported for a resource-based policy document in JSON format is 20 KB. DDB counts whitespaces when calculating the size of a policy against this limit. 
+          +  Resource-based policies don't support [drift detection](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-stack-drift.html#). If you update a policy outside of the CFNshort stack template, you'll need to update the CFNshort stack with the changes.
+          +  Resource-based policies don't support out-of-band changes. If you add, update, or delete a policy outside of the CFNshort template, the change won't be overwritten if there are no changes to the policy within the template.
+         For example, say that your template contains a resource-based policy, which you later update outside of the template. If you don't make any changes to the policy in the template, the updated policy in DDB won’t be synced with the policy in the template.
+         Conversely, say that your template doesn’t contain a resource-based policy, but you add a policy outside of the template. This policy won’t be removed from DDB as long as you don’t add it to the template. When you add a policy to the template and update the stack, the existing policy in DDB will be updated to match the one defined in the template.
+          
+         For a full list of all considerations, see [Resource-based policy considerations](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/rbac-considerations.html).
+      additionalProperties: false
+      type: object
+      properties:
+        PolicyDocument:
+          description: >-
+            A resource-based policy document that contains permissions to add to the specified DDB table, index, or both. In a CFNshort template, you can provide the policy in JSON or YAML format because CFNshort converts YAML to JSON before submitting it to DDB. For more information about resource-based policies, see [Using resource-based policies for](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/access-control-resource-based.html) and [Resource-based policy
+            examples](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/rbac-examples.html).
+          type: object
+      required:
+        - PolicyDocument
     DeprecatedKeySchema:
       description: ''
       additionalProperties: false
@@ -1149,6 +1280,46 @@ components:
           $ref: '#/components/schemas/DeprecatedHashKeyElement'
       required:
         - HashKeyElement
+    Table_KeySchema:
+      description: |-
+        Represents *a single element* of a key schema. A key schema specifies the attributes that make up the primary key of a table, or the key attributes of an index.
+         A ``KeySchemaElement`` represents exactly one attribute of the primary key. For example, a simple primary key would be represented by one ``KeySchemaElement`` (for the partition key). A composite primary key would require one ``KeySchemaElement`` for the partition key, and another ``KeySchemaElement`` for the sort key.
+         A ``KeySchemaElement`` must be a scalar, top-level attribute (not a nested attribute). The data type must be one of String, Number, or Binary. The attribute cannot be nested within a List or a Map.
+      additionalProperties: false
+      type: object
+      properties:
+        KeyType:
+          description: |-
+            The role that this key attribute will assume:
+              +  ``HASH`` - partition key
+              +  ``RANGE`` - sort key
+              
+              The partition key of an item is also known as its *hash attribute*. The term "hash attribute" derives from DynamoDB's usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.
+             The sort key of an item is also known as its *range attribute*. The term "range attribute" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.
+          type: string
+        AttributeName:
+          description: The name of a key attribute.
+          type: string
+      required:
+        - KeyType
+        - AttributeName
+    Table_Tag:
+      description: |-
+        Describes a tag. A tag is a key-value pair. You can add up to 50 tags to a single DynamoDB table. 
+         AWS-assigned tag names and values are automatically assigned the ``aws:`` prefix, which the user cannot assign. AWS-assigned tag names do not count towards the tag limit of 50. User-assigned tag names have the prefix ``user:`` in the Cost Allocation Report. You cannot backdate the application of a tag.
+         For an overview on tagging DynamoDB resources, see [Tagging for DynamoDB](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Tagging.html) in the *Amazon DynamoDB Developer Guide*.
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          description: The value of the tag. Tag values are case-sensitive and can be null.
+          type: string
+        Key:
+          description: The key of the tag. Tag keys are case sensitive. Each DynamoDB table can only have up to one tag with the same key. If you try to add an existing tag (same key), the existing tag value will be updated to the new value.
+          type: string
+      required:
+        - Value
+        - Key
     DeprecatedHashKeyElement:
       description: ''
       additionalProperties: false
@@ -1161,6 +1332,22 @@ components:
       required:
         - AttributeType
         - AttributeName
+    Table_TimeToLiveSpecification:
+      description: Represents the settings used to enable or disable Time to Live (TTL) for the specified table.
+      additionalProperties: false
+      type: object
+      properties:
+        Enabled:
+          description: Indicates whether TTL is to be enabled (true) or disabled (false) on the table.
+          type: boolean
+        AttributeName:
+          description: |-
+            The name of the TTL attribute used to store the expiration time for items in the table.
+               +  The ``AttributeName`` property is required when enabling the TTL, or when TTL is already enabled.
+              +  To update this property, you must first disable TTL and then enable TTL with the new attribute name.
+          type: string
+      required:
+        - Enabled
     Table:
       type: object
       properties:
@@ -1169,16 +1356,16 @@ components:
           $ref: '#/components/schemas/OnDemandThroughput'
         SSESpecification:
           description: Specifies the settings to enable server-side encryption.
-          $ref: '#/components/schemas/SSESpecification'
+          $ref: '#/components/schemas/Table_SSESpecification'
         KinesisStreamSpecification:
           description: The Kinesis Data Streams configuration for the specified table.
-          $ref: '#/components/schemas/KinesisStreamSpecification'
+          $ref: '#/components/schemas/Table_KinesisStreamSpecification'
         StreamSpecification:
           description: The settings for the DDB table stream, which capture changes to items stored in the table.
-          $ref: '#/components/schemas/StreamSpecification'
+          $ref: '#/components/schemas/Table_StreamSpecification'
         ContributorInsightsSpecification:
           description: The settings used to enable or disable CloudWatch Contributor Insights for the specified table.
-          $ref: '#/components/schemas/ContributorInsightsSpecification'
+          $ref: '#/components/schemas/Table_ContributorInsightsSpecification'
         ImportSourceSpecification:
           description: |-
             Specifies the properties of data being imported from the S3 bucket source to the" table.
@@ -1186,7 +1373,7 @@ components:
           $ref: '#/components/schemas/ImportSourceSpecification'
         PointInTimeRecoverySpecification:
           description: The settings used to enable point in time recovery.
-          $ref: '#/components/schemas/PointInTimeRecoverySpecification'
+          $ref: '#/components/schemas/Table_PointInTimeRecoverySpecification'
         ProvisionedThroughput:
           description: |-
             Throughput for the specified table, which consists of values for ``ReadCapacityUnits`` and ``WriteCapacityUnits``. For more information about the contents of a provisioned throughput structure, see [Amazon DynamoDB Table ProvisionedThroughput](https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_ProvisionedThroughput.html). 
@@ -1194,7 +1381,7 @@ components:
           $ref: '#/components/schemas/ProvisionedThroughput'
         WarmThroughput:
           description: Represents the warm throughput (in read units per second and write units per second) for creating a table.
-          $ref: '#/components/schemas/WarmThroughput'
+          $ref: '#/components/schemas/Table_WarmThroughput'
         TableName:
           description: |-
             A name for the table. If you don't specify a name, CFNlong generates a unique physical ID and uses that ID for the table name. For more information, see [Name Type](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-name.html).
@@ -1208,7 +1395,7 @@ components:
              Update requires: [Some interruptions](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-some-interrupt). Replacement if you edit an existing AttributeDefinition.
           type: array
           items:
-            $ref: '#/components/schemas/AttributeDefinition'
+            $ref: '#/components/schemas/Table_AttributeDefinition'
         BillingMode:
           description: |-
             Specify how you are charged for read and write throughput and how you manage capacity.
@@ -1229,20 +1416,20 @@ components:
               +  You can delete or add one global secondary index without interruption. If you do both in the same update (for example, by changing the index's logical ID), the update fails.
           type: array
           items:
-            $ref: '#/components/schemas/GlobalSecondaryIndex'
+            $ref: '#/components/schemas/Table_GlobalSecondaryIndex'
         ResourcePolicy:
           description: |-
             An AWS resource-based policy document in JSON format that will be attached to the table.
              When you attach a resource-based policy while creating a table, the policy application is *strongly consistent*.
              The maximum size supported for a resource-based policy document is 20 KB. DynamoDB counts whitespaces when calculating the size of a policy against this limit. For a full list of all considerations that apply for resource-based policies, see [Resource-based policy considerations](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/rbac-considerations.html).
               You need to specify the ``CreateTable`` and ``PutResourcePolicy`` IAM actions for authorizing a user to create a table with a resource-based policy.
-          $ref: '#/components/schemas/ResourcePolicy'
+          $ref: '#/components/schemas/Table_ResourcePolicy'
         KeySchema:
           oneOf:
             - uniqueItems: true
               type: array
               items:
-                $ref: '#/components/schemas/KeySchema'
+                $ref: '#/components/schemas/Table_KeySchema'
             - type: object
           description: Specifies the attributes that make up the primary key for the table. The attributes in the ``KeySchema`` property must also be defined in the ``AttributeDefinitions`` property.
         LocalSecondaryIndexes:
@@ -1250,7 +1437,7 @@ components:
           description: Local secondary indexes to be created on the table. You can create up to 5 local secondary indexes. Each index is scoped to a given hash key value. The size of each hash key can be up to 10 gigabytes.
           type: array
           items:
-            $ref: '#/components/schemas/LocalSecondaryIndex'
+            $ref: '#/components/schemas/Table_LocalSecondaryIndex'
         Arn:
           description: ''
           type: string
@@ -1270,12 +1457,12 @@ components:
              For more information, see [Tag](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html).
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Table_Tag'
         TimeToLiveSpecification:
           description: |-
             Specifies the Time to Live (TTL) settings for the table.
               For detailed information about the limits in DynamoDB, see [Limits in Amazon DynamoDB](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Limits.html) in the Amazon DynamoDB Developer Guide.
-          $ref: '#/components/schemas/TimeToLiveSpecification'
+          $ref: '#/components/schemas/Table_TimeToLiveSpecification'
       required:
         - KeySchema
       x-stackql-resource-name: table
@@ -1489,16 +1676,16 @@ components:
               $ref: '#/components/schemas/OnDemandThroughput'
             SSESpecification:
               description: Specifies the settings to enable server-side encryption.
-              $ref: '#/components/schemas/SSESpecification'
+              $ref: '#/components/schemas/Table_SSESpecification'
             KinesisStreamSpecification:
               description: The Kinesis Data Streams configuration for the specified table.
-              $ref: '#/components/schemas/KinesisStreamSpecification'
+              $ref: '#/components/schemas/Table_KinesisStreamSpecification'
             StreamSpecification:
               description: The settings for the DDB table stream, which capture changes to items stored in the table.
-              $ref: '#/components/schemas/StreamSpecification'
+              $ref: '#/components/schemas/Table_StreamSpecification'
             ContributorInsightsSpecification:
               description: The settings used to enable or disable CloudWatch Contributor Insights for the specified table.
-              $ref: '#/components/schemas/ContributorInsightsSpecification'
+              $ref: '#/components/schemas/Table_ContributorInsightsSpecification'
             ImportSourceSpecification:
               description: |-
                 Specifies the properties of data being imported from the S3 bucket source to the" table.
@@ -1506,7 +1693,7 @@ components:
               $ref: '#/components/schemas/ImportSourceSpecification'
             PointInTimeRecoverySpecification:
               description: The settings used to enable point in time recovery.
-              $ref: '#/components/schemas/PointInTimeRecoverySpecification'
+              $ref: '#/components/schemas/Table_PointInTimeRecoverySpecification'
             ProvisionedThroughput:
               description: |-
                 Throughput for the specified table, which consists of values for ``ReadCapacityUnits`` and ``WriteCapacityUnits``. For more information about the contents of a provisioned throughput structure, see [Amazon DynamoDB Table ProvisionedThroughput](https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_ProvisionedThroughput.html). 
@@ -1514,7 +1701,7 @@ components:
               $ref: '#/components/schemas/ProvisionedThroughput'
             WarmThroughput:
               description: Represents the warm throughput (in read units per second and write units per second) for creating a table.
-              $ref: '#/components/schemas/WarmThroughput'
+              $ref: '#/components/schemas/Table_WarmThroughput'
             TableName:
               description: |-
                 A name for the table. If you don't specify a name, CFNlong generates a unique physical ID and uses that ID for the table name. For more information, see [Name Type](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-name.html).
@@ -1528,7 +1715,7 @@ components:
                  Update requires: [Some interruptions](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-some-interrupt). Replacement if you edit an existing AttributeDefinition.
               type: array
               items:
-                $ref: '#/components/schemas/AttributeDefinition'
+                $ref: '#/components/schemas/Table_AttributeDefinition'
             BillingMode:
               description: |-
                 Specify how you are charged for read and write throughput and how you manage capacity.
@@ -1549,20 +1736,20 @@ components:
                   +  You can delete or add one global secondary index without interruption. If you do both in the same update (for example, by changing the index's logical ID), the update fails.
               type: array
               items:
-                $ref: '#/components/schemas/GlobalSecondaryIndex'
+                $ref: '#/components/schemas/Table_GlobalSecondaryIndex'
             ResourcePolicy:
               description: |-
                 An AWS resource-based policy document in JSON format that will be attached to the table.
                  When you attach a resource-based policy while creating a table, the policy application is *strongly consistent*.
                  The maximum size supported for a resource-based policy document is 20 KB. DynamoDB counts whitespaces when calculating the size of a policy against this limit. For a full list of all considerations that apply for resource-based policies, see [Resource-based policy considerations](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/rbac-considerations.html).
                   You need to specify the ``CreateTable`` and ``PutResourcePolicy`` IAM actions for authorizing a user to create a table with a resource-based policy.
-              $ref: '#/components/schemas/ResourcePolicy'
+              $ref: '#/components/schemas/Table_ResourcePolicy'
             KeySchema:
               oneOf:
                 - uniqueItems: true
                   type: array
                   items:
-                    $ref: '#/components/schemas/KeySchema'
+                    $ref: '#/components/schemas/Table_KeySchema'
                 - type: object
               description: Specifies the attributes that make up the primary key for the table. The attributes in the ``KeySchema`` property must also be defined in the ``AttributeDefinitions`` property.
             LocalSecondaryIndexes:
@@ -1570,7 +1757,7 @@ components:
               description: Local secondary indexes to be created on the table. You can create up to 5 local secondary indexes. Each index is scoped to a given hash key value. The size of each hash key can be up to 10 gigabytes.
               type: array
               items:
-                $ref: '#/components/schemas/LocalSecondaryIndex'
+                $ref: '#/components/schemas/Table_LocalSecondaryIndex'
             Arn:
               description: ''
               type: string
@@ -1590,12 +1777,12 @@ components:
                  For more information, see [Tag](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html).
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Table_Tag'
             TimeToLiveSpecification:
               description: |-
                 Specifies the Time to Live (TTL) settings for the table.
                   For detailed information about the limits in DynamoDB, see [Limits in Amazon DynamoDB](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Limits.html) in the Amazon DynamoDB Developer Guide.
-              $ref: '#/components/schemas/TimeToLiveSpecification'
+              $ref: '#/components/schemas/Table_TimeToLiveSpecification'
           x-stackQL-stringOnly: true
       x-title: CreateTableRequest
       type: object
@@ -1613,7 +1800,7 @@ components:
       id: awscc.dynamodb.global_tables
       x-cfn-schema-name: GlobalTable
       x-cfn-type-name: AWS::DynamoDB::GlobalTable
-      x-identifiers:
+      x-identifiers: &ref_0
         - TableName
       x-type: cloud_control
       methods:
@@ -1733,8 +1920,7 @@ components:
       id: awscc.dynamodb.global_tables_list_only
       x-cfn-schema-name: GlobalTable
       x-cfn-type-name: AWS::DynamoDB::GlobalTable
-      x-identifiers:
-        - TableName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1764,7 +1950,7 @@ components:
       id: awscc.dynamodb.tables
       x-cfn-schema-name: Table
       x-cfn-type-name: AWS::DynamoDB::Table
-      x-identifiers:
+      x-identifiers: &ref_1
         - TableName
       x-type: cloud_control
       methods:
@@ -1892,8 +2078,7 @@ components:
       id: awscc.dynamodb.tables_list_only
       x-cfn-schema-name: Table
       x-cfn-type-name: AWS::DynamoDB::Table
-      x-identifiers:
-        - TableName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/ec2.yaml b/openapi/src/awscc/v00.00.00000/services/ec2.yaml
index 60918b50d..37ae41b56 100644
--- a/openapi/src/awscc/v00.00.00000/services/ec2.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/ec2.yaml
@@ -394,32 +394,23 @@ components:
       type: object
       additionalProperties: false
       properties:
-        Key:
-          type: string
-          description: The tag key.
         Value:
           type: string
-          description: The tag value.
+        Key:
+          type: string
       required:
         - Value
         - Key
-      description: Specifies a tag. For more information, see [Resource tags](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html).
     TagSpecification:
-      description: |-
-        Specifies the tags to apply to resources that are created during instance launch.
-         ``TagSpecification`` is a property type of [TagSpecifications](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-tagspecifications). [TagSpecifications](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-tagspecifications) is a property of [AWS::EC2::LaunchTemplate LaunchTemplateData](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html).
-      additionalProperties: false
       type: object
+      additionalProperties: false
       properties:
         ResourceType:
-          description: |-
-            The type of resource to tag. You can specify tags for the following resource types only: ``instance`` | ``volume`` | ``network-interface`` | ``spot-instances-request``. If the instance does not include the resource type that you specify, the instance launch fails. For example, not all instance types include a volume.
-             To tag a resource after it has been created, see [CreateTags](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html).
           type: string
         Tags:
-          uniqueItems: false
-          description: The tags to apply to the resource.
           type: array
+          x-insertionOrder: false
+          uniqueItems: false
           items:
             $ref: '#/components/schemas/Tag'
     CapacityAllocation:
@@ -698,9 +689,24 @@ components:
           - ec2:DeleteTags
     Tags:
       type: array
+      x-insertionOrder: false
       uniqueItems: true
       items:
-        $ref: '#/components/schemas/Tag'
+        $ref: '#/components/schemas/CarrierGateway_Tag'
+    CarrierGateway_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 127
+          pattern: ^(?!aws:.*)
+        Value:
+          type: string
+          minLength: 1
+          maxLength: 255
+          pattern: ^(?!aws:.*)
+      additionalProperties: false
     CarrierGateway:
       type: object
       properties:
@@ -763,6 +769,20 @@ components:
           - ec2:DeleteTags
         list:
           - ec2:DescribeCarrierGateways
+    CustomerGateway_Tag:
+      description: Specifies a tag. For more information, see [Resource tags](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html).
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          description: The tag value.
+          type: string
+        Key:
+          description: The tag key.
+          type: string
+      required:
+        - Value
+        - Key
     CustomerGateway:
       type: object
       properties:
@@ -796,7 +816,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/CustomerGateway_Tag'
         CertificateArn:
           pattern: ^arn:(aws[a-zA-Z-]*)?:acm:[a-z]{2}((-gov)|(-iso([a-z]{1})?))?-[a-z]+-\d{1}:\d{12}:certificate\/[a-zA-Z0-9-_]+$
           description: The Amazon Resource Name (ARN) for the customer gateway certificate.
@@ -849,6 +869,21 @@ components:
         delete:
           - ec2:DeleteCustomerGateway
           - ec2:DescribeCustomerGateways
+    DHCPOptions_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          minLength: 0
+          maxLength: 256
+      required:
+        - Value
+        - Key
     DHCPOptions:
       type: object
       properties:
@@ -887,7 +922,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/DHCPOptions_Tag'
       x-stackql-resource-name: dhcp_options
       description: Resource Type definition for AWS::EC2::DHCPOptions
       x-type-name: AWS::EC2::DHCPOptions
@@ -1018,38 +1053,24 @@ components:
       required:
         - Version
     Placement:
-      description: |-
-        Specifies the placement of an instance.
-         ``Placement`` is a property of [AWS::EC2::LaunchTemplate LaunchTemplateData](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html).
-      additionalProperties: false
       type: object
+      additionalProperties: false
       properties:
         GroupName:
-          description: The name of the placement group for the instance.
           type: string
         Tenancy:
-          description: The tenancy of the instance. An instance with a tenancy of dedicated runs on single-tenant hardware.
           type: string
         SpreadDomain:
-          description: Reserved for future use.
           type: string
         PartitionNumber:
-          description: The number of the partition the instance should launch in. Valid only if the placement group strategy is set to ``partition``.
           type: integer
         AvailabilityZone:
-          description: The Availability Zone for the instance.
           type: string
         Affinity:
-          description: The affinity setting for an instance on a Dedicated Host.
           type: string
         HostId:
-          description: The ID of the Dedicated Host for the instance.
           type: string
         HostResourceGroupArn:
-          description: The ARN of the host resource group in which to launch the instances. If you specify a host resource group ARN, omit the *Tenancy* parameter or set it to ``host``.
-          type: string
-        GroupId:
-          description: The Group Id of a placement group. You must specify the Placement Group *Group Id* to launch an instance in a shared placement group.
           type: string
     BlockDeviceMapping:
       type: object
@@ -1063,8 +1084,6 @@ components:
           type: string
         VirtualName:
           type: string
-      required:
-        - DeviceName
     EbsBlockDevice:
       type: object
       additionalProperties: false
@@ -1075,6 +1094,8 @@ components:
           type: boolean
         Iops:
           type: integer
+        KmsKeyId:
+          type: string
         SnapshotId:
           type: string
         VolumeSize:
@@ -1133,6 +1154,65 @@ components:
           uniqueItems: true
           items:
             $ref: '#/components/schemas/BlockDeviceMapping'
+    EC2Fleet_TagSpecification:
+      type: object
+      additionalProperties: false
+      properties:
+        ResourceType:
+          type: string
+          enum:
+            - client-vpn-endpoint
+            - customer-gateway
+            - dedicated-host
+            - dhcp-options
+            - egress-only-internet-gateway
+            - elastic-gpu
+            - elastic-ip
+            - export-image-task
+            - export-instance-task
+            - fleet
+            - fpga-image
+            - host-reservation
+            - image
+            - import-image-task
+            - import-snapshot-task
+            - instance
+            - internet-gateway
+            - key-pair
+            - launch-template
+            - local-gateway-route-table-vpc-association
+            - natgateway
+            - network-acl
+            - network-insights-analysis
+            - network-insights-path
+            - network-interface
+            - placement-group
+            - reserved-instances
+            - route-table
+            - security-group
+            - snapshot
+            - spot-fleet-request
+            - spot-instances-request
+            - subnet
+            - traffic-mirror-filter
+            - traffic-mirror-session
+            - traffic-mirror-target
+            - transit-gateway
+            - transit-gateway-attachment
+            - transit-gateway-connect-peer
+            - transit-gateway-multicast-domain
+            - transit-gateway-route-table
+            - volume
+            - vpc
+            - vpc-flow-log
+            - vpc-peering-connection
+            - vpn-connection
+            - vpn-gateway
+        Tags:
+          type: array
+          uniqueItems: false
+          items:
+            $ref: '#/components/schemas/Tag'
     InstanceRequirementsRequest:
       type: object
       additionalProperties: false
@@ -1395,7 +1475,7 @@ components:
           type: array
           uniqueItems: false
           items:
-            $ref: '#/components/schemas/TagSpecification'
+            $ref: '#/components/schemas/EC2Fleet_TagSpecification'
         SpotOptions:
           $ref: '#/components/schemas/SpotOptionsRequest'
         ValidFrom:
@@ -1455,6 +1535,20 @@ components:
         update:
           - ec2:ModifyFleet
           - ec2:DescribeFleets
+    EgressOnlyInternetGateway_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          maxLength: 256
+      required:
+        - Value
+        - Key
     EgressOnlyInternetGateway:
       type: object
       properties:
@@ -1470,7 +1564,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/EgressOnlyInternetGateway_Tag'
       required:
         - VpcId
       x-stackql-resource-name: egress_only_internet_gateway
@@ -1512,6 +1606,20 @@ components:
           - ec2:DescribeEgressOnlyInternetGateways
         list:
           - ec2:DescribeEgressOnlyInternetGateways
+    EIP_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: The tag key.
+        Value:
+          type: string
+          description: The tag value.
+      required:
+        - Value
+        - Key
+      description: Specifies a tag. For more information, see [Add tags to a resource](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html#cloudformation-add-tag-specifications).
     EIP:
       type: object
       properties:
@@ -1558,7 +1666,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/EIP_Tag'
       x-stackql-resource-name: eip
       description: |-
         Specifies an Elastic IP (EIP) address and can, optionally, associate it with an Amazon EC2 instance.
@@ -1994,51 +2102,48 @@ components:
           description: The ID of the launch template. You must specify the LaunchTemplateName or the LaunchTemplateId, but not both.
           type: string
     MetadataOptions:
-      description: |-
-        The metadata options for the instance. For more information, see [Instance metadata and user data](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html) in the *Amazon EC2 User Guide*.
-         ``MetadataOptions`` is a property of [AWS::EC2::LaunchTemplate LaunchTemplateData](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html).
       additionalProperties: false
       type: object
       properties:
         HttpPutResponseHopLimit:
-          description: |-
-            The desired HTTP PUT response hop limit for instance metadata requests. The larger the number, the further instance metadata requests can travel.
-             Default: ``1``
-             Possible values: Integers from 1 to 64
+          default: 1
+          description: The number of network hops that the metadata token can travel. Maximum is 64.
+          maximum: 64
           type: integer
-        HttpTokens:
-          description: |-
-            Indicates whether IMDSv2 is required.
-              +  ``optional`` - IMDSv2 is optional. You can choose whether to send a session token in your instance metadata retrieval requests. If you retrieve IAM role credentials without a session token, you receive the IMDSv1 role credentials. If you retrieve IAM role credentials using a valid session token, you receive the IMDSv2 role credentials.
-              +  ``required`` - IMDSv2 is required. You must send a session token in your instance metadata retrieval requests. With this option, retrieving the IAM role credentials always returns IMDSv2 credentials; IMDSv1 credentials are not available.
-              
-             Default: If the value of ``ImdsSupport`` for the Amazon Machine Image (AMI) for your instance is ``v2.0``, the default is ``required``.
-          type: string
+          minimum: 1
         HttpProtocolIpv6:
-          description: |-
-            Enables or disables the IPv6 endpoint for the instance metadata service.
-             Default: ``disabled``
+          description: Enables or disables the IPv6 endpoint for the instance metadata service. To use this option, the instance must be a Nitro-based instance launched in a subnet that supports IPv6.
+          type: string
+          enum:
+            - disabled
+            - enabled
+        HttpTokens:
+          description: Indicates whether IMDSv2 is required.
           type: string
+          enum:
+            - optional
+            - required
         InstanceMetadataTags:
-          description: |-
-            Set to ``enabled`` to allow access to instance tags from the instance metadata. Set to ``disabled`` to turn off access to instance tags from the instance metadata. For more information, see [View tags for your EC2 instances using instance metadata](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/work-with-tags-in-IMDS.html).
-             Default: ``disabled``
+          description: Indicates whether tags from the instance are propagated to the EBS volumes.
           type: string
+          enum:
+            - disabled
+            - enabled
         HttpEndpoint:
-          description: |-
-            Enables or disables the HTTP metadata endpoint on your instances. If the parameter is not specified, the default state is ``enabled``.
-              If you specify a value of ``disabled``, you will not be able to access your instance metadata.
+          description: Enables or disables the HTTP metadata endpoint on your instances. If you specify a value of disabled, you cannot access your instance metadata.
           type: string
+          enum:
+            - disabled
+            - enabled
     LicenseSpecification:
-      description: |-
-        Specifies a license configuration for an instance.
-         ``LicenseSpecification`` is a property of [AWS::EC2::LaunchTemplate LaunchTemplateData](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html).
       additionalProperties: false
       type: object
       properties:
         LicenseConfigurationArn:
           description: The Amazon Resource Name (ARN) of the license configuration.
           type: string
+      required:
+        - LicenseConfigurationArn
     ElasticGpuSpecification:
       additionalProperties: false
       type: object
@@ -2049,180 +2154,88 @@ components:
       required:
         - Type
     InstanceIpv6Address:
-      type: object
       additionalProperties: false
+      type: object
       properties:
         Ipv6Address:
+          description: The IPv6 address.
           type: string
       required:
         - Ipv6Address
-    NetworkInterface:
+    Instance_NetworkInterface:
+      additionalProperties: false
       type: object
       properties:
         Description:
-          description: A description for the network interface.
+          description: The description of the network interface.
           type: string
         PrivateIpAddress:
-          description: 'Assigns a single private IP address to the network interface, which is used as the primary private IP address. If you want to specify multiple private IP address, use the PrivateIpAddresses property. '
-          type: string
-        PrimaryIpv6Address:
-          description: The primary IPv6 address
+          description: The private IPv4 address of the network interface.
           type: string
         PrivateIpAddresses:
           uniqueItems: false
-          description: Assigns a list of private IP addresses to the network interface. You can specify a primary private IP address by setting the value of the Primary property to true in the PrivateIpAddressSpecification property. If you want EC2 to automatically assign private IP addresses, use the SecondaryPrivateIpAddressCount property and do not specify this property.
+          description: One or more private IPv4 addresses to assign to the network interface.
           x-insertionOrder: false
           type: array
           items:
             $ref: '#/components/schemas/PrivateIpAddressSpecification'
         SecondaryPrivateIpAddressCount:
-          description: The number of secondary private IPv4 addresses to assign to a network interface. When you specify a number of secondary IPv4 addresses, Amazon EC2 selects these IP addresses within the subnet's IPv4 CIDR range. You can't specify this option and specify more than one private IP address using privateIpAddresses
-          type: integer
-        Ipv6PrefixCount:
-          description: 'The number of IPv6 prefixes to assign to a network interface. When you specify a number of IPv6 prefixes, Amazon EC2 selects these prefixes from your existing subnet CIDR reservations, if available, or from free spaces in the subnet. By default, these will be /80 prefixes. You can''t specify a count of IPv6 prefixes if you''ve specified one of the following: specific IPv6 prefixes, specific IPv6 addresses, or a count of IPv6 addresses.'
+          description: The number of secondary private IPv4 addresses.
           type: integer
-        PrimaryPrivateIpAddress:
-          description: Returns the primary private IP address of the network interface.
+        DeviceIndex:
+          description: The position of the network interface in the attachment order. A primary network interface has a device index of 0.
           type: string
-        Ipv4Prefixes:
-          uniqueItems: false
-          description: 'Assigns a list of IPv4 prefixes to the network interface. If you want EC2 to automatically assign IPv4 prefixes, use the Ipv4PrefixCount property and do not specify this property. Presently, only /28 prefixes are supported. You can''t specify IPv4 prefixes if you''ve specified one of the following: a count of IPv4 prefixes, specific private IPv4 addresses, or a count of private IPv4 addresses.'
-          x-insertionOrder: false
-          type: array
-          items:
-            $ref: '#/components/schemas/Ipv4PrefixSpecification'
-        Ipv4PrefixCount:
-          description: 'The number of IPv4 prefixes to assign to a network interface. When you specify a number of IPv4 prefixes, Amazon EC2 selects these prefixes from your existing subnet CIDR reservations, if available, or from free spaces in the subnet. By default, these will be /28 prefixes. You can''t specify a count of IPv4 prefixes if you''ve specified one of the following: specific IPv4 prefixes, specific private IPv4 addresses, or a count of private IPv4 addresses.'
-          type: integer
-        EnablePrimaryIpv6:
-          description: >-
-            If you have instances or ENIs that rely on the IPv6 address not changing, to avoid disrupting traffic to instances or ENIs, you can enable a primary IPv6 address. Enable this option to automatically assign an IPv6 associated with the ENI attached to your instance to be the primary IPv6 address. When you enable an IPv6 address to be a primary IPv6, you cannot disable it. Traffic will be routed to the primary IPv6 address until the instance is terminated or the ENI is detached. If you
-            have multiple IPv6 addresses associated with an ENI and you enable a primary IPv6 address, the first IPv6 address associated with the ENI becomes the primary IPv6 address.
-          type: boolean
         GroupSet:
           uniqueItems: false
-          description: A list of security group IDs associated with this network interface.
+          description: The IDs of the security groups for the network interface.
           x-insertionOrder: false
           type: array
           items:
             type: string
         Ipv6Addresses:
-          uniqueItems: true
-          description: One or more specific IPv6 addresses from the IPv6 CIDR block range of your subnet to associate with the network interface. If you're specifying a number of IPv6 addresses, use the Ipv6AddressCount property and don't specify this property.
-          x-insertionOrder: false
-          type: array
-          items:
-            $ref: '#/components/schemas/InstanceIpv6Address'
-        Ipv6Prefixes:
           uniqueItems: false
-          description: 'Assigns a list of IPv6 prefixes to the network interface. If you want EC2 to automatically assign IPv6 prefixes, use the Ipv6PrefixCount property and do not specify this property. Presently, only /80 prefixes are supported. You can''t specify IPv6 prefixes if you''ve specified one of the following: a count of IPv6 prefixes, specific IPv6 addresses, or a count of IPv6 addresses.'
+          description: The IPv6 addresses associated with the network interface.
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Ipv6PrefixSpecification'
+            $ref: '#/components/schemas/InstanceIpv6Address'
         SubnetId:
-          description: The ID of the subnet to associate with the network interface.
+          description: The ID of the subnet.
           type: string
-        SourceDestCheck:
-          description: Indicates whether traffic to or from the instance is validated.
+        AssociatePublicIpAddress:
+          description: Indicates whether to assign a public IPv4 address to an instance you launch in a VPC.
           type: boolean
-        InterfaceType:
-          description: Indicates the type of network interface.
-          type: string
-        SecondaryPrivateIpAddresses:
-          uniqueItems: false
-          description: Returns the secondary private IP addresses of the network interface.
-          x-insertionOrder: false
-          type: array
-          items:
-            type: string
-        VpcId:
-          description: The ID of the VPC
+        NetworkInterfaceId:
+          description: The ID of the network interface.
           type: string
+        AssociateCarrierIpAddress:
+          description: Not currently supported by AWS CloudFormation.
+          type: boolean
+        EnaSrdSpecification:
+          $ref: '#/components/schemas/EnaSrdSpecification'
         Ipv6AddressCount:
-          description: The number of IPv6 addresses to assign to a network interface. Amazon EC2 automatically selects the IPv6 addresses from the subnet range. To specify specific IPv6 addresses, use the Ipv6Addresses property and don't specify this property.
+          description: A number of IPv6 addresses to assign to the network interface.
           type: integer
-        Id:
-          description: Network interface id.
-          type: string
-        Tags:
-          uniqueItems: false
-          description: An arbitrary set of tags (key-value pairs) for this network interface.
-          x-insertionOrder: false
-          type: array
-          items:
-            $ref: '#/components/schemas/Tag'
-        ConnectionTrackingSpecification:
-          $ref: '#/components/schemas/ConnectionTrackingSpecification'
+        DeleteOnTermination:
+          description: If set to true, the interface is deleted when the instance is terminated.
+          type: boolean
       required:
-        - SubnetId
-      x-stackql-resource-name: network_interface
-      description: The AWS::EC2::NetworkInterface resource creates network interface
-      x-type-name: AWS::EC2::NetworkInterface
-      x-stackql-primary-identifier:
-        - Id
-      x-create-only-properties:
-        - PrivateIpAddress
-        - InterfaceType
-        - SubnetId
-      x-conditional-create-only-properties:
-        - PrivateIpAddresses
-        - EnablePrimaryIpv6
-        - ConnectionTrackingSpecification
-      x-read-only-properties:
-        - Id
-        - SecondaryPrivateIpAddresses
-        - PrimaryPrivateIpAddress
-        - PrimaryIpv6Address
-        - VpcId
-      x-required-properties:
-        - SubnetId
-      x-tagging:
-        permissions:
-          - ec2:CreateTags
-          - ec2:DeleteTags
-        taggable: true
-        tagOnCreate: true
-        tagUpdatable: true
-        tagProperty: /properties/Tags
-        cloudFormationSystemTags: true
-      x-required-permissions:
-        read:
-          - ec2:DescribeNetworkInterfaces
-        create:
-          - ec2:CreateNetworkInterface
-          - ec2:DescribeNetworkInterfaces
-          - ec2:CreateTags
-          - ec2:ModifyNetworkInterfaceAttribute
-          - ec2:ModifyPublicIpDnsNameOptions
-        update:
-          - ec2:DescribeNetworkInterfaces
-          - ec2:ModifyNetworkInterfaceAttribute
-          - ec2:UnassignIpv6Addresses
-          - ec2:AssignIpv6Addresses
-          - ec2:DeleteTags
-          - ec2:CreateTags
-          - ec2:UnassignPrivateIpAddresses
-          - ec2:AssignPrivateIpAddresses
-          - ec2:ModifyPublicIpDnsNameOptions
-        list:
-          - ec2:DescribeNetworkInterfaces
-        delete:
-          - ec2:DescribeNetworkInterfaces
-          - ec2:DeleteNetworkInterface
+        - DeviceIndex
     PrivateDnsNameOptions:
-      description: The hostname type for EC2 instances launched into this subnet and how DNS A and AAAA record queries should be handled. For more information, see [Amazon EC2 instance hostname types](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-naming.html) in the *User Guide*.
       additionalProperties: false
       type: object
       properties:
         EnableResourceNameDnsARecord:
-          description: Indicates whether to respond to DNS queries for instance hostnames with DNS A records.
+          description: Indicates whether to respond to DNS queries for instance hostnames with DNS A records. For more information, see Amazon EC2 instance hostname types in the Amazon Elastic Compute Cloud User Guide.
           type: boolean
         HostnameType:
-          description: The type of hostname for EC2 instances. For IPv4 only subnets, an instance DNS name must be based on the instance IPv4 address. For IPv6 only subnets, an instance DNS name must be based on the instance ID. For dual-stack subnets, you can specify whether DNS names use the instance IPv4 address or the instance ID. For more information, see [Amazon EC2 instance hostname types](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-naming.html) in the *User Guide*.
+          description: The type of hostnames to assign to instances in the subnet at launch. For IPv4 only subnets, an instance DNS name must be based on the instance IPv4 address. For IPv6 only subnets, an instance DNS name must be based on the instance ID. For dual-stack subnets, you can specify whether DNS names use the instance IPv4 address or the instance ID. For more information, see Amazon EC2 instance hostname types in the Amazon Elastic Compute Cloud User Guide.
           type: string
+          enum:
+            - ip-name
+            - resource-name
         EnableResourceNameDnsAAAARecord:
-          description: Indicates whether to respond to DNS queries for instance hostnames with DNS AAAA records.
+          description: Indicates whether to respond to DNS queries for instance hostnames with DNS AAAA records. For more information, see Amazon EC2 instance hostname types in the Amazon Elastic Compute Cloud User Guide.
           type: boolean
     ElasticInferenceAccelerator:
       additionalProperties: false
@@ -2271,299 +2284,132 @@ components:
       required:
         - DocumentName
     PrivateIpAddressSpecification:
-      type: object
       additionalProperties: false
+      type: object
       properties:
-        Primary:
-          type: boolean
         PrivateIpAddress:
+          description: The private IPv4 addresses.
           type: string
+        Primary:
+          description: Indicates whether the private IPv4 address is the primary private IPv4 address. Only one IPv4 address can be designated as primary.
+          type: boolean
       required:
         - PrivateIpAddress
+        - Primary
     EnaSrdSpecification:
-      type: object
+      description: Specifies the ENA Express settings for the network interface that's attached to the instance.
       additionalProperties: false
+      type: object
       properties:
         EnaSrdEnabled:
+          description: Specifies whether ENA Express is enabled for the network interface when you launch an instance.
           type: boolean
-          description: Indicates whether ENA Express is enabled for the network interface.
         EnaSrdUdpSpecification:
-          type: object
-          additionalProperties: false
-          properties:
-            EnaSrdUdpEnabled:
-              type: boolean
-          description: Configures ENA Express for UDP network traffic.
-      description: |-
-        ENA Express uses AWS Scalable Reliable Datagram (SRD) technology to increase the maximum bandwidth used per stream and minimize tail latency of network traffic between EC2 instances. With ENA Express, you can communicate between two EC2 instances in the same subnet within the same account, or in different accounts. Both sending and receiving instances must have ENA Express enabled.
-         To improve the reliability of network packet delivery, ENA Express reorders network packets on the receiving end by default. However, some UDP-based applications are designed to handle network packets that are out of order to reduce the overhead for packet delivery at the network layer. When ENA Express is enabled, you can specify whether UDP network traffic uses it.
+          $ref: '#/components/schemas/EnaSrdUdpSpecification'
     EnaSrdUdpSpecification:
-      description: ENA Express is compatible with both TCP and UDP transport protocols. When it's enabled, TCP traffic automatically uses it. However, some UDP-based applications are designed to handle network packets that are out of order, without a need for retransmission, such as live video broadcasting or other near-real-time applications. For UDP traffic, you can specify whether to use ENA Express, based on your application environment needs.
+      description: Contains ENA Express settings for UDP network traffic for the network interface that's attached to the instance.
       additionalProperties: false
       type: object
       properties:
         EnaSrdUdpEnabled:
-          description: Indicates whether UDP traffic to and from the instance uses ENA Express. To specify this setting, you must first enable ENA Express.
+          description: Indicates whether UDP traffic uses ENA Express for your instance.
           type: boolean
-    Volume:
+    Instance_Volume:
+      additionalProperties: false
       type: object
       properties:
-        MultiAttachEnabled:
-          description: |-
-            Indicates whether Amazon EBS Multi-Attach is enabled.
-             CFNlong does not currently support updating a single-attach volume to be multi-attach enabled, updating a multi-attach enabled volume to be single-attach, or updating the size or number of I/O operations per second (IOPS) of a multi-attach enabled volume.
-          type: boolean
+        VolumeId:
+          description: The ID of the EBS volume. The volume and instance must be within the same Availability Zone.
+          type: string
+        Device:
+          description: The device name (for example, /dev/sdh or xvdh).
+          type: string
+      required:
+        - VolumeId
+        - Device
+    State:
+      description: The current state of the instance
+      additionalProperties: false
+      type: object
+      properties:
+        Code:
+          description: The state of the instance as a 16-bit unsigned integer.
+          type: string
+        Name:
+          description: The current state of the instance.
+          type: string
+    Ebs:
+      additionalProperties: false
+      type: object
+      properties:
+        SnapshotId:
+          description: The ID of the snapshot.
+          type: string
+        VolumeType:
+          description: The volume type.
+          type: string
         KmsKeyId:
-          description: |-
-            The identifier of the kms-key-long to use for Amazon EBS encryption. If ``KmsKeyId`` is specified, the encrypted state must be ``true``.
-             If you omit this property and your account is enabled for encryption by default, or *Encrypted* is set to ``true``, then the volume is encrypted using the default key specified for your account. If your account does not have a default key, then the volume is encrypted using the aws-managed-key.
-             Alternatively, if you want to specify a different key, you can specify one of the following:
-              +  Key ID. For example, 1234abcd-12ab-34cd-56ef-1234567890ab.
-              +  Key alias. Specify the alias for the key, prefixed with ``alias/``. For example, for a key with the alias ``my_cmk``, use ``alias/my_cmk``. Or to specify the aws-managed-key, use ``alias/aws/ebs``.
-              +  Key ARN. For example, arn:aws:kms:us-east-1:012345678910:key/1234abcd-12ab-34cd-56ef-1234567890ab.
-              +  Alias ARN. For example, arn:aws:kms:us-east-1:012345678910:alias/ExampleAlias.
+          description: The identifier of the AWS Key Management Service (AWS KMS) customer managed CMK to use for Amazon EBS encryption. If KmsKeyId is specified, the encrypted state must be true. If the encrypted state is true but you do not specify KmsKeyId, your AWS managed CMK for EBS is used.
           type: string
         Encrypted:
-          description: |-
-            Indicates whether the volume should be encrypted. The effect of setting the encryption state to ``true`` depends on the volume origin (new or from a snapshot), starting encryption state, ownership, and whether encryption by default is enabled. For more information, see [Encryption by default](https://docs.aws.amazon.com/ebs/latest/userguide/work-with-ebs-encr.html#encryption-by-default) in the *Amazon EBS User Guide*.
-             Encrypted Amazon EBS volumes must be attached to instances that support Amazon EBS encryption. For more information, see [Supported instance types](https://docs.aws.amazon.com/ebs/latest/userguide/ebs-encryption-requirements.html#ebs-encryption_supported_instances).
+          description: Indicates whether the volume should be encrypted.
           type: boolean
-        Size:
-          description: |-
-            The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. If you specify a snapshot, the default is the snapshot size. You can specify a volume size that is equal to or larger than the snapshot size.
-             The following are the supported volumes sizes for each volume type:
-              +  ``gp2`` and ``gp3``: 1 - 16,384 GiB
-              +  ``io1``: 4 - 16,384 GiB
-              +  ``io2``: 4 - 65,536 GiB
-              +  ``st1`` and ``sc1``: 125 - 16,384 GiB
-              +  ``standard``: 1 - 1024 GiB
+        Iops:
+          description: The number of I/O operations per second (IOPS). For gp3, io1, and io2 volumes, this represents the number of IOPS that are provisioned for the volume. For gp2 volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.
           type: integer
-        AutoEnableIO:
-          description: Indicates whether the volume is auto-enabled for I/O operations. By default, Amazon EBS disables I/O to the volume from attached EC2 instances when it determines that a volume's data is potentially inconsistent. If the consistency of the volume is not a concern, and you prefer that the volume be made available immediately if it's impaired, you can configure the volume to automatically enable I/O.
+        VolumeSize:
+          description: The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. If you specify a snapshot, the default is the snapshot size. You can specify a volume size that is equal to or larger than the snapshot size.
+          type: integer
+        DeleteOnTermination:
+          description: Indicates whether the EBS volume is deleted on instance termination.
           type: boolean
-        OutpostArn:
-          description: The Amazon Resource Name (ARN) of the Outpost.
+    Instance_BlockDeviceMapping:
+      additionalProperties: false
+      type: object
+      properties:
+        Ebs:
+          description: Parameters used to automatically set up EBS volumes when the instance is launched.
+          $ref: '#/components/schemas/Ebs'
+        NoDevice:
+          additionalProperties: false
+          type: object
+        VirtualName:
           type: string
-        AvailabilityZone:
-          description: |-
-            The ID of the Availability Zone in which to create the volume. For example, ``us-east-1a``.
-             Either ``AvailabilityZone`` or ``AvailabilityZoneId`` must be specified, but not both.
+        DeviceName:
+          description: The device name (for example, /dev/sdh or xvdh).
           type: string
-        Throughput:
-          description: |-
-            The throughput to provision for a volume, with a maximum of 1,000 MiB/s.
-             This parameter is valid only for ``gp3`` volumes. The default value is 125.
-             Valid Range: Minimum value of 125. Maximum value of 1000.
-          type: integer
-        Iops:
-          description: |-
-            The number of I/O operations per second (IOPS). For ``gp3``, ``io1``, and ``io2`` volumes, this represents the number of IOPS that are provisioned for the volume. For ``gp2`` volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.
-             The following are the supported values for each volume type:
-              +  ``gp3``: 3,000 - 16,000 IOPS
-              +  ``io1``: 100 - 64,000 IOPS
-              +  ``io2``: 100 - 256,000 IOPS
-              
-             For ``io2`` volumes, you can achieve up to 256,000 IOPS on [instances built on the Nitro System](https://docs.aws.amazon.com/ec2/latest/instancetypes/ec2-nitro-instances.html). On other instances, you can achieve performance up to 32,000 IOPS.
-             This parameter is required for ``io1`` and ``io2`` volumes. The default for ``gp3`` volumes is 3,000 IOPS. This parameter is not supported for ``gp2``, ``st1``, ``sc1``, or ``standard`` volumes.
-          type: integer
-        VolumeInitializationRate:
-          description: |-
-            Specifies the Amazon EBS Provisioned Rate for Volume Initialization (volume initialization rate), in MiB/s, at which to download the snapshot blocks from Amazon S3 to the volume. This is also known as *volume initialization*. Specifying a volume initialization rate ensures that the volume is initialized at a predictable and consistent rate after creation.
-             This parameter is supported only for volumes created from snapshots. Omit this parameter if:
-              +  You want to create the volume using fast snapshot restore. You must specify a snapshot that is enabled for fast snapshot restore. In this case, the volume is fully initialized at creation.
-              If you specify a snapshot that is enabled for fast snapshot restore and a volume initialization rate, the volume will be initialized at the specified rate instead of fast snapshot restore.
-               +  You want to create a volume that is initialized at the default rate.
-              
-             For more information, see [Initialize Amazon EBS volumes](https://docs.aws.amazon.com/ebs/latest/userguide/initalize-volume.html) in the *Amazon EC2 User Guide*.
-             Valid range: 100 - 300 MiB/s
-          type: integer
-        SnapshotId:
-          description: The snapshot from which to create the volume. You must specify either a snapshot ID or a volume size.
+      required:
+        - DeviceName
+    Instance:
+      type: object
+      properties:
+        PrivateDnsName:
+          description: 'The private DNS name of the specified instance. For example: ip-10-24-34-0.ec2.internal.'
           type: string
-        VolumeId:
-          description: ''
+        Volumes:
+          uniqueItems: false
+          description: The volumes to attach to the instance.
+          x-insertionOrder: false
+          type: array
+          items:
+            $ref: '#/components/schemas/Instance_Volume'
+        PrivateIp:
+          description: 'The private IP address of the specified instance. For example: 10.24.34.0.'
           type: string
-        VolumeType:
-          description: |-
-            The volume type. This parameter can be one of the following values:
-              +  General Purpose SSD: ``gp2`` | ``gp3``
-              +  Provisioned IOPS SSD: ``io1`` | ``io2``
-              +  Throughput Optimized HDD: ``st1``
-              +  Cold HDD: ``sc1``
-              +  Magnetic: ``standard``
-              
-             For more information, see [Amazon EBS volume types](https://docs.aws.amazon.com/ebs/latest/userguide/ebs-volume-types.html).
-             Default: ``gp2``
+        EnclaveOptions:
+          description: Indicates whether the instance is enabled for AWS Nitro Enclaves.
+          additionalProperties: false
+          type: object
+          properties:
+            Enabled:
+              description: If this parameter is set to true, the instance is enabled for AWS Nitro Enclaves; otherwise, it is not enabled for AWS Nitro Enclaves.
+              type: boolean
+        ImageId:
+          description: The ID of the AMI. An AMI ID is required to launch an instance and must be specified here or in a launch template.
           type: string
         Tags:
           uniqueItems: false
-          description: The tags to apply to the volume during creation.
-          x-insertionOrder: false
-          type: array
-          items:
-            $ref: '#/components/schemas/Tag'
-      required:
-        - AvailabilityZone
-      x-stackql-resource-name: volume
-      description: |-
-        Specifies an Amazon Elastic Block Store (Amazon EBS) volume.
-         When you use CFNlong to update an Amazon EBS volume that modifies ``Iops``, ``Size``, or ``VolumeType``, there is a cooldown period before another operation can occur. This can cause your stack to report being in ``UPDATE_IN_PROGRESS`` or ``UPDATE_ROLLBACK_IN_PROGRESS`` for long periods of time.
-         Amazon EBS does not support sizing down an Amazon EBS volume. CFNlong does not attempt to modify an Amazon EBS volume to a smaller size on rollback.
-         Some common scenarios when you might encounter a cooldown period for Amazon EBS include:
-          +  You successfully update an Amazon EBS volume and the update succeeds. When you attempt another update within the cooldown window, that update will be subject to a cooldown period.
-          +  You successfully update an Amazon EBS volume and the update succeeds but another change in your ``update-stack`` call fails. The rollback will be subject to a cooldown period.
-          
-         For more information, see [Requirements for EBS volume modifications](https://docs.aws.amazon.com/ebs/latest/userguide/modify-volume-requirements.html).
-          *DeletionPolicy attribute* 
-         To control how CFNlong handles the volume when the stack is deleted, set a deletion policy for your volume. You can choose to retain the volume, to delete the volume, or to create a snapshot of the volume. For more information, see [DeletionPolicy attribute](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-deletionpolicy.html).
-          If you set a deletion policy that creates a snapshot, all tags on the volume are included in the snapshot.
-      x-type-name: AWS::EC2::Volume
-      x-stackql-primary-identifier:
-        - VolumeId
-      x-read-only-properties:
-        - VolumeId
-      x-required-properties:
-        - AvailabilityZone
-      x-tagging:
-        permissions:
-          - ec2:CreateTags
-          - ec2:DeleteTags
-          - ec2:DescribeTags
-        taggable: true
-        tagOnCreate: true
-        tagUpdatable: true
-        tagProperty: /properties/Tags
-        cloudFormationSystemTags: false
-      x-required-permissions:
-        read:
-          - ec2:DescribeVolumes
-          - ec2:DescribeVolumeAttribute
-          - ec2:DescribeTags
-        create:
-          - ec2:CreateVolume
-          - ec2:DescribeVolumes
-          - ec2:DescribeVolumeAttribute
-          - ec2:ModifyVolumeAttribute
-          - ec2:CreateTags
-          - kms:GenerateDataKeyWithoutPlaintext
-          - kms:CreateGrant
-        update:
-          - ec2:ModifyVolume
-          - ec2:ModifyVolumeAttribute
-          - ec2:DescribeVolumeAttribute
-          - ec2:DescribeVolumesModifications
-          - ec2:DescribeVolumes
-          - ec2:CreateTags
-          - ec2:DeleteTags
-        list:
-          - ec2:DescribeVolumes
-          - ec2:DescribeTags
-          - ec2:DescribeVolumeAttribute
-        delete:
-          - ec2:DeleteVolume
-          - ec2:CreateSnapshot
-          - ec2:DescribeSnapshots
-          - ec2:DeleteTags
-          - ec2:DescribeVolumes
-    State:
-      description: The current state of the instance
-      additionalProperties: false
-      type: object
-      properties:
-        Code:
-          description: The state of the instance as a 16-bit unsigned integer.
-          type: string
-        Name:
-          description: The current state of the instance.
-          type: string
-    Ebs:
-      description: |-
-        Parameters for a block device for an EBS volume in an Amazon EC2 launch template.
-         ``Ebs`` is a property of [AWS::EC2::LaunchTemplate BlockDeviceMapping](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping.html).
-      additionalProperties: false
-      type: object
-      properties:
-        SnapshotId:
-          description: The ID of the snapshot.
-          type: string
-        VolumeType:
-          description: The volume type. For more information, see [Amazon EBS volume types](https://docs.aws.amazon.com/ebs/latest/userguide/ebs-volume-types.html) in the *Amazon EBS User Guide*.
-          type: string
-        KmsKeyId:
-          description: Identifier (key ID, key alias, key ARN, or alias ARN) of the customer managed KMS key to use for EBS encryption.
-          type: string
-        Encrypted:
-          description: Indicates whether the EBS volume is encrypted. Encrypted volumes can only be attached to instances that support Amazon EBS encryption. If you are creating a volume from a snapshot, you can't specify an encryption value.
-          type: boolean
-        Throughput:
-          description: |-
-            The throughput to provision for a ``gp3`` volume, with a maximum of 1,000 MiB/s.
-             Valid Range: Minimum value of 125. Maximum value of 1000.
-          type: integer
-        Iops:
-          description: |-
-            The number of I/O operations per second (IOPS). For ``gp3``, ``io1``, and ``io2`` volumes, this represents the number of IOPS that are provisioned for the volume. For ``gp2`` volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.
-             The following are the supported values for each volume type:
-              +  ``gp3``: 3,000 - 16,000 IOPS
-              +  ``io1``: 100 - 64,000 IOPS
-              +  ``io2``: 100 - 256,000 IOPS
-              
-             For ``io2`` volumes, you can achieve up to 256,000 IOPS on [instances built on the Nitro System](https://docs.aws.amazon.com/ec2/latest/instancetypes/ec2-nitro-instances.html). On other instances, you can achieve performance up to 32,000 IOPS.
-             This parameter is supported for ``io1``, ``io2``, and ``gp3`` volumes only.
-          type: integer
-        VolumeInitializationRate:
-          description: |-
-            Specifies the Amazon EBS Provisioned Rate for Volume Initialization (volume initialization rate), in MiB/s, at which to download the snapshot blocks from Amazon S3 to the volume. This is also known as *volume initialization*. Specifying a volume initialization rate ensures that the volume is initialized at a predictable and consistent rate after creation.
-             This parameter is supported only for volumes created from snapshots. Omit this parameter if:
-              +  You want to create the volume using fast snapshot restore. You must specify a snapshot that is enabled for fast snapshot restore. In this case, the volume is fully initialized at creation.
-              If you specify a snapshot that is enabled for fast snapshot restore and a volume initialization rate, the volume will be initialized at the specified rate instead of fast snapshot restore.
-               +  You want to create a volume that is initialized at the default rate.
-              
-             For more information, see [Initialize Amazon EBS volumes](https://docs.aws.amazon.com/ebs/latest/userguide/initalize-volume.html) in the *Amazon EC2 User Guide*.
-             Valid range: 100 - 300 MiB/s
-          type: integer
-        VolumeSize:
-          description: |-
-            The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. The following are the supported volumes sizes for each volume type:
-              +  ``gp2`` and ``gp3``: 1 - 16,384 GiB
-              +  ``io1``: 4 - 16,384 GiB
-              +  ``io2``: 4 - 65,536 GiB
-              +  ``st1`` and ``sc1``: 125 - 16,384 GiB
-              +  ``standard``: 1 - 1024 GiB
-          type: integer
-        DeleteOnTermination:
-          description: Indicates whether the EBS volume is deleted on instance termination.
-          type: boolean
-    Instance:
-      type: object
-      properties:
-        PrivateDnsName:
-          description: 'The private DNS name of the specified instance. For example: ip-10-24-34-0.ec2.internal.'
-          type: string
-        Volumes:
-          uniqueItems: false
-          description: The volumes to attach to the instance.
-          x-insertionOrder: false
-          type: array
-          items:
-            $ref: '#/components/schemas/Volume'
-        PrivateIp:
-          description: 'The private IP address of the specified instance. For example: 10.24.34.0.'
-          type: string
-        EnclaveOptions:
-          description: Indicates whether the instance is enabled for AWS Nitro Enclaves.
-          additionalProperties: false
-          type: object
-          properties:
-            Enabled:
-              description: If this parameter is set to true, the instance is enabled for AWS Nitro Enclaves; otherwise, it is not enabled for AWS Nitro Enclaves.
-              type: boolean
-        ImageId:
-          description: The ID of the AMI. An AMI ID is required to launch an instance and must be specified here or in a launch template.
-          type: string
-        Tags:
-          uniqueItems: false
-          description: The tags to add to the instance.
+          description: The tags to add to the instance.
           x-insertionOrder: false
           type: array
           items:
@@ -2668,7 +2514,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/BlockDeviceMapping'
+            $ref: '#/components/schemas/Instance_BlockDeviceMapping'
         IamInstanceProfile:
           description: The IAM instance profile.
           type: string
@@ -2720,7 +2566,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/NetworkInterface'
+            $ref: '#/components/schemas/Instance_NetworkInterface'
         InstanceType:
           description: The instance type.
           type: string
@@ -2903,8 +2749,20 @@ components:
           - ec2:DescribeLaunchTemplates
           - ssm:DescribeAssociation
           - ssm:ListAssociations
+    InstanceConnectEndpoint_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+        Value:
+          type: string
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     SecurityGroupId:
-      description: The ID of a security group for the endpoint.
+      description: A key-value pair to associate with a resource.
       type: string
     InstanceConnectEndpoint:
       type: object
@@ -2927,7 +2785,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/InstanceConnectEndpoint_Tag'
         SecurityGroupIds:
           description: The security group IDs of the instance connect endpoint.
           type: array
@@ -2980,6 +2838,23 @@ components:
           - ec2:DescribeInstanceConnectEndpoints
         list:
           - ec2:DescribeInstanceConnectEndpoints
+    InternetGateway_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+          description: The tag key.
+        Value:
+          type: string
+          maxLength: 256
+          description: The tag value.
+      required:
+        - Value
+        - Key
+      description: Specifies a tag. For more information, see [Resource tags](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html).
     InternetGateway:
       type: object
       properties:
@@ -2992,7 +2867,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/InternetGateway_Tag'
       x-stackql-resource-name: internet_gateway
       description: Allocates an internet gateway for use with a VPC. After creating the Internet gateway, you then attach it to a VPC.
       x-type-name: AWS::EC2::InternetGateway
@@ -3026,7 +2901,7 @@ components:
         list:
           - ec2:DescribeInternetGateways
     IpamOperatingRegion:
-      description: The regions IPAM Resource Discovery is enabled for. Allows for monitoring.
+      description: The regions IPAM is enabled for. Allows pools to be created in these regions, as well as enabling monitoring
       type: object
       properties:
         RegionName:
@@ -3035,6 +2910,24 @@ components:
       required:
         - RegionName
       additionalProperties: false
+    IPAM_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     IpamOrganizationalUnitExclusion:
       description: If your IPAM is integrated with AWS Organizations and you add an organizational unit (OU) exclusion, IPAM will not manage the IP addresses in accounts in that OU exclusion.
       type: object
@@ -3111,7 +3004,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/IPAM_Tag'
       required: []
       x-stackql-resource-name: ipam
       description: Resource Schema of AWS::EC2::IPAM Type
@@ -3162,7 +3055,7 @@ components:
         list:
           - ec2:DescribeIpams
     Cidr:
-      description: Represents a single IPv4 or IPv6 CIDR
+      description: Represents an IPAM custom allocation of a single IPv4 or IPv6 CIDR
       type: string
     IPAMAllocation:
       type: object
@@ -3215,12 +3108,15 @@ components:
           - ec2:ReleaseIpamPoolAllocation
         list:
           - ec2:GetIpamPoolAllocations
+    IPAMPool_Cidr:
+      description: Represents a single IPv4 or IPv6 CIDR
+      type: string
     ProvisionedCidr:
       description: An address space to be inserted into this pool. All allocations must be made from this address space.
       type: object
       properties:
         Cidr:
-          $ref: '#/components/schemas/Cidr'
+          $ref: '#/components/schemas/IPAMPool_Cidr'
       required:
         - Cidr
       additionalProperties: false
@@ -3242,6 +3138,24 @@ components:
         - ResourceRegion
         - ResourceOwner
       additionalProperties: false
+    IPAMPool_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     IPAMPool:
       type: object
       properties:
@@ -3266,7 +3180,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/IPAMPool_Tag'
         Arn:
           description: The Amazon Resource Name (ARN) of the IPAM Pool.
           type: string
@@ -3341,7 +3255,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/IPAMPool_Tag'
       required:
         - IpamScopeId
         - AddressFamily
@@ -3457,6 +3371,34 @@ components:
           - ec2:GetIpamPoolCidrs
         list:
           - ec2:GetIpamPoolCidrs
+    IPAMResourceDiscovery_IpamOperatingRegion:
+      description: The regions IPAM Resource Discovery is enabled for. Allows for monitoring.
+      type: object
+      properties:
+        RegionName:
+          type: string
+          description: The name of the region.
+      required:
+        - RegionName
+      additionalProperties: false
+    IPAMResourceDiscovery_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     IpamResourceDiscoveryOrganizationalUnitExclusion:
       description: If your IPAM is integrated with AWS Organizations and you add an organizational unit (OU) exclusion, IPAM will not manage the IP addresses in accounts in that OU exclusion.
       type: object
@@ -3483,7 +3425,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/IpamOperatingRegion'
+            $ref: '#/components/schemas/IPAMResourceDiscovery_IpamOperatingRegion'
         IpamResourceDiscoveryRegion:
           description: 'The region the resource discovery is setup in. '
           type: string
@@ -3511,7 +3453,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/IPAMResourceDiscovery_Tag'
       required: []
       x-stackql-resource-name: ipam_resource_discovery
       description: Resource Schema of AWS::EC2::IPAMResourceDiscovery Type
@@ -3555,11 +3497,29 @@ components:
           - ec2:DeleteTags
         list:
           - ec2:DescribeIpamResourceDiscoveries
-    IPAMResourceDiscoveryAssociation:
+    IPAMResourceDiscoveryAssociation_Tag:
+      description: A key-value pair to associate with a resource.
       type: object
       properties:
-        IpamArn:
-          description: Arn of the IPAM.
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
+    IPAMResourceDiscoveryAssociation:
+      type: object
+      properties:
+        IpamArn:
+          description: Arn of the IPAM.
           type: string
         IpamRegion:
           description: The home region of the IPAM.
@@ -3594,7 +3554,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/IPAMResourceDiscoveryAssociation_Tag'
       required:
         - IpamId
         - IpamResourceDiscoveryId
@@ -3644,6 +3604,24 @@ components:
           - ec2:DeleteTags
         list:
           - ec2:DescribeIpamResourceDiscoveryAssociations
+    IPAMScope_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     IPAMScope:
       type: object
       properties:
@@ -3679,7 +3657,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/IPAMScope_Tag'
       required:
         - IpamId
       x-stackql-resource-name: ipam_scope
@@ -3769,6 +3747,24 @@ components:
           - ec2:DescribeRouteTables
         list:
           - ec2:DescribeRouteTables
+    KeyPair_Tag:
+      description: Specifies a tag. For more information, see [Resource tags](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html).
+      type: object
+      properties:
+        Key:
+          type: string
+          description: The tag key.
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: The tag value.
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     KeyPair:
       type: object
       properties:
@@ -3811,7 +3807,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/KeyPair_Tag'
       required:
         - KeyName
       x-stackql-resource-name: key_pair
@@ -3885,7 +3881,7 @@ components:
              To tag the launch template itself, use [TagSpecifications](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html#cfn-ec2-launchtemplate-tagspecifications).
           type: array
           items:
-            $ref: '#/components/schemas/TagSpecification'
+            $ref: '#/components/schemas/LaunchTemplate_TagSpecification'
         NetworkPerformanceOptions:
           description: The settings for the network performance options for the instance. For more information, see [EC2 instance bandwidth weighting configuration](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configure-bandwidth-weighting.html).
           $ref: '#/components/schemas/NetworkPerformanceOptions'
@@ -3899,7 +3895,7 @@ components:
           description: The block device mapping.
           type: array
           items:
-            $ref: '#/components/schemas/BlockDeviceMapping'
+            $ref: '#/components/schemas/LaunchTemplate_BlockDeviceMapping'
         MaintenanceOptions:
           description: The maintenance options of your instance.
           $ref: '#/components/schemas/MaintenanceOptions'
@@ -3916,13 +3912,13 @@ components:
           type: boolean
         Placement:
           description: The placement for the instance.
-          $ref: '#/components/schemas/Placement'
+          $ref: '#/components/schemas/LaunchTemplate_Placement'
         NetworkInterfaces:
           uniqueItems: false
           description: The network interfaces for the instance.
           type: array
           items:
-            $ref: '#/components/schemas/NetworkInterface'
+            $ref: '#/components/schemas/LaunchTemplate_NetworkInterface'
         EnclaveOptions:
           description: |-
             Indicates whether the instance is enabled for AWS Nitro Enclaves. For more information, see [What is Nitro Enclaves?](https://docs.aws.amazon.com/enclaves/latest/user/nitro-enclave.html) in the *Nitro Enclaves User Guide*.
@@ -3952,13 +3948,13 @@ components:
           $ref: '#/components/schemas/HibernationOptions'
         MetadataOptions:
           description: The metadata options for the instance. For more information, see [Configure the Instance Metadata Service options](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-options.html) in the *Amazon EC2 User Guide*.
-          $ref: '#/components/schemas/MetadataOptions'
+          $ref: '#/components/schemas/LaunchTemplate_MetadataOptions'
         LicenseSpecifications:
           uniqueItems: false
           description: The license configurations.
           type: array
           items:
-            $ref: '#/components/schemas/LicenseSpecification'
+            $ref: '#/components/schemas/LaunchTemplate_LicenseSpecification'
         InstanceInitiatedShutdownBehavior:
           description: |-
             Indicates whether an instance stops or terminates when you initiate shutdown from the instance (using the operating system command for system shutdown).
@@ -3972,7 +3968,7 @@ components:
           $ref: '#/components/schemas/CpuOptions'
         PrivateDnsNameOptions:
           description: The hostname type for EC2 instances launched into this subnet and how DNS A and AAAA record queries should be handled. For more information, see [Amazon EC2 instance hostname types](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-naming.html) in the *User Guide*.
-          $ref: '#/components/schemas/PrivateDnsNameOptions'
+          $ref: '#/components/schemas/LaunchTemplate_PrivateDnsNameOptions'
         SecurityGroupIds:
           uniqueItems: false
           description: |-
@@ -4036,6 +4032,16 @@ components:
             Specify the bandwidth weighting option to boost the associated type of baseline bandwidth, as follows:
               + default This option uses the standard bandwidth configuration for your instance type. + vpc-1 This option boosts your networking baseline bandwidth and reduces your EBS baseline bandwidth. + ebs-1 This option boosts your EBS baseline bandwidth and reduces your networking baseline bandwidth.
           type: string
+    LaunchTemplate_LicenseSpecification:
+      description: |-
+        Specifies a license configuration for an instance.
+         ``LicenseSpecification`` is a property of [AWS::EC2::LaunchTemplate LaunchTemplateData](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html).
+      additionalProperties: false
+      type: object
+      properties:
+        LicenseConfigurationArn:
+          description: The Amazon Resource Name (ARN) of the license configuration.
+          type: string
     MaintenanceOptions:
       description: The maintenance options of your instance.
       additionalProperties: false
@@ -4089,13 +4095,62 @@ components:
           description: The maximum number of vCPUs. To specify no maximum limit, omit this parameter.
           type: integer
     Ipv4PrefixSpecification:
+      description: |-
+        Specifies an IPv4 prefix for a network interface.
+         ``Ipv4PrefixSpecification`` is a property of [AWS::EC2::LaunchTemplate NetworkInterface](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterface.html).
       additionalProperties: false
       type: object
       properties:
         Ipv4Prefix:
+          description: The IPv4 prefix. For information, see [Assigning prefixes to network interfaces](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-prefix-eni.html) in the *Amazon EC2 User Guide*.
+          type: string
+    LaunchTemplate_EnaSrdSpecification:
+      description: |-
+        ENA Express uses AWS Scalable Reliable Datagram (SRD) technology to increase the maximum bandwidth used per stream and minimize tail latency of network traffic between EC2 instances. With ENA Express, you can communicate between two EC2 instances in the same subnet within the same account, or in different accounts. Both sending and receiving instances must have ENA Express enabled.
+         To improve the reliability of network packet delivery, ENA Express reorders network packets on the receiving end by default. However, some UDP-based applications are designed to handle network packets that are out of order to reduce the overhead for packet delivery at the network layer. When ENA Express is enabled, you can specify whether UDP network traffic uses it.
+      additionalProperties: false
+      type: object
+      properties:
+        EnaSrdEnabled:
+          description: Indicates whether ENA Express is enabled for the network interface.
+          type: boolean
+        EnaSrdUdpSpecification:
+          description: Configures ENA Express for UDP network traffic.
+          $ref: '#/components/schemas/LaunchTemplate_EnaSrdUdpSpecification'
+    LaunchTemplate_Placement:
+      description: |-
+        Specifies the placement of an instance.
+         ``Placement`` is a property of [AWS::EC2::LaunchTemplate LaunchTemplateData](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html).
+      additionalProperties: false
+      type: object
+      properties:
+        GroupName:
+          description: The name of the placement group for the instance.
+          type: string
+        Tenancy:
+          description: The tenancy of the instance. An instance with a tenancy of dedicated runs on single-tenant hardware.
+          type: string
+        SpreadDomain:
+          description: Reserved for future use.
+          type: string
+        PartitionNumber:
+          description: The number of the partition the instance should launch in. Valid only if the placement group strategy is set to ``partition``.
+          type: integer
+        AvailabilityZone:
+          description: The Availability Zone for the instance.
+          type: string
+        Affinity:
+          description: The affinity setting for an instance on a Dedicated Host.
+          type: string
+        HostId:
+          description: The ID of the Dedicated Host for the instance.
+          type: string
+        HostResourceGroupArn:
+          description: The ARN of the host resource group in which to launch the instances. If you specify a host resource group ARN, omit the *Tenancy* parameter or set it to ``host``.
+          type: string
+        GroupId:
+          description: The Group Id of a placement group. You must specify the Placement Group *Group Id* to launch an instance in a shared placement group.
           type: string
-      required:
-        - Ipv4Prefix
     EnclaveOptions:
       description: Indicates whether the instance is enabled for AWS Nitro Enclaves.
       additionalProperties: false
@@ -4104,6 +4159,83 @@ components:
         Enabled:
           description: If this parameter is set to ``true``, the instance is enabled for AWS Nitro Enclaves; otherwise, it is not enabled for AWS Nitro Enclaves.
           type: boolean
+    LaunchTemplate_Ebs:
+      description: |-
+        Parameters for a block device for an EBS volume in an Amazon EC2 launch template.
+         ``Ebs`` is a property of [AWS::EC2::LaunchTemplate BlockDeviceMapping](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping.html).
+      additionalProperties: false
+      type: object
+      properties:
+        SnapshotId:
+          description: The ID of the snapshot.
+          type: string
+        VolumeType:
+          description: The volume type. For more information, see [Amazon EBS volume types](https://docs.aws.amazon.com/ebs/latest/userguide/ebs-volume-types.html) in the *Amazon EBS User Guide*.
+          type: string
+        KmsKeyId:
+          description: Identifier (key ID, key alias, key ARN, or alias ARN) of the customer managed KMS key to use for EBS encryption.
+          type: string
+        Encrypted:
+          description: Indicates whether the EBS volume is encrypted. Encrypted volumes can only be attached to instances that support Amazon EBS encryption. If you are creating a volume from a snapshot, you can't specify an encryption value.
+          type: boolean
+        Throughput:
+          description: |-
+            The throughput to provision for a ``gp3`` volume, with a maximum of 1,000 MiB/s.
+             Valid Range: Minimum value of 125. Maximum value of 1000.
+          type: integer
+        Iops:
+          description: |-
+            The number of I/O operations per second (IOPS). For ``gp3``, ``io1``, and ``io2`` volumes, this represents the number of IOPS that are provisioned for the volume. For ``gp2`` volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.
+             The following are the supported values for each volume type:
+              +  ``gp3``: 3,000 - 16,000 IOPS
+              +  ``io1``: 100 - 64,000 IOPS
+              +  ``io2``: 100 - 256,000 IOPS
+              
+             For ``io2`` volumes, you can achieve up to 256,000 IOPS on [instances built on the Nitro System](https://docs.aws.amazon.com/ec2/latest/instancetypes/ec2-nitro-instances.html). On other instances, you can achieve performance up to 32,000 IOPS.
+             This parameter is supported for ``io1``, ``io2``, and ``gp3`` volumes only.
+          type: integer
+        VolumeInitializationRate:
+          description: |-
+            Specifies the Amazon EBS Provisioned Rate for Volume Initialization (volume initialization rate), in MiB/s, at which to download the snapshot blocks from Amazon S3 to the volume. This is also known as *volume initialization*. Specifying a volume initialization rate ensures that the volume is initialized at a predictable and consistent rate after creation.
+             This parameter is supported only for volumes created from snapshots. Omit this parameter if:
+              +  You want to create the volume using fast snapshot restore. You must specify a snapshot that is enabled for fast snapshot restore. In this case, the volume is fully initialized at creation.
+              If you specify a snapshot that is enabled for fast snapshot restore and a volume initialization rate, the volume will be initialized at the specified rate instead of fast snapshot restore.
+               +  You want to create a volume that is initialized at the default rate.
+              
+             For more information, see [Initialize Amazon EBS volumes](https://docs.aws.amazon.com/ebs/latest/userguide/initalize-volume.html) in the *Amazon EC2 User Guide*.
+             Valid range: 100 - 300 MiB/s
+          type: integer
+        VolumeSize:
+          description: |-
+            The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. The following are the supported volumes sizes for each volume type:
+              +  ``gp2`` and ``gp3``: 1 - 16,384 GiB
+              +  ``io1``: 4 - 16,384 GiB
+              +  ``io2``: 4 - 65,536 GiB
+              +  ``st1`` and ``sc1``: 125 - 16,384 GiB
+              +  ``standard``: 1 - 1024 GiB
+          type: integer
+        DeleteOnTermination:
+          description: Indicates whether the EBS volume is deleted on instance termination.
+          type: boolean
+    LaunchTemplate_BlockDeviceMapping:
+      description: |-
+        Specifies a block device mapping for a launch template. You must specify ``DeviceName`` plus exactly one of the following properties: ``Ebs``, ``NoDevice``, or ``VirtualName``.
+         ``BlockDeviceMapping`` is a property of [AWS::EC2::LaunchTemplate LaunchTemplateData](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html).
+      additionalProperties: false
+      type: object
+      properties:
+        Ebs:
+          description: Parameters used to automatically set up EBS volumes when the instance is launched.
+          $ref: '#/components/schemas/LaunchTemplate_Ebs'
+        NoDevice:
+          description: To omit the device from the block device mapping, specify an empty string.
+          type: string
+        VirtualName:
+          description: The virtual device name (ephemeralN). Instance store volumes are numbered starting from 0. An instance type with 2 available instance store volumes can specify mappings for ephemeral0 and ephemeral1. The number of available instance store volumes depends on the instance type. After you connect to the instance, you must mount the volume.
+          type: string
+        DeviceName:
+          description: The device name (for example, /dev/sdh or xvdh).
+          type: string
     Monitoring:
       description: |-
         Specifies whether detailed monitoring is enabled for an instance. For more information about detailed monitoring, see [Enable or turn off detailed monitoring for your instances](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-cloudwatch-new.html) in the *User Guide*.
@@ -4137,6 +4269,42 @@ components:
             If you set this parameter to ``true``, the instance is enabled for hibernation.
              Default: ``false``
           type: boolean
+    LaunchTemplate_MetadataOptions:
+      description: |-
+        The metadata options for the instance. For more information, see [Instance metadata and user data](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html) in the *Amazon EC2 User Guide*.
+         ``MetadataOptions`` is a property of [AWS::EC2::LaunchTemplate LaunchTemplateData](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html).
+      additionalProperties: false
+      type: object
+      properties:
+        HttpPutResponseHopLimit:
+          description: |-
+            The desired HTTP PUT response hop limit for instance metadata requests. The larger the number, the further instance metadata requests can travel.
+             Default: ``1``
+             Possible values: Integers from 1 to 64
+          type: integer
+        HttpTokens:
+          description: |-
+            Indicates whether IMDSv2 is required.
+              +  ``optional`` - IMDSv2 is optional. You can choose whether to send a session token in your instance metadata retrieval requests. If you retrieve IAM role credentials without a session token, you receive the IMDSv1 role credentials. If you retrieve IAM role credentials using a valid session token, you receive the IMDSv2 role credentials.
+              +  ``required`` - IMDSv2 is required. You must send a session token in your instance metadata retrieval requests. With this option, retrieving the IAM role credentials always returns IMDSv2 credentials; IMDSv1 credentials are not available.
+              
+             Default: If the value of ``ImdsSupport`` for the Amazon Machine Image (AMI) for your instance is ``v2.0``, the default is ``required``.
+          type: string
+        HttpProtocolIpv6:
+          description: |-
+            Enables or disables the IPv6 endpoint for the instance metadata service.
+             Default: ``disabled``
+          type: string
+        InstanceMetadataTags:
+          description: |-
+            Set to ``enabled`` to allow access to instance tags from the instance metadata. Set to ``disabled`` to turn off access to instance tags from the instance metadata. For more information, see [View tags for your EC2 instances using instance metadata](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/work-with-tags-in-IMDS.html).
+             Default: ``disabled``
+          type: string
+        HttpEndpoint:
+          description: |-
+            Enables or disables the HTTP metadata endpoint on your instances. If the parameter is not specified, the default state is ``enabled``.
+              If you specify a value of ``disabled``, you will not be able to access your instance metadata.
+          type: string
     NetworkInterfaceCount:
       description: The minimum and maximum number of network interfaces.
       additionalProperties: false
@@ -4219,55 +4387,198 @@ components:
               
              Default: 7 days from the current date
           type: string
-    PrivateIpAdd:
+    LaunchTemplate_NetworkInterface:
       description: |-
-        Specifies a secondary private IPv4 address for a network interface.
-         ``PrivateIpAdd`` is a property of [AWS::EC2::LaunchTemplate NetworkInterface](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterface.html).
-      additionalProperties: false
-      type: object
-      properties:
-        PrivateIpAddress:
-          description: The private IPv4 address.
-          type: string
-        Primary:
-          description: Indicates whether the private IPv4 address is the primary private IPv4 address. Only one IPv4 address can be designated as primary.
-          type: boolean
-    Ipv6PrefixSpecification:
+        Specifies the parameters for a network interface.
+         ``NetworkInterface`` is a property of [AWS::EC2::LaunchTemplate LaunchTemplateData](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html).
       additionalProperties: false
       type: object
       properties:
-        Ipv6Prefix:
+        Description:
+          description: A description for the network interface.
           type: string
-      required:
-        - Ipv6Prefix
-    LaunchTemplateTagSpecification:
-      description: |-
-        Specifies the tags to apply to the launch template during creation.
-         To specify the tags for the resources that are created during instance launch, use [AWS::EC2::LaunchTemplate TagSpecification](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html).
-         ``LaunchTemplateTagSpecification`` is a property of [AWS::EC2::LaunchTemplate](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html).
-      additionalProperties: false
-      type: object
-      properties:
-        ResourceType:
-          description: The type of resource. To tag a launch template, ``ResourceType`` must be ``launch-template``.
+        PrivateIpAddress:
+          description: The primary private IPv4 address of the network interface.
           type: string
-        Tags:
+        PrivateIpAddresses:
           uniqueItems: false
-          description: The tags for the resource.
+          description: One or more private IPv4 addresses.
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
-    NetworkBandwidthGbps:
-      description: |-
-        The minimum and maximum amount of network bandwidth, in gigabits per second (Gbps).
-          Setting the minimum bandwidth does not guarantee that your instance will achieve the minimum bandwidth. Amazon EC2 will identify instance types that support the specified minimum bandwidth, but the actual bandwidth of your instance might go below the specified minimum at times. For more information, see [Available instance bandwidth](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-network-bandwidth.html#available-instance-bandwidth) in the *Amazon EC2 User Guide*.
-      additionalProperties: false
-      type: object
-      properties:
-        Min:
-          description: The minimum amount of network bandwidth, in Gbps. If this parameter is not specified, there is no minimum limit.
-          type: number
-        Max:
+            $ref: '#/components/schemas/PrivateIpAdd'
+        SecondaryPrivateIpAddressCount:
+          description: The number of secondary private IPv4 addresses to assign to a network interface.
+          type: integer
+        Ipv6PrefixCount:
+          description: The number of IPv6 prefixes to be automatically assigned to the network interface. You cannot use this option if you use the ``Ipv6Prefix`` option.
+          type: integer
+        Ipv4Prefixes:
+          uniqueItems: false
+          description: One or more IPv4 prefixes to be assigned to the network interface. You cannot use this option if you use the ``Ipv4PrefixCount`` option.
+          type: array
+          items:
+            $ref: '#/components/schemas/Ipv4PrefixSpecification'
+        DeviceIndex:
+          description: |-
+            The device index for the network interface attachment. The primary network interface has a device index of 0. If the network interface is of type ``interface``, you must specify a device index.
+             If you create a launch template that includes secondary network interfaces but no primary network interface, and you specify it using the ``LaunchTemplate`` property of ``AWS::EC2::Instance``, then you must include a primary network interface using the ``NetworkInterfaces`` property of ``AWS::EC2::Instance``.
+          type: integer
+        PrimaryIpv6:
+          description: The primary IPv6 address of the network interface. When you enable an IPv6 GUA address to be a primary IPv6, the first IPv6 GUA will be made the primary IPv6 address until the instance is terminated or the network interface is detached. For more information about primary IPv6 addresses, see [RunInstances](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html).
+          type: boolean
+        Ipv4PrefixCount:
+          description: The number of IPv4 prefixes to be automatically assigned to the network interface. You cannot use this option if you use the ``Ipv4Prefix`` option.
+          type: integer
+        EnaQueueCount:
+          description: ''
+          type: integer
+        Ipv6Prefixes:
+          uniqueItems: false
+          description: One or more IPv6 prefixes to be assigned to the network interface. You cannot use this option if you use the ``Ipv6PrefixCount`` option.
+          type: array
+          items:
+            $ref: '#/components/schemas/Ipv6PrefixSpecification'
+        SubnetId:
+          description: The ID of the subnet for the network interface.
+          type: string
+        Ipv6Addresses:
+          uniqueItems: false
+          description: One or more specific IPv6 addresses from the IPv6 CIDR block range of your subnet. You can't use this option if you're specifying a number of IPv6 addresses.
+          type: array
+          items:
+            $ref: '#/components/schemas/Ipv6Add'
+        AssociatePublicIpAddress:
+          description: |-
+            Associates a public IPv4 address with eth0 for a new network interface.
+             AWS charges for all public IPv4 addresses, including public IPv4 addresses associated with running instances and Elastic IP addresses. For more information, see the *Public IPv4 Address* tab on the [Amazon VPC pricing page](https://docs.aws.amazon.com/vpc/pricing/).
+          type: boolean
+        NetworkInterfaceId:
+          description: The ID of the network interface.
+          type: string
+        NetworkCardIndex:
+          description: The index of the network card. Some instance types support multiple network cards. The primary network interface must be assigned to network card index 0. The default is network card index 0.
+          type: integer
+        InterfaceType:
+          description: |-
+            The type of network interface. To create an Elastic Fabric Adapter (EFA), specify ``efa`` or ``efa``. For more information, see [Elastic Fabric Adapter for AI/ML and HPC workloads on Amazon EC2](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/efa.html) in the *Amazon EC2 User Guide*.
+             If you are not creating an EFA, specify ``interface`` or omit this parameter.
+             If you specify ``efa-only``, do not assign any IP addresses to the network interface. EFA-only network interfaces do not support IP addresses.
+             Valid values: ``interface`` | ``efa`` | ``efa-only``
+          type: string
+        AssociateCarrierIpAddress:
+          description: |-
+            Associates a Carrier IP address with eth0 for a new network interface.
+             Use this option when you launch an instance in a Wavelength Zone and want to associate a Carrier IP address with the network interface. For more information about Carrier IP addresses, see [Carrier IP addresses](https://docs.aws.amazon.com/wavelength/latest/developerguide/how-wavelengths-work.html#provider-owned-ip) in the *Developer Guide*.
+          type: boolean
+        EnaSrdSpecification:
+          description: The ENA Express configuration for the network interface.
+          $ref: '#/components/schemas/LaunchTemplate_EnaSrdSpecification'
+        Ipv6AddressCount:
+          description: The number of IPv6 addresses to assign to a network interface. Amazon EC2 automatically selects the IPv6 addresses from the subnet range. You can't use this option if specifying specific IPv6 addresses.
+          type: integer
+        Groups:
+          uniqueItems: false
+          description: The IDs of one or more security groups.
+          type: array
+          items:
+            type: string
+        DeleteOnTermination:
+          description: Indicates whether the network interface is deleted when the instance is terminated.
+          type: boolean
+        ConnectionTrackingSpecification:
+          description: A connection tracking specification for the network interface.
+          $ref: '#/components/schemas/ConnectionTrackingSpecification'
+    LaunchTemplate_PrivateDnsNameOptions:
+      description: The hostname type for EC2 instances launched into this subnet and how DNS A and AAAA record queries should be handled. For more information, see [Amazon EC2 instance hostname types](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-naming.html) in the *User Guide*.
+      additionalProperties: false
+      type: object
+      properties:
+        EnableResourceNameDnsARecord:
+          description: Indicates whether to respond to DNS queries for instance hostnames with DNS A records.
+          type: boolean
+        HostnameType:
+          description: The type of hostname for EC2 instances. For IPv4 only subnets, an instance DNS name must be based on the instance IPv4 address. For IPv6 only subnets, an instance DNS name must be based on the instance ID. For dual-stack subnets, you can specify whether DNS names use the instance IPv4 address or the instance ID. For more information, see [Amazon EC2 instance hostname types](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-naming.html) in the *User Guide*.
+          type: string
+        EnableResourceNameDnsAAAARecord:
+          description: Indicates whether to respond to DNS queries for instance hostnames with DNS AAAA records.
+          type: boolean
+    PrivateIpAdd:
+      description: |-
+        Specifies a secondary private IPv4 address for a network interface.
+         ``PrivateIpAdd`` is a property of [AWS::EC2::LaunchTemplate NetworkInterface](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterface.html).
+      additionalProperties: false
+      type: object
+      properties:
+        PrivateIpAddress:
+          description: The private IPv4 address.
+          type: string
+        Primary:
+          description: Indicates whether the private IPv4 address is the primary private IPv4 address. Only one IPv4 address can be designated as primary.
+          type: boolean
+    Ipv6PrefixSpecification:
+      description: |-
+        Specifies an IPv6 prefix for a network interface.
+         ``Ipv6PrefixSpecification`` is a property of [AWS::EC2::LaunchTemplate NetworkInterface](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterface.html).
+      additionalProperties: false
+      type: object
+      properties:
+        Ipv6Prefix:
+          description: The IPv6 prefix.
+          type: string
+    LaunchTemplateTagSpecification:
+      description: |-
+        Specifies the tags to apply to the launch template during creation.
+         To specify the tags for the resources that are created during instance launch, use [AWS::EC2::LaunchTemplate TagSpecification](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html).
+         ``LaunchTemplateTagSpecification`` is a property of [AWS::EC2::LaunchTemplate](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html).
+      additionalProperties: false
+      type: object
+      properties:
+        ResourceType:
+          description: The type of resource. To tag a launch template, ``ResourceType`` must be ``launch-template``.
+          type: string
+        Tags:
+          uniqueItems: false
+          description: The tags for the resource.
+          type: array
+          items:
+            $ref: '#/components/schemas/LaunchTemplate_Tag'
+    LaunchTemplate_TagSpecification:
+      description: |-
+        Specifies the tags to apply to resources that are created during instance launch.
+         ``TagSpecification`` is a property type of [TagSpecifications](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-tagspecifications). [TagSpecifications](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-tagspecifications) is a property of [AWS::EC2::LaunchTemplate LaunchTemplateData](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html).
+      additionalProperties: false
+      type: object
+      properties:
+        ResourceType:
+          description: |-
+            The type of resource to tag. You can specify tags for the following resource types only: ``instance`` | ``volume`` | ``network-interface`` | ``spot-instances-request``. If the instance does not include the resource type that you specify, the instance launch fails. For example, not all instance types include a volume.
+             To tag a resource after it has been created, see [CreateTags](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html).
+          type: string
+        Tags:
+          uniqueItems: false
+          description: The tags to apply to the resource.
+          type: array
+          items:
+            $ref: '#/components/schemas/LaunchTemplate_Tag'
+    LaunchTemplate_EnaSrdUdpSpecification:
+      description: ENA Express is compatible with both TCP and UDP transport protocols. When it's enabled, TCP traffic automatically uses it. However, some UDP-based applications are designed to handle network packets that are out of order, without a need for retransmission, such as live video broadcasting or other near-real-time applications. For UDP traffic, you can specify whether to use ENA Express, based on your application environment needs.
+      additionalProperties: false
+      type: object
+      properties:
+        EnaSrdUdpEnabled:
+          description: Indicates whether UDP traffic to and from the instance uses ENA Express. To specify this setting, you must first enable ENA Express.
+          type: boolean
+    NetworkBandwidthGbps:
+      description: |-
+        The minimum and maximum amount of network bandwidth, in gigabits per second (Gbps).
+          Setting the minimum bandwidth does not guarantee that your instance will achieve the minimum bandwidth. Amazon EC2 will identify instance types that support the specified minimum bandwidth, but the actual bandwidth of your instance might go below the specified minimum at times. For more information, see [Available instance bandwidth](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-network-bandwidth.html#available-instance-bandwidth) in the *Amazon EC2 User Guide*.
+      additionalProperties: false
+      type: object
+      properties:
+        Min:
+          description: The minimum amount of network bandwidth, in Gbps. If this parameter is not specified, there is no minimum limit.
+          type: number
+        Max:
           description: The maximum amount of network bandwidth, in Gbps. To specify no maximum limit, omit this parameter.
           type: number
     AcceleratorCount:
@@ -4549,6 +4860,20 @@ components:
             The minimum and maximum amount of total local storage, in GB.
              Default: No minimum or maximum limits
           $ref: '#/components/schemas/TotalLocalStorageGB'
+    LaunchTemplate_Tag:
+      description: Specifies a tag. For more information, see [Resource tags](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html).
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          description: The tag value.
+          type: string
+        Key:
+          description: The tag key.
+          type: string
+      required:
+        - Value
+        - Key
     AcceleratorTotalMemoryMiB:
       description: The minimum and maximum amount of total accelerator memory, in MiB.
       additionalProperties: false
@@ -4614,14 +4939,18 @@ components:
           description: The maximum amount of total local storage, in GB. To specify no maximum limit, omit this parameter.
           type: number
     ConnectionTrackingSpecification:
+      description: A security group connection tracking specification that enables you to set the idle timeout for connection tracking on an Elastic network interface. For more information, see [Connection tracking timeouts](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/security-group-connection-tracking.html#connection-tracking-timeouts) in the *Amazon EC2 User Guide*.
       additionalProperties: false
       type: object
       properties:
         UdpTimeout:
+          description: 'Timeout (in seconds) for idle UDP flows that have seen traffic only in a single direction or a single request-response transaction. Min: 30 seconds. Max: 60 seconds. Default: 30 seconds.'
           type: integer
         TcpEstablishedTimeout:
+          description: 'Timeout (in seconds) for idle TCP connections in an established state. Min: 60 seconds. Max: 432000 seconds (5 days). Default: 432000 seconds. Recommended: Less than 432000 seconds.'
           type: integer
         UdpStreamTimeout:
+          description: 'Timeout (in seconds) for idle UDP flows classified as streams which have seen more than one request-response transaction. Min: 60 seconds. Max: 180 seconds (3 minutes). Default: 180 seconds.'
           type: integer
     LaunchTemplate:
       type: object
@@ -4750,6 +5079,26 @@ components:
         update:
           - ec2:ModifyLocalGatewayRoute
           - ec2:SearchLocalGatewayRoutes
+    LocalGatewayRouteTable_Tags:
+      type: array
+      x-insertionOrder: false
+      uniqueItems: true
+      items:
+        $ref: '#/components/schemas/LocalGatewayRouteTable_Tag'
+    LocalGatewayRouteTable_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 127
+          pattern: ^(?!aws:.*)
+        Value:
+          type: string
+          minLength: 1
+          maxLength: 255
+          pattern: ^(?!aws:.*)
+      additionalProperties: false
     LocalGatewayRouteTable:
       type: object
       properties:
@@ -4776,7 +5125,7 @@ components:
           type: string
         Tags:
           description: The tags for the local gateway route table.
-          $ref: '#/components/schemas/Tags'
+          $ref: '#/components/schemas/LocalGatewayRouteTable_Tags'
       required:
         - LocalGatewayId
       x-stackql-resource-name: local_gateway_route_table
@@ -4825,6 +5174,26 @@ components:
           - ec2:DeleteTags
         list:
           - ec2:DescribeLocalGatewayRouteTables
+    LocalGatewayRouteTableVirtualInterfaceGroupAssociation_Tags:
+      type: array
+      x-insertionOrder: false
+      uniqueItems: true
+      items:
+        $ref: '#/components/schemas/LocalGatewayRouteTableVirtualInterfaceGroupAssociation_Tag'
+    LocalGatewayRouteTableVirtualInterfaceGroupAssociation_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 127
+          pattern: ^(?!aws:.*)
+        Value:
+          type: string
+          minLength: 1
+          maxLength: 255
+          pattern: ^(?!aws:.*)
+      additionalProperties: false
     LocalGatewayRouteTableVirtualInterfaceGroupAssociation:
       type: object
       properties:
@@ -4851,7 +5220,7 @@ components:
           type: string
         Tags:
           description: The tags for the local gateway route table virtual interface group association.
-          $ref: '#/components/schemas/Tags'
+          $ref: '#/components/schemas/LocalGatewayRouteTableVirtualInterfaceGroupAssociation_Tags'
       required:
         - LocalGatewayRouteTableId
         - LocalGatewayVirtualInterfaceGroupId
@@ -4902,6 +5271,26 @@ components:
           - ec2:DeleteTags
         list:
           - ec2:DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociations
+    LocalGatewayRouteTableVPCAssociation_Tags:
+      type: array
+      x-insertionOrder: false
+      uniqueItems: true
+      items:
+        $ref: '#/components/schemas/LocalGatewayRouteTableVPCAssociation_Tag'
+    LocalGatewayRouteTableVPCAssociation_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 127
+          pattern: ^(?!aws:.*)
+        Value:
+          type: string
+          minLength: 1
+          maxLength: 255
+          pattern: ^(?!aws:.*)
+      additionalProperties: false
     LocalGatewayRouteTableVPCAssociation:
       type: object
       properties:
@@ -4922,7 +5311,7 @@ components:
           type: string
         Tags:
           description: The tags for the association.
-          $ref: '#/components/schemas/Tags'
+          $ref: '#/components/schemas/LocalGatewayRouteTableVPCAssociation_Tags'
       required:
         - LocalGatewayRouteTableId
         - VpcId
@@ -4970,6 +5359,20 @@ components:
           - ec2:DeleteTags
         list:
           - ec2:DescribeLocalGatewayRouteTableVpcAssociations
+    NatGateway_Tag:
+      description: Specifies a tag. For more information, see [Resource tags](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html).
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          description: The tag value.
+          type: string
+        Key:
+          description: The tag key.
+          type: string
+      required:
+        - Value
+        - Key
     AvailabilityZoneAddress:
       description: ''
       additionalProperties: false
@@ -5032,7 +5435,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/NatGateway_Tag'
         MaxDrainDurationSeconds:
           description: The maximum amount of time to wait (in seconds) before forcibly releasing the IP addresses if connections are still in progress. Default value is 350 seconds.
           type: integer
@@ -5083,6 +5486,20 @@ components:
         delete:
           - ec2:DeleteNatGateway
           - ec2:DescribeNatGateways
+    NetworkAcl_Tag:
+      description: Specifies a tag. For more information, see [Resource tags](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html).
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          description: The tag value.
+          type: string
+        Key:
+          description: The tag key.
+          type: string
+      required:
+        - Value
+        - Key
     NetworkAcl:
       type: object
       properties:
@@ -5098,7 +5515,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/NetworkAcl_Tag'
       required:
         - VpcId
       x-stackql-resource-name: network_acl
@@ -5141,6 +5558,16 @@ components:
           - ec2:DeleteTags
           - ec2:DeleteNetworkAcl
           - ec2:DescribeNetworkAcls
+    NetworkInsightsAccessScope_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+        Value:
+          type: string
+      required:
+        - Key
     AccessScopePathRequest:
       type: object
       additionalProperties: false
@@ -5241,7 +5668,7 @@ components:
           type: array
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/NetworkInsightsAccessScope_Tag'
         MatchPaths:
           type: array
           x-insertionOrder: true
@@ -5297,6 +5724,16 @@ components:
           - ec2:DeleteTags
         list:
           - ec2:DescribeNetworkInsightsAccessScopes
+    NetworkInsightsAccessScopeAnalysis_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+        Value:
+          type: string
+      required:
+        - Key
     NetworkInsightsAccessScopeAnalysis:
       type: object
       properties:
@@ -5330,7 +5767,7 @@ components:
           type: array
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/NetworkInsightsAccessScopeAnalysis_Tag'
       required:
         - NetworkInsightsAccessScopeId
       x-stackql-resource-name: network_insights_access_scope_analysis
@@ -5465,7 +5902,7 @@ components:
           x-insertionOrder: true
           type: array
           items:
-            $ref: '#/components/schemas/Protocol'
+            $ref: '#/components/schemas/NetworkInsightsAnalysis_Protocol'
         IngressRouteTable:
           $ref: '#/components/schemas/AnalysisComponent'
         ClassicLoadBalancerListener:
@@ -5609,7 +6046,7 @@ components:
           items:
             $ref: '#/components/schemas/IpAddress'
         Protocol:
-          $ref: '#/components/schemas/Protocol'
+          $ref: '#/components/schemas/NetworkInsightsAnalysis_Protocol'
         SourceAddresses:
           uniqueItems: false
           x-insertionOrder: true
@@ -5658,6 +6095,13 @@ components:
           type: string
         AttachmentId:
           type: string
+    NetworkInsightsAnalysis_Protocol:
+      type: string
+    NetworkInsightsAnalysis_Tags:
+      uniqueItems: true
+      type: array
+      items:
+        $ref: '#/components/schemas/NetworkInsightsAnalysis_Tag'
     AnalysisSecurityGroupRule:
       additionalProperties: false
       type: object
@@ -5671,7 +6115,7 @@ components:
         SecurityGroupId:
           type: string
         Protocol:
-          $ref: '#/components/schemas/Protocol'
+          $ref: '#/components/schemas/NetworkInsightsAnalysis_Protocol'
         Direction:
           type: string
     AnalysisComponent:
@@ -5697,7 +6141,7 @@ components:
         RuleNumber:
           type: integer
         Protocol:
-          $ref: '#/components/schemas/Protocol'
+          $ref: '#/components/schemas/NetworkInsightsAnalysis_Protocol'
     AnalysisRouteTableRoute:
       additionalProperties: false
       type: object
@@ -5727,22 +6171,25 @@ components:
     ResourceArn:
       type: string
     PortRange:
-      description: The IP port range.
+      additionalProperties: false
       type: object
       properties:
-        FromPort:
-          description: The first port in the range.
+        From:
           type: integer
-          minimum: 1
-          maximum: 65535
-        ToPort:
-          description: The last port in the range.
+        To:
           type: integer
-          minimum: 1
-          maximum: 65535
-      additionalProperties: false
     IpAddress:
       type: string
+    NetworkInsightsAnalysis_Tag:
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          type: string
+        Key:
+          type: string
+      required:
+        - Key
     NetworkInsightsAnalysis:
       type: object
       properties:
@@ -5816,7 +6263,7 @@ components:
           uniqueItems: true
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/NetworkInsightsAnalysis_Tag'
       required:
         - NetworkInsightsPathId
       x-stackql-resource-name: network_insights_analysis
@@ -5877,6 +6324,21 @@ components:
         delete:
           - ec2:DeleteNetworkInsightsAnalysis
           - ec2:DeleteTags
+    NetworkInsightsPath_Tags:
+      type: array
+      uniqueItems: true
+      items:
+        $ref: '#/components/schemas/NetworkInsightsPath_Tag'
+    NetworkInsightsPath_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+        Value:
+          type: string
+      required:
+        - Key
     FilterPortRange:
       type: object
       additionalProperties: false
@@ -5930,7 +6392,7 @@ components:
           type: array
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/NetworkInsightsPath_Tag'
       required:
         - Protocol
         - Source
@@ -5983,6 +6445,222 @@ components:
           - ec2:DescribeNetworkInsightsPaths
           - ec2:CreateTags
           - ec2:DeleteTags
+    NetworkInterface_PrivateIpAddressSpecification:
+      additionalProperties: false
+      type: object
+      properties:
+        PrivateIpAddress:
+          type: string
+        Primary:
+          type: boolean
+      required:
+        - PrivateIpAddress
+        - Primary
+    NetworkInterface_Ipv4PrefixSpecification:
+      additionalProperties: false
+      type: object
+      properties:
+        Ipv4Prefix:
+          type: string
+      required:
+        - Ipv4Prefix
+    NetworkInterface_InstanceIpv6Address:
+      additionalProperties: false
+      type: object
+      properties:
+        Ipv6Address:
+          type: string
+      required:
+        - Ipv6Address
+    NetworkInterface_Ipv6PrefixSpecification:
+      additionalProperties: false
+      type: object
+      properties:
+        Ipv6Prefix:
+          type: string
+      required:
+        - Ipv6Prefix
+    NetworkInterface_ConnectionTrackingSpecification:
+      additionalProperties: false
+      type: object
+      properties:
+        UdpTimeout:
+          type: integer
+        TcpEstablishedTimeout:
+          type: integer
+        UdpStreamTimeout:
+          type: integer
+    NetworkInterface:
+      type: object
+      properties:
+        Description:
+          description: A description for the network interface.
+          type: string
+        PrivateIpAddress:
+          description: 'Assigns a single private IP address to the network interface, which is used as the primary private IP address. If you want to specify multiple private IP address, use the PrivateIpAddresses property. '
+          type: string
+        PrimaryIpv6Address:
+          description: The primary IPv6 address
+          type: string
+        PrivateIpAddresses:
+          uniqueItems: false
+          description: Assigns a list of private IP addresses to the network interface. You can specify a primary private IP address by setting the value of the Primary property to true in the PrivateIpAddressSpecification property. If you want EC2 to automatically assign private IP addresses, use the SecondaryPrivateIpAddressCount property and do not specify this property.
+          x-insertionOrder: false
+          type: array
+          items:
+            $ref: '#/components/schemas/NetworkInterface_PrivateIpAddressSpecification'
+        SecondaryPrivateIpAddressCount:
+          description: The number of secondary private IPv4 addresses to assign to a network interface. When you specify a number of secondary IPv4 addresses, Amazon EC2 selects these IP addresses within the subnet's IPv4 CIDR range. You can't specify this option and specify more than one private IP address using privateIpAddresses
+          type: integer
+        Ipv6PrefixCount:
+          description: 'The number of IPv6 prefixes to assign to a network interface. When you specify a number of IPv6 prefixes, Amazon EC2 selects these prefixes from your existing subnet CIDR reservations, if available, or from free spaces in the subnet. By default, these will be /80 prefixes. You can''t specify a count of IPv6 prefixes if you''ve specified one of the following: specific IPv6 prefixes, specific IPv6 addresses, or a count of IPv6 addresses.'
+          type: integer
+        PrimaryPrivateIpAddress:
+          description: Returns the primary private IP address of the network interface.
+          type: string
+        Ipv4Prefixes:
+          uniqueItems: false
+          description: 'Assigns a list of IPv4 prefixes to the network interface. If you want EC2 to automatically assign IPv4 prefixes, use the Ipv4PrefixCount property and do not specify this property. Presently, only /28 prefixes are supported. You can''t specify IPv4 prefixes if you''ve specified one of the following: a count of IPv4 prefixes, specific private IPv4 addresses, or a count of private IPv4 addresses.'
+          x-insertionOrder: false
+          type: array
+          items:
+            $ref: '#/components/schemas/NetworkInterface_Ipv4PrefixSpecification'
+        Ipv4PrefixCount:
+          description: 'The number of IPv4 prefixes to assign to a network interface. When you specify a number of IPv4 prefixes, Amazon EC2 selects these prefixes from your existing subnet CIDR reservations, if available, or from free spaces in the subnet. By default, these will be /28 prefixes. You can''t specify a count of IPv4 prefixes if you''ve specified one of the following: specific IPv4 prefixes, specific private IPv4 addresses, or a count of private IPv4 addresses.'
+          type: integer
+        EnablePrimaryIpv6:
+          description: >-
+            If you have instances or ENIs that rely on the IPv6 address not changing, to avoid disrupting traffic to instances or ENIs, you can enable a primary IPv6 address. Enable this option to automatically assign an IPv6 associated with the ENI attached to your instance to be the primary IPv6 address. When you enable an IPv6 address to be a primary IPv6, you cannot disable it. Traffic will be routed to the primary IPv6 address until the instance is terminated or the ENI is detached. If you
+            have multiple IPv6 addresses associated with an ENI and you enable a primary IPv6 address, the first IPv6 address associated with the ENI becomes the primary IPv6 address.
+          type: boolean
+        GroupSet:
+          uniqueItems: false
+          description: A list of security group IDs associated with this network interface.
+          x-insertionOrder: false
+          type: array
+          items:
+            type: string
+        Ipv6Addresses:
+          uniqueItems: true
+          description: One or more specific IPv6 addresses from the IPv6 CIDR block range of your subnet to associate with the network interface. If you're specifying a number of IPv6 addresses, use the Ipv6AddressCount property and don't specify this property.
+          x-insertionOrder: false
+          type: array
+          items:
+            $ref: '#/components/schemas/NetworkInterface_InstanceIpv6Address'
+        Ipv6Prefixes:
+          uniqueItems: false
+          description: 'Assigns a list of IPv6 prefixes to the network interface. If you want EC2 to automatically assign IPv6 prefixes, use the Ipv6PrefixCount property and do not specify this property. Presently, only /80 prefixes are supported. You can''t specify IPv6 prefixes if you''ve specified one of the following: a count of IPv6 prefixes, specific IPv6 addresses, or a count of IPv6 addresses.'
+          x-insertionOrder: false
+          type: array
+          items:
+            $ref: '#/components/schemas/NetworkInterface_Ipv6PrefixSpecification'
+        SubnetId:
+          description: The ID of the subnet to associate with the network interface.
+          type: string
+        SourceDestCheck:
+          description: Indicates whether traffic to or from the instance is validated.
+          type: boolean
+        InterfaceType:
+          description: Indicates the type of network interface.
+          type: string
+        SecondaryPrivateIpAddresses:
+          uniqueItems: false
+          description: Returns the secondary private IP addresses of the network interface.
+          x-insertionOrder: false
+          type: array
+          items:
+            type: string
+        VpcId:
+          description: The ID of the VPC
+          type: string
+        Ipv6AddressCount:
+          description: The number of IPv6 addresses to assign to a network interface. Amazon EC2 automatically selects the IPv6 addresses from the subnet range. To specify specific IPv6 addresses, use the Ipv6Addresses property and don't specify this property.
+          type: integer
+        Id:
+          description: Network interface id.
+          type: string
+        Tags:
+          uniqueItems: false
+          description: An arbitrary set of tags (key-value pairs) for this network interface.
+          x-insertionOrder: false
+          type: array
+          items:
+            $ref: '#/components/schemas/Tag'
+        ConnectionTrackingSpecification:
+          $ref: '#/components/schemas/NetworkInterface_ConnectionTrackingSpecification'
+      required:
+        - SubnetId
+      x-stackql-resource-name: network_interface
+      description: The AWS::EC2::NetworkInterface resource creates network interface
+      x-type-name: AWS::EC2::NetworkInterface
+      x-stackql-primary-identifier:
+        - Id
+      x-create-only-properties:
+        - PrivateIpAddress
+        - InterfaceType
+        - SubnetId
+      x-conditional-create-only-properties:
+        - PrivateIpAddresses
+        - EnablePrimaryIpv6
+        - ConnectionTrackingSpecification
+      x-read-only-properties:
+        - Id
+        - SecondaryPrivateIpAddresses
+        - PrimaryPrivateIpAddress
+        - PrimaryIpv6Address
+        - VpcId
+      x-required-properties:
+        - SubnetId
+      x-tagging:
+        permissions:
+          - ec2:CreateTags
+          - ec2:DeleteTags
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        tagProperty: /properties/Tags
+        cloudFormationSystemTags: true
+      x-required-permissions:
+        read:
+          - ec2:DescribeNetworkInterfaces
+        create:
+          - ec2:CreateNetworkInterface
+          - ec2:DescribeNetworkInterfaces
+          - ec2:CreateTags
+          - ec2:ModifyNetworkInterfaceAttribute
+          - ec2:ModifyPublicIpDnsNameOptions
+        update:
+          - ec2:DescribeNetworkInterfaces
+          - ec2:ModifyNetworkInterfaceAttribute
+          - ec2:UnassignIpv6Addresses
+          - ec2:AssignIpv6Addresses
+          - ec2:DeleteTags
+          - ec2:CreateTags
+          - ec2:UnassignPrivateIpAddresses
+          - ec2:AssignPrivateIpAddresses
+          - ec2:ModifyPublicIpDnsNameOptions
+        list:
+          - ec2:DescribeNetworkInterfaces
+        delete:
+          - ec2:DescribeNetworkInterfaces
+          - ec2:DeleteNetworkInterface
+    NetworkInterfaceAttachment_EnaSrdSpecification:
+      type: object
+      additionalProperties: false
+      properties:
+        EnaSrdEnabled:
+          type: boolean
+          description: Indicates whether ENA Express is enabled for the network interface.
+        EnaSrdUdpSpecification:
+          type: object
+          additionalProperties: false
+          properties:
+            EnaSrdUdpEnabled:
+              type: boolean
+          description: Configures ENA Express for UDP network traffic.
+      description: |-
+        ENA Express uses AWS Scalable Reliable Datagram (SRD) technology to increase the maximum bandwidth used per stream and minimize tail latency of network traffic between EC2 instances. With ENA Express, you can communicate between two EC2 instances in the same subnet within the same account, or in different accounts. Both sending and receiving instances must have ENA Express enabled.
+         To improve the reliability of network packet delivery, ENA Express reorders network packets on the receiving end by default. However, some UDP-based applications are designed to handle network packets that are out of order to reduce the overhead for packet delivery at the network layer. When ENA Express is enabled, you can specify whether UDP network traffic uses it.
     NetworkInterfaceAttachment:
       type: object
       properties:
@@ -6003,7 +6681,7 @@ components:
           description: The ID of the ENI that you want to attach.
           type: string
         EnaSrdSpecification:
-          $ref: '#/components/schemas/EnaSrdSpecification'
+          $ref: '#/components/schemas/NetworkInterfaceAttachment_EnaSrdSpecification'
           description: Configures ENA Express for the network interface that this action attaches to the instance.
       required:
         - DeviceIndex
@@ -6100,6 +6778,24 @@ components:
           - ec2:DisableAwsNetworkPerformanceMetricSubscription
         list:
           - ec2:DescribeAwsNetworkPerformanceMetricSubscriptions
+    PlacementGroup_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     PlacementGroup:
       type: object
       properties:
@@ -6121,7 +6817,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/PlacementGroup_Tag'
       x-stackql-resource-name: placement_group
       description: Resource Type definition for AWS::EC2::PlacementGroup
       x-type-name: AWS::EC2::PlacementGroup
@@ -6154,6 +6850,19 @@ components:
           - ec2:DescribePlacementGroups
         list:
           - ec2:DescribePlacementGroups
+    PrefixList_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          maxLength: 256
+      required:
+        - Key
+      additionalProperties: false
     Entry:
       type: object
       properties:
@@ -6199,7 +6908,7 @@ components:
           description: Tags for Prefix List
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/PrefixList_Tag'
         Entries:
           description: Entries of Prefix List.
           type: array
@@ -6344,6 +7053,24 @@ components:
           - ec2:DescribeRouteTables
         list:
           - ec2:DescribeRouteTables
+    RouteServer_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     RouteServer:
       type: object
       properties:
@@ -6380,7 +7107,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/RouteServer_Tag'
       required:
         - AmazonSideAsn
       x-stackql-resource-name: route_server
@@ -6474,6 +7201,24 @@ components:
         list:
           - ec2:DescribeRouteServers
           - ec2:GetRouteServerAssociations
+    RouteServerEndpoint_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     RouteServerEndpoint:
       type: object
       properties:
@@ -6504,7 +7249,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/RouteServerEndpoint_Tag'
       required:
         - RouteServerId
         - SubnetId
@@ -6566,6 +7311,24 @@ components:
         list:
           - ec2:DescribeTags
           - ec2:DescribeRouteServerEndpoints
+    RouteServerPeer_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     BgpOptions:
       description: BGP Options
       type: object
@@ -6621,7 +7384,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/RouteServerPeer_Tag'
       required:
         - RouteServerEndpointId
         - PeerAddress
@@ -6722,6 +7485,20 @@ components:
         list:
           - ec2:DescribeRouteServers
           - ec2:GetRouteServerPropagations
+    RouteTable_Tag:
+      description: Specifies a tag. For more information, see [Resource tags](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html).
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          description: The tag value.
+          type: string
+        Key:
+          description: The tag key.
+          type: string
+      required:
+        - Value
+        - Key
     RouteTable:
       type: object
       properties:
@@ -6737,7 +7514,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/RouteTable_Tag'
       required:
         - VpcId
       x-stackql-resource-name: route_table
@@ -7306,7 +8083,7 @@ components:
           type: array
           uniqueItems: true
           items:
-            $ref: '#/components/schemas/BlockDeviceMapping'
+            $ref: '#/components/schemas/SpotFleet_BlockDeviceMapping'
         EbsOptimized:
           type: boolean
           default: false
@@ -7550,18 +8327,32 @@ components:
           type: array
           uniqueItems: true
           items:
-            $ref: '#/components/schemas/InstanceIpv6Address'
+            $ref: '#/components/schemas/SpotFleet_InstanceIpv6Address'
         NetworkInterfaceId:
           type: string
         PrivateIpAddresses:
           type: array
           uniqueItems: true
           items:
-            $ref: '#/components/schemas/PrivateIpAddressSpecification'
+            $ref: '#/components/schemas/SpotFleet_PrivateIpAddressSpecification'
         SecondaryPrivateIpAddressCount:
           type: integer
         SubnetId:
           type: string
+    SpotFleet_BlockDeviceMapping:
+      type: object
+      additionalProperties: false
+      properties:
+        DeviceName:
+          type: string
+        Ebs:
+          $ref: '#/components/schemas/SpotFleet_EbsBlockDevice'
+        NoDevice:
+          type: string
+        VirtualName:
+          type: string
+      required:
+        - DeviceName
     TargetGroupsConfig:
       type: object
       additionalProperties: false
@@ -7573,6 +8364,30 @@ components:
             $ref: '#/components/schemas/TargetGroup'
       required:
         - TargetGroups
+    SpotFleet_EbsBlockDevice:
+      type: object
+      additionalProperties: false
+      properties:
+        DeleteOnTermination:
+          type: boolean
+        Encrypted:
+          type: boolean
+        Iops:
+          type: integer
+        SnapshotId:
+          type: string
+        VolumeSize:
+          type: integer
+        VolumeType:
+          type: string
+          enum:
+            - gp2
+            - gp3
+            - io1
+            - io2
+            - sc1
+            - st1
+            - standard
     TargetGroup:
       type: object
       additionalProperties: false
@@ -7581,6 +8396,16 @@ components:
           type: string
       required:
         - Arn
+    SpotFleet_PrivateIpAddressSpecification:
+      type: object
+      additionalProperties: false
+      properties:
+        Primary:
+          type: boolean
+        PrivateIpAddress:
+          type: string
+      required:
+        - PrivateIpAddress
     ClassicLoadBalancer:
       type: object
       additionalProperties: false
@@ -7589,6 +8414,14 @@ components:
           type: string
       required:
         - Name
+    SpotFleet_InstanceIpv6Address:
+      type: object
+      additionalProperties: false
+      properties:
+        Ipv6Address:
+          type: string
+      required:
+        - Ipv6Address
     SpotFleet:
       type: object
       properties:
@@ -7649,6 +8482,20 @@ components:
         update:
           - ec2:ModifySpotFleetRequest
           - ec2:DescribeSpotFleetRequests
+    Subnet_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Value:
+          type: string
+          description: The tag value.
+        Key:
+          type: string
+          description: The tag key.
+      required:
+        - Value
+        - Key
+      description: Specifies a tag. For more information, see [Resource tags](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html).
     Subnet:
       type: object
       properties:
@@ -7731,7 +8578,7 @@ components:
           type: array
           uniqueItems: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Subnet_Tag'
           description: Any tags assigned to the subnet.
         Ipv4IpamPoolId:
           type: string
@@ -7978,6 +8825,17 @@ components:
           - ec2:DisassociateRouteTable
           - ec2:DescribeSubnets
           - ec2:DescribeRouteTables
+    TrafficMirrorFilter_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+        Value:
+          type: string
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     TrafficMirrorNetworkService:
       description: The network service traffic that is associated with the traffic mirror filter.
       type: string
@@ -8005,7 +8863,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/TrafficMirrorFilter_Tag'
       x-stackql-resource-name: traffic_mirror_filter
       description: Resource schema for AWS::EC2::TrafficMirrorFilter
       x-type-name: AWS::EC2::TrafficMirrorFilter
@@ -8157,6 +9015,18 @@ components:
           - ec2:DeleteTrafficMirrorFilterRule
         list:
           - ec2:DescribeTrafficMirrorFilterRules
+    TrafficMirrorSession_Tag:
+      description: A key-value pair to associate with a traffic mirror session resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+        Value:
+          type: string
+      required:
+        - Key
+        - Value
     TrafficMirrorSessionField:
       type: string
       enum:
@@ -8199,7 +9069,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/TrafficMirrorSession_Tag'
       required:
         - NetworkInterfaceId
         - TrafficMirrorFilterId
@@ -8495,6 +9365,16 @@ components:
           description: The tunnel protocol.
           type: string
       additionalProperties: false
+    TransitGatewayConnect_Tag:
+      type: object
+      properties:
+        Key:
+          description: 'The key of the tag. Constraints: Tag keys are case-sensitive and accept a maximum of 127 Unicode characters. May not begin with aws:.'
+          type: string
+        Value:
+          description: 'The value of the tag. Constraints: Tag values are case-sensitive and accept a maximum of 255 Unicode characters.'
+          type: string
+      additionalProperties: false
     TransitGatewayConnect:
       type: object
       properties:
@@ -8517,7 +9397,7 @@ components:
           description: The tags for the attachment.
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/TransitGatewayConnect_Tag'
         Options:
           $ref: '#/components/schemas/TransitGatewayConnectOptions'
           description: The Connect attachment options.
@@ -8571,6 +9451,16 @@ components:
         list:
           - ec2:DescribeTransitGatewayConnects
           - ec2:DescribeTags
+    TransitGatewayConnectPeer_Tag:
+      type: object
+      properties:
+        Value:
+          description: 'The value of the tag. Constraints: Tag values are case-sensitive and accept a maximum of 256 Unicode characters.'
+          type: string
+        Key:
+          description: 'The key of the tag. Constraints: Tag keys are case-sensitive and accept a maximum of 127 Unicode characters. May not begin with aws: .'
+          type: string
+      additionalProperties: false
     TransitGatewayConnectPeerConfiguration:
       type: object
       properties:
@@ -8638,7 +9528,7 @@ components:
           description: The tags for the Connect Peer.
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/TransitGatewayConnectPeer_Tag'
       required:
         - TransitGatewayAttachmentId
         - ConnectPeerConfiguration
@@ -8698,6 +9588,16 @@ components:
         list:
           - ec2:DescribeTransitGatewayConnectPeers
           - ec2:DescribeTags
+    TransitGatewayMulticastDomain_Tag:
+      type: object
+      properties:
+        Key:
+          description: 'The key of the tag. Constraints: Tag keys are case-sensitive and accept a maximum of 127 Unicode characters. May not begin with aws:.'
+          type: string
+        Value:
+          description: 'The value of the tag. Constraints: Tag values are case-sensitive and accept a maximum of 255 Unicode characters.'
+          type: string
+      additionalProperties: false
     TransitGatewayMulticastDomain:
       type: object
       properties:
@@ -8721,7 +9621,7 @@ components:
           description: The tags for the transit gateway multicast domain.
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/TransitGatewayMulticastDomain_Tag'
         Options:
           description: The options for the transit gateway multicast domain.
           type: object
@@ -8995,6 +9895,16 @@ components:
           - ec2:SearchTransitGatewayMulticastGroups
         list:
           - ec2:SearchTransitGatewayMulticastGroups
+    TransitGatewayPeeringAttachment_Tag:
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          description: 'The value of the tag. Constraints: Tag values are case-sensitive and accept a maximum of 255 Unicode characters.'
+          type: string
+        Key:
+          description: 'The key of the tag. Constraints: Tag keys are case-sensitive and accept a maximum of 127 Unicode characters. May not begin with aws:.'
+          type: string
     PeeringAttachmentStatus:
       additionalProperties: false
       type: object
@@ -9034,7 +9944,7 @@ components:
           description: The tags for the transit gateway peering attachment.
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/TransitGatewayPeeringAttachment_Tag'
         TransitGatewayAttachmentId:
           description: The ID of the transit gateway peering attachment.
           type: string
@@ -9143,6 +10053,19 @@ components:
         delete:
           - ec2:DeleteTransitGatewayRoute
           - ec2:SearchTransitGatewayRoutes
+    TransitGatewayRouteTable_Tag:
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          description: The value of the associated tag key-value pair
+          type: string
+        Key:
+          description: The key of the associated tag key-value pair
+          type: string
+      required:
+        - Value
+        - Key
     TransitGatewayRouteTable:
       type: object
       properties:
@@ -9158,7 +10081,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/TransitGatewayRouteTable_Tag'
       required:
         - TransitGatewayId
       x-stackql-resource-name: transit_gateway_route_table
@@ -9386,6 +10309,9 @@ components:
           - ec2:DeleteTransitGatewayVpcAttachment
           - ec2:DeleteTags
           - ec2:ModifyTransitGatewayVpcAttachment
+    VerifiedAccessEndpoint_SecurityGroupId:
+      description: The ID of a security group for the endpoint.
+      type: string
     NetworkInterfaceOptions:
       description: The options for network-interface type endpoint.
       type: object
@@ -9404,7 +10330,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/PortRange'
+            $ref: '#/components/schemas/VerifiedAccessEndpoint_PortRange'
         Protocol:
           description: The IP protocol.
           type: string
@@ -9427,7 +10353,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/PortRange'
+            $ref: '#/components/schemas/VerifiedAccessEndpoint_PortRange'
         Protocol:
           description: The IP protocol.
           type: string
@@ -9484,7 +10410,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/PortRange'
+            $ref: '#/components/schemas/VerifiedAccessEndpoint_PortRange'
         Protocol:
           description: The IP protocol.
           type: string
@@ -9496,9 +10422,42 @@ components:
           items:
             $ref: '#/components/schemas/SubnetId'
       additionalProperties: false
+    VerifiedAccessEndpoint_PortRange:
+      description: The IP port range.
+      type: object
+      properties:
+        FromPort:
+          description: The first port in the range.
+          type: integer
+          minimum: 1
+          maximum: 65535
+        ToPort:
+          description: The last port in the range.
+          type: integer
+          minimum: 1
+          maximum: 65535
+      additionalProperties: false
     SubnetId:
       description: The IDs of the subnet.
       type: string
+    VerifiedAccessEndpoint_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     SseSpecification:
       description: The configuration options for customer provided KMS encryption.
       type: object
@@ -9531,7 +10490,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/SecurityGroupId'
+            $ref: '#/components/schemas/VerifiedAccessEndpoint_SecurityGroupId'
         NetworkInterfaceOptions:
           description: The options for network-interface type endpoint.
           $ref: '#/components/schemas/NetworkInterfaceOptions'
@@ -9586,7 +10545,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/VerifiedAccessEndpoint_Tag'
         SseSpecification:
           description: The configuration options for customer provided KMS encryption.
           $ref: '#/components/schemas/SseSpecification'
@@ -9716,6 +10675,24 @@ components:
           - kms:DescribeKey
           - kms:Decrypt
           - kms:GenerateDataKey
+    VerifiedAccessGroup_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     VerifiedAccessGroup:
       type: object
       properties:
@@ -9752,7 +10729,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/VerifiedAccessGroup_Tag'
         SseSpecification:
           description: The configuration options for customer provided KMS encryption.
           $ref: '#/components/schemas/SseSpecification'
@@ -9833,135 +10810,26 @@ components:
           - kms:CreateGrant
           - kms:GenerateDataKey
           - kms:Decrypt
-    VerifiedAccessTrustProvider:
+    VerifiedAccessInstance_VerifiedAccessTrustProvider:
+      description: A Verified Access Trust Provider.
       type: object
       properties:
-        TrustProviderType:
-          description: 'Type of trust provider. Possible values: user|device'
+        VerifiedAccessTrustProviderId:
+          description: The ID of the trust provider.
           type: string
-        DeviceTrustProviderType:
-          description: 'The type of device-based trust provider. Possible values: jamf|crowdstrike'
+        Description:
+          description: The description of trust provider.
+          type: string
+        TrustProviderType:
+          description: The type of trust provider (user- or device-based).
           type: string
         UserTrustProviderType:
-          description: 'The type of device-based trust provider. Possible values: oidc|iam-identity-center'
+          description: The type of user-based trust provider.
           type: string
-        OidcOptions:
-          $ref: '#/components/schemas/OidcOptions'
-        DeviceOptions:
-          $ref: '#/components/schemas/DeviceOptions'
-        PolicyReferenceName:
-          description: The identifier to be used when working with policy rules.
+        DeviceTrustProviderType:
+          description: The type of device-based trust provider.
           type: string
-        CreationTime:
-          description: The creation time.
-          type: string
-        LastUpdatedTime:
-          description: The last updated time.
-          type: string
-        VerifiedAccessTrustProviderId:
-          description: The ID of the Amazon Web Services Verified Access trust provider.
-          type: string
-        Description:
-          description: A description for the Amazon Web Services Verified Access trust provider.
-          type: string
-        Tags:
-          description: An array of key-value pairs to apply to this resource.
-          type: array
-          uniqueItems: true
-          x-insertionOrder: false
-          items:
-            $ref: '#/components/schemas/Tag'
-        SseSpecification:
-          description: The configuration options for customer provided KMS encryption.
-          type: object
-          properties:
-            KmsKeyArn:
-              description: KMS Key Arn used to encrypt the group policy
-              type: string
-            CustomerManagedKeyEnabled:
-              description: Whether to encrypt the policy with the provided key or disable encryption
-              type: boolean
-          additionalProperties: false
-        NativeApplicationOidcOptions:
-          $ref: '#/components/schemas/NativeApplicationOidcOptions'
-      required:
-        - TrustProviderType
-        - PolicyReferenceName
-      x-stackql-resource-name: verified_access_trust_provider
-      description: The AWS::EC2::VerifiedAccessTrustProvider type describes a verified access trust provider
-      x-type-name: AWS::EC2::VerifiedAccessTrustProvider
-      x-stackql-primary-identifier:
-        - VerifiedAccessTrustProviderId
-      x-create-only-properties:
-        - PolicyReferenceName
-        - DeviceOptions
-        - DeviceTrustProviderType
-        - TrustProviderType
-        - UserTrustProviderType
-      x-write-only-properties:
-        - NativeApplicationOidcOptions/ClientSecret
-      x-read-only-properties:
-        - VerifiedAccessTrustProviderId
-        - CreationTime
-        - LastUpdatedTime
-      x-required-properties:
-        - TrustProviderType
-        - PolicyReferenceName
-      x-tagging:
-        taggable: true
-        tagOnCreate: true
-        tagUpdatable: true
-        cloudFormationSystemTags: false
-        tagProperty: /properties/Tags
-        permissions:
-          - ec2:CreateTags
-          - ec2:DescribeTags
-          - ec2:DeleteTags
-      x-required-permissions:
-        create:
-          - ec2:CreateVerifiedAccessTrustProvider
-          - ec2:DescribeVerifiedAccessTrustProviders
-          - ec2:CreateTags
-          - ec2:DescribeTags
-          - sso:GetSharedSsoConfiguration
-          - kms:DescribeKey
-          - kms:RetireGrant
-          - kms:CreateGrant
-          - kms:GenerateDataKey
-          - kms:Decrypt
-        read:
-          - ec2:DescribeVerifiedAccessTrustProviders
-          - ec2:DescribeTags
-          - kms:DescribeKey
-          - kms:GenerateDataKey
-          - kms:Decrypt
-        update:
-          - ec2:ModifyVerifiedAccessTrustProvider
-          - ec2:DescribeVerifiedAccessTrustProviders
-          - ec2:DescribeTags
-          - ec2:DeleteTags
-          - ec2:CreateTags
-          - kms:DescribeKey
-          - kms:RetireGrant
-          - kms:CreateGrant
-          - kms:GenerateDataKey
-          - kms:Decrypt
-        delete:
-          - ec2:DeleteVerifiedAccessTrustProvider
-          - ec2:DeleteTags
-          - ec2:DescribeVerifiedAccessTrustProviders
-          - ec2:DescribeTags
-          - kms:DescribeKey
-          - kms:RetireGrant
-          - kms:CreateGrant
-          - kms:GenerateDataKey
-          - kms:Decrypt
-        list:
-          - ec2:DescribeVerifiedAccessTrustProviders
-          - ec2:DescribeTags
-          - kms:DescribeKey
-          - kms:GenerateDataKey
-          - kms:Decrypt
+      additionalProperties: false
     VerifiedAccessTrustProviderId:
       description: The ID of the AWS Verified Access trust provider.
       type: string
@@ -10015,6 +10883,24 @@ components:
               type: string
           additionalProperties: false
       additionalProperties: false
+    VerifiedAccessInstance_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     Nameserver:
       description: The value of the name server
       type: string
@@ -10030,7 +10916,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/VerifiedAccessTrustProvider'
+            $ref: '#/components/schemas/VerifiedAccessInstance_VerifiedAccessTrustProvider'
         VerifiedAccessTrustProviderIds:
           description: The IDs of the AWS Verified Access trust providers.
           type: array
@@ -10056,7 +10942,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/VerifiedAccessInstance_Tag'
         FipsEnabled:
           description: Indicates whether FIPS is enabled
           type: boolean
@@ -10205,6 +11091,27 @@ components:
           type: string
           description: URL Verified Access will use to verify authenticity of the device tokens.
       additionalProperties: false
+    VerifiedAccessTrustProvider_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
+    VerifiedAccessTrustProvider_SseSpecification:
+      description: The configuration options for customer provided KMS encryption.
+      type: object
     NativeApplicationOidcOptions:
       description: The OpenID Connect details for an oidc -type, user-identity based trust provider for L4.
       type: object
@@ -10234,6 +11141,309 @@ components:
           type: string
           description: The public signing key for endpoint
       additionalProperties: false
+    VerifiedAccessTrustProvider:
+      type: object
+      properties:
+        TrustProviderType:
+          description: 'Type of trust provider. Possible values: user|device'
+          type: string
+        DeviceTrustProviderType:
+          description: 'The type of device-based trust provider. Possible values: jamf|crowdstrike'
+          type: string
+        UserTrustProviderType:
+          description: 'The type of device-based trust provider. Possible values: oidc|iam-identity-center'
+          type: string
+        OidcOptions:
+          $ref: '#/components/schemas/OidcOptions'
+        DeviceOptions:
+          $ref: '#/components/schemas/DeviceOptions'
+        PolicyReferenceName:
+          description: The identifier to be used when working with policy rules.
+          type: string
+        CreationTime:
+          description: The creation time.
+          type: string
+        LastUpdatedTime:
+          description: The last updated time.
+          type: string
+        VerifiedAccessTrustProviderId:
+          description: The ID of the Amazon Web Services Verified Access trust provider.
+          type: string
+        Description:
+          description: A description for the Amazon Web Services Verified Access trust provider.
+          type: string
+        Tags:
+          description: An array of key-value pairs to apply to this resource.
+          type: array
+          uniqueItems: true
+          x-insertionOrder: false
+          items:
+            $ref: '#/components/schemas/VerifiedAccessTrustProvider_Tag'
+        SseSpecification:
+          description: The configuration options for customer provided KMS encryption.
+          type: object
+          properties:
+            KmsKeyArn:
+              description: KMS Key Arn used to encrypt the group policy
+              type: string
+            CustomerManagedKeyEnabled:
+              description: Whether to encrypt the policy with the provided key or disable encryption
+              type: boolean
+          additionalProperties: false
+        NativeApplicationOidcOptions:
+          $ref: '#/components/schemas/NativeApplicationOidcOptions'
+      required:
+        - TrustProviderType
+        - PolicyReferenceName
+      x-stackql-resource-name: verified_access_trust_provider
+      description: The AWS::EC2::VerifiedAccessTrustProvider type describes a verified access trust provider
+      x-type-name: AWS::EC2::VerifiedAccessTrustProvider
+      x-stackql-primary-identifier:
+        - VerifiedAccessTrustProviderId
+      x-create-only-properties:
+        - PolicyReferenceName
+        - DeviceOptions
+        - DeviceTrustProviderType
+        - TrustProviderType
+        - UserTrustProviderType
+      x-write-only-properties:
+        - NativeApplicationOidcOptions/ClientSecret
+      x-read-only-properties:
+        - VerifiedAccessTrustProviderId
+        - CreationTime
+        - LastUpdatedTime
+      x-required-properties:
+        - TrustProviderType
+        - PolicyReferenceName
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: false
+        tagProperty: /properties/Tags
+        permissions:
+          - ec2:CreateTags
+          - ec2:DescribeTags
+          - ec2:DeleteTags
+      x-required-permissions:
+        create:
+          - ec2:CreateVerifiedAccessTrustProvider
+          - ec2:DescribeVerifiedAccessTrustProviders
+          - ec2:CreateTags
+          - ec2:DescribeTags
+          - sso:GetSharedSsoConfiguration
+          - kms:DescribeKey
+          - kms:RetireGrant
+          - kms:CreateGrant
+          - kms:GenerateDataKey
+          - kms:Decrypt
+        read:
+          - ec2:DescribeVerifiedAccessTrustProviders
+          - ec2:DescribeTags
+          - kms:DescribeKey
+          - kms:GenerateDataKey
+          - kms:Decrypt
+        update:
+          - ec2:ModifyVerifiedAccessTrustProvider
+          - ec2:DescribeVerifiedAccessTrustProviders
+          - ec2:DescribeTags
+          - ec2:DeleteTags
+          - ec2:CreateTags
+          - kms:DescribeKey
+          - kms:RetireGrant
+          - kms:CreateGrant
+          - kms:GenerateDataKey
+          - kms:Decrypt
+        delete:
+          - ec2:DeleteVerifiedAccessTrustProvider
+          - ec2:DeleteTags
+          - ec2:DescribeVerifiedAccessTrustProviders
+          - ec2:DescribeTags
+          - kms:DescribeKey
+          - kms:RetireGrant
+          - kms:CreateGrant
+          - kms:GenerateDataKey
+          - kms:Decrypt
+        list:
+          - ec2:DescribeVerifiedAccessTrustProviders
+          - ec2:DescribeTags
+          - kms:DescribeKey
+          - kms:GenerateDataKey
+          - kms:Decrypt
+    Volume_Tag:
+      description: Specifies a tag. For more information, see [Resource tags](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html).
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          description: The tag value.
+          type: string
+        Key:
+          description: The tag key.
+          type: string
+      required:
+        - Value
+        - Key
+    Volume:
+      type: object
+      properties:
+        MultiAttachEnabled:
+          description: |-
+            Indicates whether Amazon EBS Multi-Attach is enabled.
+             CFNlong does not currently support updating a single-attach volume to be multi-attach enabled, updating a multi-attach enabled volume to be single-attach, or updating the size or number of I/O operations per second (IOPS) of a multi-attach enabled volume.
+          type: boolean
+        KmsKeyId:
+          description: |-
+            The identifier of the kms-key-long to use for Amazon EBS encryption. If ``KmsKeyId`` is specified, the encrypted state must be ``true``.
+             If you omit this property and your account is enabled for encryption by default, or *Encrypted* is set to ``true``, then the volume is encrypted using the default key specified for your account. If your account does not have a default key, then the volume is encrypted using the aws-managed-key.
+             Alternatively, if you want to specify a different key, you can specify one of the following:
+              +  Key ID. For example, 1234abcd-12ab-34cd-56ef-1234567890ab.
+              +  Key alias. Specify the alias for the key, prefixed with ``alias/``. For example, for a key with the alias ``my_cmk``, use ``alias/my_cmk``. Or to specify the aws-managed-key, use ``alias/aws/ebs``.
+              +  Key ARN. For example, arn:aws:kms:us-east-1:012345678910:key/1234abcd-12ab-34cd-56ef-1234567890ab.
+              +  Alias ARN. For example, arn:aws:kms:us-east-1:012345678910:alias/ExampleAlias.
+          type: string
+        Encrypted:
+          description: |-
+            Indicates whether the volume should be encrypted. The effect of setting the encryption state to ``true`` depends on the volume origin (new or from a snapshot), starting encryption state, ownership, and whether encryption by default is enabled. For more information, see [Encryption by default](https://docs.aws.amazon.com/ebs/latest/userguide/work-with-ebs-encr.html#encryption-by-default) in the *Amazon EBS User Guide*.
+             Encrypted Amazon EBS volumes must be attached to instances that support Amazon EBS encryption. For more information, see [Supported instance types](https://docs.aws.amazon.com/ebs/latest/userguide/ebs-encryption-requirements.html#ebs-encryption_supported_instances).
+          type: boolean
+        Size:
+          description: |-
+            The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. If you specify a snapshot, the default is the snapshot size. You can specify a volume size that is equal to or larger than the snapshot size.
+             The following are the supported volumes sizes for each volume type:
+              +  ``gp2`` and ``gp3``: 1 - 16,384 GiB
+              +  ``io1``: 4 - 16,384 GiB
+              +  ``io2``: 4 - 65,536 GiB
+              +  ``st1`` and ``sc1``: 125 - 16,384 GiB
+              +  ``standard``: 1 - 1024 GiB
+          type: integer
+        AutoEnableIO:
+          description: Indicates whether the volume is auto-enabled for I/O operations. By default, Amazon EBS disables I/O to the volume from attached EC2 instances when it determines that a volume's data is potentially inconsistent. If the consistency of the volume is not a concern, and you prefer that the volume be made available immediately if it's impaired, you can configure the volume to automatically enable I/O.
+          type: boolean
+        OutpostArn:
+          description: The Amazon Resource Name (ARN) of the Outpost.
+          type: string
+        AvailabilityZone:
+          description: |-
+            The ID of the Availability Zone in which to create the volume. For example, ``us-east-1a``.
+             Either ``AvailabilityZone`` or ``AvailabilityZoneId`` must be specified, but not both.
+          type: string
+        Throughput:
+          description: |-
+            The throughput to provision for a volume, with a maximum of 1,000 MiB/s.
+             This parameter is valid only for ``gp3`` volumes. The default value is 125.
+             Valid Range: Minimum value of 125. Maximum value of 1000.
+          type: integer
+        Iops:
+          description: |-
+            The number of I/O operations per second (IOPS). For ``gp3``, ``io1``, and ``io2`` volumes, this represents the number of IOPS that are provisioned for the volume. For ``gp2`` volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.
+             The following are the supported values for each volume type:
+              +  ``gp3``: 3,000 - 16,000 IOPS
+              +  ``io1``: 100 - 64,000 IOPS
+              +  ``io2``: 100 - 256,000 IOPS
+              
+             For ``io2`` volumes, you can achieve up to 256,000 IOPS on [instances built on the Nitro System](https://docs.aws.amazon.com/ec2/latest/instancetypes/ec2-nitro-instances.html). On other instances, you can achieve performance up to 32,000 IOPS.
+             This parameter is required for ``io1`` and ``io2`` volumes. The default for ``gp3`` volumes is 3,000 IOPS. This parameter is not supported for ``gp2``, ``st1``, ``sc1``, or ``standard`` volumes.
+          type: integer
+        VolumeInitializationRate:
+          description: |-
+            Specifies the Amazon EBS Provisioned Rate for Volume Initialization (volume initialization rate), in MiB/s, at which to download the snapshot blocks from Amazon S3 to the volume. This is also known as *volume initialization*. Specifying a volume initialization rate ensures that the volume is initialized at a predictable and consistent rate after creation.
+             This parameter is supported only for volumes created from snapshots. Omit this parameter if:
+              +  You want to create the volume using fast snapshot restore. You must specify a snapshot that is enabled for fast snapshot restore. In this case, the volume is fully initialized at creation.
+              If you specify a snapshot that is enabled for fast snapshot restore and a volume initialization rate, the volume will be initialized at the specified rate instead of fast snapshot restore.
+               +  You want to create a volume that is initialized at the default rate.
+              
+             For more information, see [Initialize Amazon EBS volumes](https://docs.aws.amazon.com/ebs/latest/userguide/initalize-volume.html) in the *Amazon EC2 User Guide*.
+             Valid range: 100 - 300 MiB/s
+          type: integer
+        SnapshotId:
+          description: The snapshot from which to create the volume. You must specify either a snapshot ID or a volume size.
+          type: string
+        VolumeId:
+          description: ''
+          type: string
+        VolumeType:
+          description: |-
+            The volume type. This parameter can be one of the following values:
+              +  General Purpose SSD: ``gp2`` | ``gp3``
+              +  Provisioned IOPS SSD: ``io1`` | ``io2``
+              +  Throughput Optimized HDD: ``st1``
+              +  Cold HDD: ``sc1``
+              +  Magnetic: ``standard``
+              
+             For more information, see [Amazon EBS volume types](https://docs.aws.amazon.com/ebs/latest/userguide/ebs-volume-types.html).
+             Default: ``gp2``
+          type: string
+        Tags:
+          uniqueItems: false
+          description: The tags to apply to the volume during creation.
+          x-insertionOrder: false
+          type: array
+          items:
+            $ref: '#/components/schemas/Volume_Tag'
+      required:
+        - AvailabilityZone
+      x-stackql-resource-name: volume
+      description: |-
+        Specifies an Amazon Elastic Block Store (Amazon EBS) volume.
+         When you use CFNlong to update an Amazon EBS volume that modifies ``Iops``, ``Size``, or ``VolumeType``, there is a cooldown period before another operation can occur. This can cause your stack to report being in ``UPDATE_IN_PROGRESS`` or ``UPDATE_ROLLBACK_IN_PROGRESS`` for long periods of time.
+         Amazon EBS does not support sizing down an Amazon EBS volume. CFNlong does not attempt to modify an Amazon EBS volume to a smaller size on rollback.
+         Some common scenarios when you might encounter a cooldown period for Amazon EBS include:
+          +  You successfully update an Amazon EBS volume and the update succeeds. When you attempt another update within the cooldown window, that update will be subject to a cooldown period.
+          +  You successfully update an Amazon EBS volume and the update succeeds but another change in your ``update-stack`` call fails. The rollback will be subject to a cooldown period.
+          
+         For more information, see [Requirements for EBS volume modifications](https://docs.aws.amazon.com/ebs/latest/userguide/modify-volume-requirements.html).
+          *DeletionPolicy attribute* 
+         To control how CFNlong handles the volume when the stack is deleted, set a deletion policy for your volume. You can choose to retain the volume, to delete the volume, or to create a snapshot of the volume. For more information, see [DeletionPolicy attribute](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-deletionpolicy.html).
+          If you set a deletion policy that creates a snapshot, all tags on the volume are included in the snapshot.
+      x-type-name: AWS::EC2::Volume
+      x-stackql-primary-identifier:
+        - VolumeId
+      x-read-only-properties:
+        - VolumeId
+      x-required-properties:
+        - AvailabilityZone
+      x-tagging:
+        permissions:
+          - ec2:CreateTags
+          - ec2:DeleteTags
+          - ec2:DescribeTags
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        tagProperty: /properties/Tags
+        cloudFormationSystemTags: false
+      x-required-permissions:
+        read:
+          - ec2:DescribeVolumes
+          - ec2:DescribeVolumeAttribute
+          - ec2:DescribeTags
+        create:
+          - ec2:CreateVolume
+          - ec2:DescribeVolumes
+          - ec2:DescribeVolumeAttribute
+          - ec2:ModifyVolumeAttribute
+          - ec2:CreateTags
+          - kms:GenerateDataKeyWithoutPlaintext
+          - kms:CreateGrant
+        update:
+          - ec2:ModifyVolume
+          - ec2:ModifyVolumeAttribute
+          - ec2:DescribeVolumeAttribute
+          - ec2:DescribeVolumesModifications
+          - ec2:DescribeVolumes
+          - ec2:CreateTags
+          - ec2:DeleteTags
+        list:
+          - ec2:DescribeVolumes
+          - ec2:DescribeTags
+          - ec2:DescribeVolumeAttribute
+        delete:
+          - ec2:DeleteVolume
+          - ec2:CreateSnapshot
+          - ec2:DescribeSnapshots
+          - ec2:DeleteTags
+          - ec2:DescribeVolumes
     VolumeId:
       description: The ID of the Amazon EBS volume
       type: string
@@ -10294,6 +11504,20 @@ components:
           - ec2:DescribeVolumes
         list:
           - ec2:DescribeVolumes
+    VPC_Tag:
+      description: Specifies a tag. For more information, see [Resource tags](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html).
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          description: The tag value.
+          type: string
+        Key:
+          description: The tag key.
+          type: string
+      required:
+        - Value
+        - Key
     VPC:
       type: object
       properties:
@@ -10359,7 +11583,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/VPC_Tag'
       x-stackql-resource-name: vpc
       description: |-
         Specifies a virtual private cloud (VPC).
@@ -10415,6 +11639,24 @@ components:
         delete:
           - ec2:DeleteVpc
           - ec2:DescribeVpcs
+    VPCBlockPublicAccessExclusion_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     VPCBlockPublicAccessExclusion:
       type: object
       properties:
@@ -10439,7 +11681,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/VPCBlockPublicAccessExclusion_Tag'
       required:
         - InternetGatewayExclusionMode
       x-stackql-resource-name: vpc_block_public_access_exclusion
@@ -10672,6 +11914,24 @@ components:
             - dualstack
             - service-defined
             - not-specified
+    VPCEndpoint_Tag:
+      description: Describes a tag.
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          description: |-
+            The value of the tag.
+             Constraints: Tag values are case-sensitive and accept a maximum of 256 Unicode characters.
+          type: string
+        Key:
+          description: |-
+            The key of the tag.
+             Constraints: Tag keys are case-sensitive and accept a maximum of 127 Unicode characters. May not begin with ``aws:``.
+          type: string
+      required:
+        - Value
+        - Key
     VPCEndpoint:
       type: object
       properties:
@@ -10789,7 +12049,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/VPCEndpoint_Tag'
       required:
         - VpcId
       x-stackql-resource-name: vpc_endpoint
@@ -11137,6 +12397,20 @@ components:
         list:
           - ec2:DescribeInternetGateways
           - ec2:DescribeVpnGateways
+    VPCPeeringConnection_Tag:
+      description: A key-value pair to associate with a resource.
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+        Key:
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+      required:
+        - Key
+        - Value
     VPCPeeringConnection:
       type: object
       properties:
@@ -11162,7 +12436,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/VPCPeeringConnection_Tag'
       required:
         - VpcId
         - PeerVpcId
@@ -11477,6 +12751,20 @@ components:
           enum:
             - ikev1
             - ikev2
+    VPNConnection_Tag:
+      description: Specifies a tag. For more information, see [Resource tags](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html).
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          description: The tag value.
+          type: string
+        Key:
+          description: The tag key.
+          type: string
+      required:
+        - Value
+        - Key
     VpnTunnelLogOptionsSpecification:
       description: Options for logging VPN tunnel activity.
       additionalProperties: false
@@ -11594,7 +12882,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/VPNConnection_Tag'
       required:
         - Type
         - CustomerGatewayId
@@ -11696,6 +12984,20 @@ components:
         delete:
           - ec2:DeleteVpnConnectionRoute
           - ec2:DescribeVpnConnections
+    VPNGateway_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: The tag key.
+        Value:
+          type: string
+          description: The tag value.
+      required:
+        - Value
+        - Key
+      description: Specifies a tag. For more information, see [Resource tags](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html).
     VPNGateway:
       type: object
       properties:
@@ -11712,7 +13014,7 @@ components:
           x-insertionOrder: false
           uniqueItems: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/VPNGateway_Tag'
         Type:
           description: The type of VPN connection the virtual private gateway supports.
           type: string
@@ -11971,7 +13273,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/CustomerGateway_Tag'
             CertificateArn:
               pattern: ^arn:(aws[a-zA-Z-]*)?:acm:[a-z]{2}((-gov)|(-iso([a-z]{1})?))?-[a-z]+-\d{1}:\d{12}:certificate\/[a-zA-Z0-9-_]+$
               description: The Amazon Resource Name (ARN) for the customer gateway certificate.
@@ -12031,7 +13333,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/DHCPOptions_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateDHCPOptionsRequest
       type: object
@@ -12068,7 +13370,7 @@ components:
               type: array
               uniqueItems: false
               items:
-                $ref: '#/components/schemas/TagSpecification'
+                $ref: '#/components/schemas/EC2Fleet_TagSpecification'
             SpotOptions:
               $ref: '#/components/schemas/SpotOptionsRequest'
             ValidFrom:
@@ -12118,7 +13420,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/EgressOnlyInternetGateway_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateEgressOnlyInternetGatewayRequest
       type: object
@@ -12179,7 +13481,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/EIP_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateEIPRequest
       type: object
@@ -12356,193 +13658,30 @@ components:
     CreateGatewayRouteTableAssociationRequest:
       properties:
         ClientToken:
-          type: string
-        RoleArn:
-          type: string
-        TypeName:
-          type: string
-        TypeVersionId:
-          type: string
-        DesiredState:
-          type: object
-          properties:
-            RouteTableId:
-              description: The ID of the route table.
-              type: string
-            GatewayId:
-              description: The ID of the gateway.
-              type: string
-            AssociationId:
-              description: The route table association ID.
-              type: string
-          x-stackQL-stringOnly: true
-      x-title: CreateGatewayRouteTableAssociationRequest
-      type: object
-      required: []
-    CreateHostRequest:
-      properties:
-        ClientToken:
-          type: string
-        RoleArn:
-          type: string
-        TypeName:
-          type: string
-        TypeVersionId:
-          type: string
-        DesiredState:
-          type: object
-          properties:
-            HostId:
-              description: ID of the host created.
-              type: string
-            AutoPlacement:
-              description: Indicates whether the host accepts any untargeted instance launches that match its instance type configuration, or if it only accepts Host tenancy instance launches that specify its unique host ID.
-              type: string
-            AvailabilityZone:
-              description: The Availability Zone in which to allocate the Dedicated Host.
-              type: string
-            HostRecovery:
-              description: Indicates whether to enable or disable host recovery for the Dedicated Host. Host recovery is disabled by default.
-              type: string
-            InstanceType:
-              description: Specifies the instance type to be supported by the Dedicated Hosts. If you specify an instance type, the Dedicated Hosts support instances of the specified instance type only.
-              type: string
-            InstanceFamily:
-              description: Specifies the instance family to be supported by the Dedicated Hosts. If you specify an instance family, the Dedicated Hosts support multiple instance types within that instance family.
-              type: string
-            OutpostArn:
-              description: The Amazon Resource Name (ARN) of the Amazon Web Services Outpost on which to allocate the Dedicated Host.
-              type: string
-            HostMaintenance:
-              description: Automatically allocates a new dedicated host and moves your instances on to it if a degradation is detected on your current host.
-              type: string
-            AssetId:
-              description: The ID of the Outpost hardware asset.
-              type: string
-            Tags:
-              description: Any tags assigned to the Host.
-              type: array
-              uniqueItems: false
-              x-insertionOrder: false
-              items:
-                $ref: '#/components/schemas/Tag'
-          x-stackQL-stringOnly: true
-      x-title: CreateHostRequest
-      type: object
-      required: []
-    CreateNetworkInterfaceRequest:
-      properties:
-        ClientToken:
-          type: string
-        RoleArn:
-          type: string
-        TypeName:
-          type: string
-        TypeVersionId:
-          type: string
-        DesiredState:
-          type: object
-          properties:
-            Description:
-              description: A description for the network interface.
-              type: string
-            PrivateIpAddress:
-              description: 'Assigns a single private IP address to the network interface, which is used as the primary private IP address. If you want to specify multiple private IP address, use the PrivateIpAddresses property. '
-              type: string
-            PrimaryIpv6Address:
-              description: The primary IPv6 address
-              type: string
-            PrivateIpAddresses:
-              uniqueItems: false
-              description: Assigns a list of private IP addresses to the network interface. You can specify a primary private IP address by setting the value of the Primary property to true in the PrivateIpAddressSpecification property. If you want EC2 to automatically assign private IP addresses, use the SecondaryPrivateIpAddressCount property and do not specify this property.
-              x-insertionOrder: false
-              type: array
-              items:
-                $ref: '#/components/schemas/PrivateIpAddressSpecification'
-            SecondaryPrivateIpAddressCount:
-              description: The number of secondary private IPv4 addresses to assign to a network interface. When you specify a number of secondary IPv4 addresses, Amazon EC2 selects these IP addresses within the subnet's IPv4 CIDR range. You can't specify this option and specify more than one private IP address using privateIpAddresses
-              type: integer
-            Ipv6PrefixCount:
-              description: 'The number of IPv6 prefixes to assign to a network interface. When you specify a number of IPv6 prefixes, Amazon EC2 selects these prefixes from your existing subnet CIDR reservations, if available, or from free spaces in the subnet. By default, these will be /80 prefixes. You can''t specify a count of IPv6 prefixes if you''ve specified one of the following: specific IPv6 prefixes, specific IPv6 addresses, or a count of IPv6 addresses.'
-              type: integer
-            PrimaryPrivateIpAddress:
-              description: Returns the primary private IP address of the network interface.
-              type: string
-            Ipv4Prefixes:
-              uniqueItems: false
-              description: 'Assigns a list of IPv4 prefixes to the network interface. If you want EC2 to automatically assign IPv4 prefixes, use the Ipv4PrefixCount property and do not specify this property. Presently, only /28 prefixes are supported. You can''t specify IPv4 prefixes if you''ve specified one of the following: a count of IPv4 prefixes, specific private IPv4 addresses, or a count of private IPv4 addresses.'
-              x-insertionOrder: false
-              type: array
-              items:
-                $ref: '#/components/schemas/Ipv4PrefixSpecification'
-            Ipv4PrefixCount:
-              description: 'The number of IPv4 prefixes to assign to a network interface. When you specify a number of IPv4 prefixes, Amazon EC2 selects these prefixes from your existing subnet CIDR reservations, if available, or from free spaces in the subnet. By default, these will be /28 prefixes. You can''t specify a count of IPv4 prefixes if you''ve specified one of the following: specific IPv4 prefixes, specific private IPv4 addresses, or a count of private IPv4 addresses.'
-              type: integer
-            EnablePrimaryIpv6:
-              description: >-
-                If you have instances or ENIs that rely on the IPv6 address not changing, to avoid disrupting traffic to instances or ENIs, you can enable a primary IPv6 address. Enable this option to automatically assign an IPv6 associated with the ENI attached to your instance to be the primary IPv6 address. When you enable an IPv6 address to be a primary IPv6, you cannot disable it. Traffic will be routed to the primary IPv6 address until the instance is terminated or the ENI is detached. If
-                you have multiple IPv6 addresses associated with an ENI and you enable a primary IPv6 address, the first IPv6 address associated with the ENI becomes the primary IPv6 address.
-              type: boolean
-            GroupSet:
-              uniqueItems: false
-              description: A list of security group IDs associated with this network interface.
-              x-insertionOrder: false
-              type: array
-              items:
-                type: string
-            Ipv6Addresses:
-              uniqueItems: true
-              description: One or more specific IPv6 addresses from the IPv6 CIDR block range of your subnet to associate with the network interface. If you're specifying a number of IPv6 addresses, use the Ipv6AddressCount property and don't specify this property.
-              x-insertionOrder: false
-              type: array
-              items:
-                $ref: '#/components/schemas/InstanceIpv6Address'
-            Ipv6Prefixes:
-              uniqueItems: false
-              description: 'Assigns a list of IPv6 prefixes to the network interface. If you want EC2 to automatically assign IPv6 prefixes, use the Ipv6PrefixCount property and do not specify this property. Presently, only /80 prefixes are supported. You can''t specify IPv6 prefixes if you''ve specified one of the following: a count of IPv6 prefixes, specific IPv6 addresses, or a count of IPv6 addresses.'
-              x-insertionOrder: false
-              type: array
-              items:
-                $ref: '#/components/schemas/Ipv6PrefixSpecification'
-            SubnetId:
-              description: The ID of the subnet to associate with the network interface.
-              type: string
-            SourceDestCheck:
-              description: Indicates whether traffic to or from the instance is validated.
-              type: boolean
-            InterfaceType:
-              description: Indicates the type of network interface.
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            RouteTableId:
+              description: The ID of the route table.
               type: string
-            SecondaryPrivateIpAddresses:
-              uniqueItems: false
-              description: Returns the secondary private IP addresses of the network interface.
-              x-insertionOrder: false
-              type: array
-              items:
-                type: string
-            VpcId:
-              description: The ID of the VPC
+            GatewayId:
+              description: The ID of the gateway.
               type: string
-            Ipv6AddressCount:
-              description: The number of IPv6 addresses to assign to a network interface. Amazon EC2 automatically selects the IPv6 addresses from the subnet range. To specify specific IPv6 addresses, use the Ipv6Addresses property and don't specify this property.
-              type: integer
-            Id:
-              description: Network interface id.
+            AssociationId:
+              description: The route table association ID.
               type: string
-            Tags:
-              uniqueItems: false
-              description: An arbitrary set of tags (key-value pairs) for this network interface.
-              x-insertionOrder: false
-              type: array
-              items:
-                $ref: '#/components/schemas/Tag'
-            ConnectionTrackingSpecification:
-              $ref: '#/components/schemas/ConnectionTrackingSpecification'
           x-stackQL-stringOnly: true
-      x-title: CreateNetworkInterfaceRequest
+      x-title: CreateGatewayRouteTableAssociationRequest
       type: object
       required: []
-    CreateVolumeRequest:
+    CreateHostRequest:
       properties:
         ClientToken:
           type: string
@@ -12555,102 +13694,42 @@ components:
         DesiredState:
           type: object
           properties:
-            MultiAttachEnabled:
-              description: |-
-                Indicates whether Amazon EBS Multi-Attach is enabled.
-                 CFNlong does not currently support updating a single-attach volume to be multi-attach enabled, updating a multi-attach enabled volume to be single-attach, or updating the size or number of I/O operations per second (IOPS) of a multi-attach enabled volume.
-              type: boolean
-            KmsKeyId:
-              description: |-
-                The identifier of the kms-key-long to use for Amazon EBS encryption. If ``KmsKeyId`` is specified, the encrypted state must be ``true``.
-                 If you omit this property and your account is enabled for encryption by default, or *Encrypted* is set to ``true``, then the volume is encrypted using the default key specified for your account. If your account does not have a default key, then the volume is encrypted using the aws-managed-key.
-                 Alternatively, if you want to specify a different key, you can specify one of the following:
-                  +  Key ID. For example, 1234abcd-12ab-34cd-56ef-1234567890ab.
-                  +  Key alias. Specify the alias for the key, prefixed with ``alias/``. For example, for a key with the alias ``my_cmk``, use ``alias/my_cmk``. Or to specify the aws-managed-key, use ``alias/aws/ebs``.
-                  +  Key ARN. For example, arn:aws:kms:us-east-1:012345678910:key/1234abcd-12ab-34cd-56ef-1234567890ab.
-                  +  Alias ARN. For example, arn:aws:kms:us-east-1:012345678910:alias/ExampleAlias.
+            HostId:
+              description: ID of the host created.
               type: string
-            Encrypted:
-              description: |-
-                Indicates whether the volume should be encrypted. The effect of setting the encryption state to ``true`` depends on the volume origin (new or from a snapshot), starting encryption state, ownership, and whether encryption by default is enabled. For more information, see [Encryption by default](https://docs.aws.amazon.com/ebs/latest/userguide/work-with-ebs-encr.html#encryption-by-default) in the *Amazon EBS User Guide*.
-                 Encrypted Amazon EBS volumes must be attached to instances that support Amazon EBS encryption. For more information, see [Supported instance types](https://docs.aws.amazon.com/ebs/latest/userguide/ebs-encryption-requirements.html#ebs-encryption_supported_instances).
-              type: boolean
-            Size:
-              description: |-
-                The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. If you specify a snapshot, the default is the snapshot size. You can specify a volume size that is equal to or larger than the snapshot size.
-                 The following are the supported volumes sizes for each volume type:
-                  +  ``gp2`` and ``gp3``: 1 - 16,384 GiB
-                  +  ``io1``: 4 - 16,384 GiB
-                  +  ``io2``: 4 - 65,536 GiB
-                  +  ``st1`` and ``sc1``: 125 - 16,384 GiB
-                  +  ``standard``: 1 - 1024 GiB
-              type: integer
-            AutoEnableIO:
-              description: Indicates whether the volume is auto-enabled for I/O operations. By default, Amazon EBS disables I/O to the volume from attached EC2 instances when it determines that a volume's data is potentially inconsistent. If the consistency of the volume is not a concern, and you prefer that the volume be made available immediately if it's impaired, you can configure the volume to automatically enable I/O.
-              type: boolean
-            OutpostArn:
-              description: The Amazon Resource Name (ARN) of the Outpost.
+            AutoPlacement:
+              description: Indicates whether the host accepts any untargeted instance launches that match its instance type configuration, or if it only accepts Host tenancy instance launches that specify its unique host ID.
               type: string
             AvailabilityZone:
-              description: |-
-                The ID of the Availability Zone in which to create the volume. For example, ``us-east-1a``.
-                 Either ``AvailabilityZone`` or ``AvailabilityZoneId`` must be specified, but not both.
+              description: The Availability Zone in which to allocate the Dedicated Host.
               type: string
-            Throughput:
-              description: |-
-                The throughput to provision for a volume, with a maximum of 1,000 MiB/s.
-                 This parameter is valid only for ``gp3`` volumes. The default value is 125.
-                 Valid Range: Minimum value of 125. Maximum value of 1000.
-              type: integer
-            Iops:
-              description: |-
-                The number of I/O operations per second (IOPS). For ``gp3``, ``io1``, and ``io2`` volumes, this represents the number of IOPS that are provisioned for the volume. For ``gp2`` volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.
-                 The following are the supported values for each volume type:
-                  +  ``gp3``: 3,000 - 16,000 IOPS
-                  +  ``io1``: 100 - 64,000 IOPS
-                  +  ``io2``: 100 - 256,000 IOPS
-                  
-                 For ``io2`` volumes, you can achieve up to 256,000 IOPS on [instances built on the Nitro System](https://docs.aws.amazon.com/ec2/latest/instancetypes/ec2-nitro-instances.html). On other instances, you can achieve performance up to 32,000 IOPS.
-                 This parameter is required for ``io1`` and ``io2`` volumes. The default for ``gp3`` volumes is 3,000 IOPS. This parameter is not supported for ``gp2``, ``st1``, ``sc1``, or ``standard`` volumes.
-              type: integer
-            VolumeInitializationRate:
-              description: |-
-                Specifies the Amazon EBS Provisioned Rate for Volume Initialization (volume initialization rate), in MiB/s, at which to download the snapshot blocks from Amazon S3 to the volume. This is also known as *volume initialization*. Specifying a volume initialization rate ensures that the volume is initialized at a predictable and consistent rate after creation.
-                 This parameter is supported only for volumes created from snapshots. Omit this parameter if:
-                  +  You want to create the volume using fast snapshot restore. You must specify a snapshot that is enabled for fast snapshot restore. In this case, the volume is fully initialized at creation.
-                  If you specify a snapshot that is enabled for fast snapshot restore and a volume initialization rate, the volume will be initialized at the specified rate instead of fast snapshot restore.
-                   +  You want to create a volume that is initialized at the default rate.
-                  
-                 For more information, see [Initialize Amazon EBS volumes](https://docs.aws.amazon.com/ebs/latest/userguide/initalize-volume.html) in the *Amazon EC2 User Guide*.
-                 Valid range: 100 - 300 MiB/s
-              type: integer
-            SnapshotId:
-              description: The snapshot from which to create the volume. You must specify either a snapshot ID or a volume size.
+            HostRecovery:
+              description: Indicates whether to enable or disable host recovery for the Dedicated Host. Host recovery is disabled by default.
               type: string
-            VolumeId:
-              description: ''
+            InstanceType:
+              description: Specifies the instance type to be supported by the Dedicated Hosts. If you specify an instance type, the Dedicated Hosts support instances of the specified instance type only.
               type: string
-            VolumeType:
-              description: |-
-                The volume type. This parameter can be one of the following values:
-                  +  General Purpose SSD: ``gp2`` | ``gp3``
-                  +  Provisioned IOPS SSD: ``io1`` | ``io2``
-                  +  Throughput Optimized HDD: ``st1``
-                  +  Cold HDD: ``sc1``
-                  +  Magnetic: ``standard``
-                  
-                 For more information, see [Amazon EBS volume types](https://docs.aws.amazon.com/ebs/latest/userguide/ebs-volume-types.html).
-                 Default: ``gp2``
+            InstanceFamily:
+              description: Specifies the instance family to be supported by the Dedicated Hosts. If you specify an instance family, the Dedicated Hosts support multiple instance types within that instance family.
+              type: string
+            OutpostArn:
+              description: The Amazon Resource Name (ARN) of the Amazon Web Services Outpost on which to allocate the Dedicated Host.
+              type: string
+            HostMaintenance:
+              description: Automatically allocates a new dedicated host and moves your instances on to it if a degradation is detected on your current host.
+              type: string
+            AssetId:
+              description: The ID of the Outpost hardware asset.
               type: string
             Tags:
+              description: Any tags assigned to the Host.
+              type: array
               uniqueItems: false
-              description: The tags to apply to the volume during creation.
               x-insertionOrder: false
-              type: array
               items:
                 $ref: '#/components/schemas/Tag'
           x-stackQL-stringOnly: true
-      x-title: CreateVolumeRequest
+      x-title: CreateHostRequest
       type: object
       required: []
     CreateInstanceRequest:
@@ -12675,7 +13754,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Volume'
+                $ref: '#/components/schemas/Instance_Volume'
             PrivateIp:
               description: 'The private IP address of the specified instance. For example: 10.24.34.0.'
               type: string
@@ -12797,7 +13876,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/BlockDeviceMapping'
+                $ref: '#/components/schemas/Instance_BlockDeviceMapping'
             IamInstanceProfile:
               description: The IAM instance profile.
               type: string
@@ -12849,7 +13928,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/NetworkInterface'
+                $ref: '#/components/schemas/Instance_NetworkInterface'
             InstanceType:
               description: The instance type.
               type: string
@@ -12919,7 +13998,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/InstanceConnectEndpoint_Tag'
             SecurityGroupIds:
               description: The security group IDs of the instance connect endpoint.
               type: array
@@ -12953,7 +14032,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/InternetGateway_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateInternetGatewayRequest
       type: object
@@ -13033,7 +14112,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/IPAM_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateIPAMRequest
       type: object
@@ -13102,7 +14181,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/IPAMPool_Tag'
             Arn:
               description: The Amazon Resource Name (ARN) of the IPAM Pool.
               type: string
@@ -13177,7 +14256,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/IPAMPool_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateIPAMPoolRequest
       type: object
@@ -13239,7 +14318,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/IpamOperatingRegion'
+                $ref: '#/components/schemas/IPAMResourceDiscovery_IpamOperatingRegion'
             IpamResourceDiscoveryRegion:
               description: 'The region the resource discovery is setup in. '
               type: string
@@ -13267,7 +14346,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/IPAMResourceDiscovery_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateIPAMResourceDiscoveryRequest
       type: object
@@ -13321,7 +14400,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/IPAMResourceDiscoveryAssociation_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateIPAMResourceDiscoveryAssociationRequest
       type: object
@@ -13371,7 +14450,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/IPAMScope_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateIPAMScopeRequest
       type: object
@@ -13454,7 +14533,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/KeyPair_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateKeyPairRequest
       type: object
@@ -13573,7 +14652,7 @@ components:
               type: string
             Tags:
               description: The tags for the local gateway route table.
-              $ref: '#/components/schemas/Tags'
+              $ref: '#/components/schemas/LocalGatewayRouteTable_Tags'
           x-stackQL-stringOnly: true
       x-title: CreateLocalGatewayRouteTableRequest
       type: object
@@ -13614,7 +14693,7 @@ components:
               type: string
             Tags:
               description: The tags for the local gateway route table virtual interface group association.
-              $ref: '#/components/schemas/Tags'
+              $ref: '#/components/schemas/LocalGatewayRouteTableVirtualInterfaceGroupAssociation_Tags'
           x-stackQL-stringOnly: true
       x-title: CreateLocalGatewayRouteTableVirtualInterfaceGroupAssociationRequest
       type: object
@@ -13649,7 +14728,7 @@ components:
               type: string
             Tags:
               description: The tags for the association.
-              $ref: '#/components/schemas/Tags'
+              $ref: '#/components/schemas/LocalGatewayRouteTableVPCAssociation_Tags'
           x-stackQL-stringOnly: true
       x-title: CreateLocalGatewayRouteTableVPCAssociationRequest
       type: object
@@ -13710,7 +14789,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/NatGateway_Tag'
             MaxDrainDurationSeconds:
               description: The maximum amount of time to wait (in seconds) before forcibly releasing the IP addresses if connections are still in progress. Default value is 350 seconds.
               type: integer
@@ -13743,7 +14822,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/NetworkAcl_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateNetworkAclRequest
       type: object
@@ -13773,7 +14852,7 @@ components:
               type: array
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/NetworkInsightsAccessScope_Tag'
             MatchPaths:
               type: array
               x-insertionOrder: true
@@ -13831,7 +14910,7 @@ components:
               type: array
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/NetworkInsightsAccessScopeAnalysis_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateNetworkInsightsAccessScopeAnalysisRequest
       type: object
@@ -13919,7 +14998,7 @@ components:
               uniqueItems: true
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/NetworkInsightsAnalysis_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateNetworkInsightsAnalysisRequest
       type: object
@@ -13953,23 +15032,135 @@ components:
               $ref: '#/components/schemas/IpAddress'
             Source:
               type: string
-            Destination:
+            Destination:
+              type: string
+            SourceArn:
+              type: string
+            DestinationArn:
+              type: string
+            Protocol:
+              $ref: '#/components/schemas/Protocol'
+            DestinationPort:
+              $ref: '#/components/schemas/Port'
+            Tags:
+              type: array
+              x-insertionOrder: false
+              items:
+                $ref: '#/components/schemas/NetworkInsightsPath_Tag'
+          x-stackQL-stringOnly: true
+      x-title: CreateNetworkInsightsPathRequest
+      type: object
+      required: []
+    CreateNetworkInterfaceRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            Description:
+              description: A description for the network interface.
+              type: string
+            PrivateIpAddress:
+              description: 'Assigns a single private IP address to the network interface, which is used as the primary private IP address. If you want to specify multiple private IP address, use the PrivateIpAddresses property. '
+              type: string
+            PrimaryIpv6Address:
+              description: The primary IPv6 address
+              type: string
+            PrivateIpAddresses:
+              uniqueItems: false
+              description: Assigns a list of private IP addresses to the network interface. You can specify a primary private IP address by setting the value of the Primary property to true in the PrivateIpAddressSpecification property. If you want EC2 to automatically assign private IP addresses, use the SecondaryPrivateIpAddressCount property and do not specify this property.
+              x-insertionOrder: false
+              type: array
+              items:
+                $ref: '#/components/schemas/NetworkInterface_PrivateIpAddressSpecification'
+            SecondaryPrivateIpAddressCount:
+              description: The number of secondary private IPv4 addresses to assign to a network interface. When you specify a number of secondary IPv4 addresses, Amazon EC2 selects these IP addresses within the subnet's IPv4 CIDR range. You can't specify this option and specify more than one private IP address using privateIpAddresses
+              type: integer
+            Ipv6PrefixCount:
+              description: 'The number of IPv6 prefixes to assign to a network interface. When you specify a number of IPv6 prefixes, Amazon EC2 selects these prefixes from your existing subnet CIDR reservations, if available, or from free spaces in the subnet. By default, these will be /80 prefixes. You can''t specify a count of IPv6 prefixes if you''ve specified one of the following: specific IPv6 prefixes, specific IPv6 addresses, or a count of IPv6 addresses.'
+              type: integer
+            PrimaryPrivateIpAddress:
+              description: Returns the primary private IP address of the network interface.
+              type: string
+            Ipv4Prefixes:
+              uniqueItems: false
+              description: 'Assigns a list of IPv4 prefixes to the network interface. If you want EC2 to automatically assign IPv4 prefixes, use the Ipv4PrefixCount property and do not specify this property. Presently, only /28 prefixes are supported. You can''t specify IPv4 prefixes if you''ve specified one of the following: a count of IPv4 prefixes, specific private IPv4 addresses, or a count of private IPv4 addresses.'
+              x-insertionOrder: false
+              type: array
+              items:
+                $ref: '#/components/schemas/NetworkInterface_Ipv4PrefixSpecification'
+            Ipv4PrefixCount:
+              description: 'The number of IPv4 prefixes to assign to a network interface. When you specify a number of IPv4 prefixes, Amazon EC2 selects these prefixes from your existing subnet CIDR reservations, if available, or from free spaces in the subnet. By default, these will be /28 prefixes. You can''t specify a count of IPv4 prefixes if you''ve specified one of the following: specific IPv4 prefixes, specific private IPv4 addresses, or a count of private IPv4 addresses.'
+              type: integer
+            EnablePrimaryIpv6:
+              description: >-
+                If you have instances or ENIs that rely on the IPv6 address not changing, to avoid disrupting traffic to instances or ENIs, you can enable a primary IPv6 address. Enable this option to automatically assign an IPv6 associated with the ENI attached to your instance to be the primary IPv6 address. When you enable an IPv6 address to be a primary IPv6, you cannot disable it. Traffic will be routed to the primary IPv6 address until the instance is terminated or the ENI is detached. If
+                you have multiple IPv6 addresses associated with an ENI and you enable a primary IPv6 address, the first IPv6 address associated with the ENI becomes the primary IPv6 address.
+              type: boolean
+            GroupSet:
+              uniqueItems: false
+              description: A list of security group IDs associated with this network interface.
+              x-insertionOrder: false
+              type: array
+              items:
+                type: string
+            Ipv6Addresses:
+              uniqueItems: true
+              description: One or more specific IPv6 addresses from the IPv6 CIDR block range of your subnet to associate with the network interface. If you're specifying a number of IPv6 addresses, use the Ipv6AddressCount property and don't specify this property.
+              x-insertionOrder: false
+              type: array
+              items:
+                $ref: '#/components/schemas/NetworkInterface_InstanceIpv6Address'
+            Ipv6Prefixes:
+              uniqueItems: false
+              description: 'Assigns a list of IPv6 prefixes to the network interface. If you want EC2 to automatically assign IPv6 prefixes, use the Ipv6PrefixCount property and do not specify this property. Presently, only /80 prefixes are supported. You can''t specify IPv6 prefixes if you''ve specified one of the following: a count of IPv6 prefixes, specific IPv6 addresses, or a count of IPv6 addresses.'
+              x-insertionOrder: false
+              type: array
+              items:
+                $ref: '#/components/schemas/NetworkInterface_Ipv6PrefixSpecification'
+            SubnetId:
+              description: The ID of the subnet to associate with the network interface.
+              type: string
+            SourceDestCheck:
+              description: Indicates whether traffic to or from the instance is validated.
+              type: boolean
+            InterfaceType:
+              description: Indicates the type of network interface.
               type: string
-            SourceArn:
+            SecondaryPrivateIpAddresses:
+              uniqueItems: false
+              description: Returns the secondary private IP addresses of the network interface.
+              x-insertionOrder: false
+              type: array
+              items:
+                type: string
+            VpcId:
+              description: The ID of the VPC
               type: string
-            DestinationArn:
+            Ipv6AddressCount:
+              description: The number of IPv6 addresses to assign to a network interface. Amazon EC2 automatically selects the IPv6 addresses from the subnet range. To specify specific IPv6 addresses, use the Ipv6Addresses property and don't specify this property.
+              type: integer
+            Id:
+              description: Network interface id.
               type: string
-            Protocol:
-              $ref: '#/components/schemas/Protocol'
-            DestinationPort:
-              $ref: '#/components/schemas/Port'
             Tags:
-              type: array
+              uniqueItems: false
+              description: An arbitrary set of tags (key-value pairs) for this network interface.
               x-insertionOrder: false
+              type: array
               items:
                 $ref: '#/components/schemas/Tag'
+            ConnectionTrackingSpecification:
+              $ref: '#/components/schemas/NetworkInterface_ConnectionTrackingSpecification'
           x-stackQL-stringOnly: true
-      x-title: CreateNetworkInsightsPathRequest
+      x-title: CreateNetworkInterfaceRequest
       type: object
       required: []
     CreateNetworkInterfaceAttachmentRequest:
@@ -14002,7 +15193,7 @@ components:
               description: The ID of the ENI that you want to attach.
               type: string
             EnaSrdSpecification:
-              $ref: '#/components/schemas/EnaSrdSpecification'
+              $ref: '#/components/schemas/NetworkInterfaceAttachment_EnaSrdSpecification'
               description: Configures ENA Express for the network interface that this action attaches to the instance.
           x-stackQL-stringOnly: true
       x-title: CreateNetworkInterfaceAttachmentRequest
@@ -14068,7 +15259,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/PlacementGroup_Tag'
           x-stackQL-stringOnly: true
       x-title: CreatePlacementGroupRequest
       type: object
@@ -14114,7 +15305,7 @@ components:
               description: Tags for Prefix List
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/PrefixList_Tag'
             Entries:
               description: Entries of Prefix List.
               type: array
@@ -14240,7 +15431,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/RouteServer_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateRouteServerRequest
       type: object
@@ -14308,7 +15499,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/RouteServerEndpoint_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateRouteServerEndpointRequest
       type: object
@@ -14361,7 +15552,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/RouteServerPeer_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateRouteServerPeerRequest
       type: object
@@ -14414,7 +15605,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/RouteTable_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateRouteTableRequest
       type: object
@@ -14780,7 +15971,7 @@ components:
               type: array
               uniqueItems: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Subnet_Tag'
               description: Any tags assigned to the subnet.
             Ipv4IpamPoolId:
               type: string
@@ -14932,7 +16123,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/TrafficMirrorFilter_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateTrafficMirrorFilterRequest
       type: object
@@ -15040,7 +16231,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/TrafficMirrorSession_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateTrafficMirrorSessionRequest
       type: object
@@ -15223,7 +16414,7 @@ components:
               description: The tags for the attachment.
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/TransitGatewayConnect_Tag'
             Options:
               $ref: '#/components/schemas/TransitGatewayConnectOptions'
               description: The Connect attachment options.
@@ -15263,7 +16454,7 @@ components:
               description: The tags for the Connect Peer.
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/TransitGatewayConnectPeer_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateTransitGatewayConnectPeerRequest
       type: object
@@ -15301,7 +16492,7 @@ components:
               description: The tags for the transit gateway multicast domain.
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/TransitGatewayMulticastDomain_Tag'
             Options:
               description: The options for the transit gateway multicast domain.
               type: object
@@ -15488,7 +16679,7 @@ components:
               description: The tags for the transit gateway peering attachment.
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/TransitGatewayPeeringAttachment_Tag'
             TransitGatewayAttachmentId:
               description: The ID of the transit gateway peering attachment.
               type: string
@@ -15550,7 +16741,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/TransitGatewayRouteTable_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateTransitGatewayRouteTableRequest
       type: object
@@ -15696,7 +16887,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/SecurityGroupId'
+                $ref: '#/components/schemas/VerifiedAccessEndpoint_SecurityGroupId'
             NetworkInterfaceOptions:
               description: The options for network-interface type endpoint.
               $ref: '#/components/schemas/NetworkInterfaceOptions'
@@ -15751,7 +16942,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/VerifiedAccessEndpoint_Tag'
             SseSpecification:
               description: The configuration options for customer provided KMS encryption.
               $ref: '#/components/schemas/SseSpecification'
@@ -15805,7 +16996,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/VerifiedAccessGroup_Tag'
             SseSpecification:
               description: The configuration options for customer provided KMS encryption.
               $ref: '#/components/schemas/SseSpecification'
@@ -15813,6 +17004,71 @@ components:
       x-title: CreateVerifiedAccessGroupRequest
       type: object
       required: []
+    CreateVerifiedAccessInstanceRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            VerifiedAccessInstanceId:
+              description: The ID of the AWS Verified Access instance.
+              type: string
+            VerifiedAccessTrustProviders:
+              description: AWS Verified Access trust providers.
+              type: array
+              uniqueItems: true
+              x-insertionOrder: false
+              items:
+                $ref: '#/components/schemas/VerifiedAccessInstance_VerifiedAccessTrustProvider'
+            VerifiedAccessTrustProviderIds:
+              description: The IDs of the AWS Verified Access trust providers.
+              type: array
+              uniqueItems: true
+              x-insertionOrder: false
+              items:
+                $ref: '#/components/schemas/VerifiedAccessTrustProviderId'
+            CreationTime:
+              description: Time this Verified Access Instance was created.
+              type: string
+            LastUpdatedTime:
+              description: Time this Verified Access Instance was last updated.
+              type: string
+            Description:
+              description: A description for the AWS Verified Access instance.
+              type: string
+            LoggingConfigurations:
+              description: The configuration options for AWS Verified Access instances.
+              $ref: '#/components/schemas/VerifiedAccessLogs'
+            Tags:
+              description: An array of key-value pairs to apply to this resource.
+              type: array
+              uniqueItems: true
+              x-insertionOrder: false
+              items:
+                $ref: '#/components/schemas/VerifiedAccessInstance_Tag'
+            FipsEnabled:
+              description: Indicates whether FIPS is enabled
+              type: boolean
+            CidrEndpointsCustomSubDomain:
+              description: Introduce CidrEndpointsCustomSubDomain property to represent the domain (say, ava.my-company.com)
+              type: string
+            CidrEndpointsCustomSubDomainNameServers:
+              description: Property to represent the name servers assoicated with the domain that AVA manages (say, ['ns1.amazonaws.com', 'ns2.amazonaws.com', 'ns3.amazonaws.com', 'ns4.amazonaws.com']).
+              type: array
+              x-insertionOrder: false
+              items:
+                $ref: '#/components/schemas/Nameserver'
+          x-stackQL-stringOnly: true
+      x-title: CreateVerifiedAccessInstanceRequest
+      type: object
+      required: []
     CreateVerifiedAccessTrustProviderRequest:
       properties:
         ClientToken:
@@ -15860,7 +17116,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/VerifiedAccessTrustProvider_Tag'
             SseSpecification:
               description: The configuration options for customer provided KMS encryption.
               type: object
@@ -15878,7 +17134,7 @@ components:
       x-title: CreateVerifiedAccessTrustProviderRequest
       type: object
       required: []
-    CreateVerifiedAccessInstanceRequest:
+    CreateVolumeRequest:
       properties:
         ClientToken:
           type: string
@@ -15891,56 +17147,102 @@ components:
         DesiredState:
           type: object
           properties:
-            VerifiedAccessInstanceId:
-              description: The ID of the AWS Verified Access instance.
+            MultiAttachEnabled:
+              description: |-
+                Indicates whether Amazon EBS Multi-Attach is enabled.
+                 CFNlong does not currently support updating a single-attach volume to be multi-attach enabled, updating a multi-attach enabled volume to be single-attach, or updating the size or number of I/O operations per second (IOPS) of a multi-attach enabled volume.
+              type: boolean
+            KmsKeyId:
+              description: |-
+                The identifier of the kms-key-long to use for Amazon EBS encryption. If ``KmsKeyId`` is specified, the encrypted state must be ``true``.
+                 If you omit this property and your account is enabled for encryption by default, or *Encrypted* is set to ``true``, then the volume is encrypted using the default key specified for your account. If your account does not have a default key, then the volume is encrypted using the aws-managed-key.
+                 Alternatively, if you want to specify a different key, you can specify one of the following:
+                  +  Key ID. For example, 1234abcd-12ab-34cd-56ef-1234567890ab.
+                  +  Key alias. Specify the alias for the key, prefixed with ``alias/``. For example, for a key with the alias ``my_cmk``, use ``alias/my_cmk``. Or to specify the aws-managed-key, use ``alias/aws/ebs``.
+                  +  Key ARN. For example, arn:aws:kms:us-east-1:012345678910:key/1234abcd-12ab-34cd-56ef-1234567890ab.
+                  +  Alias ARN. For example, arn:aws:kms:us-east-1:012345678910:alias/ExampleAlias.
               type: string
-            VerifiedAccessTrustProviders:
-              description: AWS Verified Access trust providers.
-              type: array
-              uniqueItems: true
-              x-insertionOrder: false
-              items:
-                $ref: '#/components/schemas/VerifiedAccessTrustProvider'
-            VerifiedAccessTrustProviderIds:
-              description: The IDs of the AWS Verified Access trust providers.
-              type: array
-              uniqueItems: true
-              x-insertionOrder: false
-              items:
-                $ref: '#/components/schemas/VerifiedAccessTrustProviderId'
-            CreationTime:
-              description: Time this Verified Access Instance was created.
+            Encrypted:
+              description: |-
+                Indicates whether the volume should be encrypted. The effect of setting the encryption state to ``true`` depends on the volume origin (new or from a snapshot), starting encryption state, ownership, and whether encryption by default is enabled. For more information, see [Encryption by default](https://docs.aws.amazon.com/ebs/latest/userguide/work-with-ebs-encr.html#encryption-by-default) in the *Amazon EBS User Guide*.
+                 Encrypted Amazon EBS volumes must be attached to instances that support Amazon EBS encryption. For more information, see [Supported instance types](https://docs.aws.amazon.com/ebs/latest/userguide/ebs-encryption-requirements.html#ebs-encryption_supported_instances).
+              type: boolean
+            Size:
+              description: |-
+                The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. If you specify a snapshot, the default is the snapshot size. You can specify a volume size that is equal to or larger than the snapshot size.
+                 The following are the supported volumes sizes for each volume type:
+                  +  ``gp2`` and ``gp3``: 1 - 16,384 GiB
+                  +  ``io1``: 4 - 16,384 GiB
+                  +  ``io2``: 4 - 65,536 GiB
+                  +  ``st1`` and ``sc1``: 125 - 16,384 GiB
+                  +  ``standard``: 1 - 1024 GiB
+              type: integer
+            AutoEnableIO:
+              description: Indicates whether the volume is auto-enabled for I/O operations. By default, Amazon EBS disables I/O to the volume from attached EC2 instances when it determines that a volume's data is potentially inconsistent. If the consistency of the volume is not a concern, and you prefer that the volume be made available immediately if it's impaired, you can configure the volume to automatically enable I/O.
+              type: boolean
+            OutpostArn:
+              description: The Amazon Resource Name (ARN) of the Outpost.
               type: string
-            LastUpdatedTime:
-              description: Time this Verified Access Instance was last updated.
+            AvailabilityZone:
+              description: |-
+                The ID of the Availability Zone in which to create the volume. For example, ``us-east-1a``.
+                 Either ``AvailabilityZone`` or ``AvailabilityZoneId`` must be specified, but not both.
               type: string
-            Description:
-              description: A description for the AWS Verified Access instance.
+            Throughput:
+              description: |-
+                The throughput to provision for a volume, with a maximum of 1,000 MiB/s.
+                 This parameter is valid only for ``gp3`` volumes. The default value is 125.
+                 Valid Range: Minimum value of 125. Maximum value of 1000.
+              type: integer
+            Iops:
+              description: |-
+                The number of I/O operations per second (IOPS). For ``gp3``, ``io1``, and ``io2`` volumes, this represents the number of IOPS that are provisioned for the volume. For ``gp2`` volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.
+                 The following are the supported values for each volume type:
+                  +  ``gp3``: 3,000 - 16,000 IOPS
+                  +  ``io1``: 100 - 64,000 IOPS
+                  +  ``io2``: 100 - 256,000 IOPS
+                  
+                 For ``io2`` volumes, you can achieve up to 256,000 IOPS on [instances built on the Nitro System](https://docs.aws.amazon.com/ec2/latest/instancetypes/ec2-nitro-instances.html). On other instances, you can achieve performance up to 32,000 IOPS.
+                 This parameter is required for ``io1`` and ``io2`` volumes. The default for ``gp3`` volumes is 3,000 IOPS. This parameter is not supported for ``gp2``, ``st1``, ``sc1``, or ``standard`` volumes.
+              type: integer
+            VolumeInitializationRate:
+              description: |-
+                Specifies the Amazon EBS Provisioned Rate for Volume Initialization (volume initialization rate), in MiB/s, at which to download the snapshot blocks from Amazon S3 to the volume. This is also known as *volume initialization*. Specifying a volume initialization rate ensures that the volume is initialized at a predictable and consistent rate after creation.
+                 This parameter is supported only for volumes created from snapshots. Omit this parameter if:
+                  +  You want to create the volume using fast snapshot restore. You must specify a snapshot that is enabled for fast snapshot restore. In this case, the volume is fully initialized at creation.
+                  If you specify a snapshot that is enabled for fast snapshot restore and a volume initialization rate, the volume will be initialized at the specified rate instead of fast snapshot restore.
+                   +  You want to create a volume that is initialized at the default rate.
+                  
+                 For more information, see [Initialize Amazon EBS volumes](https://docs.aws.amazon.com/ebs/latest/userguide/initalize-volume.html) in the *Amazon EC2 User Guide*.
+                 Valid range: 100 - 300 MiB/s
+              type: integer
+            SnapshotId:
+              description: The snapshot from which to create the volume. You must specify either a snapshot ID or a volume size.
+              type: string
+            VolumeId:
+              description: ''
+              type: string
+            VolumeType:
+              description: |-
+                The volume type. This parameter can be one of the following values:
+                  +  General Purpose SSD: ``gp2`` | ``gp3``
+                  +  Provisioned IOPS SSD: ``io1`` | ``io2``
+                  +  Throughput Optimized HDD: ``st1``
+                  +  Cold HDD: ``sc1``
+                  +  Magnetic: ``standard``
+                  
+                 For more information, see [Amazon EBS volume types](https://docs.aws.amazon.com/ebs/latest/userguide/ebs-volume-types.html).
+                 Default: ``gp2``
               type: string
-            LoggingConfigurations:
-              description: The configuration options for AWS Verified Access instances.
-              $ref: '#/components/schemas/VerifiedAccessLogs'
             Tags:
-              description: An array of key-value pairs to apply to this resource.
-              type: array
-              uniqueItems: true
+              uniqueItems: false
+              description: The tags to apply to the volume during creation.
               x-insertionOrder: false
-              items:
-                $ref: '#/components/schemas/Tag'
-            FipsEnabled:
-              description: Indicates whether FIPS is enabled
-              type: boolean
-            CidrEndpointsCustomSubDomain:
-              description: Introduce CidrEndpointsCustomSubDomain property to represent the domain (say, ava.my-company.com)
-              type: string
-            CidrEndpointsCustomSubDomainNameServers:
-              description: Property to represent the name servers assoicated with the domain that AVA manages (say, ['ns1.amazonaws.com', 'ns2.amazonaws.com', 'ns3.amazonaws.com', 'ns4.amazonaws.com']).
               type: array
-              x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Nameserver'
+                $ref: '#/components/schemas/Volume_Tag'
           x-stackQL-stringOnly: true
-      x-title: CreateVerifiedAccessInstanceRequest
+      x-title: CreateVolumeRequest
       type: object
       required: []
     CreateVolumeAttachmentRequest:
@@ -16044,7 +17346,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/VPC_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateVPCRequest
       type: object
@@ -16083,7 +17385,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/VPCBlockPublicAccessExclusion_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateVPCBlockPublicAccessExclusionRequest
       type: object
@@ -16323,7 +17625,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/VPCEndpoint_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateVPCEndpointRequest
       type: object
@@ -16511,7 +17813,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/VPCPeeringConnection_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateVPCPeeringConnectionRequest
       type: object
@@ -16613,7 +17915,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/VPNConnection_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateVPNConnectionRequest
       type: object
@@ -16667,7 +17969,7 @@ components:
               x-insertionOrder: false
               uniqueItems: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/VPNGateway_Tag'
             Type:
               description: The type of VPN connection the virtual private gateway supports.
               type: string
@@ -16688,7 +17990,7 @@ components:
       id: awscc.ec2.capacity_reservations
       x-cfn-schema-name: CapacityReservation
       x-cfn-type-name: AWS::EC2::CapacityReservation
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
       x-type: cloud_control
       methods:
@@ -16828,8 +18130,7 @@ components:
       id: awscc.ec2.capacity_reservations_list_only
       x-cfn-schema-name: CapacityReservation
       x-cfn-type-name: AWS::EC2::CapacityReservation
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -16859,7 +18160,7 @@ components:
       id: awscc.ec2.capacity_reservation_fleets
       x-cfn-schema-name: CapacityReservationFleet
       x-cfn-type-name: AWS::EC2::CapacityReservationFleet
-      x-identifiers:
+      x-identifiers: &ref_1
         - CapacityReservationFleetId
       x-type: cloud_control
       methods:
@@ -16962,9 +18263,8 @@ components:
       name: capacity_reservation_fleets_list_only
       id: awscc.ec2.capacity_reservation_fleets_list_only
       x-cfn-schema-name: CapacityReservationFleet
-      x-cfn-type-name: AWS::EC2::CapacityReservationFleet
-      x-identifiers:
-        - CapacityReservationFleetId
+      x-cfn-type-name: AWS::EC2::CapacityReservationFleet
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -16994,7 +18294,7 @@ components:
       id: awscc.ec2.carrier_gateways
       x-cfn-schema-name: CarrierGateway
       x-cfn-type-name: AWS::EC2::CarrierGateway
-      x-identifiers:
+      x-identifiers: &ref_2
         - CarrierGatewayId
       x-type: cloud_control
       methods:
@@ -17088,8 +18388,7 @@ components:
       id: awscc.ec2.carrier_gateways_list_only
       x-cfn-schema-name: CarrierGateway
       x-cfn-type-name: AWS::EC2::CarrierGateway
-      x-identifiers:
-        - CarrierGatewayId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -17119,7 +18418,7 @@ components:
       id: awscc.ec2.customer_gateways
       x-cfn-schema-name: CustomerGateway
       x-cfn-type-name: AWS::EC2::CustomerGateway
-      x-identifiers:
+      x-identifiers: &ref_3
         - CustomerGatewayId
       x-type: cloud_control
       methods:
@@ -17219,8 +18518,7 @@ components:
       id: awscc.ec2.customer_gateways_list_only
       x-cfn-schema-name: CustomerGateway
       x-cfn-type-name: AWS::EC2::CustomerGateway
-      x-identifiers:
-        - CustomerGatewayId
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -17250,7 +18548,7 @@ components:
       id: awscc.ec2.dhcp_options
       x-cfn-schema-name: DHCPOptions
       x-cfn-type-name: AWS::EC2::DHCPOptions
-      x-identifiers:
+      x-identifiers: &ref_4
         - DhcpOptionsId
       x-type: cloud_control
       methods:
@@ -17350,8 +18648,7 @@ components:
       id: awscc.ec2.dhcp_options_list_only
       x-cfn-schema-name: DHCPOptions
       x-cfn-type-name: AWS::EC2::DHCPOptions
-      x-identifiers:
-        - DhcpOptionsId
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -17381,7 +18678,7 @@ components:
       id: awscc.ec2.ec2fleets
       x-cfn-schema-name: EC2Fleet
       x-cfn-type-name: AWS::EC2::EC2Fleet
-      x-identifiers:
+      x-identifiers: &ref_5
         - FleetId
       x-type: cloud_control
       methods:
@@ -17491,8 +18788,7 @@ components:
       id: awscc.ec2.ec2fleets_list_only
       x-cfn-schema-name: EC2Fleet
       x-cfn-type-name: AWS::EC2::EC2Fleet
-      x-identifiers:
-        - FleetId
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -17522,7 +18818,7 @@ components:
       id: awscc.ec2.egress_only_internet_gateways
       x-cfn-schema-name: EgressOnlyInternetGateway
       x-cfn-type-name: AWS::EC2::EgressOnlyInternetGateway
-      x-identifiers:
+      x-identifiers: &ref_6
         - Id
       x-type: cloud_control
       methods:
@@ -17612,8 +18908,7 @@ components:
       id: awscc.ec2.egress_only_internet_gateways_list_only
       x-cfn-schema-name: EgressOnlyInternetGateway
       x-cfn-type-name: AWS::EC2::EgressOnlyInternetGateway
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -17643,7 +18938,7 @@ components:
       id: awscc.ec2.eips
       x-cfn-schema-name: EIP
       x-cfn-type-name: AWS::EC2::EIP
-      x-identifiers:
+      x-identifiers: &ref_7
         - PublicIp
         - AllocationId
       x-type: cloud_control
@@ -17748,9 +19043,7 @@ components:
       id: awscc.ec2.eips_list_only
       x-cfn-schema-name: EIP
       x-cfn-type-name: AWS::EC2::EIP
-      x-identifiers:
-        - PublicIp
-        - AllocationId
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -17782,7 +19075,7 @@ components:
       id: awscc.ec2.eip_associations
       x-cfn-schema-name: EIPAssociation
       x-cfn-type-name: AWS::EC2::EIPAssociation
-      x-identifiers:
+      x-identifiers: &ref_8
         - Id
       x-type: cloud_control
       methods:
@@ -17861,8 +19154,7 @@ components:
       id: awscc.ec2.eip_associations_list_only
       x-cfn-schema-name: EIPAssociation
       x-cfn-type-name: AWS::EC2::EIPAssociation
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -17892,7 +19184,7 @@ components:
       id: awscc.ec2.enclave_certificate_iam_role_associations
       x-cfn-schema-name: EnclaveCertificateIamRoleAssociation
       x-cfn-type-name: AWS::EC2::EnclaveCertificateIamRoleAssociation
-      x-identifiers:
+      x-identifiers: &ref_9
         - CertificateArn
         - RoleArn
       x-type: cloud_control
@@ -17970,9 +19262,7 @@ components:
       id: awscc.ec2.enclave_certificate_iam_role_associations_list_only
       x-cfn-schema-name: EnclaveCertificateIamRoleAssociation
       x-cfn-type-name: AWS::EC2::EnclaveCertificateIamRoleAssociation
-      x-identifiers:
-        - CertificateArn
-        - RoleArn
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -18004,7 +19294,7 @@ components:
       id: awscc.ec2.flow_logs
       x-cfn-schema-name: FlowLog
       x-cfn-type-name: AWS::EC2::FlowLog
-      x-identifiers:
+      x-identifiers: &ref_10
         - Id
       x-type: cloud_control
       methods:
@@ -18114,8 +19404,7 @@ components:
       id: awscc.ec2.flow_logs_list_only
       x-cfn-schema-name: FlowLog
       x-cfn-type-name: AWS::EC2::FlowLog
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -18191,232 +19480,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::EC2::GatewayRouteTableAssociation"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-      sqlVerbs:
-        insert:
-          - $ref: '#/components/x-stackQL-resources/gateway_route_table_associations/methods/create_resource'
-        delete:
-          - $ref: '#/components/x-stackQL-resources/gateway_route_table_associations/methods/delete_resource'
-        update:
-          - $ref: '#/components/x-stackQL-resources/gateway_route_table_associations/methods/update_resource'
-      config:
-        views:
-          select:
-            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
-            ddl: |-
-              SELECT
-              region,
-              Identifier,
-              JSON_EXTRACT(Properties, '$.RouteTableId') as route_table_id,
-              JSON_EXTRACT(Properties, '$.GatewayId') as gateway_id,
-              JSON_EXTRACT(Properties, '$.AssociationId') as association_id
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EC2::GatewayRouteTableAssociation'
-              AND Identifier = '<GatewayId>'
-              AND region = 'us-east-1'
-            fallback:
-              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
-              ddl: |-
-                SELECT
-                region,
-                Identifier,
-                json_extract_path_text(Properties, 'RouteTableId') as route_table_id,
-                json_extract_path_text(Properties, 'GatewayId') as gateway_id,
-                json_extract_path_text(Properties, 'AssociationId') as association_id
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EC2::GatewayRouteTableAssociation'
-                AND Identifier = '<GatewayId>'
-                AND region = 'us-east-1'
-    hosts:
-      name: hosts
-      id: awscc.ec2.hosts
-      x-cfn-schema-name: Host
-      x-cfn-type-name: AWS::EC2::Host
-      x-identifiers:
-        - HostId
-      x-type: cloud_control
-      methods:
-        create_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive_DesiredState
-          operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Host&__detailTransformed=true/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::EC2::Host"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-        update_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive
-          operation:
-            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::EC2::Host"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-        delete_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive
-          operation:
-            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::EC2::Host"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-      sqlVerbs:
-        insert:
-          - $ref: '#/components/x-stackQL-resources/hosts/methods/create_resource'
-        delete:
-          - $ref: '#/components/x-stackQL-resources/hosts/methods/delete_resource'
-        update:
-          - $ref: '#/components/x-stackQL-resources/hosts/methods/update_resource'
-      config:
-        views:
-          select:
-            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
-            ddl: |-
-              SELECT
-              region,
-              Identifier,
-              JSON_EXTRACT(Properties, '$.HostId') as host_id,
-              JSON_EXTRACT(Properties, '$.AutoPlacement') as auto_placement,
-              JSON_EXTRACT(Properties, '$.AvailabilityZone') as availability_zone,
-              JSON_EXTRACT(Properties, '$.HostRecovery') as host_recovery,
-              JSON_EXTRACT(Properties, '$.InstanceType') as instance_type,
-              JSON_EXTRACT(Properties, '$.InstanceFamily') as instance_family,
-              JSON_EXTRACT(Properties, '$.OutpostArn') as outpost_arn,
-              JSON_EXTRACT(Properties, '$.HostMaintenance') as host_maintenance,
-              JSON_EXTRACT(Properties, '$.AssetId') as asset_id,
-              JSON_EXTRACT(Properties, '$.Tags') as tags
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EC2::Host'
-              AND Identifier = '<HostId>'
-              AND region = 'us-east-1'
-            fallback:
-              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
-              ddl: |-
-                SELECT
-                region,
-                Identifier,
-                json_extract_path_text(Properties, 'HostId') as host_id,
-                json_extract_path_text(Properties, 'AutoPlacement') as auto_placement,
-                json_extract_path_text(Properties, 'AvailabilityZone') as availability_zone,
-                json_extract_path_text(Properties, 'HostRecovery') as host_recovery,
-                json_extract_path_text(Properties, 'InstanceType') as instance_type,
-                json_extract_path_text(Properties, 'InstanceFamily') as instance_family,
-                json_extract_path_text(Properties, 'OutpostArn') as outpost_arn,
-                json_extract_path_text(Properties, 'HostMaintenance') as host_maintenance,
-                json_extract_path_text(Properties, 'AssetId') as asset_id,
-                json_extract_path_text(Properties, 'Tags') as tags
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EC2::Host'
-                AND Identifier = '<HostId>'
-                AND region = 'us-east-1'
-    hosts_list_only:
-      name: hosts_list_only
-      id: awscc.ec2.hosts_list_only
-      x-cfn-schema-name: Host
-      x-cfn-type-name: AWS::EC2::Host
-      x-identifiers:
-        - HostId
-      x-type: cloud_control_view
-      methods: {}
-      sqlVerbs:
-        insert: []
-        delete: []
-        update: []
-      config:
-        views:
-          select:
-            predicate: sqlDialect == "sqlite3"
-            ddl: |-
-              SELECT
-              region,
-              JSON_EXTRACT(Properties, '$.HostId') as host_id
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EC2::Host'
-              AND region = 'us-east-1'
-            fallback:
-              predicate: sqlDialect == "postgres"
-              ddl: |-
-                SELECT
-                region,
-                json_extract_path_text(Properties, 'HostId') as host_id
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EC2::Host'
-                AND region = 'us-east-1'
-    network_interfaces:
-      name: network_interfaces
-      id: awscc.ec2.network_interfaces
-      x-cfn-schema-name: NetworkInterface
-      x-cfn-type-name: AWS::EC2::NetworkInterface
-      x-identifiers:
-        - Id
-      x-type: cloud_control
-      methods:
-        create_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive_DesiredState
-          operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__NetworkInterface&__detailTransformed=true/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::EC2::NetworkInterface"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-        update_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive
-          operation:
-            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::EC2::NetworkInterface"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-        delete_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive
-          operation:
-            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::EC2::NetworkInterface"
+                "TypeName": "AWS::EC2::GatewayRouteTableAssociation"
               }
           response:
             mediaType: application/json
@@ -18424,11 +19488,11 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/network_interfaces/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/gateway_route_table_associations/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/network_interfaces/methods/delete_resource'
+          - $ref: '#/components/x-stackQL-resources/gateway_route_table_associations/methods/delete_resource'
         update:
-          - $ref: '#/components/x-stackQL-resources/network_interfaces/methods/update_resource'
+          - $ref: '#/components/x-stackQL-resources/gateway_route_table_associations/methods/update_resource'
       config:
         views:
           select:
@@ -18437,30 +19501,11 @@ components:
               SELECT
               region,
               Identifier,
-              JSON_EXTRACT(Properties, '$.Description') as description,
-              JSON_EXTRACT(Properties, '$.PrivateIpAddress') as private_ip_address,
-              JSON_EXTRACT(Properties, '$.PrimaryIpv6Address') as primary_ipv6_address,
-              JSON_EXTRACT(Properties, '$.PrivateIpAddresses') as private_ip_addresses,
-              JSON_EXTRACT(Properties, '$.SecondaryPrivateIpAddressCount') as secondary_private_ip_address_count,
-              JSON_EXTRACT(Properties, '$.Ipv6PrefixCount') as ipv6_prefix_count,
-              JSON_EXTRACT(Properties, '$.PrimaryPrivateIpAddress') as primary_private_ip_address,
-              JSON_EXTRACT(Properties, '$.Ipv4Prefixes') as ipv4_prefixes,
-              JSON_EXTRACT(Properties, '$.Ipv4PrefixCount') as ipv4_prefix_count,
-              JSON_EXTRACT(Properties, '$.EnablePrimaryIpv6') as enable_primary_ipv6,
-              JSON_EXTRACT(Properties, '$.GroupSet') as group_set,
-              JSON_EXTRACT(Properties, '$.Ipv6Addresses') as ipv6_addresses,
-              JSON_EXTRACT(Properties, '$.Ipv6Prefixes') as ipv6_prefixes,
-              JSON_EXTRACT(Properties, '$.SubnetId') as subnet_id,
-              JSON_EXTRACT(Properties, '$.SourceDestCheck') as source_dest_check,
-              JSON_EXTRACT(Properties, '$.InterfaceType') as interface_type,
-              JSON_EXTRACT(Properties, '$.SecondaryPrivateIpAddresses') as secondary_private_ip_addresses,
-              JSON_EXTRACT(Properties, '$.VpcId') as vpc_id,
-              JSON_EXTRACT(Properties, '$.Ipv6AddressCount') as ipv6_address_count,
-              JSON_EXTRACT(Properties, '$.Id') as id,
-              JSON_EXTRACT(Properties, '$.Tags') as tags,
-              JSON_EXTRACT(Properties, '$.ConnectionTrackingSpecification') as connection_tracking_specification
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EC2::NetworkInterface'
-              AND Identifier = '<Id>'
+              JSON_EXTRACT(Properties, '$.RouteTableId') as route_table_id,
+              JSON_EXTRACT(Properties, '$.GatewayId') as gateway_id,
+              JSON_EXTRACT(Properties, '$.AssociationId') as association_id
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EC2::GatewayRouteTableAssociation'
+              AND Identifier = '<GatewayId>'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
@@ -18468,69 +19513,19 @@ components:
                 SELECT
                 region,
                 Identifier,
-                json_extract_path_text(Properties, 'Description') as description,
-                json_extract_path_text(Properties, 'PrivateIpAddress') as private_ip_address,
-                json_extract_path_text(Properties, 'PrimaryIpv6Address') as primary_ipv6_address,
-                json_extract_path_text(Properties, 'PrivateIpAddresses') as private_ip_addresses,
-                json_extract_path_text(Properties, 'SecondaryPrivateIpAddressCount') as secondary_private_ip_address_count,
-                json_extract_path_text(Properties, 'Ipv6PrefixCount') as ipv6_prefix_count,
-                json_extract_path_text(Properties, 'PrimaryPrivateIpAddress') as primary_private_ip_address,
-                json_extract_path_text(Properties, 'Ipv4Prefixes') as ipv4_prefixes,
-                json_extract_path_text(Properties, 'Ipv4PrefixCount') as ipv4_prefix_count,
-                json_extract_path_text(Properties, 'EnablePrimaryIpv6') as enable_primary_ipv6,
-                json_extract_path_text(Properties, 'GroupSet') as group_set,
-                json_extract_path_text(Properties, 'Ipv6Addresses') as ipv6_addresses,
-                json_extract_path_text(Properties, 'Ipv6Prefixes') as ipv6_prefixes,
-                json_extract_path_text(Properties, 'SubnetId') as subnet_id,
-                json_extract_path_text(Properties, 'SourceDestCheck') as source_dest_check,
-                json_extract_path_text(Properties, 'InterfaceType') as interface_type,
-                json_extract_path_text(Properties, 'SecondaryPrivateIpAddresses') as secondary_private_ip_addresses,
-                json_extract_path_text(Properties, 'VpcId') as vpc_id,
-                json_extract_path_text(Properties, 'Ipv6AddressCount') as ipv6_address_count,
-                json_extract_path_text(Properties, 'Id') as id,
-                json_extract_path_text(Properties, 'Tags') as tags,
-                json_extract_path_text(Properties, 'ConnectionTrackingSpecification') as connection_tracking_specification
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EC2::NetworkInterface'
-                AND Identifier = '<Id>'
-                AND region = 'us-east-1'
-    network_interfaces_list_only:
-      name: network_interfaces_list_only
-      id: awscc.ec2.network_interfaces_list_only
-      x-cfn-schema-name: NetworkInterface
-      x-cfn-type-name: AWS::EC2::NetworkInterface
-      x-identifiers:
-        - Id
-      x-type: cloud_control_view
-      methods: {}
-      sqlVerbs:
-        insert: []
-        delete: []
-        update: []
-      config:
-        views:
-          select:
-            predicate: sqlDialect == "sqlite3"
-            ddl: |-
-              SELECT
-              region,
-              JSON_EXTRACT(Properties, '$.Id') as id
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EC2::NetworkInterface'
-              AND region = 'us-east-1'
-            fallback:
-              predicate: sqlDialect == "postgres"
-              ddl: |-
-                SELECT
-                region,
-                json_extract_path_text(Properties, 'Id') as id
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EC2::NetworkInterface'
+                json_extract_path_text(Properties, 'RouteTableId') as route_table_id,
+                json_extract_path_text(Properties, 'GatewayId') as gateway_id,
+                json_extract_path_text(Properties, 'AssociationId') as association_id
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EC2::GatewayRouteTableAssociation'
+                AND Identifier = '<GatewayId>'
                 AND region = 'us-east-1'
-    volumes:
-      name: volumes
-      id: awscc.ec2.volumes
-      x-cfn-schema-name: Volume
-      x-cfn-type-name: AWS::EC2::Volume
-      x-identifiers:
-        - VolumeId
+    hosts:
+      name: hosts
+      id: awscc.ec2.hosts
+      x-cfn-schema-name: Host
+      x-cfn-type-name: AWS::EC2::Host
+      x-identifiers: &ref_11
+        - HostId
       x-type: cloud_control
       methods:
         create_resource:
@@ -18538,12 +19533,12 @@ components:
             requestBodyTranslate:
               algorithm: naive_DesiredState
           operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Volume&__detailTransformed=true/post'
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Host&__detailTransformed=true/post'
           request:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::EC2::Volume"
+                "TypeName": "AWS::EC2::Host"
               }
           response:
             mediaType: application/json
@@ -18559,7 +19554,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::EC2::Volume"
+                "TypeName": "AWS::EC2::Host"
               }
           response:
             mediaType: application/json
@@ -18575,7 +19570,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::EC2::Volume"
+                "TypeName": "AWS::EC2::Host"
               }
           response:
             mediaType: application/json
@@ -18583,11 +19578,11 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/volumes/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/hosts/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/volumes/methods/delete_resource'
+          - $ref: '#/components/x-stackQL-resources/hosts/methods/delete_resource'
         update:
-          - $ref: '#/components/x-stackQL-resources/volumes/methods/update_resource'
+          - $ref: '#/components/x-stackQL-resources/hosts/methods/update_resource'
       config:
         views:
           select:
@@ -18596,22 +19591,18 @@ components:
               SELECT
               region,
               Identifier,
-              JSON_EXTRACT(Properties, '$.MultiAttachEnabled') as multi_attach_enabled,
-              JSON_EXTRACT(Properties, '$.KmsKeyId') as kms_key_id,
-              JSON_EXTRACT(Properties, '$.Encrypted') as encrypted,
-              JSON_EXTRACT(Properties, '$.Size') as size,
-              JSON_EXTRACT(Properties, '$.AutoEnableIO') as auto_enable_io,
-              JSON_EXTRACT(Properties, '$.OutpostArn') as outpost_arn,
+              JSON_EXTRACT(Properties, '$.HostId') as host_id,
+              JSON_EXTRACT(Properties, '$.AutoPlacement') as auto_placement,
               JSON_EXTRACT(Properties, '$.AvailabilityZone') as availability_zone,
-              JSON_EXTRACT(Properties, '$.Throughput') as throughput,
-              JSON_EXTRACT(Properties, '$.Iops') as iops,
-              JSON_EXTRACT(Properties, '$.VolumeInitializationRate') as volume_initialization_rate,
-              JSON_EXTRACT(Properties, '$.SnapshotId') as snapshot_id,
-              JSON_EXTRACT(Properties, '$.VolumeId') as volume_id,
-              JSON_EXTRACT(Properties, '$.VolumeType') as volume_type,
+              JSON_EXTRACT(Properties, '$.HostRecovery') as host_recovery,
+              JSON_EXTRACT(Properties, '$.InstanceType') as instance_type,
+              JSON_EXTRACT(Properties, '$.InstanceFamily') as instance_family,
+              JSON_EXTRACT(Properties, '$.OutpostArn') as outpost_arn,
+              JSON_EXTRACT(Properties, '$.HostMaintenance') as host_maintenance,
+              JSON_EXTRACT(Properties, '$.AssetId') as asset_id,
               JSON_EXTRACT(Properties, '$.Tags') as tags
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EC2::Volume'
-              AND Identifier = '<VolumeId>'
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EC2::Host'
+              AND Identifier = '<HostId>'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
@@ -18619,30 +19610,25 @@ components:
                 SELECT
                 region,
                 Identifier,
-                json_extract_path_text(Properties, 'MultiAttachEnabled') as multi_attach_enabled,
-                json_extract_path_text(Properties, 'KmsKeyId') as kms_key_id,
-                json_extract_path_text(Properties, 'Encrypted') as encrypted,
-                json_extract_path_text(Properties, 'Size') as size,
-                json_extract_path_text(Properties, 'AutoEnableIO') as auto_enable_io,
-                json_extract_path_text(Properties, 'OutpostArn') as outpost_arn,
+                json_extract_path_text(Properties, 'HostId') as host_id,
+                json_extract_path_text(Properties, 'AutoPlacement') as auto_placement,
                 json_extract_path_text(Properties, 'AvailabilityZone') as availability_zone,
-                json_extract_path_text(Properties, 'Throughput') as throughput,
-                json_extract_path_text(Properties, 'Iops') as iops,
-                json_extract_path_text(Properties, 'VolumeInitializationRate') as volume_initialization_rate,
-                json_extract_path_text(Properties, 'SnapshotId') as snapshot_id,
-                json_extract_path_text(Properties, 'VolumeId') as volume_id,
-                json_extract_path_text(Properties, 'VolumeType') as volume_type,
+                json_extract_path_text(Properties, 'HostRecovery') as host_recovery,
+                json_extract_path_text(Properties, 'InstanceType') as instance_type,
+                json_extract_path_text(Properties, 'InstanceFamily') as instance_family,
+                json_extract_path_text(Properties, 'OutpostArn') as outpost_arn,
+                json_extract_path_text(Properties, 'HostMaintenance') as host_maintenance,
+                json_extract_path_text(Properties, 'AssetId') as asset_id,
                 json_extract_path_text(Properties, 'Tags') as tags
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EC2::Volume'
-                AND Identifier = '<VolumeId>'
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EC2::Host'
+                AND Identifier = '<HostId>'
                 AND region = 'us-east-1'
-    volumes_list_only:
-      name: volumes_list_only
-      id: awscc.ec2.volumes_list_only
-      x-cfn-schema-name: Volume
-      x-cfn-type-name: AWS::EC2::Volume
-      x-identifiers:
-        - VolumeId
+    hosts_list_only:
+      name: hosts_list_only
+      id: awscc.ec2.hosts_list_only
+      x-cfn-schema-name: Host
+      x-cfn-type-name: AWS::EC2::Host
+      x-identifiers: *ref_11
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -18656,23 +19642,23 @@ components:
             ddl: |-
               SELECT
               region,
-              JSON_EXTRACT(Properties, '$.VolumeId') as volume_id
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EC2::Volume'
+              JSON_EXTRACT(Properties, '$.HostId') as host_id
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EC2::Host'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres"
               ddl: |-
                 SELECT
                 region,
-                json_extract_path_text(Properties, 'VolumeId') as volume_id
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EC2::Volume'
+                json_extract_path_text(Properties, 'HostId') as host_id
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EC2::Host'
                 AND region = 'us-east-1'
     instances:
       name: instances
       id: awscc.ec2.instances
       x-cfn-schema-name: Instance
       x-cfn-type-name: AWS::EC2::Instance
-      x-identifiers:
+      x-identifiers: &ref_12
         - InstanceId
       x-type: cloud_control
       methods:
@@ -18852,8 +19838,7 @@ components:
       id: awscc.ec2.instances_list_only
       x-cfn-schema-name: Instance
       x-cfn-type-name: AWS::EC2::Instance
-      x-identifiers:
-        - InstanceId
+      x-identifiers: *ref_12
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -18883,7 +19868,7 @@ components:
       id: awscc.ec2.instance_connect_endpoints
       x-cfn-schema-name: InstanceConnectEndpoint
       x-cfn-type-name: AWS::EC2::InstanceConnectEndpoint
-      x-identifiers:
+      x-identifiers: &ref_13
         - Id
       x-type: cloud_control
       methods:
@@ -18979,8 +19964,7 @@ components:
       id: awscc.ec2.instance_connect_endpoints_list_only
       x-cfn-schema-name: InstanceConnectEndpoint
       x-cfn-type-name: AWS::EC2::InstanceConnectEndpoint
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_13
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -19010,7 +19994,7 @@ components:
       id: awscc.ec2.internet_gateways
       x-cfn-schema-name: InternetGateway
       x-cfn-type-name: AWS::EC2::InternetGateway
-      x-identifiers:
+      x-identifiers: &ref_14
         - InternetGatewayId
       x-type: cloud_control
       methods:
@@ -19098,8 +20082,7 @@ components:
       id: awscc.ec2.internet_gateways_list_only
       x-cfn-schema-name: InternetGateway
       x-cfn-type-name: AWS::EC2::InternetGateway
-      x-identifiers:
-        - InternetGatewayId
+      x-identifiers: *ref_14
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -19129,7 +20112,7 @@ components:
       id: awscc.ec2.ipams
       x-cfn-schema-name: IPAM
       x-cfn-type-name: AWS::EC2::IPAM
-      x-identifiers:
+      x-identifiers: &ref_15
         - IpamId
       x-type: cloud_control
       methods:
@@ -19243,8 +20226,7 @@ components:
       id: awscc.ec2.ipams_list_only
       x-cfn-schema-name: IPAM
       x-cfn-type-name: AWS::EC2::IPAM
-      x-identifiers:
-        - IpamId
+      x-identifiers: *ref_15
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -19274,7 +20256,7 @@ components:
       id: awscc.ec2.ipam_allocations
       x-cfn-schema-name: IPAMAllocation
       x-cfn-type-name: AWS::EC2::IPAMAllocation
-      x-identifiers:
+      x-identifiers: &ref_16
         - IpamPoolId
         - IpamPoolAllocationId
         - Cidr
@@ -19353,10 +20335,7 @@ components:
       id: awscc.ec2.ipam_allocations_list_only
       x-cfn-schema-name: IPAMAllocation
       x-cfn-type-name: AWS::EC2::IPAMAllocation
-      x-identifiers:
-        - IpamPoolId
-        - IpamPoolAllocationId
-        - Cidr
+      x-identifiers: *ref_16
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -19390,7 +20369,7 @@ components:
       id: awscc.ec2.ipam_pools
       x-cfn-schema-name: IPAMPool
       x-cfn-type-name: AWS::EC2::IPAMPool
-      x-identifiers:
+      x-identifiers: &ref_17
         - IpamPoolId
       x-type: cloud_control
       methods:
@@ -19522,8 +20501,7 @@ components:
       id: awscc.ec2.ipam_pools_list_only
       x-cfn-schema-name: IPAMPool
       x-cfn-type-name: AWS::EC2::IPAMPool
-      x-identifiers:
-        - IpamPoolId
+      x-identifiers: *ref_17
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -19553,7 +20531,7 @@ components:
       id: awscc.ec2.ipam_pool_cidrs
       x-cfn-schema-name: IPAMPoolCidr
       x-cfn-type-name: AWS::EC2::IPAMPoolCidr
-      x-identifiers:
+      x-identifiers: &ref_18
         - IpamPoolId
         - IpamPoolCidrId
       x-type: cloud_control
@@ -19631,9 +20609,7 @@ components:
       id: awscc.ec2.ipam_pool_cidrs_list_only
       x-cfn-schema-name: IPAMPoolCidr
       x-cfn-type-name: AWS::EC2::IPAMPoolCidr
-      x-identifiers:
-        - IpamPoolId
-        - IpamPoolCidrId
+      x-identifiers: *ref_18
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -19665,7 +20641,7 @@ components:
       id: awscc.ec2.ipam_resource_discoveries
       x-cfn-schema-name: IPAMResourceDiscovery
       x-cfn-type-name: AWS::EC2::IPAMResourceDiscovery
-      x-identifiers:
+      x-identifiers: &ref_19
         - IpamResourceDiscoveryId
       x-type: cloud_control
       methods:
@@ -19769,8 +20745,7 @@ components:
       id: awscc.ec2.ipam_resource_discoveries_list_only
       x-cfn-schema-name: IPAMResourceDiscovery
       x-cfn-type-name: AWS::EC2::IPAMResourceDiscovery
-      x-identifiers:
-        - IpamResourceDiscoveryId
+      x-identifiers: *ref_19
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -19800,7 +20775,7 @@ components:
       id: awscc.ec2.ipam_resource_discovery_associations
       x-cfn-schema-name: IPAMResourceDiscoveryAssociation
       x-cfn-type-name: AWS::EC2::IPAMResourceDiscoveryAssociation
-      x-identifiers:
+      x-identifiers: &ref_20
         - IpamResourceDiscoveryAssociationId
       x-type: cloud_control
       methods:
@@ -19906,8 +20881,7 @@ components:
       id: awscc.ec2.ipam_resource_discovery_associations_list_only
       x-cfn-schema-name: IPAMResourceDiscoveryAssociation
       x-cfn-type-name: AWS::EC2::IPAMResourceDiscoveryAssociation
-      x-identifiers:
-        - IpamResourceDiscoveryAssociationId
+      x-identifiers: *ref_20
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -19937,7 +20911,7 @@ components:
       id: awscc.ec2.ipam_scopes
       x-cfn-schema-name: IPAMScope
       x-cfn-type-name: AWS::EC2::IPAMScope
-      x-identifiers:
+      x-identifiers: &ref_21
         - IpamScopeId
       x-type: cloud_control
       methods:
@@ -20039,8 +21013,7 @@ components:
       id: awscc.ec2.ipam_scopes_list_only
       x-cfn-schema-name: IPAMScope
       x-cfn-type-name: AWS::EC2::IPAMScope
-      x-identifiers:
-        - IpamScopeId
+      x-identifiers: *ref_21
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -20070,7 +21043,7 @@ components:
       id: awscc.ec2.ip_pool_route_table_associations
       x-cfn-schema-name: IpPoolRouteTableAssociation
       x-cfn-type-name: AWS::EC2::IpPoolRouteTableAssociation
-      x-identifiers:
+      x-identifiers: &ref_22
         - AssociationId
       x-type: cloud_control
       methods:
@@ -20143,8 +21116,7 @@ components:
       id: awscc.ec2.ip_pool_route_table_associations_list_only
       x-cfn-schema-name: IpPoolRouteTableAssociation
       x-cfn-type-name: AWS::EC2::IpPoolRouteTableAssociation
-      x-identifiers:
-        - AssociationId
+      x-identifiers: *ref_22
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -20174,7 +21146,7 @@ components:
       id: awscc.ec2.key_pairs
       x-cfn-schema-name: KeyPair
       x-cfn-type-name: AWS::EC2::KeyPair
-      x-identifiers:
+      x-identifiers: &ref_23
         - KeyName
       x-type: cloud_control
       methods:
@@ -20255,8 +21227,7 @@ components:
       id: awscc.ec2.key_pairs_list_only
       x-cfn-schema-name: KeyPair
       x-cfn-type-name: AWS::EC2::KeyPair
-      x-identifiers:
-        - KeyName
+      x-identifiers: *ref_23
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -20286,7 +21257,7 @@ components:
       id: awscc.ec2.launch_templates
       x-cfn-schema-name: LaunchTemplate
       x-cfn-type-name: AWS::EC2::LaunchTemplate
-      x-identifiers:
+      x-identifiers: &ref_24
         - LaunchTemplateId
       x-type: cloud_control
       methods:
@@ -20384,8 +21355,7 @@ components:
       id: awscc.ec2.launch_templates_list_only
       x-cfn-schema-name: LaunchTemplate
       x-cfn-type-name: AWS::EC2::LaunchTemplate
-      x-identifiers:
-        - LaunchTemplateId
+      x-identifiers: *ref_24
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -20415,7 +21385,7 @@ components:
       id: awscc.ec2.local_gateway_routes
       x-cfn-schema-name: LocalGatewayRoute
       x-cfn-type-name: AWS::EC2::LocalGatewayRoute
-      x-identifiers:
+      x-identifiers: &ref_25
         - DestinationCidrBlock
         - LocalGatewayRouteTableId
       x-type: cloud_control
@@ -20512,9 +21482,7 @@ components:
       id: awscc.ec2.local_gateway_routes_list_only
       x-cfn-schema-name: LocalGatewayRoute
       x-cfn-type-name: AWS::EC2::LocalGatewayRoute
-      x-identifiers:
-        - DestinationCidrBlock
-        - LocalGatewayRouteTableId
+      x-identifiers: *ref_25
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -20546,7 +21514,7 @@ components:
       id: awscc.ec2.local_gateway_route_tables
       x-cfn-schema-name: LocalGatewayRouteTable
       x-cfn-type-name: AWS::EC2::LocalGatewayRouteTable
-      x-identifiers:
+      x-identifiers: &ref_26
         - LocalGatewayRouteTableId
       x-type: cloud_control
       methods:
@@ -20646,8 +21614,7 @@ components:
       id: awscc.ec2.local_gateway_route_tables_list_only
       x-cfn-schema-name: LocalGatewayRouteTable
       x-cfn-type-name: AWS::EC2::LocalGatewayRouteTable
-      x-identifiers:
-        - LocalGatewayRouteTableId
+      x-identifiers: *ref_26
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -20677,7 +21644,7 @@ components:
       id: awscc.ec2.local_gateway_route_table_virtual_interface_group_associations
       x-cfn-schema-name: LocalGatewayRouteTableVirtualInterfaceGroupAssociation
       x-cfn-type-name: AWS::EC2::LocalGatewayRouteTableVirtualInterfaceGroupAssociation
-      x-identifiers:
+      x-identifiers: &ref_27
         - LocalGatewayRouteTableVirtualInterfaceGroupAssociationId
       x-type: cloud_control
       methods:
@@ -20777,8 +21744,7 @@ components:
       id: awscc.ec2.local_gateway_route_table_virtual_interface_group_associations_list_only
       x-cfn-schema-name: LocalGatewayRouteTableVirtualInterfaceGroupAssociation
       x-cfn-type-name: AWS::EC2::LocalGatewayRouteTableVirtualInterfaceGroupAssociation
-      x-identifiers:
-        - LocalGatewayRouteTableVirtualInterfaceGroupAssociationId
+      x-identifiers: *ref_27
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -20808,7 +21774,7 @@ components:
       id: awscc.ec2.local_gateway_route_tablevpc_associations
       x-cfn-schema-name: LocalGatewayRouteTableVPCAssociation
       x-cfn-type-name: AWS::EC2::LocalGatewayRouteTableVPCAssociation
-      x-identifiers:
+      x-identifiers: &ref_28
         - LocalGatewayRouteTableVpcAssociationId
       x-type: cloud_control
       methods:
@@ -20904,8 +21870,7 @@ components:
       id: awscc.ec2.local_gateway_route_tablevpc_associations_list_only
       x-cfn-schema-name: LocalGatewayRouteTableVPCAssociation
       x-cfn-type-name: AWS::EC2::LocalGatewayRouteTableVPCAssociation
-      x-identifiers:
-        - LocalGatewayRouteTableVpcAssociationId
+      x-identifiers: *ref_28
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -20935,7 +21900,7 @@ components:
       id: awscc.ec2.nat_gateways
       x-cfn-schema-name: NatGateway
       x-cfn-type-name: AWS::EC2::NatGateway
-      x-identifiers:
+      x-identifiers: &ref_29
         - NatGatewayId
       x-type: cloud_control
       methods:
@@ -21039,8 +22004,7 @@ components:
       id: awscc.ec2.nat_gateways_list_only
       x-cfn-schema-name: NatGateway
       x-cfn-type-name: AWS::EC2::NatGateway
-      x-identifiers:
-        - NatGatewayId
+      x-identifiers: *ref_29
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -21070,7 +22034,7 @@ components:
       id: awscc.ec2.network_acls
       x-cfn-schema-name: NetworkAcl
       x-cfn-type-name: AWS::EC2::NetworkAcl
-      x-identifiers:
+      x-identifiers: &ref_30
         - Id
       x-type: cloud_control
       methods:
@@ -21160,8 +22124,7 @@ components:
       id: awscc.ec2.network_acls_list_only
       x-cfn-schema-name: NetworkAcl
       x-cfn-type-name: AWS::EC2::NetworkAcl
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_30
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -21191,7 +22154,7 @@ components:
       id: awscc.ec2.network_insights_access_scopes
       x-cfn-schema-name: NetworkInsightsAccessScope
       x-cfn-type-name: AWS::EC2::NetworkInsightsAccessScope
-      x-identifiers:
+      x-identifiers: &ref_31
         - NetworkInsightsAccessScopeId
       x-type: cloud_control
       methods:
@@ -21289,8 +22252,7 @@ components:
       id: awscc.ec2.network_insights_access_scopes_list_only
       x-cfn-schema-name: NetworkInsightsAccessScope
       x-cfn-type-name: AWS::EC2::NetworkInsightsAccessScope
-      x-identifiers:
-        - NetworkInsightsAccessScopeId
+      x-identifiers: *ref_31
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -21320,7 +22282,7 @@ components:
       id: awscc.ec2.network_insights_access_scope_analyses
       x-cfn-schema-name: NetworkInsightsAccessScopeAnalysis
       x-cfn-type-name: AWS::EC2::NetworkInsightsAccessScopeAnalysis
-      x-identifiers:
+      x-identifiers: &ref_32
         - NetworkInsightsAccessScopeAnalysisId
       x-type: cloud_control
       methods:
@@ -21424,8 +22386,7 @@ components:
       id: awscc.ec2.network_insights_access_scope_analyses_list_only
       x-cfn-schema-name: NetworkInsightsAccessScopeAnalysis
       x-cfn-type-name: AWS::EC2::NetworkInsightsAccessScopeAnalysis
-      x-identifiers:
-        - NetworkInsightsAccessScopeAnalysisId
+      x-identifiers: *ref_32
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -21455,7 +22416,7 @@ components:
       id: awscc.ec2.network_insights_analyses
       x-cfn-schema-name: NetworkInsightsAnalysis
       x-cfn-type-name: AWS::EC2::NetworkInsightsAnalysis
-      x-identifiers:
+      x-identifiers: &ref_33
         - NetworkInsightsAnalysisId
       x-type: cloud_control
       methods:
@@ -21571,8 +22532,7 @@ components:
       id: awscc.ec2.network_insights_analyses_list_only
       x-cfn-schema-name: NetworkInsightsAnalysis
       x-cfn-type-name: AWS::EC2::NetworkInsightsAnalysis
-      x-identifiers:
-        - NetworkInsightsAnalysisId
+      x-identifiers: *ref_33
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -21602,7 +22562,7 @@ components:
       id: awscc.ec2.network_insights_paths
       x-cfn-schema-name: NetworkInsightsPath
       x-cfn-type-name: AWS::EC2::NetworkInsightsPath
-      x-identifiers:
+      x-identifiers: &ref_34
         - NetworkInsightsPathId
       x-type: cloud_control
       methods:
@@ -21714,8 +22674,7 @@ components:
       id: awscc.ec2.network_insights_paths_list_only
       x-cfn-schema-name: NetworkInsightsPath
       x-cfn-type-name: AWS::EC2::NetworkInsightsPath
-      x-identifiers:
-        - NetworkInsightsPathId
+      x-identifiers: *ref_34
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -21740,12 +22699,170 @@ components:
                 json_extract_path_text(Properties, 'NetworkInsightsPathId') as network_insights_path_id
                 FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EC2::NetworkInsightsPath'
                 AND region = 'us-east-1'
+    network_interfaces:
+      name: network_interfaces
+      id: awscc.ec2.network_interfaces
+      x-cfn-schema-name: NetworkInterface
+      x-cfn-type-name: AWS::EC2::NetworkInterface
+      x-identifiers: &ref_35
+        - Id
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__NetworkInterface&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::EC2::NetworkInterface"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::EC2::NetworkInterface"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::EC2::NetworkInterface"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/network_interfaces/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/network_interfaces/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/network_interfaces/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.Description') as description,
+              JSON_EXTRACT(Properties, '$.PrivateIpAddress') as private_ip_address,
+              JSON_EXTRACT(Properties, '$.PrimaryIpv6Address') as primary_ipv6_address,
+              JSON_EXTRACT(Properties, '$.PrivateIpAddresses') as private_ip_addresses,
+              JSON_EXTRACT(Properties, '$.SecondaryPrivateIpAddressCount') as secondary_private_ip_address_count,
+              JSON_EXTRACT(Properties, '$.Ipv6PrefixCount') as ipv6_prefix_count,
+              JSON_EXTRACT(Properties, '$.PrimaryPrivateIpAddress') as primary_private_ip_address,
+              JSON_EXTRACT(Properties, '$.Ipv4Prefixes') as ipv4_prefixes,
+              JSON_EXTRACT(Properties, '$.Ipv4PrefixCount') as ipv4_prefix_count,
+              JSON_EXTRACT(Properties, '$.EnablePrimaryIpv6') as enable_primary_ipv6,
+              JSON_EXTRACT(Properties, '$.GroupSet') as group_set,
+              JSON_EXTRACT(Properties, '$.Ipv6Addresses') as ipv6_addresses,
+              JSON_EXTRACT(Properties, '$.Ipv6Prefixes') as ipv6_prefixes,
+              JSON_EXTRACT(Properties, '$.SubnetId') as subnet_id,
+              JSON_EXTRACT(Properties, '$.SourceDestCheck') as source_dest_check,
+              JSON_EXTRACT(Properties, '$.InterfaceType') as interface_type,
+              JSON_EXTRACT(Properties, '$.SecondaryPrivateIpAddresses') as secondary_private_ip_addresses,
+              JSON_EXTRACT(Properties, '$.VpcId') as vpc_id,
+              JSON_EXTRACT(Properties, '$.Ipv6AddressCount') as ipv6_address_count,
+              JSON_EXTRACT(Properties, '$.Id') as id,
+              JSON_EXTRACT(Properties, '$.Tags') as tags,
+              JSON_EXTRACT(Properties, '$.ConnectionTrackingSpecification') as connection_tracking_specification
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EC2::NetworkInterface'
+              AND Identifier = '<Id>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'Description') as description,
+                json_extract_path_text(Properties, 'PrivateIpAddress') as private_ip_address,
+                json_extract_path_text(Properties, 'PrimaryIpv6Address') as primary_ipv6_address,
+                json_extract_path_text(Properties, 'PrivateIpAddresses') as private_ip_addresses,
+                json_extract_path_text(Properties, 'SecondaryPrivateIpAddressCount') as secondary_private_ip_address_count,
+                json_extract_path_text(Properties, 'Ipv6PrefixCount') as ipv6_prefix_count,
+                json_extract_path_text(Properties, 'PrimaryPrivateIpAddress') as primary_private_ip_address,
+                json_extract_path_text(Properties, 'Ipv4Prefixes') as ipv4_prefixes,
+                json_extract_path_text(Properties, 'Ipv4PrefixCount') as ipv4_prefix_count,
+                json_extract_path_text(Properties, 'EnablePrimaryIpv6') as enable_primary_ipv6,
+                json_extract_path_text(Properties, 'GroupSet') as group_set,
+                json_extract_path_text(Properties, 'Ipv6Addresses') as ipv6_addresses,
+                json_extract_path_text(Properties, 'Ipv6Prefixes') as ipv6_prefixes,
+                json_extract_path_text(Properties, 'SubnetId') as subnet_id,
+                json_extract_path_text(Properties, 'SourceDestCheck') as source_dest_check,
+                json_extract_path_text(Properties, 'InterfaceType') as interface_type,
+                json_extract_path_text(Properties, 'SecondaryPrivateIpAddresses') as secondary_private_ip_addresses,
+                json_extract_path_text(Properties, 'VpcId') as vpc_id,
+                json_extract_path_text(Properties, 'Ipv6AddressCount') as ipv6_address_count,
+                json_extract_path_text(Properties, 'Id') as id,
+                json_extract_path_text(Properties, 'Tags') as tags,
+                json_extract_path_text(Properties, 'ConnectionTrackingSpecification') as connection_tracking_specification
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EC2::NetworkInterface'
+                AND Identifier = '<Id>'
+                AND region = 'us-east-1'
+    network_interfaces_list_only:
+      name: network_interfaces_list_only
+      id: awscc.ec2.network_interfaces_list_only
+      x-cfn-schema-name: NetworkInterface
+      x-cfn-type-name: AWS::EC2::NetworkInterface
+      x-identifiers: *ref_35
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.Id') as id
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EC2::NetworkInterface'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'Id') as id
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EC2::NetworkInterface'
+                AND region = 'us-east-1'
     network_interface_attachments:
       name: network_interface_attachments
       id: awscc.ec2.network_interface_attachments
       x-cfn-schema-name: NetworkInterfaceAttachment
       x-cfn-type-name: AWS::EC2::NetworkInterfaceAttachment
-      x-identifiers:
+      x-identifiers: &ref_36
         - AttachmentId
       x-type: cloud_control
       methods:
@@ -21841,8 +22958,7 @@ components:
       id: awscc.ec2.network_interface_attachments_list_only
       x-cfn-schema-name: NetworkInterfaceAttachment
       x-cfn-type-name: AWS::EC2::NetworkInterfaceAttachment
-      x-identifiers:
-        - AttachmentId
+      x-identifiers: *ref_36
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -21872,7 +22988,7 @@ components:
       id: awscc.ec2.network_performance_metric_subscriptions
       x-cfn-schema-name: NetworkPerformanceMetricSubscription
       x-cfn-type-name: AWS::EC2::NetworkPerformanceMetricSubscription
-      x-identifiers:
+      x-identifiers: &ref_37
         - Source
         - Destination
         - Metric
@@ -21950,11 +23066,7 @@ components:
       id: awscc.ec2.network_performance_metric_subscriptions_list_only
       x-cfn-schema-name: NetworkPerformanceMetricSubscription
       x-cfn-type-name: AWS::EC2::NetworkPerformanceMetricSubscription
-      x-identifiers:
-        - Source
-        - Destination
-        - Metric
-        - Statistic
+      x-identifiers: *ref_37
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -21990,7 +23102,7 @@ components:
       id: awscc.ec2.placement_groups
       x-cfn-schema-name: PlacementGroup
       x-cfn-type-name: AWS::EC2::PlacementGroup
-      x-identifiers:
+      x-identifiers: &ref_38
         - GroupName
       x-type: cloud_control
       methods:
@@ -22067,8 +23179,7 @@ components:
       id: awscc.ec2.placement_groups_list_only
       x-cfn-schema-name: PlacementGroup
       x-cfn-type-name: AWS::EC2::PlacementGroup
-      x-identifiers:
-        - GroupName
+      x-identifiers: *ref_38
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -22098,7 +23209,7 @@ components:
       id: awscc.ec2.prefix_lists
       x-cfn-schema-name: PrefixList
       x-cfn-type-name: AWS::EC2::PrefixList
-      x-identifiers:
+      x-identifiers: &ref_39
         - PrefixListId
       x-type: cloud_control
       methods:
@@ -22200,8 +23311,7 @@ components:
       id: awscc.ec2.prefix_lists_list_only
       x-cfn-schema-name: PrefixList
       x-cfn-type-name: AWS::EC2::PrefixList
-      x-identifiers:
-        - PrefixListId
+      x-identifiers: *ref_39
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -22231,7 +23341,7 @@ components:
       id: awscc.ec2.routes
       x-cfn-schema-name: Route
       x-cfn-type-name: AWS::EC2::Route
-      x-identifiers:
+      x-identifiers: &ref_40
         - RouteTableId
         - CidrBlock
       x-type: cloud_control
@@ -22348,9 +23458,7 @@ components:
       id: awscc.ec2.routes_list_only
       x-cfn-schema-name: Route
       x-cfn-type-name: AWS::EC2::Route
-      x-identifiers:
-        - RouteTableId
-        - CidrBlock
+      x-identifiers: *ref_40
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -22382,7 +23490,7 @@ components:
       id: awscc.ec2.route_servers
       x-cfn-schema-name: RouteServer
       x-cfn-type-name: AWS::EC2::RouteServer
-      x-identifiers:
+      x-identifiers: &ref_41
         - Id
       x-type: cloud_control
       methods:
@@ -22480,8 +23588,7 @@ components:
       id: awscc.ec2.route_servers_list_only
       x-cfn-schema-name: RouteServer
       x-cfn-type-name: AWS::EC2::RouteServer
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_41
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -22511,7 +23618,7 @@ components:
       id: awscc.ec2.route_server_associations
       x-cfn-schema-name: RouteServerAssociation
       x-cfn-type-name: AWS::EC2::RouteServerAssociation
-      x-identifiers:
+      x-identifiers: &ref_42
         - RouteServerId
         - VpcId
       x-type: cloud_control
@@ -22583,9 +23690,7 @@ components:
       id: awscc.ec2.route_server_associations_list_only
       x-cfn-schema-name: RouteServerAssociation
       x-cfn-type-name: AWS::EC2::RouteServerAssociation
-      x-identifiers:
-        - RouteServerId
-        - VpcId
+      x-identifiers: *ref_42
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -22617,7 +23722,7 @@ components:
       id: awscc.ec2.route_server_endpoints
       x-cfn-schema-name: RouteServerEndpoint
       x-cfn-type-name: AWS::EC2::RouteServerEndpoint
-      x-identifiers:
+      x-identifiers: &ref_43
         - Id
       x-type: cloud_control
       methods:
@@ -22717,8 +23822,7 @@ components:
       id: awscc.ec2.route_server_endpoints_list_only
       x-cfn-schema-name: RouteServerEndpoint
       x-cfn-type-name: AWS::EC2::RouteServerEndpoint
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_43
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -22748,7 +23852,7 @@ components:
       id: awscc.ec2.route_server_peers
       x-cfn-schema-name: RouteServerPeer
       x-cfn-type-name: AWS::EC2::RouteServerPeer
-      x-identifiers:
+      x-identifiers: &ref_44
         - Id
       x-type: cloud_control
       methods:
@@ -22854,8 +23958,7 @@ components:
       id: awscc.ec2.route_server_peers_list_only
       x-cfn-schema-name: RouteServerPeer
       x-cfn-type-name: AWS::EC2::RouteServerPeer
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_44
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -22885,7 +23988,7 @@ components:
       id: awscc.ec2.route_server_propagations
       x-cfn-schema-name: RouteServerPropagation
       x-cfn-type-name: AWS::EC2::RouteServerPropagation
-      x-identifiers:
+      x-identifiers: &ref_45
         - RouteServerId
         - RouteTableId
       x-type: cloud_control
@@ -22957,9 +24060,7 @@ components:
       id: awscc.ec2.route_server_propagations_list_only
       x-cfn-schema-name: RouteServerPropagation
       x-cfn-type-name: AWS::EC2::RouteServerPropagation
-      x-identifiers:
-        - RouteServerId
-        - RouteTableId
+      x-identifiers: *ref_45
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -22991,7 +24092,7 @@ components:
       id: awscc.ec2.route_tables
       x-cfn-schema-name: RouteTable
       x-cfn-type-name: AWS::EC2::RouteTable
-      x-identifiers:
+      x-identifiers: &ref_46
         - RouteTableId
       x-type: cloud_control
       methods:
@@ -23081,8 +24182,7 @@ components:
       id: awscc.ec2.route_tables_list_only
       x-cfn-schema-name: RouteTable
       x-cfn-type-name: AWS::EC2::RouteTable
-      x-identifiers:
-        - RouteTableId
+      x-identifiers: *ref_46
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -23112,7 +24212,7 @@ components:
       id: awscc.ec2.security_groups
       x-cfn-schema-name: SecurityGroup
       x-cfn-type-name: AWS::EC2::SecurityGroup
-      x-identifiers:
+      x-identifiers: &ref_47
         - Id
       x-type: cloud_control
       methods:
@@ -23212,8 +24312,7 @@ components:
       id: awscc.ec2.security_groups_list_only
       x-cfn-schema-name: SecurityGroup
       x-cfn-type-name: AWS::EC2::SecurityGroup
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_47
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -23243,7 +24342,7 @@ components:
       id: awscc.ec2.security_group_egresses
       x-cfn-schema-name: SecurityGroupEgress
       x-cfn-type-name: AWS::EC2::SecurityGroupEgress
-      x-identifiers:
+      x-identifiers: &ref_48
         - Id
       x-type: cloud_control
       methods:
@@ -23347,8 +24446,7 @@ components:
       id: awscc.ec2.security_group_egresses_list_only
       x-cfn-schema-name: SecurityGroupEgress
       x-cfn-type-name: AWS::EC2::SecurityGroupEgress
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_48
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -23378,7 +24476,7 @@ components:
       id: awscc.ec2.security_group_ingresses
       x-cfn-schema-name: SecurityGroupIngress
       x-cfn-type-name: AWS::EC2::SecurityGroupIngress
-      x-identifiers:
+      x-identifiers: &ref_49
         - Id
       x-type: cloud_control
       methods:
@@ -23488,8 +24586,7 @@ components:
       id: awscc.ec2.security_group_ingresses_list_only
       x-cfn-schema-name: SecurityGroupIngress
       x-cfn-type-name: AWS::EC2::SecurityGroupIngress
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_49
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -23519,7 +24616,7 @@ components:
       id: awscc.ec2.security_group_vpc_associations
       x-cfn-schema-name: SecurityGroupVpcAssociation
       x-cfn-type-name: AWS::EC2::SecurityGroupVpcAssociation
-      x-identifiers:
+      x-identifiers: &ref_50
         - GroupId
         - VpcId
       x-type: cloud_control
@@ -23597,9 +24694,7 @@ components:
       id: awscc.ec2.security_group_vpc_associations_list_only
       x-cfn-schema-name: SecurityGroupVpcAssociation
       x-cfn-type-name: AWS::EC2::SecurityGroupVpcAssociation
-      x-identifiers:
-        - GroupId
-        - VpcId
+      x-identifiers: *ref_50
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -23631,7 +24726,7 @@ components:
       id: awscc.ec2.snapshot_block_public_accesses
       x-cfn-schema-name: SnapshotBlockPublicAccess
       x-cfn-type-name: AWS::EC2::SnapshotBlockPublicAccess
-      x-identifiers:
+      x-identifiers: &ref_51
         - AccountId
       x-type: cloud_control
       methods:
@@ -23719,8 +24814,7 @@ components:
       id: awscc.ec2.snapshot_block_public_accesses_list_only
       x-cfn-schema-name: SnapshotBlockPublicAccess
       x-cfn-type-name: AWS::EC2::SnapshotBlockPublicAccess
-      x-identifiers:
-        - AccountId
+      x-identifiers: *ref_51
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -23750,7 +24844,7 @@ components:
       id: awscc.ec2.spot_fleets
       x-cfn-schema-name: SpotFleet
       x-cfn-type-name: AWS::EC2::SpotFleet
-      x-identifiers:
+      x-identifiers: &ref_52
         - Id
       x-type: cloud_control
       methods:
@@ -23838,8 +24932,7 @@ components:
       id: awscc.ec2.spot_fleets_list_only
       x-cfn-schema-name: SpotFleet
       x-cfn-type-name: AWS::EC2::SpotFleet
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_52
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -23869,7 +24962,7 @@ components:
       id: awscc.ec2.subnets
       x-cfn-schema-name: Subnet
       x-cfn-type-name: AWS::EC2::Subnet
-      x-identifiers:
+      x-identifiers: &ref_53
         - SubnetId
       x-type: cloud_control
       methods:
@@ -23995,8 +25088,7 @@ components:
       id: awscc.ec2.subnets_list_only
       x-cfn-schema-name: Subnet
       x-cfn-type-name: AWS::EC2::Subnet
-      x-identifiers:
-        - SubnetId
+      x-identifiers: *ref_53
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -24026,7 +25118,7 @@ components:
       id: awscc.ec2.subnet_cidr_blocks
       x-cfn-schema-name: SubnetCidrBlock
       x-cfn-type-name: AWS::EC2::SubnetCidrBlock
-      x-identifiers:
+      x-identifiers: &ref_54
         - Id
       x-type: cloud_control
       methods:
@@ -24107,8 +25199,7 @@ components:
       id: awscc.ec2.subnet_cidr_blocks_list_only
       x-cfn-schema-name: SubnetCidrBlock
       x-cfn-type-name: AWS::EC2::SubnetCidrBlock
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_54
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -24138,7 +25229,7 @@ components:
       id: awscc.ec2.subnet_network_acl_associations
       x-cfn-schema-name: SubnetNetworkAclAssociation
       x-cfn-type-name: AWS::EC2::SubnetNetworkAclAssociation
-      x-identifiers:
+      x-identifiers: &ref_55
         - AssociationId
       x-type: cloud_control
       methods:
@@ -24211,8 +25302,7 @@ components:
       id: awscc.ec2.subnet_network_acl_associations_list_only
       x-cfn-schema-name: SubnetNetworkAclAssociation
       x-cfn-type-name: AWS::EC2::SubnetNetworkAclAssociation
-      x-identifiers:
-        - AssociationId
+      x-identifiers: *ref_55
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -24242,7 +25332,7 @@ components:
       id: awscc.ec2.subnet_route_table_associations
       x-cfn-schema-name: SubnetRouteTableAssociation
       x-cfn-type-name: AWS::EC2::SubnetRouteTableAssociation
-      x-identifiers:
+      x-identifiers: &ref_56
         - Id
       x-type: cloud_control
       methods:
@@ -24315,8 +25405,7 @@ components:
       id: awscc.ec2.subnet_route_table_associations_list_only
       x-cfn-schema-name: SubnetRouteTableAssociation
       x-cfn-type-name: AWS::EC2::SubnetRouteTableAssociation
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_56
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -24346,7 +25435,7 @@ components:
       id: awscc.ec2.traffic_mirror_filters
       x-cfn-schema-name: TrafficMirrorFilter
       x-cfn-type-name: AWS::EC2::TrafficMirrorFilter
-      x-identifiers:
+      x-identifiers: &ref_57
         - Id
       x-type: cloud_control
       methods:
@@ -24438,8 +25527,7 @@ components:
       id: awscc.ec2.traffic_mirror_filters_list_only
       x-cfn-schema-name: TrafficMirrorFilter
       x-cfn-type-name: AWS::EC2::TrafficMirrorFilter
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_57
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -24469,7 +25557,7 @@ components:
       id: awscc.ec2.traffic_mirror_filter_rules
       x-cfn-schema-name: TrafficMirrorFilterRule
       x-cfn-type-name: AWS::EC2::TrafficMirrorFilterRule
-      x-identifiers:
+      x-identifiers: &ref_58
         - TrafficMirrorFilterRuleId
       x-type: cloud_control
       methods:
@@ -24577,8 +25665,7 @@ components:
       id: awscc.ec2.traffic_mirror_filter_rules_list_only
       x-cfn-schema-name: TrafficMirrorFilterRule
       x-cfn-type-name: AWS::EC2::TrafficMirrorFilterRule
-      x-identifiers:
-        - TrafficMirrorFilterRuleId
+      x-identifiers: *ref_58
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -24608,7 +25695,7 @@ components:
       id: awscc.ec2.traffic_mirror_sessions
       x-cfn-schema-name: TrafficMirrorSession
       x-cfn-type-name: AWS::EC2::TrafficMirrorSession
-      x-identifiers:
+      x-identifiers: &ref_59
         - Id
       x-type: cloud_control
       methods:
@@ -24712,8 +25799,7 @@ components:
       id: awscc.ec2.traffic_mirror_sessions_list_only
       x-cfn-schema-name: TrafficMirrorSession
       x-cfn-type-name: AWS::EC2::TrafficMirrorSession
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_59
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -24743,7 +25829,7 @@ components:
       id: awscc.ec2.traffic_mirror_targets
       x-cfn-schema-name: TrafficMirrorTarget
       x-cfn-type-name: AWS::EC2::TrafficMirrorTarget
-      x-identifiers:
+      x-identifiers: &ref_60
         - Id
       x-type: cloud_control
       methods:
@@ -24839,8 +25925,7 @@ components:
       id: awscc.ec2.traffic_mirror_targets_list_only
       x-cfn-schema-name: TrafficMirrorTarget
       x-cfn-type-name: AWS::EC2::TrafficMirrorTarget
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_60
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -24870,7 +25955,7 @@ components:
       id: awscc.ec2.transit_gateways
       x-cfn-schema-name: TransitGateway
       x-cfn-type-name: AWS::EC2::TransitGateway
-      x-identifiers:
+      x-identifiers: &ref_61
         - Id
       x-type: cloud_control
       methods:
@@ -24984,8 +26069,7 @@ components:
       id: awscc.ec2.transit_gateways_list_only
       x-cfn-schema-name: TransitGateway
       x-cfn-type-name: AWS::EC2::TransitGateway
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_61
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -25015,7 +26099,7 @@ components:
       id: awscc.ec2.transit_gateway_attachments
       x-cfn-schema-name: TransitGatewayAttachment
       x-cfn-type-name: AWS::EC2::TransitGatewayAttachment
-      x-identifiers:
+      x-identifiers: &ref_62
         - Id
       x-type: cloud_control
       methods:
@@ -25111,8 +26195,7 @@ components:
       id: awscc.ec2.transit_gateway_attachments_list_only
       x-cfn-schema-name: TransitGatewayAttachment
       x-cfn-type-name: AWS::EC2::TransitGatewayAttachment
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_62
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -25142,7 +26225,7 @@ components:
       id: awscc.ec2.transit_gateway_connects
       x-cfn-schema-name: TransitGatewayConnect
       x-cfn-type-name: AWS::EC2::TransitGatewayConnect
-      x-identifiers:
+      x-identifiers: &ref_63
         - TransitGatewayAttachmentId
       x-type: cloud_control
       methods:
@@ -25239,9 +26322,8 @@ components:
       name: transit_gateway_connects_list_only
       id: awscc.ec2.transit_gateway_connects_list_only
       x-cfn-schema-name: TransitGatewayConnect
-      x-cfn-type-name: AWS::EC2::TransitGatewayConnect
-      x-identifiers:
-        - TransitGatewayAttachmentId
+      x-cfn-type-name: AWS::EC2::TransitGatewayConnect
+      x-identifiers: *ref_63
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -25271,7 +26353,7 @@ components:
       id: awscc.ec2.transit_gateway_connect_peers
       x-cfn-schema-name: TransitGatewayConnectPeer
       x-cfn-type-name: AWS::EC2::TransitGatewayConnectPeer
-      x-identifiers:
+      x-identifiers: &ref_64
         - TransitGatewayConnectPeerId
       x-type: cloud_control
       methods:
@@ -25367,8 +26449,7 @@ components:
       id: awscc.ec2.transit_gateway_connect_peers_list_only
       x-cfn-schema-name: TransitGatewayConnectPeer
       x-cfn-type-name: AWS::EC2::TransitGatewayConnectPeer
-      x-identifiers:
-        - TransitGatewayConnectPeerId
+      x-identifiers: *ref_64
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -25398,7 +26479,7 @@ components:
       id: awscc.ec2.transit_gateway_multicast_domains
       x-cfn-schema-name: TransitGatewayMulticastDomain
       x-cfn-type-name: AWS::EC2::TransitGatewayMulticastDomain
-      x-identifiers:
+      x-identifiers: &ref_65
         - TransitGatewayMulticastDomainId
       x-type: cloud_control
       methods:
@@ -25496,8 +26577,7 @@ components:
       id: awscc.ec2.transit_gateway_multicast_domains_list_only
       x-cfn-schema-name: TransitGatewayMulticastDomain
       x-cfn-type-name: AWS::EC2::TransitGatewayMulticastDomain
-      x-identifiers:
-        - TransitGatewayMulticastDomainId
+      x-identifiers: *ref_65
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -25527,7 +26607,7 @@ components:
       id: awscc.ec2.transit_gateway_multicast_domain_associations
       x-cfn-schema-name: TransitGatewayMulticastDomainAssociation
       x-cfn-type-name: AWS::EC2::TransitGatewayMulticastDomainAssociation
-      x-identifiers:
+      x-identifiers: &ref_66
         - TransitGatewayMulticastDomainId
         - TransitGatewayAttachmentId
         - SubnetId
@@ -25608,10 +26688,7 @@ components:
       id: awscc.ec2.transit_gateway_multicast_domain_associations_list_only
       x-cfn-schema-name: TransitGatewayMulticastDomainAssociation
       x-cfn-type-name: AWS::EC2::TransitGatewayMulticastDomainAssociation
-      x-identifiers:
-        - TransitGatewayMulticastDomainId
-        - TransitGatewayAttachmentId
-        - SubnetId
+      x-identifiers: *ref_66
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -25645,7 +26722,7 @@ components:
       id: awscc.ec2.transit_gateway_multicast_group_members
       x-cfn-schema-name: TransitGatewayMulticastGroupMember
       x-cfn-type-name: AWS::EC2::TransitGatewayMulticastGroupMember
-      x-identifiers:
+      x-identifiers: &ref_67
         - TransitGatewayMulticastDomainId
         - GroupIpAddress
         - NetworkInterfaceId
@@ -25734,10 +26811,7 @@ components:
       id: awscc.ec2.transit_gateway_multicast_group_members_list_only
       x-cfn-schema-name: TransitGatewayMulticastGroupMember
       x-cfn-type-name: AWS::EC2::TransitGatewayMulticastGroupMember
-      x-identifiers:
-        - TransitGatewayMulticastDomainId
-        - GroupIpAddress
-        - NetworkInterfaceId
+      x-identifiers: *ref_67
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -25771,7 +26845,7 @@ components:
       id: awscc.ec2.transit_gateway_multicast_group_sources
       x-cfn-schema-name: TransitGatewayMulticastGroupSource
       x-cfn-type-name: AWS::EC2::TransitGatewayMulticastGroupSource
-      x-identifiers:
+      x-identifiers: &ref_68
         - TransitGatewayMulticastDomainId
         - GroupIpAddress
         - NetworkInterfaceId
@@ -25860,10 +26934,7 @@ components:
       id: awscc.ec2.transit_gateway_multicast_group_sources_list_only
       x-cfn-schema-name: TransitGatewayMulticastGroupSource
       x-cfn-type-name: AWS::EC2::TransitGatewayMulticastGroupSource
-      x-identifiers:
-        - TransitGatewayMulticastDomainId
-        - GroupIpAddress
-        - NetworkInterfaceId
+      x-identifiers: *ref_68
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -25897,7 +26968,7 @@ components:
       id: awscc.ec2.transit_gateway_peering_attachments
       x-cfn-schema-name: TransitGatewayPeeringAttachment
       x-cfn-type-name: AWS::EC2::TransitGatewayPeeringAttachment
-      x-identifiers:
+      x-identifiers: &ref_69
         - TransitGatewayAttachmentId
       x-type: cloud_control
       methods:
@@ -25999,8 +27070,7 @@ components:
       id: awscc.ec2.transit_gateway_peering_attachments_list_only
       x-cfn-schema-name: TransitGatewayPeeringAttachment
       x-cfn-type-name: AWS::EC2::TransitGatewayPeeringAttachment
-      x-identifiers:
-        - TransitGatewayAttachmentId
+      x-identifiers: *ref_69
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -26030,7 +27100,7 @@ components:
       id: awscc.ec2.transit_gateway_routes
       x-cfn-schema-name: TransitGatewayRoute
       x-cfn-type-name: AWS::EC2::TransitGatewayRoute
-      x-identifiers:
+      x-identifiers: &ref_70
         - TransitGatewayRouteTableId
         - DestinationCidrBlock
       x-type: cloud_control
@@ -26106,9 +27176,7 @@ components:
       id: awscc.ec2.transit_gateway_routes_list_only
       x-cfn-schema-name: TransitGatewayRoute
       x-cfn-type-name: AWS::EC2::TransitGatewayRoute
-      x-identifiers:
-        - TransitGatewayRouteTableId
-        - DestinationCidrBlock
+      x-identifiers: *ref_70
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -26140,7 +27208,7 @@ components:
       id: awscc.ec2.transit_gateway_route_tables
       x-cfn-schema-name: TransitGatewayRouteTable
       x-cfn-type-name: AWS::EC2::TransitGatewayRouteTable
-      x-identifiers:
+      x-identifiers: &ref_71
         - TransitGatewayRouteTableId
       x-type: cloud_control
       methods:
@@ -26230,8 +27298,7 @@ components:
       id: awscc.ec2.transit_gateway_route_tables_list_only
       x-cfn-schema-name: TransitGatewayRouteTable
       x-cfn-type-name: AWS::EC2::TransitGatewayRouteTable
-      x-identifiers:
-        - TransitGatewayRouteTableId
+      x-identifiers: *ref_71
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -26261,7 +27328,7 @@ components:
       id: awscc.ec2.transit_gateway_route_table_associations
       x-cfn-schema-name: TransitGatewayRouteTableAssociation
       x-cfn-type-name: AWS::EC2::TransitGatewayRouteTableAssociation
-      x-identifiers:
+      x-identifiers: &ref_72
         - TransitGatewayRouteTableId
         - TransitGatewayAttachmentId
       x-type: cloud_control
@@ -26333,9 +27400,7 @@ components:
       id: awscc.ec2.transit_gateway_route_table_associations_list_only
       x-cfn-schema-name: TransitGatewayRouteTableAssociation
       x-cfn-type-name: AWS::EC2::TransitGatewayRouteTableAssociation
-      x-identifiers:
-        - TransitGatewayRouteTableId
-        - TransitGatewayAttachmentId
+      x-identifiers: *ref_72
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -26367,7 +27432,7 @@ components:
       id: awscc.ec2.transit_gateway_route_table_propagations
       x-cfn-schema-name: TransitGatewayRouteTablePropagation
       x-cfn-type-name: AWS::EC2::TransitGatewayRouteTablePropagation
-      x-identifiers:
+      x-identifiers: &ref_73
         - TransitGatewayRouteTableId
         - TransitGatewayAttachmentId
       x-type: cloud_control
@@ -26439,9 +27504,7 @@ components:
       id: awscc.ec2.transit_gateway_route_table_propagations_list_only
       x-cfn-schema-name: TransitGatewayRouteTablePropagation
       x-cfn-type-name: AWS::EC2::TransitGatewayRouteTablePropagation
-      x-identifiers:
-        - TransitGatewayRouteTableId
-        - TransitGatewayAttachmentId
+      x-identifiers: *ref_73
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -26473,7 +27536,7 @@ components:
       id: awscc.ec2.transit_gateway_vpc_attachments
       x-cfn-schema-name: TransitGatewayVpcAttachment
       x-cfn-type-name: AWS::EC2::TransitGatewayVpcAttachment
-      x-identifiers:
+      x-identifiers: &ref_74
         - Id
       x-type: cloud_control
       methods:
@@ -26573,8 +27636,7 @@ components:
       id: awscc.ec2.transit_gateway_vpc_attachments_list_only
       x-cfn-schema-name: TransitGatewayVpcAttachment
       x-cfn-type-name: AWS::EC2::TransitGatewayVpcAttachment
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_74
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -26604,7 +27666,7 @@ components:
       id: awscc.ec2.verified_access_endpoints
       x-cfn-schema-name: VerifiedAccessEndpoint
       x-cfn-type-name: AWS::EC2::VerifiedAccessEndpoint
-      x-identifiers:
+      x-identifiers: &ref_75
         - VerifiedAccessEndpointId
       x-type: cloud_control
       methods:
@@ -26734,8 +27796,7 @@ components:
       id: awscc.ec2.verified_access_endpoints_list_only
       x-cfn-schema-name: VerifiedAccessEndpoint
       x-cfn-type-name: AWS::EC2::VerifiedAccessEndpoint
-      x-identifiers:
-        - VerifiedAccessEndpointId
+      x-identifiers: *ref_75
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -26765,7 +27826,7 @@ components:
       id: awscc.ec2.verified_access_groups
       x-cfn-schema-name: VerifiedAccessGroup
       x-cfn-type-name: AWS::EC2::VerifiedAccessGroup
-      x-identifiers:
+      x-identifiers: &ref_76
         - VerifiedAccessGroupId
       x-type: cloud_control
       methods:
@@ -26871,8 +27932,7 @@ components:
       id: awscc.ec2.verified_access_groups_list_only
       x-cfn-schema-name: VerifiedAccessGroup
       x-cfn-type-name: AWS::EC2::VerifiedAccessGroup
-      x-identifiers:
-        - VerifiedAccessGroupId
+      x-identifiers: *ref_76
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -26897,12 +27957,148 @@ components:
                 json_extract_path_text(Properties, 'VerifiedAccessGroupId') as verified_access_group_id
                 FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EC2::VerifiedAccessGroup'
                 AND region = 'us-east-1'
+    verified_access_instances:
+      name: verified_access_instances
+      id: awscc.ec2.verified_access_instances
+      x-cfn-schema-name: VerifiedAccessInstance
+      x-cfn-type-name: AWS::EC2::VerifiedAccessInstance
+      x-identifiers: &ref_77
+        - VerifiedAccessInstanceId
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__VerifiedAccessInstance&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::EC2::VerifiedAccessInstance"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::EC2::VerifiedAccessInstance"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::EC2::VerifiedAccessInstance"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/verified_access_instances/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/verified_access_instances/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/verified_access_instances/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.VerifiedAccessInstanceId') as verified_access_instance_id,
+              JSON_EXTRACT(Properties, '$.VerifiedAccessTrustProviders') as verified_access_trust_providers,
+              JSON_EXTRACT(Properties, '$.VerifiedAccessTrustProviderIds') as verified_access_trust_provider_ids,
+              JSON_EXTRACT(Properties, '$.CreationTime') as creation_time,
+              JSON_EXTRACT(Properties, '$.LastUpdatedTime') as last_updated_time,
+              JSON_EXTRACT(Properties, '$.Description') as description,
+              JSON_EXTRACT(Properties, '$.LoggingConfigurations') as logging_configurations,
+              JSON_EXTRACT(Properties, '$.Tags') as tags,
+              JSON_EXTRACT(Properties, '$.FipsEnabled') as fips_enabled,
+              JSON_EXTRACT(Properties, '$.CidrEndpointsCustomSubDomain') as cidr_endpoints_custom_sub_domain,
+              JSON_EXTRACT(Properties, '$.CidrEndpointsCustomSubDomainNameServers') as cidr_endpoints_custom_sub_domain_name_servers
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EC2::VerifiedAccessInstance'
+              AND Identifier = '<VerifiedAccessInstanceId>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'VerifiedAccessInstanceId') as verified_access_instance_id,
+                json_extract_path_text(Properties, 'VerifiedAccessTrustProviders') as verified_access_trust_providers,
+                json_extract_path_text(Properties, 'VerifiedAccessTrustProviderIds') as verified_access_trust_provider_ids,
+                json_extract_path_text(Properties, 'CreationTime') as creation_time,
+                json_extract_path_text(Properties, 'LastUpdatedTime') as last_updated_time,
+                json_extract_path_text(Properties, 'Description') as description,
+                json_extract_path_text(Properties, 'LoggingConfigurations') as logging_configurations,
+                json_extract_path_text(Properties, 'Tags') as tags,
+                json_extract_path_text(Properties, 'FipsEnabled') as fips_enabled,
+                json_extract_path_text(Properties, 'CidrEndpointsCustomSubDomain') as cidr_endpoints_custom_sub_domain,
+                json_extract_path_text(Properties, 'CidrEndpointsCustomSubDomainNameServers') as cidr_endpoints_custom_sub_domain_name_servers
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EC2::VerifiedAccessInstance'
+                AND Identifier = '<VerifiedAccessInstanceId>'
+                AND region = 'us-east-1'
+    verified_access_instances_list_only:
+      name: verified_access_instances_list_only
+      id: awscc.ec2.verified_access_instances_list_only
+      x-cfn-schema-name: VerifiedAccessInstance
+      x-cfn-type-name: AWS::EC2::VerifiedAccessInstance
+      x-identifiers: *ref_77
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.VerifiedAccessInstanceId') as verified_access_instance_id
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EC2::VerifiedAccessInstance'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'VerifiedAccessInstanceId') as verified_access_instance_id
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EC2::VerifiedAccessInstance'
+                AND region = 'us-east-1'
     verified_access_trust_providers:
       name: verified_access_trust_providers
       id: awscc.ec2.verified_access_trust_providers
       x-cfn-schema-name: VerifiedAccessTrustProvider
       x-cfn-type-name: AWS::EC2::VerifiedAccessTrustProvider
-      x-identifiers:
+      x-identifiers: &ref_78
         - VerifiedAccessTrustProviderId
       x-type: cloud_control
       methods:
@@ -27012,8 +28208,7 @@ components:
       id: awscc.ec2.verified_access_trust_providers_list_only
       x-cfn-schema-name: VerifiedAccessTrustProvider
       x-cfn-type-name: AWS::EC2::VerifiedAccessTrustProvider
-      x-identifiers:
-        - VerifiedAccessTrustProviderId
+      x-identifiers: *ref_78
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -27038,13 +28233,13 @@ components:
                 json_extract_path_text(Properties, 'VerifiedAccessTrustProviderId') as verified_access_trust_provider_id
                 FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EC2::VerifiedAccessTrustProvider'
                 AND region = 'us-east-1'
-    verified_access_instances:
-      name: verified_access_instances
-      id: awscc.ec2.verified_access_instances
-      x-cfn-schema-name: VerifiedAccessInstance
-      x-cfn-type-name: AWS::EC2::VerifiedAccessInstance
-      x-identifiers:
-        - VerifiedAccessInstanceId
+    volumes:
+      name: volumes
+      id: awscc.ec2.volumes
+      x-cfn-schema-name: Volume
+      x-cfn-type-name: AWS::EC2::Volume
+      x-identifiers: &ref_79
+        - VolumeId
       x-type: cloud_control
       methods:
         create_resource:
@@ -27052,12 +28247,12 @@ components:
             requestBodyTranslate:
               algorithm: naive_DesiredState
           operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__VerifiedAccessInstance&__detailTransformed=true/post'
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Volume&__detailTransformed=true/post'
           request:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::EC2::VerifiedAccessInstance"
+                "TypeName": "AWS::EC2::Volume"
               }
           response:
             mediaType: application/json
@@ -27073,7 +28268,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::EC2::VerifiedAccessInstance"
+                "TypeName": "AWS::EC2::Volume"
               }
           response:
             mediaType: application/json
@@ -27089,7 +28284,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::EC2::VerifiedAccessInstance"
+                "TypeName": "AWS::EC2::Volume"
               }
           response:
             mediaType: application/json
@@ -27097,11 +28292,11 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/verified_access_instances/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/volumes/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/verified_access_instances/methods/delete_resource'
+          - $ref: '#/components/x-stackQL-resources/volumes/methods/delete_resource'
         update:
-          - $ref: '#/components/x-stackQL-resources/verified_access_instances/methods/update_resource'
+          - $ref: '#/components/x-stackQL-resources/volumes/methods/update_resource'
       config:
         views:
           select:
@@ -27110,19 +28305,22 @@ components:
               SELECT
               region,
               Identifier,
-              JSON_EXTRACT(Properties, '$.VerifiedAccessInstanceId') as verified_access_instance_id,
-              JSON_EXTRACT(Properties, '$.VerifiedAccessTrustProviders') as verified_access_trust_providers,
-              JSON_EXTRACT(Properties, '$.VerifiedAccessTrustProviderIds') as verified_access_trust_provider_ids,
-              JSON_EXTRACT(Properties, '$.CreationTime') as creation_time,
-              JSON_EXTRACT(Properties, '$.LastUpdatedTime') as last_updated_time,
-              JSON_EXTRACT(Properties, '$.Description') as description,
-              JSON_EXTRACT(Properties, '$.LoggingConfigurations') as logging_configurations,
-              JSON_EXTRACT(Properties, '$.Tags') as tags,
-              JSON_EXTRACT(Properties, '$.FipsEnabled') as fips_enabled,
-              JSON_EXTRACT(Properties, '$.CidrEndpointsCustomSubDomain') as cidr_endpoints_custom_sub_domain,
-              JSON_EXTRACT(Properties, '$.CidrEndpointsCustomSubDomainNameServers') as cidr_endpoints_custom_sub_domain_name_servers
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EC2::VerifiedAccessInstance'
-              AND Identifier = '<VerifiedAccessInstanceId>'
+              JSON_EXTRACT(Properties, '$.MultiAttachEnabled') as multi_attach_enabled,
+              JSON_EXTRACT(Properties, '$.KmsKeyId') as kms_key_id,
+              JSON_EXTRACT(Properties, '$.Encrypted') as encrypted,
+              JSON_EXTRACT(Properties, '$.Size') as size,
+              JSON_EXTRACT(Properties, '$.AutoEnableIO') as auto_enable_io,
+              JSON_EXTRACT(Properties, '$.OutpostArn') as outpost_arn,
+              JSON_EXTRACT(Properties, '$.AvailabilityZone') as availability_zone,
+              JSON_EXTRACT(Properties, '$.Throughput') as throughput,
+              JSON_EXTRACT(Properties, '$.Iops') as iops,
+              JSON_EXTRACT(Properties, '$.VolumeInitializationRate') as volume_initialization_rate,
+              JSON_EXTRACT(Properties, '$.SnapshotId') as snapshot_id,
+              JSON_EXTRACT(Properties, '$.VolumeId') as volume_id,
+              JSON_EXTRACT(Properties, '$.VolumeType') as volume_type,
+              JSON_EXTRACT(Properties, '$.Tags') as tags
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EC2::Volume'
+              AND Identifier = '<VolumeId>'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
@@ -27130,27 +28328,29 @@ components:
                 SELECT
                 region,
                 Identifier,
-                json_extract_path_text(Properties, 'VerifiedAccessInstanceId') as verified_access_instance_id,
-                json_extract_path_text(Properties, 'VerifiedAccessTrustProviders') as verified_access_trust_providers,
-                json_extract_path_text(Properties, 'VerifiedAccessTrustProviderIds') as verified_access_trust_provider_ids,
-                json_extract_path_text(Properties, 'CreationTime') as creation_time,
-                json_extract_path_text(Properties, 'LastUpdatedTime') as last_updated_time,
-                json_extract_path_text(Properties, 'Description') as description,
-                json_extract_path_text(Properties, 'LoggingConfigurations') as logging_configurations,
-                json_extract_path_text(Properties, 'Tags') as tags,
-                json_extract_path_text(Properties, 'FipsEnabled') as fips_enabled,
-                json_extract_path_text(Properties, 'CidrEndpointsCustomSubDomain') as cidr_endpoints_custom_sub_domain,
-                json_extract_path_text(Properties, 'CidrEndpointsCustomSubDomainNameServers') as cidr_endpoints_custom_sub_domain_name_servers
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EC2::VerifiedAccessInstance'
-                AND Identifier = '<VerifiedAccessInstanceId>'
+                json_extract_path_text(Properties, 'MultiAttachEnabled') as multi_attach_enabled,
+                json_extract_path_text(Properties, 'KmsKeyId') as kms_key_id,
+                json_extract_path_text(Properties, 'Encrypted') as encrypted,
+                json_extract_path_text(Properties, 'Size') as size,
+                json_extract_path_text(Properties, 'AutoEnableIO') as auto_enable_io,
+                json_extract_path_text(Properties, 'OutpostArn') as outpost_arn,
+                json_extract_path_text(Properties, 'AvailabilityZone') as availability_zone,
+                json_extract_path_text(Properties, 'Throughput') as throughput,
+                json_extract_path_text(Properties, 'Iops') as iops,
+                json_extract_path_text(Properties, 'VolumeInitializationRate') as volume_initialization_rate,
+                json_extract_path_text(Properties, 'SnapshotId') as snapshot_id,
+                json_extract_path_text(Properties, 'VolumeId') as volume_id,
+                json_extract_path_text(Properties, 'VolumeType') as volume_type,
+                json_extract_path_text(Properties, 'Tags') as tags
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EC2::Volume'
+                AND Identifier = '<VolumeId>'
                 AND region = 'us-east-1'
-    verified_access_instances_list_only:
-      name: verified_access_instances_list_only
-      id: awscc.ec2.verified_access_instances_list_only
-      x-cfn-schema-name: VerifiedAccessInstance
-      x-cfn-type-name: AWS::EC2::VerifiedAccessInstance
-      x-identifiers:
-        - VerifiedAccessInstanceId
+    volumes_list_only:
+      name: volumes_list_only
+      id: awscc.ec2.volumes_list_only
+      x-cfn-schema-name: Volume
+      x-cfn-type-name: AWS::EC2::Volume
+      x-identifiers: *ref_79
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -27164,23 +28364,23 @@ components:
             ddl: |-
               SELECT
               region,
-              JSON_EXTRACT(Properties, '$.VerifiedAccessInstanceId') as verified_access_instance_id
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EC2::VerifiedAccessInstance'
+              JSON_EXTRACT(Properties, '$.VolumeId') as volume_id
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EC2::Volume'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres"
               ddl: |-
                 SELECT
                 region,
-                json_extract_path_text(Properties, 'VerifiedAccessInstanceId') as verified_access_instance_id
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EC2::VerifiedAccessInstance'
+                json_extract_path_text(Properties, 'VolumeId') as volume_id
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EC2::Volume'
                 AND region = 'us-east-1'
     volume_attachments:
       name: volume_attachments
       id: awscc.ec2.volume_attachments
       x-cfn-schema-name: VolumeAttachment
       x-cfn-type-name: AWS::EC2::VolumeAttachment
-      x-identifiers:
+      x-identifiers: &ref_80
         - VolumeId
         - InstanceId
       x-type: cloud_control
@@ -27254,9 +28454,7 @@ components:
       id: awscc.ec2.volume_attachments_list_only
       x-cfn-schema-name: VolumeAttachment
       x-cfn-type-name: AWS::EC2::VolumeAttachment
-      x-identifiers:
-        - VolumeId
-        - InstanceId
+      x-identifiers: *ref_80
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -27288,7 +28486,7 @@ components:
       id: awscc.ec2.vpcs
       x-cfn-schema-name: VPC
       x-cfn-type-name: AWS::EC2::VPC
-      x-identifiers:
+      x-identifiers: &ref_81
         - VpcId
       x-type: cloud_control
       methods:
@@ -27396,8 +28594,7 @@ components:
       id: awscc.ec2.vpcs_list_only
       x-cfn-schema-name: VPC
       x-cfn-type-name: AWS::EC2::VPC
-      x-identifiers:
-        - VpcId
+      x-identifiers: *ref_81
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -27427,7 +28624,7 @@ components:
       id: awscc.ec2.vpc_block_public_access_exclusions
       x-cfn-schema-name: VPCBlockPublicAccessExclusion
       x-cfn-type-name: AWS::EC2::VPCBlockPublicAccessExclusion
-      x-identifiers:
+      x-identifiers: &ref_82
         - ExclusionId
       x-type: cloud_control
       methods:
@@ -27521,8 +28718,7 @@ components:
       id: awscc.ec2.vpc_block_public_access_exclusions_list_only
       x-cfn-schema-name: VPCBlockPublicAccessExclusion
       x-cfn-type-name: AWS::EC2::VPCBlockPublicAccessExclusion
-      x-identifiers:
-        - ExclusionId
+      x-identifiers: *ref_82
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -27642,7 +28838,7 @@ components:
       id: awscc.ec2.vpc_cidr_blocks
       x-cfn-schema-name: VPCCidrBlock
       x-cfn-type-name: AWS::EC2::VPCCidrBlock
-      x-identifiers:
+      x-identifiers: &ref_83
         - Id
         - VpcId
       x-type: cloud_control
@@ -27736,9 +28932,7 @@ components:
       id: awscc.ec2.vpc_cidr_blocks_list_only
       x-cfn-schema-name: VPCCidrBlock
       x-cfn-type-name: AWS::EC2::VPCCidrBlock
-      x-identifiers:
-        - Id
-        - VpcId
+      x-identifiers: *ref_83
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -27770,7 +28964,7 @@ components:
       id: awscc.ec2.vpcdhcp_options_associations
       x-cfn-schema-name: VPCDHCPOptionsAssociation
       x-cfn-type-name: AWS::EC2::VPCDHCPOptionsAssociation
-      x-identifiers:
+      x-identifiers: &ref_84
         - DhcpOptionsId
         - VpcId
       x-type: cloud_control
@@ -27859,9 +29053,7 @@ components:
       id: awscc.ec2.vpcdhcp_options_associations_list_only
       x-cfn-schema-name: VPCDHCPOptionsAssociation
       x-cfn-type-name: AWS::EC2::VPCDHCPOptionsAssociation
-      x-identifiers:
-        - DhcpOptionsId
-        - VpcId
+      x-identifiers: *ref_84
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -27893,7 +29085,7 @@ components:
       id: awscc.ec2.vpc_endpoints
       x-cfn-schema-name: VPCEndpoint
       x-cfn-type-name: AWS::EC2::VPCEndpoint
-      x-identifiers:
+      x-identifiers: &ref_85
         - Id
       x-type: cloud_control
       methods:
@@ -28013,8 +29205,7 @@ components:
       id: awscc.ec2.vpc_endpoints_list_only
       x-cfn-schema-name: VPCEndpoint
       x-cfn-type-name: AWS::EC2::VPCEndpoint
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_85
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -28044,7 +29235,7 @@ components:
       id: awscc.ec2.vpc_endpoint_connection_notifications
       x-cfn-schema-name: VPCEndpointConnectionNotification
       x-cfn-type-name: AWS::EC2::VPCEndpointConnectionNotification
-      x-identifiers:
+      x-identifiers: &ref_86
         - VPCEndpointConnectionNotificationId
       x-type: cloud_control
       methods:
@@ -28138,8 +29329,7 @@ components:
       id: awscc.ec2.vpc_endpoint_connection_notifications_list_only
       x-cfn-schema-name: VPCEndpointConnectionNotification
       x-cfn-type-name: AWS::EC2::VPCEndpointConnectionNotification
-      x-identifiers:
-        - VPCEndpointConnectionNotificationId
+      x-identifiers: *ref_86
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -28169,7 +29359,7 @@ components:
       id: awscc.ec2.vpc_endpoint_services
       x-cfn-schema-name: VPCEndpointService
       x-cfn-type-name: AWS::EC2::VPCEndpointService
-      x-identifiers:
+      x-identifiers: &ref_87
         - ServiceId
       x-type: cloud_control
       methods:
@@ -28271,8 +29461,7 @@ components:
       id: awscc.ec2.vpc_endpoint_services_list_only
       x-cfn-schema-name: VPCEndpointService
       x-cfn-type-name: AWS::EC2::VPCEndpointService
-      x-identifiers:
-        - ServiceId
+      x-identifiers: *ref_87
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -28302,7 +29491,7 @@ components:
       id: awscc.ec2.vpc_endpoint_service_permissions
       x-cfn-schema-name: VPCEndpointServicePermissions
       x-cfn-type-name: AWS::EC2::VPCEndpointServicePermissions
-      x-identifiers:
+      x-identifiers: &ref_88
         - ServiceId
       x-type: cloud_control
       methods:
@@ -28390,8 +29579,7 @@ components:
       id: awscc.ec2.vpc_endpoint_service_permissions_list_only
       x-cfn-schema-name: VPCEndpointServicePermissions
       x-cfn-type-name: AWS::EC2::VPCEndpointServicePermissions
-      x-identifiers:
-        - ServiceId
+      x-identifiers: *ref_88
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -28421,7 +29609,7 @@ components:
       id: awscc.ec2.vpc_gateway_attachments
       x-cfn-schema-name: VPCGatewayAttachment
       x-cfn-type-name: AWS::EC2::VPCGatewayAttachment
-      x-identifiers:
+      x-identifiers: &ref_89
         - AttachmentType
         - VpcId
       x-type: cloud_control
@@ -28514,9 +29702,7 @@ components:
       id: awscc.ec2.vpc_gateway_attachments_list_only
       x-cfn-schema-name: VPCGatewayAttachment
       x-cfn-type-name: AWS::EC2::VPCGatewayAttachment
-      x-identifiers:
-        - AttachmentType
-        - VpcId
+      x-identifiers: *ref_89
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -28548,7 +29734,7 @@ components:
       id: awscc.ec2.vpc_peering_connections
       x-cfn-schema-name: VPCPeeringConnection
       x-cfn-type-name: AWS::EC2::VPCPeeringConnection
-      x-identifiers:
+      x-identifiers: &ref_90
         - Id
       x-type: cloud_control
       methods:
@@ -28646,8 +29832,7 @@ components:
       id: awscc.ec2.vpc_peering_connections_list_only
       x-cfn-schema-name: VPCPeeringConnection
       x-cfn-type-name: AWS::EC2::VPCPeeringConnection
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_90
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -28677,7 +29862,7 @@ components:
       id: awscc.ec2.vpn_connections
       x-cfn-schema-name: VPNConnection
       x-cfn-type-name: AWS::EC2::VPNConnection
-      x-identifiers:
+      x-identifiers: &ref_91
         - VpnConnectionId
       x-type: cloud_control
       methods:
@@ -28795,8 +29980,7 @@ components:
       id: awscc.ec2.vpn_connections_list_only
       x-cfn-schema-name: VPNConnection
       x-cfn-type-name: AWS::EC2::VPNConnection
-      x-identifiers:
-        - VpnConnectionId
+      x-identifiers: *ref_91
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -28826,7 +30010,7 @@ components:
       id: awscc.ec2.vpn_connection_routes
       x-cfn-schema-name: VPNConnectionRoute
       x-cfn-type-name: AWS::EC2::VPNConnectionRoute
-      x-identifiers:
+      x-identifiers: &ref_92
         - DestinationCidrBlock
         - VpnConnectionId
       x-type: cloud_control
@@ -28898,9 +30082,7 @@ components:
       id: awscc.ec2.vpn_connection_routes_list_only
       x-cfn-schema-name: VPNConnectionRoute
       x-cfn-type-name: AWS::EC2::VPNConnectionRoute
-      x-identifiers:
-        - DestinationCidrBlock
-        - VpnConnectionId
+      x-identifiers: *ref_92
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -28932,7 +30114,7 @@ components:
       id: awscc.ec2.vpn_gateways
       x-cfn-schema-name: VPNGateway
       x-cfn-type-name: AWS::EC2::VPNGateway
-      x-identifiers:
+      x-identifiers: &ref_93
         - VPNGatewayId
       x-type: cloud_control
       methods:
@@ -29024,8 +30206,7 @@ components:
       id: awscc.ec2.vpn_gateways_list_only
       x-cfn-schema-name: VPNGateway
       x-cfn-type-name: AWS::EC2::VPNGateway
-      x-identifiers:
-        - VPNGatewayId
+      x-identifiers: *ref_93
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -29799,90 +30980,6 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__NetworkInterface&__detailTransformed=true:
-    parameters:
-      - $ref: '#/components/parameters/X-Amz-Content-Sha256'
-      - $ref: '#/components/parameters/X-Amz-Date'
-      - $ref: '#/components/parameters/X-Amz-Algorithm'
-      - $ref: '#/components/parameters/X-Amz-Credential'
-      - $ref: '#/components/parameters/X-Amz-Security-Token'
-      - $ref: '#/components/parameters/X-Amz-Signature'
-      - $ref: '#/components/parameters/X-Amz-SignedHeaders'
-    post:
-      operationId: CreateNetworkInterface
-      parameters:
-        - description: Action Header
-          in: header
-          name: X-Amz-Target
-          required: false
-          schema:
-            default: CloudApiService.CreateResource
-            enum:
-              - CloudApiService.CreateResource
-            type: string
-        - in: header
-          name: Content-Type
-          required: false
-          schema:
-            default: application/x-amz-json-1.0
-            enum:
-              - application/x-amz-json-1.0
-            type: string
-      requestBody:
-        content:
-          application/x-amz-json-1.0:
-            schema:
-              $ref: '#/components/schemas/CreateNetworkInterfaceRequest'
-        required: true
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
-          description: Success
-  /?Action=CreateResource&Version=2021-09-30&__Volume&__detailTransformed=true:
-    parameters:
-      - $ref: '#/components/parameters/X-Amz-Content-Sha256'
-      - $ref: '#/components/parameters/X-Amz-Date'
-      - $ref: '#/components/parameters/X-Amz-Algorithm'
-      - $ref: '#/components/parameters/X-Amz-Credential'
-      - $ref: '#/components/parameters/X-Amz-Security-Token'
-      - $ref: '#/components/parameters/X-Amz-Signature'
-      - $ref: '#/components/parameters/X-Amz-SignedHeaders'
-    post:
-      operationId: CreateVolume
-      parameters:
-        - description: Action Header
-          in: header
-          name: X-Amz-Target
-          required: false
-          schema:
-            default: CloudApiService.CreateResource
-            enum:
-              - CloudApiService.CreateResource
-            type: string
-        - in: header
-          name: Content-Type
-          required: false
-          schema:
-            default: application/x-amz-json-1.0
-            enum:
-              - application/x-amz-json-1.0
-            type: string
-      requestBody:
-        content:
-          application/x-amz-json-1.0:
-            schema:
-              $ref: '#/components/schemas/CreateVolumeRequest'
-        required: true
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
-          description: Success
   /?Action=CreateResource&Version=2021-09-30&__Instance&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
@@ -30849,6 +31946,48 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
+  /?Action=CreateResource&Version=2021-09-30&__NetworkInterface&__detailTransformed=true:
+    parameters:
+      - $ref: '#/components/parameters/X-Amz-Content-Sha256'
+      - $ref: '#/components/parameters/X-Amz-Date'
+      - $ref: '#/components/parameters/X-Amz-Algorithm'
+      - $ref: '#/components/parameters/X-Amz-Credential'
+      - $ref: '#/components/parameters/X-Amz-Security-Token'
+      - $ref: '#/components/parameters/X-Amz-Signature'
+      - $ref: '#/components/parameters/X-Amz-SignedHeaders'
+    post:
+      operationId: CreateNetworkInterface
+      parameters:
+        - description: Action Header
+          in: header
+          name: X-Amz-Target
+          required: false
+          schema:
+            default: CloudApiService.CreateResource
+            enum:
+              - CloudApiService.CreateResource
+            type: string
+        - in: header
+          name: Content-Type
+          required: false
+          schema:
+            default: application/x-amz-json-1.0
+            enum:
+              - application/x-amz-json-1.0
+            type: string
+      requestBody:
+        content:
+          application/x-amz-json-1.0:
+            schema:
+              $ref: '#/components/schemas/CreateNetworkInterfaceRequest'
+        required: true
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
+          description: Success
   /?Action=CreateResource&Version=2021-09-30&__NetworkInterfaceAttachment&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
@@ -32571,6 +33710,48 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
+  /?Action=CreateResource&Version=2021-09-30&__VerifiedAccessInstance&__detailTransformed=true:
+    parameters:
+      - $ref: '#/components/parameters/X-Amz-Content-Sha256'
+      - $ref: '#/components/parameters/X-Amz-Date'
+      - $ref: '#/components/parameters/X-Amz-Algorithm'
+      - $ref: '#/components/parameters/X-Amz-Credential'
+      - $ref: '#/components/parameters/X-Amz-Security-Token'
+      - $ref: '#/components/parameters/X-Amz-Signature'
+      - $ref: '#/components/parameters/X-Amz-SignedHeaders'
+    post:
+      operationId: CreateVerifiedAccessInstance
+      parameters:
+        - description: Action Header
+          in: header
+          name: X-Amz-Target
+          required: false
+          schema:
+            default: CloudApiService.CreateResource
+            enum:
+              - CloudApiService.CreateResource
+            type: string
+        - in: header
+          name: Content-Type
+          required: false
+          schema:
+            default: application/x-amz-json-1.0
+            enum:
+              - application/x-amz-json-1.0
+            type: string
+      requestBody:
+        content:
+          application/x-amz-json-1.0:
+            schema:
+              $ref: '#/components/schemas/CreateVerifiedAccessInstanceRequest'
+        required: true
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
+          description: Success
   /?Action=CreateResource&Version=2021-09-30&__VerifiedAccessTrustProvider&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
@@ -32613,7 +33794,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__VerifiedAccessInstance&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__Volume&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -32623,7 +33804,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateVerifiedAccessInstance
+      operationId: CreateVolume
       parameters:
         - description: Action Header
           in: header
@@ -32646,7 +33827,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateVerifiedAccessInstanceRequest'
+              $ref: '#/components/schemas/CreateVolumeRequest'
         required: true
       responses:
         '200':
diff --git a/openapi/src/awscc/v00.00.00000/services/ecr.yaml b/openapi/src/awscc/v00.00.00000/services/ecr.yaml
index d8af3bae1..b36bdbf45 100644
--- a/openapi/src/awscc/v00.00.00000/services/ecr.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/ecr.yaml
@@ -442,15 +442,15 @@ components:
           type: string
           description: One part of a key-value pair that make up a tag. A ``key`` is a general label that acts like a category for more specific tag values.
           minLength: 1
-          maxLength: 128
+          maxLength: 127
         Value:
           type: string
           description: A ``value`` acts as a descriptor within a tag category (key).
-          minLength: 0
-          maxLength: 256
+          minLength: 1
+          maxLength: 255
       required:
-        - Key
         - Value
+        - Key
       additionalProperties: false
     PublicRepository:
       type: object
@@ -533,6 +533,62 @@ components:
           - ecr-public:DeleteRepository
         list:
           - ecr-public:DescribeRepositories
+    PullThroughCacheRule_PullThroughCacheRule:
+      minItems: 0
+      maxItems: 50
+      type: object
+      properties:
+        RegistryId:
+          $ref: '#/components/schemas/PullThroughCacheRule_RegistryId'
+        EcrRepositoryPrefix:
+          $ref: '#/components/schemas/EcrRepositoryPrefix'
+        UpstreamRegistryUrl:
+          $ref: '#/components/schemas/UpstreamRegistryUrl'
+        CredentialArn:
+          $ref: '#/components/schemas/CredentialArn'
+        UpstreamRegistry:
+          $ref: '#/components/schemas/UpstreamRegistry'
+        CustomRoleArn:
+          $ref: '#/components/schemas/CustomRoleArn'
+        UpstreamRepositoryPrefix:
+          $ref: '#/components/schemas/UpstreamRepositoryPrefix'
+      required:
+        - EcrRepositoryPrefix
+        - UpstreamRegistryUrl
+      additionalProperties: false
+      description: ''
+    PullThroughCacheRule_RegistryId:
+      type: string
+      description: The account ID of the registry pull-through cache repository will be created in.
+      pattern: ^[0-9]{12}$
+    EcrRepositoryPrefix:
+      type: string
+      description: The ECRRepositoryPrefix is a custom alias for upstream registry url.
+      minLength: 2
+      maxLength: 30
+      pattern: ^((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*/?|ROOT)$
+    UpstreamRegistryUrl:
+      type: string
+      description: The upstreamRegistryUrl is the endpoint of upstream registry url of the public repository to be cached
+    CredentialArn:
+      type: string
+      description: The Amazon Resource Name (ARN) of the AWS Secrets Manager secret that identifies the credentials to authenticate to the upstream registry.
+      minLength: 50
+      maxLength: 612
+      pattern: ^arn:aws:secretsmanager:[a-zA-Z0-9-:]+:secret:ecr\-pullthroughcache\/[a-zA-Z0-9\/_+=.@-]+$
+    UpstreamRegistry:
+      type: string
+      description: The name of the upstream registry.
+    CustomRoleArn:
+      type: string
+      description: The ARN of the IAM role to be assumed by Amazon ECR to authenticate to ECR upstream registry. This role must be in the same account as the registry that you are configuring.
+      maxLength: 2048
+    UpstreamRepositoryPrefix:
+      type: string
+      description: The repository name prefix of upstream registry to match with the upstream repository name. When this field isn't specified, Amazon ECR will use the `ROOT`.
+      minLength: 2
+      maxLength: 30
+      pattern: ^((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*/?|ROOT)$
     PullThroughCacheRule:
       type: object
       properties:
@@ -594,39 +650,17 @@ components:
           - ecr:DeletePullThroughCacheRule
         list:
           - ecr:DescribePullThroughCacheRules
-    EcrRepositoryPrefix:
-      type: string
-      description: The ECRRepositoryPrefix is a custom alias for upstream registry url.
-      minLength: 2
-      maxLength: 30
-      pattern: ^((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*/?|ROOT)$
-    UpstreamRegistryUrl:
+    RegistryPolicy_RegistryId:
       type: string
-      description: The upstreamRegistryUrl is the endpoint of upstream registry url of the public repository to be cached
-    CredentialArn:
-      type: string
-      description: The Amazon Resource Name (ARN) of the AWS Secrets Manager secret that identifies the credentials to authenticate to the upstream registry.
-      minLength: 50
-      maxLength: 612
-      pattern: ^arn:aws:secretsmanager:[a-zA-Z0-9-:]+:secret:ecr\-pullthroughcache\/[a-zA-Z0-9\/_+=.@-]+$
-    UpstreamRegistry:
-      type: string
-      description: The name of the upstream registry.
-    CustomRoleArn:
-      type: string
-      description: The ARN of the IAM role to be assumed by Amazon ECR to authenticate to ECR upstream registry. This role must be in the same account as the registry that you are configuring.
-      maxLength: 2048
-    UpstreamRepositoryPrefix:
-      type: string
-      description: The repository name prefix of upstream registry to match with the upstream repository name. When this field isn't specified, Amazon ECR will use the `ROOT`.
-      minLength: 2
-      maxLength: 30
-      pattern: ^((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*/?|ROOT)$
+      description: The registry id.
+      minLength: 12
+      maxLength: 12
+      pattern: ^[0-9]{12}$
     RegistryPolicy:
       type: object
       properties:
         RegistryId:
-          $ref: '#/components/schemas/RegistryId'
+          $ref: '#/components/schemas/RegistryPolicy_RegistryId'
           description: ''
         PolicyText:
           type: object
@@ -691,10 +725,10 @@ components:
       properties:
         Filter:
           $ref: '#/components/schemas/Filter'
-          description: The repository filter details. When the ``PREFIX_MATCH`` filter type is specified, this value is required and should be the repository name prefix to configure replication for.
+          description: The filter to use when scanning.
         FilterType:
           $ref: '#/components/schemas/FilterType'
-          description: The repository filter type. The only supported value is ``PREFIX_MATCH``, which is a repository name prefix specified with the ``filter`` parameter.
+          description: The type associated with the filter.
       description: The filter settings used with image replication. Specifying a repository filter to a replication rule provides a method for controlling which repositories in a private registry are replicated. If no filters are added, the contents of all repositories are replicated.
       required:
         - Filter
@@ -702,13 +736,13 @@ components:
       additionalProperties: false
     Filter:
       type: string
-      description: The repository filter to be applied for replication.
-      pattern: ^(?:[a-z0-9]+(?:[._-][a-z0-9]*)*/)*[a-z0-9]*(?:[._-][a-z0-9]*)*$
+      description: The filter to use when scanning.
+      pattern: ^[a-z0-9*](?:[._\-/a-z0-9*]?[a-z0-9*]+)*$
     FilterType:
-      description: Type of repository filter
+      description: The type associated with the filter.
       type: string
       enum:
-        - PREFIX_MATCH
+        - WILDCARD
     ScanFrequency:
       description: The frequency that scans are performed.
       type: string
@@ -721,6 +755,10 @@ components:
       enum:
         - BASIC
         - ENHANCED
+    RegistryScanningConfiguration_RegistryId:
+      type: string
+      description: The registry id.
+      pattern: ^[0-9]{12}$
     RegistryScanningConfiguration:
       type: object
       properties:
@@ -731,7 +769,7 @@ components:
           $ref: '#/components/schemas/ScanType'
           description: The type of scanning configured for the registry.
         RegistryId:
-          $ref: '#/components/schemas/RegistryId'
+          $ref: '#/components/schemas/RegistryScanningConfiguration_RegistryId'
           description: ''
       required:
         - Rules
@@ -770,11 +808,91 @@ components:
           - inspector2:Disable
         list:
           - ecr:GetRegistryScanningConfiguration
+    ReplicationConfiguration_ReplicationConfiguration:
+      type: object
+      properties:
+        Rules:
+          type: array
+          minItems: 0
+          maxItems: 10
+          items:
+            $ref: '#/components/schemas/ReplicationRule'
+          description: An array of objects representing the replication destinations and repository filters for a replication configuration.
+      description: The replication configuration for a registry.
+      required:
+        - Rules
+      additionalProperties: false
+    ReplicationRule:
+      type: object
+      properties:
+        RepositoryFilters:
+          type: array
+          minItems: 0
+          maxItems: 100
+          items:
+            $ref: '#/components/schemas/ReplicationConfiguration_RepositoryFilter'
+          description: An array of objects representing the filters for a replication rule. Specifying a repository filter for a replication rule provides a method for controlling which repositories in a private registry are replicated.
+        Destinations:
+          type: array
+          minItems: 1
+          maxItems: 100
+          items:
+            $ref: '#/components/schemas/ReplicationDestination'
+          description: An array of objects representing the destination for a replication rule.
+      description: An array of objects representing the replication destinations and repository filters for a replication configuration.
+      required:
+        - Destinations
+      additionalProperties: false
+    ReplicationConfiguration_RepositoryFilter:
+      type: object
+      properties:
+        Filter:
+          $ref: '#/components/schemas/ReplicationConfiguration_Filter'
+          description: The repository filter details. When the ``PREFIX_MATCH`` filter type is specified, this value is required and should be the repository name prefix to configure replication for.
+        FilterType:
+          $ref: '#/components/schemas/ReplicationConfiguration_FilterType'
+          description: The repository filter type. The only supported value is ``PREFIX_MATCH``, which is a repository name prefix specified with the ``filter`` parameter.
+      description: The filter settings used with image replication. Specifying a repository filter to a replication rule provides a method for controlling which repositories in a private registry are replicated. If no filters are added, the contents of all repositories are replicated.
+      required:
+        - Filter
+        - FilterType
+      additionalProperties: false
+    ReplicationConfiguration_Filter:
+      type: string
+      description: The repository filter to be applied for replication.
+      pattern: ^(?:[a-z0-9]+(?:[._-][a-z0-9]*)*/)*[a-z0-9]*(?:[._-][a-z0-9]*)*$
+    ReplicationConfiguration_FilterType:
+      description: Type of repository filter
+      type: string
+      enum:
+        - PREFIX_MATCH
+    ReplicationDestination:
+      type: object
+      properties:
+        Region:
+          $ref: '#/components/schemas/Region'
+          description: The Region to replicate to.
+        RegistryId:
+          $ref: '#/components/schemas/ReplicationConfiguration_RegistryId'
+          description: The AWS account ID of the Amazon ECR private registry to replicate to. When configuring cross-Region replication within your own registry, specify your own account ID.
+      description: An array of objects representing the destination for a replication rule.
+      required:
+        - Region
+        - RegistryId
+      additionalProperties: false
+    ReplicationConfiguration_RegistryId:
+      type: string
+      description: The account ID of the destination registry to replicate to.
+      pattern: ^[0-9]{12}$
+    Region:
+      description: A Region to replicate to.
+      type: string
+      pattern: '[0-9a-z-]{2,25}'
     ReplicationConfiguration:
       type: object
       properties:
         ReplicationConfiguration:
-          $ref: '#/components/schemas/ReplicationConfiguration'
+          $ref: '#/components/schemas/ReplicationConfiguration_ReplicationConfiguration'
           description: The replication configuration for a registry.
         RegistryId:
           type: string
@@ -812,45 +930,6 @@ components:
           - iam:CreateServiceLinkedRole
         list:
           - ecr:DescribeRegistry
-    ReplicationRule:
-      type: object
-      properties:
-        RepositoryFilters:
-          type: array
-          minItems: 0
-          maxItems: 100
-          items:
-            $ref: '#/components/schemas/RepositoryFilter'
-          description: An array of objects representing the filters for a replication rule. Specifying a repository filter for a replication rule provides a method for controlling which repositories in a private registry are replicated.
-        Destinations:
-          type: array
-          minItems: 1
-          maxItems: 100
-          items:
-            $ref: '#/components/schemas/ReplicationDestination'
-          description: An array of objects representing the destination for a replication rule.
-      description: An array of objects representing the replication destinations and repository filters for a replication configuration.
-      required:
-        - Destinations
-      additionalProperties: false
-    ReplicationDestination:
-      type: object
-      properties:
-        Region:
-          $ref: '#/components/schemas/Region'
-          description: The Region to replicate to.
-        RegistryId:
-          $ref: '#/components/schemas/RegistryId'
-          description: The AWS account ID of the Amazon ECR private registry to replicate to. When configuring cross-Region replication within your own registry, specify your own account ID.
-      description: An array of objects representing the destination for a replication rule.
-      required:
-        - Region
-        - RegistryId
-      additionalProperties: false
-    Region:
-      description: A Region to replicate to.
-      type: string
-      pattern: '[0-9a-z-]{2,25}'
     LifecyclePolicy:
       type: object
       description: The ``LifecyclePolicy`` property type specifies a lifecycle policy. For information about lifecycle policy syntax, see [Lifecycle policy template](https://docs.aws.amazon.com/AmazonECR/latest/userguide/LifecyclePolicies.html) in the *Amazon ECR User Guide*.
@@ -919,16 +998,11 @@ components:
       description: Overrides the default image tag mutability setting of the repository for image tags that match the specified filters.
       properties:
         ImageTagMutabilityExclusionFilterType:
-          type: string
+          $ref: '#/components/schemas/ImageTagMutabilityExclusionFilterType'
           description: ''
-          enum:
-            - WILDCARD
         ImageTagMutabilityExclusionFilterValue:
-          type: string
+          $ref: '#/components/schemas/ImageTagMutabilityExclusionFilterValue'
           description: ''
-          minLength: 1
-          maxLength: 128
-          pattern: ^[0-9a-zA-Z._*-]{1,128}
       required:
         - ImageTagMutabilityExclusionFilterType
         - ImageTagMutabilityExclusionFilterValue
@@ -1057,12 +1131,49 @@ components:
           - kms:RetireGrant
         list:
           - ecr:DescribeRepositories
+    RepositoryCreationTemplate_Tag:
+      description: The metadata to apply to a resource to help you categorize and organize them. Each tag consists of a key and a value, both of which you define. Tag keys can have a maximum character length of 128 characters, and tag values can have a maximum length of 256 characters.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: One part of a key-value pair that make up a tag. A ``key`` is a general label that acts like a category for more specific tag values.
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: A ``value`` acts as a descriptor within a tag category (key).
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     AppliedForItem:
       type: string
       description: Enumerable Strings representing the repository creation scenarios that the template will apply towards.
       enum:
         - REPLICATION
         - PULL_THROUGH_CACHE
+    RepositoryCreationTemplate_ImageTagMutabilityExclusionFilter:
+      type: object
+      description: Overrides the default image tag mutability setting of the repository for image tags that match the specified filters.
+      properties:
+        ImageTagMutabilityExclusionFilterType:
+          type: string
+          description: ''
+          enum:
+            - WILDCARD
+        ImageTagMutabilityExclusionFilterValue:
+          type: string
+          description: ''
+          minLength: 1
+          maxLength: 128
+          pattern: ^[0-9a-zA-Z._*-]{1,128}
+      required:
+        - ImageTagMutabilityExclusionFilterType
+        - ImageTagMutabilityExclusionFilterValue
+      additionalProperties: false
     RepositoryCreationTemplate:
       type: object
       properties:
@@ -1092,7 +1203,7 @@ components:
           maxItems: 5
           x-insertionOrder: true
           items:
-            $ref: '#/components/schemas/ImageTagMutabilityExclusionFilter'
+            $ref: '#/components/schemas/RepositoryCreationTemplate_ImageTagMutabilityExclusionFilter'
         RepositoryPolicy:
           type: string
           description: The repository policy to apply to repositories created using the template. A repository policy is a permissions policy associated with a repository to control access permissions.
@@ -1111,7 +1222,7 @@ components:
           x-insertionOrder: false
           description: The metadata to apply to the repository to help you categorize and organize. Each tag consists of a key and an optional value, both of which you define. Tag keys can have a maximum character length of 128 characters, and tag values can have a maximum length of 256 characters.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/RepositoryCreationTemplate_Tag'
         AppliedFor:
           type: array
           uniqueItems: true
@@ -1273,7 +1384,7 @@ components:
           type: object
           properties:
             RegistryId:
-              $ref: '#/components/schemas/RegistryId'
+              $ref: '#/components/schemas/RegistryPolicy_RegistryId'
               description: ''
             PolicyText:
               type: object
@@ -1302,7 +1413,7 @@ components:
               $ref: '#/components/schemas/ScanType'
               description: The type of scanning configured for the registry.
             RegistryId:
-              $ref: '#/components/schemas/RegistryId'
+              $ref: '#/components/schemas/RegistryScanningConfiguration_RegistryId'
               description: ''
           x-stackQL-stringOnly: true
       x-title: CreateRegistryScanningConfigurationRequest
@@ -1322,7 +1433,7 @@ components:
           type: object
           properties:
             ReplicationConfiguration:
-              $ref: '#/components/schemas/ReplicationConfiguration'
+              $ref: '#/components/schemas/ReplicationConfiguration_ReplicationConfiguration'
               description: The replication configuration for a registry.
             RegistryId:
               type: string
@@ -1441,7 +1552,7 @@ components:
               maxItems: 5
               x-insertionOrder: true
               items:
-                $ref: '#/components/schemas/ImageTagMutabilityExclusionFilter'
+                $ref: '#/components/schemas/RepositoryCreationTemplate_ImageTagMutabilityExclusionFilter'
             RepositoryPolicy:
               type: string
               description: The repository policy to apply to repositories created using the template. A repository policy is a permissions policy associated with a repository to control access permissions.
@@ -1460,7 +1571,7 @@ components:
               x-insertionOrder: false
               description: The metadata to apply to the repository to help you categorize and organize. Each tag consists of a key and an optional value, both of which you define. Tag keys can have a maximum character length of 128 characters, and tag values can have a maximum length of 256 characters.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/RepositoryCreationTemplate_Tag'
             AppliedFor:
               type: array
               uniqueItems: true
@@ -1496,7 +1607,7 @@ components:
       id: awscc.ecr.public_repositories
       x-cfn-schema-name: PublicRepository
       x-cfn-type-name: AWS::ECR::PublicRepository
-      x-identifiers:
+      x-identifiers: &ref_0
         - RepositoryName
       x-type: cloud_control
       methods:
@@ -1590,8 +1701,7 @@ components:
       id: awscc.ecr.public_repositories_list_only
       x-cfn-schema-name: PublicRepository
       x-cfn-type-name: AWS::ECR::PublicRepository
-      x-identifiers:
-        - RepositoryName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1621,7 +1731,7 @@ components:
       id: awscc.ecr.pull_through_cache_rules
       x-cfn-schema-name: PullThroughCacheRule
       x-cfn-type-name: AWS::ECR::PullThroughCacheRule
-      x-identifiers:
+      x-identifiers: &ref_1
         - EcrRepositoryPrefix
       x-type: cloud_control
       methods:
@@ -1717,8 +1827,7 @@ components:
       id: awscc.ecr.pull_through_cache_rules_list_only
       x-cfn-schema-name: PullThroughCacheRule
       x-cfn-type-name: AWS::ECR::PullThroughCacheRule
-      x-identifiers:
-        - EcrRepositoryPrefix
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1748,7 +1857,7 @@ components:
       id: awscc.ecr.registry_policies
       x-cfn-schema-name: RegistryPolicy
       x-cfn-type-name: AWS::ECR::RegistryPolicy
-      x-identifiers:
+      x-identifiers: &ref_2
         - RegistryId
       x-type: cloud_control
       methods:
@@ -1836,8 +1945,7 @@ components:
       id: awscc.ecr.registry_policies_list_only
       x-cfn-schema-name: RegistryPolicy
       x-cfn-type-name: AWS::ECR::RegistryPolicy
-      x-identifiers:
-        - RegistryId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1867,7 +1975,7 @@ components:
       id: awscc.ecr.registry_scanning_configurations
       x-cfn-schema-name: RegistryScanningConfiguration
       x-cfn-type-name: AWS::ECR::RegistryScanningConfiguration
-      x-identifiers:
+      x-identifiers: &ref_3
         - RegistryId
       x-type: cloud_control
       methods:
@@ -1957,8 +2065,7 @@ components:
       id: awscc.ecr.registry_scanning_configurations_list_only
       x-cfn-schema-name: RegistryScanningConfiguration
       x-cfn-type-name: AWS::ECR::RegistryScanningConfiguration
-      x-identifiers:
-        - RegistryId
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1988,7 +2095,7 @@ components:
       id: awscc.ecr.replication_configurations
       x-cfn-schema-name: ReplicationConfiguration
       x-cfn-type-name: AWS::ECR::ReplicationConfiguration
-      x-identifiers:
+      x-identifiers: &ref_4
         - RegistryId
       x-type: cloud_control
       methods:
@@ -2076,8 +2183,7 @@ components:
       id: awscc.ecr.replication_configurations_list_only
       x-cfn-schema-name: ReplicationConfiguration
       x-cfn-type-name: AWS::ECR::ReplicationConfiguration
-      x-identifiers:
-        - RegistryId
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2107,7 +2213,7 @@ components:
       id: awscc.ecr.repositories
       x-cfn-schema-name: Repository
       x-cfn-type-name: AWS::ECR::Repository
-      x-identifiers:
+      x-identifiers: &ref_5
         - RepositoryName
       x-type: cloud_control
       methods:
@@ -2213,8 +2319,7 @@ components:
       id: awscc.ecr.repositories_list_only
       x-cfn-schema-name: Repository
       x-cfn-type-name: AWS::ECR::Repository
-      x-identifiers:
-        - RepositoryName
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2244,7 +2349,7 @@ components:
       id: awscc.ecr.repository_creation_templates
       x-cfn-schema-name: RepositoryCreationTemplate
       x-cfn-type-name: AWS::ECR::RepositoryCreationTemplate
-      x-identifiers:
+      x-identifiers: &ref_6
         - Prefix
       x-type: cloud_control
       methods:
@@ -2352,8 +2457,7 @@ components:
       id: awscc.ecr.repository_creation_templates_list_only
       x-cfn-schema-name: RepositoryCreationTemplate
       x-cfn-type-name: AWS::ECR::RepositoryCreationTemplate
-      x-identifiers:
-        - Prefix
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/ecs.yaml b/openapi/src/awscc/v00.00.00000/services/ecs.yaml
index d21d9fe12..e7e64fbf6 100644
--- a/openapi/src/awscc/v00.00.00000/services/ecs.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/ecs.yaml
@@ -433,29 +433,94 @@ components:
       type: object
       properties:
         Value:
+          minLength: 1
           type: string
         Key:
+          minLength: 1
           type: string
     CapacityProvider:
-      description: If using ec2 auto-scaling, the name of the associated capacity provider. Otherwise FARGATE, FARGATE_SPOT.
-      anyOf:
-        - type: string
-          enum:
-            - FARGATE
-            - FARGATE_SPOT
-        - minLength: 1
+      type: object
+      properties:
+        AutoScalingGroupProvider:
+          $ref: '#/components/schemas/AutoScalingGroupProvider'
+        Tags:
+          type: array
+          items:
+            $ref: '#/components/schemas/Tag'
+        Name:
           type: string
-          maxLength: 2048
-      type: string
+      x-stackql-resource-name: capacity_provider
+      description: Resource Type definition for AWS::ECS::CapacityProvider.
+      x-type-name: AWS::ECS::CapacityProvider
+      x-stackql-primary-identifier:
+        - Name
+      x-create-only-properties:
+        - AutoScalingGroupProvider/AutoScalingGroupArn
+        - Name
+      x-tagging:
+        permissions:
+          - ecs:TagResource
+          - ecs:UntagResource
+          - ecs:ListTagsForResource
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        tagProperty: /properties/Tags
+        cloudFormationSystemTags: true
+      x-required-permissions:
+        read:
+          - ecs:DescribeCapacityProviders
+        create:
+          - autoscaling:CreateOrUpdateTags
+          - ecs:CreateCapacityProvider
+          - ecs:DescribeCapacityProviders
+          - ecs:TagResource
+        update:
+          - ecs:UpdateCapacityProvider
+          - ecs:DescribeCapacityProviders
+          - ecs:ListTagsForResource
+          - ecs:TagResource
+          - ecs:UntagResource
+        list:
+          - ecs:DescribeCapacityProviders
+        delete:
+          - ecs:DescribeCapacityProviders
+          - ecs:DeleteCapacityProvider
     CapacityProviderStrategyItem:
+      description: The ``CapacityProviderStrategyItem`` property specifies the details of the default capacity provider strategy for the cluster. When services or tasks are run in the cluster with no launch type or capacity provider strategy specified, the default capacity provider strategy is used.
       additionalProperties: false
       type: object
       properties:
         CapacityProvider:
+          description: The short name of the capacity provider.
           type: string
-        Base:
-          type: integer
         Weight:
+          description: |-
+            The *weight* value designates the relative percentage of the total number of tasks launched that should use the specified capacity provider. The ``weight`` value is taken into consideration after the ``base`` value, if defined, is satisfied.
+             If no ``weight`` value is specified, the default value of ``0`` is used. When multiple capacity providers are specified within a capacity provider strategy, at least one of the capacity providers must have a weight value greater than zero and any capacity providers with a weight of ``0`` can't be used to place tasks. If you specify multiple capacity providers in a strategy that all have a weight of ``0``, any ``RunTask`` or ``CreateService`` actions using the capacity provider strategy will fail.
+             Weight value characteristics:
+              +  Weight is considered after the base value is satisfied
+              +  Default value is ``0`` if not specified
+              +  Valid range: 0 to 1,000
+              +  At least one capacity provider must have a weight greater than zero
+              +  Capacity providers with weight of ``0`` cannot place tasks
+              
+             Task distribution logic:
+              1.  Base satisfaction: The minimum number of tasks specified by the base value are placed on that capacity provider
+              1.  Weight distribution: After base requirements are met, additional tasks are distributed according to weight ratios
+              
+             Examples:
+             Equal Distribution: Two capacity providers both with weight ``1`` will split tasks evenly after base requirements are met.
+             Weighted Distribution: If capacityProviderA has weight ``1`` and capacityProviderB has weight ``4``, then for every 1 task on A, 4 tasks will run on B.
+          type: integer
+        Base:
+          description: |-
+            The *base* value designates how many tasks, at a minimum, to run on the specified capacity provider for each service. Only one capacity provider in a capacity provider strategy can have a *base* defined. If no value is specified, the default value of ``0`` is used.
+             Base value characteristics:
+              +  Only one capacity provider in a strategy can have a base defined
+              +  Default value is ``0`` if not specified
+              +  Valid range: 0 to 100,000
+              +  Base requirements are satisfied first before weight distribution
           type: integer
     ExecuteCommandLogConfiguration:
       description: The log configuration for the results of the execute command actions. The logs can be sent to CloudWatch Logs or an Amazon S3 bucket.
@@ -532,6 +597,26 @@ components:
              If you update the cluster with an empty string ``""`` for the namespace name, the cluster configuration for Service Connect is removed. Note that the namespace will remain in CMAP and must be deleted separately.
              For more information about CMAPlong, see [Working with Services](https://docs.aws.amazon.com/cloud-map/latest/dg/working-with-services.html) in the *Developer Guide*.
           type: string
+    Cluster_Tag:
+      description: |-
+        The metadata that you apply to a resource to help you categorize and organize them. Each tag consists of a key and an optional value. You define them.
+         The following basic restrictions apply to tags:
+          +  Maximum number of tags per resource - 50
+          +  For each resource, each tag key must be unique, and each tag key can have only one value.
+          +  Maximum key length - 128 Unicode characters in UTF-8
+          +  Maximum value length - 256 Unicode characters in UTF-8
+          +  If your tagging schema is used across multiple services and resources, remember that other services may have restrictions on allowed characters. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following characters: + - = . _ : / @.
+          +  Tag keys and values are case-sensitive.
+          +  Do not use ``aws:``, ``AWS:``, or any upper or lowercase combination of such as a prefix for either keys or values as it is reserved for AWS use. You cannot edit or delete tag keys or values with this prefix. Tags with this prefix do not count against your tags per resource limit.
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          description: The optional part of a key-value pair that make up a tag. A ``value`` acts as a descriptor within a tag category (key).
+          type: string
+        Key:
+          description: One part of a key-value pair that make up a tag. A ``key`` is a general label that acts like a category for more specific tag values.
+          type: string
     ClusterConfiguration:
       description: The execute command and managed storage configuration for the cluster.
       additionalProperties: false
@@ -562,27 +647,141 @@ components:
           description: The log configuration for the results of the execute command actions. The logs can be sent to CloudWatch Logs or an Amazon S3 bucket. When ``logging=OVERRIDE`` is specified, a ``logConfiguration`` must be provided.
           $ref: '#/components/schemas/ExecuteCommandLogConfiguration'
     Cluster:
-      minLength: 1
-      description: The name of the cluster
-      type: string
-      maxLength: 2048
+      type: object
+      properties:
+        ClusterSettings:
+          description: |-
+            The settings to use when creating a cluster. This parameter is used to turn on CloudWatch Container Insights with enhanced observability or CloudWatch Container Insights for a cluster.
+             Container Insights with enhanced observability provides all the Container Insights metrics, plus additional task and container metrics. This version supports enhanced observability for Amazon ECS clusters using the Amazon EC2 and Fargate launch types. After you configure Container Insights with enhanced observability on Amazon ECS, Container Insights auto-collects detailed infrastructure telemetry from the cluster level down to the container level in your environment and displays these critical performance data in curated dashboards removing the heavy lifting in observability set-up. 
+             For more information, see [Monitor Amazon ECS containers using Container Insights with enhanced observability](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/cloudwatch-container-insights.html) in the *Amazon Elastic Container Service Developer Guide*.
+          type: array
+          items:
+            $ref: '#/components/schemas/ClusterSettings'
+        DefaultCapacityProviderStrategy:
+          description: The default capacity provider strategy for the cluster. When services or tasks are run in the cluster with no launch type or capacity provider strategy specified, the default capacity provider strategy is used.
+          type: array
+          items:
+            $ref: '#/components/schemas/CapacityProviderStrategyItem'
+        Configuration:
+          description: The execute command and managed storage configuration for the cluster.
+          $ref: '#/components/schemas/ClusterConfiguration'
+        ServiceConnectDefaults:
+          description: >-
+            Use this parameter to set a default Service Connect namespace. After you set a default Service Connect namespace, any new services with Service Connect turned on that are created in the cluster are added as client services in the namespace. This setting only applies to new services that set the ``enabled`` parameter to ``true`` in the ``ServiceConnectConfiguration``. You can set the namespace of each service individually in the ``ServiceConnectConfiguration`` to override this default
+            parameter.
+             Tasks that run in a namespace can use short names to connect to services in the namespace. Tasks can connect to services across all of the clusters in the namespace. Tasks connect through a managed proxy container that collects logs and metrics for increased visibility. Only the tasks that Amazon ECS services create are supported with Service Connect. For more information, see [Service Connect](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/service-connect.html) in the *Amazon Elastic Container Service Developer Guide*.
+          $ref: '#/components/schemas/ServiceConnectDefaults'
+        CapacityProviders:
+          description: |-
+            The short name of one or more capacity providers to associate with the cluster. A capacity provider must be associated with a cluster before it can be included as part of the default capacity provider strategy of the cluster or used in a capacity provider strategy when calling the [CreateService](https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_CreateService.html) or [RunTask](https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_RunTask.html) actions.
+             If specifying a capacity provider that uses an Auto Scaling group, the capacity provider must be created but not associated with another cluster. New Auto Scaling group capacity providers can be created with the [CreateCapacityProvider](https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_CreateCapacityProvider.html) API operation.
+             To use a FARGATElong capacity provider, specify either the ``FARGATE`` or ``FARGATE_SPOT`` capacity providers. The FARGATElong capacity providers are available to all accounts and only need to be associated with a cluster to be used.
+             The [PutCapacityProvider](https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_PutCapacityProvider.html) API operation is used to update the list of available capacity providers for a cluster after the cluster is created.
+          type: array
+          items:
+            type: string
+        ClusterName:
+          description: A user-generated string that you use to identify your cluster. If you don't specify a name, CFNlong generates a unique physical ID for the name.
+          type: string
+        Arn:
+          description: ''
+          type: string
+        Tags:
+          description: |-
+            The metadata that you apply to the cluster to help you categorize and organize them. Each tag consists of a key and an optional value. You define both.
+             The following basic restrictions apply to tags:
+              +  Maximum number of tags per resource - 50
+              +  For each resource, each tag key must be unique, and each tag key can have only one value.
+              +  Maximum key length - 128 Unicode characters in UTF-8
+              +  Maximum value length - 256 Unicode characters in UTF-8
+              +  If your tagging schema is used across multiple services and resources, remember that other services may have restrictions on allowed characters. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following characters: + - = . _ : / @.
+              +  Tag keys and values are case-sensitive.
+              +  Do not use ``aws:``, ``AWS:``, or any upper or lowercase combination of such as a prefix for either keys or values as it is reserved for AWS use. You cannot edit or delete tag keys or values with this prefix. Tags with this prefix do not count against your tags per resource limit.
+          type: array
+          items:
+            $ref: '#/components/schemas/Cluster_Tag'
+      x-stackql-resource-name: cluster
+      description: The ``AWS::ECS::Cluster`` resource creates an Amazon Elastic Container Service (Amazon ECS) cluster.
+      x-type-name: AWS::ECS::Cluster
+      x-stackql-primary-identifier:
+        - ClusterName
+      x-create-only-properties:
+        - ClusterName
+      x-write-only-properties:
+        - ServiceConnectDefaults
+      x-read-only-properties:
+        - Arn
+      x-tagging:
+        permissions:
+          - ecs:TagResource
+          - ecs:UntagResource
+          - ecs:ListTagsForResource
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        tagProperty: /properties/Tags
+        cloudFormationSystemTags: true
+      x-required-permissions:
+        read:
+          - ecs:DescribeClusters
+          - kms:DescribeKey
+        create:
+          - ecs:CreateCluster
+          - ecs:DescribeClusters
+          - iam:CreateServiceLinkedRole
+          - ecs:TagResource
+          - kms:DescribeKey
+        update:
+          - ecs:PutAccountSettingDefault
+          - ecs:DescribeClusters
+          - ecs:TagResource
+          - ecs:UntagResource
+          - ecs:PutAccountSetting
+          - ecs:ListTagsForResource
+          - ecs:UpdateCluster
+          - ecs:UpdateClusterSettings
+          - ecs:PutClusterCapacityProviders
+          - kms:DescribeKey
+        list:
+          - ecs:DescribeClusters
+          - ecs:ListClusters
+        delete:
+          - ecs:DeleteCluster
+          - ecs:DescribeClusters
+          - kms:DescribeKey
     DefaultCapacityProviderStrategy:
       description: List of capacity providers to associate with the cluster
       type: array
       items:
         $ref: '#/components/schemas/CapacityProviderStrategy'
+    ClusterCapacityProviderAssociations_CapacityProvider:
+      description: If using ec2 auto-scaling, the name of the associated capacity provider. Otherwise FARGATE, FARGATE_SPOT.
+      anyOf:
+        - type: string
+          enum:
+            - FARGATE
+            - FARGATE_SPOT
+        - minLength: 1
+          type: string
+          maxLength: 2048
+      type: string
     CapacityProviders:
       uniqueItems: true
       description: List of capacity providers to associate with the cluster
       type: array
       items:
-        $ref: '#/components/schemas/CapacityProvider'
+        $ref: '#/components/schemas/ClusterCapacityProviderAssociations_CapacityProvider'
+    ClusterCapacityProviderAssociations_Cluster:
+      minLength: 1
+      description: The name of the cluster
+      type: string
+      maxLength: 2048
     CapacityProviderStrategy:
       additionalProperties: false
       type: object
       properties:
         CapacityProvider:
-          $ref: '#/components/schemas/CapacityProvider'
+          $ref: '#/components/schemas/ClusterCapacityProviderAssociations_CapacityProvider'
         Base:
           maximum: 100000
           type: integer
@@ -601,7 +800,7 @@ components:
         CapacityProviders:
           $ref: '#/components/schemas/CapacityProviders'
         Cluster:
-          $ref: '#/components/schemas/Cluster'
+          $ref: '#/components/schemas/ClusterCapacityProviderAssociations_Cluster'
       required:
         - CapacityProviders
         - Cluster
@@ -743,11 +942,18 @@ components:
       required:
         - Type
     LogConfiguration:
-      description: The ``LogConfiguration`` property specifies log configuration options to send to a custom log driver for the container.
+      description: |-
+        The log configuration for the container. This parameter maps to ``LogConfig`` in the docker container create command and the ``--log-driver`` option to docker run.
+         By default, containers use the same logging driver that the Docker daemon uses. However, the container might use a different logging driver than the Docker daemon by specifying a log driver configuration in the container definition.
+         Understand the following when specifying a log configuration for your containers.
+          +  Amazon ECS currently supports a subset of the logging drivers available to the Docker daemon. Additional log drivers may be available in future releases of the Amazon ECS container agent.
+         For tasks on FARGATElong, the supported log drivers are ``awslogs``, ``splunk``, and ``awsfirelens``.
+         For tasks hosted on Amazon EC2 instances, the supported log drivers are ``awslogs``, ``fluentd``, ``gelf``, ``json-file``, ``journald``,``syslog``, ``splunk``, and ``awsfirelens``.
+          +  This parameter requires version 1.18 of the Docker Remote API or greater on your container instance.
+          +  For tasks that are hosted on Amazon EC2 instances, the Amazon ECS container agent must register the available logging drivers with the ``ECS_AVAILABLE_LOGGING_DRIVERS`` environment variable before containers placed on that instance can use these log configuration options. For more information, see [Amazon ECS container agent configuration](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-agent-config.html) in the *Amazon Elastic Container Service Developer Guide*.
+          +  For tasks that are on FARGATElong, because you don't have access to the underlying infrastructure your tasks are hosted on, any additional software needed must be installed outside of the task. For example, the Fluentd output aggregators or a remote host running Logstash to send Gelf logs to.
       additionalProperties: false
       type: object
-      required:
-        - LogDriver
       properties:
         SecretOptions:
           description: The secrets to pass to the log configuration. For more information, see [Specifying sensitive data](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/specifying-sensitive-data.html) in the *Amazon Elastic Container Service Developer Guide*.
@@ -846,11 +1052,14 @@ components:
           description: The name of the volume. This value must match the volume name from the ``Volume`` object in the task definition.
           type: string
     NetworkConfiguration:
-      description: An object representing the network configuration for a task or service.
+      description: The network configuration for a task or service.
       additionalProperties: false
       type: object
       properties:
-        AwsVpcConfiguration:
+        AwsvpcConfiguration:
+          description: |-
+            The VPC subnets and security groups that are associated with a task.
+              All specified subnets and security groups must be from the same VPC.
           $ref: '#/components/schemas/AwsVpcConfiguration'
     ServiceConnectTestTrafficRulesHeaderValue:
       description: ''
@@ -899,7 +1108,7 @@ components:
           description: The tags applied to this Amazon EBS volume. ``AmazonECSCreated`` and ``AmazonECSManaged`` are reserved tags that can't be used.
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Service_Tag'
     AdvancedConfiguration:
       description: The advanced settings for a load balancer used in blue/green deployments. Specify the alternate target group, listener rules, and IAM role required for traffic shifting during blue/green deployments. For more information, see [Required resources for Amazon ECS blue/green deployments](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/blue-green-deployment-implementation.html) in the *Amazon Elastic Container Service Developer Guide*.
       additionalProperties: false
@@ -919,6 +1128,46 @@ components:
           type: string
       required:
         - AlternateTargetGroupArn
+    Service_CapacityProviderStrategyItem:
+      description: |-
+        The details of a capacity provider strategy. A capacity provider strategy can be set when using the ``RunTask`` or ``CreateService`` APIs or as the default capacity provider strategy for a cluster with the ``CreateCluster`` API.
+         Only capacity providers that are already associated with a cluster and have an ``ACTIVE`` or ``UPDATING`` status can be used in a capacity provider strategy. The ``PutClusterCapacityProviders`` API is used to associate a capacity provider with a cluster.
+         If specifying a capacity provider that uses an Auto Scaling group, the capacity provider must already be created. New Auto Scaling group capacity providers can be created with the ``CreateCapacityProvider`` API operation.
+         To use an FARGATElong capacity provider, specify either the ``FARGATE`` or ``FARGATE_SPOT`` capacity providers. The FARGATElong capacity providers are available to all accounts and only need to be associated with a cluster to be used in a capacity provider strategy.
+      additionalProperties: false
+      type: object
+      properties:
+        CapacityProvider:
+          description: The short name of the capacity provider.
+          type: string
+        Base:
+          description: |-
+            The *base* value designates how many tasks, at a minimum, to run on the specified capacity provider for each service. Only one capacity provider in a capacity provider strategy can have a *base* defined. If no value is specified, the default value of ``0`` is used.
+             Base value characteristics:
+              +  Only one capacity provider in a strategy can have a base defined
+              +  Default value is ``0`` if not specified
+              +  Valid range: 0 to 100,000
+              +  Base requirements are satisfied first before weight distribution
+          type: integer
+        Weight:
+          description: |-
+            The *weight* value designates the relative percentage of the total number of tasks launched that should use the specified capacity provider. The ``weight`` value is taken into consideration after the ``base`` value, if defined, is satisfied.
+             If no ``weight`` value is specified, the default value of ``0`` is used. When multiple capacity providers are specified within a capacity provider strategy, at least one of the capacity providers must have a weight value greater than zero and any capacity providers with a weight of ``0`` can't be used to place tasks. If you specify multiple capacity providers in a strategy that all have a weight of ``0``, any ``RunTask`` or ``CreateService`` actions using the capacity provider strategy will fail.
+             Weight value characteristics:
+              +  Weight is considered after the base value is satisfied
+              +  Default value is ``0`` if not specified
+              +  Valid range: 0 to 1,000
+              +  At least one capacity provider must have a weight greater than zero
+              +  Capacity providers with weight of ``0`` cannot place tasks
+              
+             Task distribution logic:
+              1.  Base satisfaction: The minimum number of tasks specified by the base value are placed on that capacity provider
+              1.  Weight distribution: After base requirements are met, additional tasks are distributed according to weight ratios
+              
+             Examples:
+             Equal Distribution: Two capacity providers both with weight ``1`` will split tasks evenly after base requirements are met.
+             Weighted Distribution: If capacityProviderA has weight ``1`` and capacityProviderB has weight ``4``, then for every 1 task on A, 4 tasks will run on B.
+          type: integer
     ForceNewDeployment:
       description: ''
       additionalProperties: false
@@ -960,22 +1209,37 @@ components:
         - Rollback
         - Enable
     LoadBalancer:
-      description: 'A load balancer object representing the load balancer to use with the task set. The supported load balancer types are either an Application Load Balancer or a Network Load Balancer. '
+      description: |-
+        The ``LoadBalancer`` property specifies details on a load balancer that is used with a service.
+         If the service is using the ``CODE_DEPLOY`` deployment controller, the service is required to use either an Application Load Balancer or Network Load Balancer. When you are creating an ACDlong deployment group, you specify two target groups (referred to as a ``targetGroupPair``). Each target group binds to a separate task set in the deployment. The load balancer can also have up to two listeners, a required listener for production traffic and an optional listener that allows you to test new revisions of the service before routing production traffic to it.
+         Services with tasks that use the ``awsvpc`` network mode (for example, those with the Fargate launch type) only support Application Load Balancers and Network Load Balancers. Classic Load Balancers are not supported. Also, when you create any target groups for these services, you must choose ``ip`` as the target type, not ``instance``. Tasks that use the ``awsvpc`` network mode are associated with an elastic network interface, not an Amazon EC2 instance.
       additionalProperties: false
       type: object
       properties:
         TargetGroupArn:
-          description: >-
-            The full Amazon Resource Name (ARN) of the Elastic Load Balancing target group or groups associated with a service or task set. A target group ARN is only specified when using an Application Load Balancer or Network Load Balancer. If you are using a Classic Load Balancer this should be omitted. For services using the ECS deployment controller, you can specify one or multiple target groups. For more information, see
-            https://docs.aws.amazon.com/AmazonECS/latest/developerguide/register-multiple-targetgroups.html in the Amazon Elastic Container Service Developer Guide. For services using the CODE_DEPLOY deployment controller, you are required to define two target groups for the load balancer. For more information, see https://docs.aws.amazon.com/AmazonECS/latest/developerguide/deployment-type-bluegreen.html in the Amazon Elastic Container Service Developer Guide. If your service's task definition
-            uses the awsvpc network mode (which is required for the Fargate launch type), you must choose ip as the target type, not instance, when creating your target groups because tasks that use the awsvpc network mode are associated with an elastic network interface, not an Amazon EC2 instance.
+          description: |-
+            The full Amazon Resource Name (ARN) of the Elastic Load Balancing target group or groups associated with a service or task set.
+             A target group ARN is only specified when using an Application Load Balancer or Network Load Balancer. 
+             For services using the ``ECS`` deployment controller, you can specify one or multiple target groups. For more information, see [Registering multiple target groups with a service](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/register-multiple-targetgroups.html) in the *Amazon Elastic Container Service Developer Guide*.
+             For services using the ``CODE_DEPLOY`` deployment controller, you're required to define two target groups for the load balancer. For more information, see [Blue/green deployment with CodeDeploy](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/deployment-type-bluegreen.html) in the *Amazon Elastic Container Service Developer Guide*.
+              If your service's task definition uses the ``awsvpc`` network mode, you must choose ``ip`` as the target type, not ``instance``. Do this when creating your target groups because tasks that use the ``awsvpc`` network mode are associated with an elastic network interface, not an Amazon EC2 instance. This network mode is required for the Fargate launch type.
+          type: string
+        LoadBalancerName:
+          description: |-
+            The name of the load balancer to associate with the Amazon ECS service or task set.
+             If you are using an Application Load Balancer or a Network Load Balancer the load balancer name parameter should be omitted.
           type: string
         ContainerName:
-          description: The name of the container (as it appears in a container definition) to associate with the load balancer.
+          description: |-
+            The name of the container (as it appears in a container definition) to associate with the load balancer.
+             You need to specify the container name when configuring the target group for an Amazon ECS load balancer.
           type: string
         ContainerPort:
-          description: The port on the container to associate with the load balancer. This port must correspond to a containerPort in the task definition the tasks in the service are using. For tasks that use the EC2 launch type, the container instance they are launched on must allow ingress traffic on the hostPort of the port mapping.
+          description: The port on the container to associate with the load balancer. This port must correspond to a ``containerPort`` in the task definition the tasks in the service are using. For tasks that use the EC2 launch type, the container instance they're launched on must allow ingress traffic on the ``hostPort`` of the port mapping.
           type: integer
+        AdvancedConfiguration:
+          description: The advanced settings for the load balancer used in blue/green deployments. Specify the alternate target group, listener rules, and IAM role required for traffic shifting during blue/green deployments.
+          $ref: '#/components/schemas/AdvancedConfiguration'
     ServiceConnectConfiguration:
       description: |-
         The Service Connect configuration of your Amazon ECS service. The configuration for this service to discover and connect to services, and be discovered by, and connected from, other services within a namespace.
@@ -1155,30 +1419,36 @@ components:
           description: The name of the secret.
           type: string
     AwsVpcConfiguration:
-      description: The VPC subnets and security groups associated with a task. All specified subnets and security groups must be from the same VPC.
+      description: An object representing the networking details for a task or service. For example ``awsVpcConfiguration={subnets=["subnet-12344321"],securityGroups=["sg-12344321"]}``.
       additionalProperties: false
       type: object
       properties:
         SecurityGroups:
-          maxItems: 5
-          description: The security groups associated with the task or service. If you do not specify a security group, the default security group for the VPC is used. There is a limit of 5 security groups that can be specified per AwsVpcConfiguration.
+          description: |-
+            The IDs of the security groups associated with the task or service. If you don't specify a security group, the default security group for the VPC is used. There's a limit of 5 security groups that can be specified.
+              All specified security groups must be from the same VPC.
+          x-insertionOrder: false
           type: array
           items:
             type: string
         Subnets:
-          maxItems: 16
-          description: The subnets associated with the task or service. There is a limit of 16 subnets that can be specified per AwsVpcConfiguration.
+          description: |-
+            The IDs of the subnets associated with the task or service. There's a limit of 16 subnets that can be specified.
+              All specified subnets must be from the same VPC.
+          x-insertionOrder: false
           type: array
           items:
             type: string
         AssignPublicIp:
-          description: Whether the task's elastic network interface receives a public IP address. The default value is DISABLED.
+          description: |-
+            Whether the task's elastic network interface receives a public IP address. 
+             Consider the following when you set this value:
+              +  When you use ``create-service`` or ``update-service``, the default is ``DISABLED``. 
+              +  When the service ``deploymentController`` is ``ECS``, the value must be ``DISABLED``.
           type: string
           enum:
             - DISABLED
             - ENABLED
-      required:
-        - Subnets
     PlacementConstraint:
       description: |-
         An object representing a constraint on task placement. For more information, see [Task placement constraints](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-placement-constraints.html) in the *Amazon Elastic Container Service Developer Guide*.
@@ -1269,24 +1539,55 @@ components:
           description: The ARN of the IAM role to associate with this volume. This is the Amazon ECS infrastructure IAM role that is used to manage your AWS infrastructure. We recommend using the Amazon ECS-managed ``AmazonECSInfrastructureRolePolicyForVolumes`` IAM policy with this role. For more information, see [Amazon ECS infrastructure IAM role](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/infrastructure_IAM_role.html) in the *Amazon ECS Developer Guide*.
           type: string
     ServiceRegistry:
+      description: |-
+        The details for the service registry.
+         Each service may be associated with one service registry. Multiple service registries for each service are not supported.
+         When you add, update, or remove the service registries configuration, Amazon ECS starts a new deployment. New tasks are registered and deregistered to the updated service registry configuration.
       additionalProperties: false
       type: object
       properties:
         ContainerName:
           description: >-
-            The container name value, already specified in the task definition, to be used for your service discovery service. If the task definition that your service task specifies uses the bridge or host network mode, you must specify a containerName and containerPort combination from the task definition. If the task definition that your service task specifies uses the awsvpc network mode and a type SRV DNS record is used, you must specify either a containerName and containerPort combination
-            or a port value, but not both.
+            The container name value to be used for your service discovery service. It's already specified in the task definition. If the task definition that your service task specifies uses the ``bridge`` or ``host`` network mode, you must specify a ``containerName`` and ``containerPort`` combination from the task definition. If the task definition that your service task specifies uses the ``awsvpc`` network mode and a type SRV DNS record is used, you must specify either a ``containerName``
+            and ``containerPort`` combination or a ``port`` value. However, you can't specify both.
           type: string
         Port:
-          description: The port value used if your service discovery service specified an SRV record. This field may be used if both the awsvpc network mode and SRV records are used.
+          description: The port value used if your service discovery service specified an SRV record. This field might be used if both the ``awsvpc`` network mode and SRV records are used.
           type: integer
         ContainerPort:
           description: >-
-            The port value, already specified in the task definition, to be used for your service discovery service. If the task definition your service task specifies uses the bridge or host network mode, you must specify a containerName and containerPort combination from the task definition. If the task definition your service task specifies uses the awsvpc network mode and a type SRV DNS record is used, you must specify either a containerName and containerPort combination or a port value, but
-            not both.
+            The port value to be used for your service discovery service. It's already specified in the task definition. If the task definition your service task specifies uses the ``bridge`` or ``host`` network mode, you must specify a ``containerName`` and ``containerPort`` combination from the task definition. If the task definition your service task specifies uses the ``awsvpc`` network mode and a type SRV DNS record is used, you must specify either a ``containerName`` and ``containerPort``
+            combination or a ``port`` value. However, you can't specify both.
           type: integer
         RegistryArn:
-          description: The Amazon Resource Name (ARN) of the service registry. The currently supported service registry is AWS Cloud Map. For more information, see https://docs.aws.amazon.com/cloud-map/latest/api/API_CreateService.html
+          description: The Amazon Resource Name (ARN) of the service registry. The currently supported service registry is CMAP. For more information, see [CreateService](https://docs.aws.amazon.com/cloud-map/latest/api/API_CreateService.html).
+          type: string
+    Service_Tag:
+      description: |-
+        The metadata that you apply to a resource to help you categorize and organize them. Each tag consists of a key and an optional value. You define them.
+         The following basic restrictions apply to tags:
+          +  Maximum number of tags per resource - 50
+          +  For each resource, each tag key must be unique, and each tag key can have only one value.
+          +  Maximum key length - 128 Unicode characters in UTF-8
+          +  Maximum value length - 256 Unicode characters in UTF-8
+          +  If your tagging schema is used across multiple services and resources, remember that other services may have restrictions on allowed characters. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following characters: + - = . _ : / @.
+          +  Tag keys and values are case-sensitive.
+          +  Do not use ``aws:``, ``AWS:``, or any upper or lowercase combination of such as a prefix for either keys or values as it is reserved for AWS use. You cannot edit or delete tag keys or values with this prefix. Tags with this prefix do not count against your tags per resource limit.
+          
+         In order to tag a service that has the following ARN format, you need to migrate the service to the long ARN. You must use the API, CLI or console to migrate the service ARN. For more information, see [Migrate an short service ARN to a long ARN](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/service-arn-migration.html) in the *Developer Guide*.
+          ``arn:aws:ecs:region:aws_account_id:service/service-name`` 
+         After the migration is complete, the following are true:
+          +   The service ARN is: ``arn:aws:ecs:region:aws_account_id:service/cluster-name/service-name``
+          +  You can use CFN to tag the service as you would a service with a long ARN format.
+          +  When the ``PhysicalResourceId`` in the CFN stack represents a service, the value does not change and will be the short service ARN.
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          description: The optional part of a key-value pair that make up a tag. A ``value`` acts as a descriptor within a tag category (key).
+          type: string
+        Key:
+          description: One part of a key-value pair that make up a tag. A ``key`` is a general label that acts like a category for more specific tag values.
           type: string
     DeploymentConfiguration:
       description: Optional deployment parameters that control how many tasks run during a deployment and the ordering of stopping and starting tasks.
@@ -1439,7 +1740,7 @@ components:
               To remove this property from your service resource, specify an empty ``CapacityProviderStrategyItem`` array.
           type: array
           items:
-            $ref: '#/components/schemas/CapacityProviderStrategyItem'
+            $ref: '#/components/schemas/Service_CapacityProviderStrategyItem'
         LaunchType:
           description: The launch type on which to run your service. For more information, see [Amazon ECS Launch Types](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html) in the *Amazon Elastic Container Service Developer Guide*.
           type: string
@@ -1486,7 +1787,7 @@ components:
               +  Do not use ``aws:``, ``AWS:``, or any upper or lowercase combination of such as a prefix for either keys or values as it is reserved for AWS use. You cannot edit or delete tag keys or values with this prefix. Tags with this prefix do not count against your tags per resource limit.
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Service_Tag'
         ForceNewDeployment:
           description: Determines whether to force a new deployment of the service. By default, deployments aren't forced. You can use this option to start a new deployment with no service definition changes. For example, you can update a service's tasks to use a newer Docker image with the same image/tag combination (``my_image:latest``) or to roll Fargate tasks onto a newer platform version.
           $ref: '#/components/schemas/ForceNewDeployment'
@@ -1838,7 +2139,7 @@ components:
               Amazon ECS currently supports a subset of the logging drivers available to the Docker daemon (shown in the [LogConfiguration](https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_LogConfiguration.html) data type). Additional log drivers may be available in future releases of the Amazon ECS container agent.
               This parameter requires version 1.18 of the Docker Remote API or greater on your container instance. To check the Docker Remote API version on your container instance, log in to your container instance and run the following command: ``sudo docker version --format '{{.Server.APIVersion}}'``
               The Amazon ECS container agent running on a container instance must register the logging drivers available on that instance with the ``ECS_AVAILABLE_LOGGING_DRIVERS`` environment variable before containers placed on that instance can use these log configuration options. For more information, see [Container Agent Configuration](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-agent-config.html) in the *Developer Guide*.
-          $ref: '#/components/schemas/LogConfiguration'
+          $ref: '#/components/schemas/TaskDefinition_LogConfiguration'
         ResourceRequirements:
           description: The type and amount of a resource to assign to a container. The only supported resource is a GPU.
           x-insertionOrder: false
@@ -2098,6 +2399,47 @@ components:
           description: Custom metadata to add to your Docker volume. This parameter maps to ``Labels`` in the docker container create command and the ``xxlabel`` option to docker volume create.
           additionalProperties: false
           type: object
+    TaskDefinition_LogConfiguration:
+      description: The ``LogConfiguration`` property specifies log configuration options to send to a custom log driver for the container.
+      additionalProperties: false
+      type: object
+      required:
+        - LogDriver
+      properties:
+        SecretOptions:
+          description: The secrets to pass to the log configuration. For more information, see [Specifying sensitive data](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/specifying-sensitive-data.html) in the *Amazon Elastic Container Service Developer Guide*.
+          x-insertionOrder: false
+          type: array
+          items:
+            $ref: '#/components/schemas/Secret'
+        Options:
+          x-patternProperties:
+            .{1,}:
+              type: string
+          description: |-
+            The configuration options to send to the log driver.
+             The options you can specify depend on the log driver. Some of the options you can specify when you use the ``awslogs`` log driver to route logs to Amazon CloudWatch include the following:
+              + awslogs-create-group Required: No Specify whether you want the log group to be created automatically. If this option isn't specified, it defaults to false. Your IAM policy must include the logs:CreateLogGroup permission before you attempt to use awslogs-create-group. + awslogs-region Required: Yes Specify the Region that the awslogs log driver is to send your Docker logs to. You can choose to send all of your logs from clusters in different Regions to a single region in CloudWatch Logs. This is so that they're all visible in one location. Otherwise, you can separate them by Region for more granularity. Make sure that the specified log group exists in the Region that you specify with this option. + awslogs-group Required: Yes Make sure to specify a log group that the awslogs log driver sends its log streams to. + awslogs-stream-prefix Required: Yes, when using Fargate.Optional when using EC2. Use the awslogs-stream-prefix option to associate a log stream with the specified prefix, the container name, and the ID of the Amazon ECS task that the container belongs to. If you specify a prefix with this option, then the log stream takes the format prefix-name/container-name/ecs-task-id. If you don't specify a prefix with this option, then the log stream is named after the container ID that's assigned by the Docker daemon on the container instance. Because it's difficult to trace logs back to the container that sent them with just the Docker container ID (which is only available on the container instance), we recommend that you specify a prefix with this option. For Amazon ECS services, you can use the service name as the prefix. Doing so, you can trace log streams to the service that the container belongs to, the name of the container that sent them, and the ID of the task that the container belongs to. You must specify a stream-prefix for your logs to have your logs appear in the Log pane when using the Amazon ECS console. + awslogs-datetime-format Required: No This option defines a multiline start pattern in Python strftime format. A log message consists of a line that matches the pattern and any following lines that don’t match the pattern. The matched line is the delimiter between log messages. One example of a use case for using this format is for parsing output such as a stack dump, which might otherwise be logged in multiple entries. The correct pattern allows it to be captured in a single entry. For more information, see awslogs-datetime-format. You cannot configure both the awslogs-datetime-format and awslogs-multiline-pattern options. Multiline logging performs regular expression parsing and matching of all log messages. This might have a negative impact on logging performance. + awslogs-multiline-pattern Required: No This option defines a multiline start pattern that uses a regular expression. A log message consists of a line that matches the pattern and any following lines that don’t match the pattern. The matched line is the delimiter between log messages. For more information, see awslogs-multiline-pattern. This option is ignored if awslogs-datetime-format is also configured. You cannot configure both the awslogs-datetime-format and awslogs-multiline-pattern options. Multiline logging performs regular expression parsing and matching of all log messages. This might have a negative impact on logging performance. 
+             The following options apply to all supported log drivers.
+              + mode Required: No Valid values: non-blocking | blocking This option defines the delivery mode of log messages from the container to the log driver specified using logDriver. The delivery mode you choose affects application availability when the flow of logs from container is interrupted. If you use the blocking mode and the flow of logs is interrupted, calls from container code to write to the stdout and stderr streams will block. The logging thread of the application will block as a result. This may cause the application to become unresponsive and lead to container healthcheck failure. If you use the non-blocking mode, the container's logs are instead stored in an in-memory intermediate buffer configured with the max-buffer-size option. This prevents the application from becoming unresponsive when logs cannot be sent. We recommend using this mode if you want to ensure service availability and are okay with some log loss. For more information, see Preventing log loss with non-blocking mode in the awslogs container log driver. You can set a default mode for all containers in a specific Region by using the defaultLogDriverMode account setting. If you don't specify the mode option or configure the account setting, Amazon ECS will default to the non-blocking mode. For more information about the account setting, see Default log driver mode in the Amazon Elastic Container Service Developer Guide. On June 25, 2025, Amazon ECS changed the default log driver mode from blocking to non-blocking to prioritize task availability over logging. To continue using the blocking mode after this change, do one of the following: Set the mode option in your container definition's logConfiguration as blocking. Set the defaultLogDriverMode account setting to blocking. + max-buffer-size Required: No Default value: 10m When non-blocking mode is used, the max-buffer-size log option controls the size of the buffer that's used for intermediate message storage. Make sure to specify an adequate buffer size based on your application. When the buffer fills up, further logs cannot be stored. Logs that cannot be stored are lost. 
+             To route logs using the ``splunk`` log router, you need to specify a ``splunk-token`` and a ``splunk-url``.
+             When you use the ``awsfirelens`` log router to route logs to an AWS Service or AWS Partner Network destination for log storage and analytics, you can set the ``log-driver-buffer-limit`` option to limit the number of events that are buffered in memory, before being sent to the log router container. It can help to resolve potential log loss issue because high throughput might result in memory running out for the buffer inside of Docker.
+             Other options you can specify when using ``awsfirelens`` to route logs depend on the destination. When you export logs to Amazon Data Firehose, you can specify the AWS Region with ``region`` and a name for the log stream with ``delivery_stream``.
+             When you export logs to Amazon Kinesis Data Streams, you can specify an AWS Region with ``region`` and a data stream name with ``stream``.
+              When you export logs to Amazon OpenSearch Service, you can specify options like ``Name``, ``Host`` (OpenSearch Service endpoint without protocol), ``Port``, ``Index``, ``Type``, ``Aws_auth``, ``Aws_region``, ``Suppress_Type_Name``, and ``tls``. For more information, see [Under the hood: FireLens for Amazon ECS Tasks](https://docs.aws.amazon.com/containers/under-the-hood-firelens-for-amazon-ecs-tasks/).
+             When you export logs to Amazon S3, you can specify the bucket using the ``bucket`` option. You can also specify ``region``, ``total_file_size``, ``upload_timeout``, and ``use_put_object`` as options.
+             This parameter requires version 1.19 of the Docker Remote API or greater on your container instance. To check the Docker Remote API version on your container instance, log in to your container instance and run the following command: ``sudo docker version --format '{{.Server.APIVersion}}'``
+          additionalProperties: false
+          type: object
+        LogDriver:
+          description: |-
+            The log driver to use for the container.
+             For tasks on FARGATElong, the supported log drivers are ``awslogs``, ``splunk``, and ``awsfirelens``.
+             For tasks hosted on Amazon EC2 instances, the supported log drivers are ``awslogs``, ``fluentd``, ``gelf``, ``json-file``, ``journald``, ``syslog``, ``splunk``, and ``awsfirelens``.
+             For more information about using the ``awslogs`` log driver, see [Send Amazon ECS logs to CloudWatch](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using_awslogs.html) in the *Amazon Elastic Container Service Developer Guide*.
+             For more information about using the ``awsfirelens`` log driver, see [Send Amazon ECS logs to an service or Partner](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using_firelens.html).
+              If you have a custom driver that isn't listed, you can fork the Amazon ECS container agent project that's [available on GitHub](https://docs.aws.amazon.com/https://github.com/aws/amazon-ecs-agent) and customize it to work with that driver. We encourage you to submit pull requests for changes that you would like to have included. However, we don't currently provide support for running modified copies of this software.
+          type: string
     FirelensConfiguration:
       description: The FireLens configuration for the container. This is used to specify and configure a log router for container logs. For more information, see [Custom log routing](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using_firelens.html) in the *Amazon Elastic Container Service Developer Guide*.
       additionalProperties: false
@@ -2591,17 +2933,37 @@ components:
           type: string
         DeviceName:
           type: string
-    EphemeralStorage:
+    TaskDefinition_Tag:
       description: |-
-        The amount of ephemeral storage to allocate for the task. This parameter is used to expand the total amount of ephemeral storage available, beyond the default amount, for tasks hosted on FARGATElong. For more information, see [Using data volumes in tasks](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using_data_volumes.html) in the *Amazon ECS Developer Guide;*.
-          For tasks using the Fargate launch type, the task requires the following platforms:
-          +  Linux platform version ``1.4.0`` or later.
-          +  Windows platform version ``1.0.0`` or later.
+        The metadata that you apply to a resource to help you categorize and organize them. Each tag consists of a key and an optional value. You define them.
+         The following basic restrictions apply to tags:
+          +  Maximum number of tags per resource - 50
+          +  For each resource, each tag key must be unique, and each tag key can have only one value.
+          +  Maximum key length - 128 Unicode characters in UTF-8
+          +  Maximum value length - 256 Unicode characters in UTF-8
+          +  If your tagging schema is used across multiple services and resources, remember that other services may have restrictions on allowed characters. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following characters: + - = . _ : / @.
+          +  Tag keys and values are case-sensitive.
+          +  Do not use ``aws:``, ``AWS:``, or any upper or lowercase combination of such as a prefix for either keys or values as it is reserved for AWS use. You cannot edit or delete tag keys or values with this prefix. Tags with this prefix do not count against your tags per resource limit.
       additionalProperties: false
       type: object
       properties:
-        SizeInGiB:
-          description: The total amount, in GiB, of ephemeral storage to set for the task. The minimum supported value is ``21`` GiB and the maximum supported value is ``200`` GiB.
+        Value:
+          description: The optional part of a key-value pair that make up a tag. A ``value`` acts as a descriptor within a tag category (key).
+          type: string
+        Key:
+          description: One part of a key-value pair that make up a tag. A ``key`` is a general label that acts like a category for more specific tag values.
+          type: string
+    EphemeralStorage:
+      description: |-
+        The amount of ephemeral storage to allocate for the task. This parameter is used to expand the total amount of ephemeral storage available, beyond the default amount, for tasks hosted on FARGATElong. For more information, see [Using data volumes in tasks](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using_data_volumes.html) in the *Amazon ECS Developer Guide;*.
+          For tasks using the Fargate launch type, the task requires the following platforms:
+          +  Linux platform version ``1.4.0`` or later.
+          +  Windows platform version ``1.0.0`` or later.
+      additionalProperties: false
+      type: object
+      properties:
+        SizeInGiB:
+          description: The total amount, in GiB, of ephemeral storage to set for the task. The minimum supported value is ``21`` GiB and the maximum supported value is ``200`` GiB.
           type: integer
     FSxWindowsFileServerVolumeConfiguration:
       description: |-
@@ -2758,7 +3120,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/TaskDefinition_Tag'
         TaskDefinitionArn:
           description: ''
           type: string
@@ -2826,6 +3188,65 @@ components:
           - ecs:DescribeTaskDefinition
           - iam:GetRole
           - iam:PassRole
+    TaskSet_CapacityProviderStrategyItem:
+      additionalProperties: false
+      type: object
+      properties:
+        CapacityProvider:
+          type: string
+        Base:
+          type: integer
+        Weight:
+          type: integer
+    TaskSet_AwsVpcConfiguration:
+      description: The VPC subnets and security groups associated with a task. All specified subnets and security groups must be from the same VPC.
+      additionalProperties: false
+      type: object
+      properties:
+        SecurityGroups:
+          maxItems: 5
+          description: The security groups associated with the task or service. If you do not specify a security group, the default security group for the VPC is used. There is a limit of 5 security groups that can be specified per AwsVpcConfiguration.
+          type: array
+          items:
+            type: string
+        Subnets:
+          maxItems: 16
+          description: The subnets associated with the task or service. There is a limit of 16 subnets that can be specified per AwsVpcConfiguration.
+          type: array
+          items:
+            type: string
+        AssignPublicIp:
+          description: Whether the task's elastic network interface receives a public IP address. The default value is DISABLED.
+          type: string
+          enum:
+            - DISABLED
+            - ENABLED
+      required:
+        - Subnets
+    TaskSet_LoadBalancer:
+      description: 'A load balancer object representing the load balancer to use with the task set. The supported load balancer types are either an Application Load Balancer or a Network Load Balancer. '
+      additionalProperties: false
+      type: object
+      properties:
+        TargetGroupArn:
+          description: >-
+            The full Amazon Resource Name (ARN) of the Elastic Load Balancing target group or groups associated with a service or task set. A target group ARN is only specified when using an Application Load Balancer or Network Load Balancer. If you are using a Classic Load Balancer this should be omitted. For services using the ECS deployment controller, you can specify one or multiple target groups. For more information, see
+            https://docs.aws.amazon.com/AmazonECS/latest/developerguide/register-multiple-targetgroups.html in the Amazon Elastic Container Service Developer Guide. For services using the CODE_DEPLOY deployment controller, you are required to define two target groups for the load balancer. For more information, see https://docs.aws.amazon.com/AmazonECS/latest/developerguide/deployment-type-bluegreen.html in the Amazon Elastic Container Service Developer Guide. If your service's task definition
+            uses the awsvpc network mode (which is required for the Fargate launch type), you must choose ip as the target type, not instance, when creating your target groups because tasks that use the awsvpc network mode are associated with an elastic network interface, not an Amazon EC2 instance.
+          type: string
+        ContainerName:
+          description: The name of the container (as it appears in a container definition) to associate with the load balancer.
+          type: string
+        ContainerPort:
+          description: The port on the container to associate with the load balancer. This port must correspond to a containerPort in the task definition the tasks in the service are using. For tasks that use the EC2 launch type, the container instance they are launched on must allow ingress traffic on the hostPort of the port mapping.
+          type: integer
+    TaskSet_NetworkConfiguration:
+      description: An object representing the network configuration for a task or service.
+      additionalProperties: false
+      type: object
+      properties:
+        AwsVpcConfiguration:
+          $ref: '#/components/schemas/TaskSet_AwsVpcConfiguration'
     Scale:
       additionalProperties: false
       type: object
@@ -2840,6 +3261,34 @@ components:
           type: string
           enum:
             - PERCENT
+    TaskSet_ServiceRegistry:
+      additionalProperties: false
+      type: object
+      properties:
+        ContainerName:
+          description: >-
+            The container name value, already specified in the task definition, to be used for your service discovery service. If the task definition that your service task specifies uses the bridge or host network mode, you must specify a containerName and containerPort combination from the task definition. If the task definition that your service task specifies uses the awsvpc network mode and a type SRV DNS record is used, you must specify either a containerName and containerPort combination
+            or a port value, but not both.
+          type: string
+        Port:
+          description: The port value used if your service discovery service specified an SRV record. This field may be used if both the awsvpc network mode and SRV records are used.
+          type: integer
+        ContainerPort:
+          description: >-
+            The port value, already specified in the task definition, to be used for your service discovery service. If the task definition your service task specifies uses the bridge or host network mode, you must specify a containerName and containerPort combination from the task definition. If the task definition your service task specifies uses the awsvpc network mode and a type SRV DNS record is used, you must specify either a containerName and containerPort combination or a port value, but
+            not both.
+          type: integer
+        RegistryArn:
+          description: The Amazon Resource Name (ARN) of the service registry. The currently supported service registry is AWS Cloud Map. For more information, see https://docs.aws.amazon.com/cloud-map/latest/api/API_CreateService.html
+          type: string
+    TaskSet_Tag:
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          type: string
+        Key:
+          type: string
     TaskSet:
       type: object
       properties:
@@ -2855,7 +3304,7 @@ components:
         LoadBalancers:
           type: array
           items:
-            $ref: '#/components/schemas/LoadBalancer'
+            $ref: '#/components/schemas/TaskSet_LoadBalancer'
         Service:
           description: The short name or full Amazon Resource Name (ARN) of the service to create the task set in.
           type: string
@@ -2866,11 +3315,11 @@ components:
           description: The details of the service discovery registries to assign to this task set. For more information, see https://docs.aws.amazon.com/AmazonECS/latest/developerguide/service-discovery.html.
           type: array
           items:
-            $ref: '#/components/schemas/ServiceRegistry'
+            $ref: '#/components/schemas/TaskSet_ServiceRegistry'
         CapacityProviderStrategy:
           type: array
           items:
-            $ref: '#/components/schemas/CapacityProviderStrategyItem'
+            $ref: '#/components/schemas/TaskSet_CapacityProviderStrategyItem'
         LaunchType:
           description: 'The launch type that new tasks in the task set will use. For more information, see https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html in the Amazon Elastic Container Service Developer Guide. '
           type: string
@@ -2881,14 +3330,14 @@ components:
           description: The short name or full Amazon Resource Name (ARN) of the task definition for the tasks in the task set to use.
           type: string
         NetworkConfiguration:
-          $ref: '#/components/schemas/NetworkConfiguration'
+          $ref: '#/components/schemas/TaskSet_NetworkConfiguration'
         Id:
           description: The ID of the task set.
           type: string
         Tags:
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/TaskSet_Tag'
       required:
         - Cluster
         - Service
@@ -2942,6 +3391,99 @@ components:
         delete:
           - ecs:DeleteTaskSet
           - ecs:DescribeTaskSets
+    CreateCapacityProviderRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            AutoScalingGroupProvider:
+              $ref: '#/components/schemas/AutoScalingGroupProvider'
+            Tags:
+              type: array
+              items:
+                $ref: '#/components/schemas/Tag'
+            Name:
+              type: string
+          x-stackQL-stringOnly: true
+      x-title: CreateCapacityProviderRequest
+      type: object
+      required: []
+    CreateClusterRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            ClusterSettings:
+              description: |-
+                The settings to use when creating a cluster. This parameter is used to turn on CloudWatch Container Insights with enhanced observability or CloudWatch Container Insights for a cluster.
+                 Container Insights with enhanced observability provides all the Container Insights metrics, plus additional task and container metrics. This version supports enhanced observability for Amazon ECS clusters using the Amazon EC2 and Fargate launch types. After you configure Container Insights with enhanced observability on Amazon ECS, Container Insights auto-collects detailed infrastructure telemetry from the cluster level down to the container level in your environment and displays these critical performance data in curated dashboards removing the heavy lifting in observability set-up. 
+                 For more information, see [Monitor Amazon ECS containers using Container Insights with enhanced observability](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/cloudwatch-container-insights.html) in the *Amazon Elastic Container Service Developer Guide*.
+              type: array
+              items:
+                $ref: '#/components/schemas/ClusterSettings'
+            DefaultCapacityProviderStrategy:
+              description: The default capacity provider strategy for the cluster. When services or tasks are run in the cluster with no launch type or capacity provider strategy specified, the default capacity provider strategy is used.
+              type: array
+              items:
+                $ref: '#/components/schemas/CapacityProviderStrategyItem'
+            Configuration:
+              description: The execute command and managed storage configuration for the cluster.
+              $ref: '#/components/schemas/ClusterConfiguration'
+            ServiceConnectDefaults:
+              description: >-
+                Use this parameter to set a default Service Connect namespace. After you set a default Service Connect namespace, any new services with Service Connect turned on that are created in the cluster are added as client services in the namespace. This setting only applies to new services that set the ``enabled`` parameter to ``true`` in the ``ServiceConnectConfiguration``. You can set the namespace of each service individually in the ``ServiceConnectConfiguration`` to override this
+                default parameter.
+                 Tasks that run in a namespace can use short names to connect to services in the namespace. Tasks can connect to services across all of the clusters in the namespace. Tasks connect through a managed proxy container that collects logs and metrics for increased visibility. Only the tasks that Amazon ECS services create are supported with Service Connect. For more information, see [Service Connect](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/service-connect.html) in the *Amazon Elastic Container Service Developer Guide*.
+              $ref: '#/components/schemas/ServiceConnectDefaults'
+            CapacityProviders:
+              description: |-
+                The short name of one or more capacity providers to associate with the cluster. A capacity provider must be associated with a cluster before it can be included as part of the default capacity provider strategy of the cluster or used in a capacity provider strategy when calling the [CreateService](https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_CreateService.html) or [RunTask](https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_RunTask.html) actions.
+                 If specifying a capacity provider that uses an Auto Scaling group, the capacity provider must be created but not associated with another cluster. New Auto Scaling group capacity providers can be created with the [CreateCapacityProvider](https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_CreateCapacityProvider.html) API operation.
+                 To use a FARGATElong capacity provider, specify either the ``FARGATE`` or ``FARGATE_SPOT`` capacity providers. The FARGATElong capacity providers are available to all accounts and only need to be associated with a cluster to be used.
+                 The [PutCapacityProvider](https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_PutCapacityProvider.html) API operation is used to update the list of available capacity providers for a cluster after the cluster is created.
+              type: array
+              items:
+                type: string
+            ClusterName:
+              description: A user-generated string that you use to identify your cluster. If you don't specify a name, CFNlong generates a unique physical ID for the name.
+              type: string
+            Arn:
+              description: ''
+              type: string
+            Tags:
+              description: |-
+                The metadata that you apply to the cluster to help you categorize and organize them. Each tag consists of a key and an optional value. You define both.
+                 The following basic restrictions apply to tags:
+                  +  Maximum number of tags per resource - 50
+                  +  For each resource, each tag key must be unique, and each tag key can have only one value.
+                  +  Maximum key length - 128 Unicode characters in UTF-8
+                  +  Maximum value length - 256 Unicode characters in UTF-8
+                  +  If your tagging schema is used across multiple services and resources, remember that other services may have restrictions on allowed characters. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following characters: + - = . _ : / @.
+                  +  Tag keys and values are case-sensitive.
+                  +  Do not use ``aws:``, ``AWS:``, or any upper or lowercase combination of such as a prefix for either keys or values as it is reserved for AWS use. You cannot edit or delete tag keys or values with this prefix. Tags with this prefix do not count against your tags per resource limit.
+              type: array
+              items:
+                $ref: '#/components/schemas/Cluster_Tag'
+          x-stackQL-stringOnly: true
+      x-title: CreateClusterRequest
+      type: object
+      required: []
     CreateClusterCapacityProviderAssociationsRequest:
       properties:
         ClientToken:
@@ -2960,7 +3502,7 @@ components:
             CapacityProviders:
               $ref: '#/components/schemas/CapacityProviders'
             Cluster:
-              $ref: '#/components/schemas/Cluster'
+              $ref: '#/components/schemas/ClusterCapacityProviderAssociations_Cluster'
           x-stackQL-stringOnly: true
       x-title: CreateClusterCapacityProviderAssociationsRequest
       type: object
@@ -3050,7 +3592,7 @@ components:
                   To remove this property from your service resource, specify an empty ``CapacityProviderStrategyItem`` array.
               type: array
               items:
-                $ref: '#/components/schemas/CapacityProviderStrategyItem'
+                $ref: '#/components/schemas/Service_CapacityProviderStrategyItem'
             LaunchType:
               description: The launch type on which to run your service. For more information, see [Amazon ECS Launch Types](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html) in the *Amazon Elastic Container Service Developer Guide*.
               type: string
@@ -3097,7 +3639,7 @@ components:
                   +  Do not use ``aws:``, ``AWS:``, or any upper or lowercase combination of such as a prefix for either keys or values as it is reserved for AWS use. You cannot edit or delete tag keys or values with this prefix. Tags with this prefix do not count against your tags per resource limit.
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Service_Tag'
             ForceNewDeployment:
               description: Determines whether to force a new deployment of the service. By default, deployments aren't forced. You can use this option to start a new deployment with no service definition changes. For example, you can update a service's tasks to use a newer Docker image with the same image/tag combination (``my_image:latest``) or to roll Fargate tasks onto a newer platform version.
               $ref: '#/components/schemas/ForceNewDeployment'
@@ -3320,7 +3862,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/TaskDefinition_Tag'
             TaskDefinitionArn:
               description: ''
               type: string
@@ -3353,7 +3895,7 @@ components:
             LoadBalancers:
               type: array
               items:
-                $ref: '#/components/schemas/LoadBalancer'
+                $ref: '#/components/schemas/TaskSet_LoadBalancer'
             Service:
               description: The short name or full Amazon Resource Name (ARN) of the service to create the task set in.
               type: string
@@ -3364,11 +3906,11 @@ components:
               description: The details of the service discovery registries to assign to this task set. For more information, see https://docs.aws.amazon.com/AmazonECS/latest/developerguide/service-discovery.html.
               type: array
               items:
-                $ref: '#/components/schemas/ServiceRegistry'
+                $ref: '#/components/schemas/TaskSet_ServiceRegistry'
             CapacityProviderStrategy:
               type: array
               items:
-                $ref: '#/components/schemas/CapacityProviderStrategyItem'
+                $ref: '#/components/schemas/TaskSet_CapacityProviderStrategyItem'
             LaunchType:
               description: 'The launch type that new tasks in the task set will use. For more information, see https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html in the Amazon Elastic Container Service Developer Guide. '
               type: string
@@ -3379,14 +3921,14 @@ components:
               description: The short name or full Amazon Resource Name (ARN) of the task definition for the tasks in the task set to use.
               type: string
             NetworkConfiguration:
-              $ref: '#/components/schemas/NetworkConfiguration'
+              $ref: '#/components/schemas/TaskSet_NetworkConfiguration'
             Id:
               description: The ID of the task set.
               type: string
             Tags:
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/TaskSet_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateTaskSetRequest
       type: object
@@ -3399,12 +3941,262 @@ components:
       description: Amazon Signature authorization v4
       x-amazon-apigateway-authtype: awsSigv4
   x-stackQL-resources:
+    capacity_providers:
+      name: capacity_providers
+      id: awscc.ecs.capacity_providers
+      x-cfn-schema-name: CapacityProvider
+      x-cfn-type-name: AWS::ECS::CapacityProvider
+      x-identifiers: &ref_0
+        - Name
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__CapacityProvider&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::ECS::CapacityProvider"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::ECS::CapacityProvider"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::ECS::CapacityProvider"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/capacity_providers/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/capacity_providers/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/capacity_providers/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.AutoScalingGroupProvider') as auto_scaling_group_provider,
+              JSON_EXTRACT(Properties, '$.Tags') as tags,
+              JSON_EXTRACT(Properties, '$.Name') as name
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::ECS::CapacityProvider'
+              AND Identifier = '<Name>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'AutoScalingGroupProvider') as auto_scaling_group_provider,
+                json_extract_path_text(Properties, 'Tags') as tags,
+                json_extract_path_text(Properties, 'Name') as name
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::ECS::CapacityProvider'
+                AND Identifier = '<Name>'
+                AND region = 'us-east-1'
+    capacity_providers_list_only:
+      name: capacity_providers_list_only
+      id: awscc.ecs.capacity_providers_list_only
+      x-cfn-schema-name: CapacityProvider
+      x-cfn-type-name: AWS::ECS::CapacityProvider
+      x-identifiers: *ref_0
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.Name') as name
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::ECS::CapacityProvider'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'Name') as name
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::ECS::CapacityProvider'
+                AND region = 'us-east-1'
+    clusters:
+      name: clusters
+      id: awscc.ecs.clusters
+      x-cfn-schema-name: Cluster
+      x-cfn-type-name: AWS::ECS::Cluster
+      x-identifiers: &ref_1
+        - ClusterName
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Cluster&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::ECS::Cluster"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::ECS::Cluster"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::ECS::Cluster"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/clusters/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/clusters/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/clusters/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.ClusterSettings') as cluster_settings,
+              JSON_EXTRACT(Properties, '$.DefaultCapacityProviderStrategy') as default_capacity_provider_strategy,
+              JSON_EXTRACT(Properties, '$.Configuration') as configuration,
+              JSON_EXTRACT(Properties, '$.ServiceConnectDefaults') as service_connect_defaults,
+              JSON_EXTRACT(Properties, '$.CapacityProviders') as capacity_providers,
+              JSON_EXTRACT(Properties, '$.ClusterName') as cluster_name,
+              JSON_EXTRACT(Properties, '$.Arn') as arn,
+              JSON_EXTRACT(Properties, '$.Tags') as tags
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::ECS::Cluster'
+              AND Identifier = '<ClusterName>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'ClusterSettings') as cluster_settings,
+                json_extract_path_text(Properties, 'DefaultCapacityProviderStrategy') as default_capacity_provider_strategy,
+                json_extract_path_text(Properties, 'Configuration') as configuration,
+                json_extract_path_text(Properties, 'ServiceConnectDefaults') as service_connect_defaults,
+                json_extract_path_text(Properties, 'CapacityProviders') as capacity_providers,
+                json_extract_path_text(Properties, 'ClusterName') as cluster_name,
+                json_extract_path_text(Properties, 'Arn') as arn,
+                json_extract_path_text(Properties, 'Tags') as tags
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::ECS::Cluster'
+                AND Identifier = '<ClusterName>'
+                AND region = 'us-east-1'
+    clusters_list_only:
+      name: clusters_list_only
+      id: awscc.ecs.clusters_list_only
+      x-cfn-schema-name: Cluster
+      x-cfn-type-name: AWS::ECS::Cluster
+      x-identifiers: *ref_1
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.ClusterName') as cluster_name
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::ECS::Cluster'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'ClusterName') as cluster_name
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::ECS::Cluster'
+                AND region = 'us-east-1'
     cluster_capacity_provider_associations:
       name: cluster_capacity_provider_associations
       id: awscc.ecs.cluster_capacity_provider_associations
       x-cfn-schema-name: ClusterCapacityProviderAssociations
       x-cfn-type-name: AWS::ECS::ClusterCapacityProviderAssociations
-      x-identifiers:
+      x-identifiers: &ref_2
         - Cluster
       x-type: cloud_control
       methods:
@@ -3494,8 +4286,7 @@ components:
       id: awscc.ecs.cluster_capacity_provider_associations_list_only
       x-cfn-schema-name: ClusterCapacityProviderAssociations
       x-cfn-type-name: AWS::ECS::ClusterCapacityProviderAssociations
-      x-identifiers:
-        - Cluster
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3573,7 +4364,7 @@ components:
       id: awscc.ecs.services
       x-cfn-schema-name: Service
       x-cfn-type-name: AWS::ECS::Service
-      x-identifiers:
+      x-identifiers: &ref_3
         - ServiceArn
         - Cluster
       x-type: cloud_control
@@ -3714,9 +4505,7 @@ components:
       id: awscc.ecs.services_list_only
       x-cfn-schema-name: Service
       x-cfn-type-name: AWS::ECS::Service
-      x-identifiers:
-        - ServiceArn
-        - Cluster
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3748,7 +4537,7 @@ components:
       id: awscc.ecs.task_definitions
       x-cfn-schema-name: TaskDefinition
       x-cfn-type-name: AWS::ECS::TaskDefinition
-      x-identifiers:
+      x-identifiers: &ref_4
         - TaskDefinitionArn
       x-type: cloud_control
       methods:
@@ -3870,8 +4659,7 @@ components:
       id: awscc.ecs.task_definitions_list_only
       x-cfn-schema-name: TaskDefinition
       x-cfn-type-name: AWS::ECS::TaskDefinition
-      x-identifiers:
-        - TaskDefinitionArn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4152,6 +4940,90 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
+  /?Action=CreateResource&Version=2021-09-30&__CapacityProvider&__detailTransformed=true:
+    parameters:
+      - $ref: '#/components/parameters/X-Amz-Content-Sha256'
+      - $ref: '#/components/parameters/X-Amz-Date'
+      - $ref: '#/components/parameters/X-Amz-Algorithm'
+      - $ref: '#/components/parameters/X-Amz-Credential'
+      - $ref: '#/components/parameters/X-Amz-Security-Token'
+      - $ref: '#/components/parameters/X-Amz-Signature'
+      - $ref: '#/components/parameters/X-Amz-SignedHeaders'
+    post:
+      operationId: CreateCapacityProvider
+      parameters:
+        - description: Action Header
+          in: header
+          name: X-Amz-Target
+          required: false
+          schema:
+            default: CloudApiService.CreateResource
+            enum:
+              - CloudApiService.CreateResource
+            type: string
+        - in: header
+          name: Content-Type
+          required: false
+          schema:
+            default: application/x-amz-json-1.0
+            enum:
+              - application/x-amz-json-1.0
+            type: string
+      requestBody:
+        content:
+          application/x-amz-json-1.0:
+            schema:
+              $ref: '#/components/schemas/CreateCapacityProviderRequest'
+        required: true
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
+          description: Success
+  /?Action=CreateResource&Version=2021-09-30&__Cluster&__detailTransformed=true:
+    parameters:
+      - $ref: '#/components/parameters/X-Amz-Content-Sha256'
+      - $ref: '#/components/parameters/X-Amz-Date'
+      - $ref: '#/components/parameters/X-Amz-Algorithm'
+      - $ref: '#/components/parameters/X-Amz-Credential'
+      - $ref: '#/components/parameters/X-Amz-Security-Token'
+      - $ref: '#/components/parameters/X-Amz-Signature'
+      - $ref: '#/components/parameters/X-Amz-SignedHeaders'
+    post:
+      operationId: CreateCluster
+      parameters:
+        - description: Action Header
+          in: header
+          name: X-Amz-Target
+          required: false
+          schema:
+            default: CloudApiService.CreateResource
+            enum:
+              - CloudApiService.CreateResource
+            type: string
+        - in: header
+          name: Content-Type
+          required: false
+          schema:
+            default: application/x-amz-json-1.0
+            enum:
+              - application/x-amz-json-1.0
+            type: string
+      requestBody:
+        content:
+          application/x-amz-json-1.0:
+            schema:
+              $ref: '#/components/schemas/CreateClusterRequest'
+        required: true
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
+          description: Success
   /?Action=CreateResource&Version=2021-09-30&__ClusterCapacityProviderAssociations&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
diff --git a/openapi/src/awscc/v00.00.00000/services/efs.yaml b/openapi/src/awscc/v00.00.00000/services/efs.yaml
index 84e8132a8..e59d12392 100644
--- a/openapi/src/awscc/v00.00.00000/services/efs.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/efs.yaml
@@ -1093,7 +1093,7 @@ components:
       id: awscc.efs.access_points
       x-cfn-schema-name: AccessPoint
       x-cfn-type-name: AWS::EFS::AccessPoint
-      x-identifiers:
+      x-identifiers: &ref_0
         - AccessPointId
       x-type: cloud_control
       methods:
@@ -1191,8 +1191,7 @@ components:
       id: awscc.efs.access_points_list_only
       x-cfn-schema-name: AccessPoint
       x-cfn-type-name: AWS::EFS::AccessPoint
-      x-identifiers:
-        - AccessPointId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1222,7 +1221,7 @@ components:
       id: awscc.efs.file_systems
       x-cfn-schema-name: FileSystem
       x-cfn-type-name: AWS::EFS::FileSystem
-      x-identifiers:
+      x-identifiers: &ref_1
         - FileSystemId
       x-type: cloud_control
       methods:
@@ -1336,8 +1335,7 @@ components:
       id: awscc.efs.file_systems_list_only
       x-cfn-schema-name: FileSystem
       x-cfn-type-name: AWS::EFS::FileSystem
-      x-identifiers:
-        - FileSystemId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1367,7 +1365,7 @@ components:
       id: awscc.efs.mount_targets
       x-cfn-schema-name: MountTarget
       x-cfn-type-name: AWS::EFS::MountTarget
-      x-identifiers:
+      x-identifiers: &ref_2
         - Id
       x-type: cloud_control
       methods:
@@ -1465,8 +1463,7 @@ components:
       id: awscc.efs.mount_targets_list_only
       x-cfn-schema-name: MountTarget
       x-cfn-type-name: AWS::EFS::MountTarget
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/eks.yaml b/openapi/src/awscc/v00.00.00000/services/eks.yaml
index 0db9e8c69..0558155eb 100644
--- a/openapi/src/awscc/v00.00.00000/services/eks.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/eks.yaml
@@ -534,102 +534,39 @@ components:
           - eks:DescribeAccessEntry
         list:
           - eks:ListAccessEntries
-    PodIdentityAssociation:
+    Addon_Tag:
+      description: A key-value pair to associate with a resource.
       type: object
+      additionalProperties: false
       properties:
-        ClusterName:
-          description: The cluster that the pod identity association is created for.
+        Key:
           type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
           minLength: 1
-        RoleArn:
-          description: The IAM role ARN that the pod identity association is created for.
-          type: string
-        Namespace:
-          description: The Kubernetes namespace that the pod identity association is created for.
-          type: string
-        ServiceAccount:
-          description: The Kubernetes service account that the pod identity association is created for.
-          type: string
-        AssociationArn:
-          description: The ARN of the pod identity association.
-          type: string
-        AssociationId:
-          description: The ID of the pod identity association.
+          maxLength: 127
+        Value:
           type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
           minLength: 1
-        TargetRoleArn:
-          description: The Target Role Arn of the pod identity association.
+          maxLength: 255
+      required:
+        - Key
+        - Value
+    Addon_PodIdentityAssociation:
+      description: A pod identity to associate with an add-on.
+      type: object
+      additionalProperties: false
+      properties:
+        ServiceAccount:
           type: string
-          minLength: 1
-        ExternalId:
-          description: The External Id of the pod identity association.
+          description: The Kubernetes service account that the pod identity association is created for.
+        RoleArn:
           type: string
-          minLength: 1
-        DisableSessionTags:
-          description: The Disable Session Tags of the pod identity association.
-          type: boolean
-          minLength: 1
-        Tags:
-          description: An array of key-value pairs to apply to this resource.
-          type: array
-          uniqueItems: true
-          x-insertionOrder: false
-          items:
-            $ref: '#/components/schemas/Tag'
+          pattern: ^arn:aws(-cn|-us-gov|-iso(-[a-z])?)?:iam::\d{12}:(role)\/*
+          description: The IAM role ARN that the pod identity association is created for.
       required:
-        - ClusterName
-        - RoleArn
-        - Namespace
-        - ServiceAccount
-      x-stackql-resource-name: pod_identity_association
-      description: An object representing an Amazon EKS PodIdentityAssociation.
-      x-type-name: AWS::EKS::PodIdentityAssociation
-      x-stackql-primary-identifier:
-        - AssociationArn
-      x-create-only-properties:
-        - ClusterName
-        - Namespace
         - ServiceAccount
-      x-read-only-properties:
-        - AssociationArn
-        - AssociationId
-        - ExternalId
-      x-required-properties:
-        - ClusterName
         - RoleArn
-        - Namespace
-        - ServiceAccount
-      x-replacement-strategy: create_then_delete
-      x-tagging:
-        taggable: true
-        tagOnCreate: true
-        tagUpdatable: true
-        cloudFormationSystemTags: true
-        tagProperty: /properties/Tags
-        permissions:
-          - eks:TagResource
-          - eks:UntagResource
-      x-required-permissions:
-        create:
-          - eks:CreatePodIdentityAssociation
-          - eks:DescribePodIdentityAssociation
-          - eks:TagResource
-          - iam:PassRole
-          - iam:GetRole
-        read:
-          - eks:DescribePodIdentityAssociation
-        update:
-          - eks:DescribePodIdentityAssociation
-          - eks:UpdatePodIdentityAssociation
-          - eks:TagResource
-          - eks:UntagResource
-          - iam:PassRole
-          - iam:GetRole
-        delete:
-          - eks:DeletePodIdentityAssociation
-          - eks:DescribePodIdentityAssociation
-        list:
-          - eks:ListPodIdentityAssociations
     Addon:
       type: object
       properties:
@@ -666,7 +603,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/PodIdentityAssociation'
+            $ref: '#/components/schemas/Addon_PodIdentityAssociation'
         ConfigurationValues:
           description: The configuration values to use with the add-on
           type: string
@@ -690,7 +627,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Addon_Tag'
       required:
         - ClusterName
         - AddonName
@@ -1178,6 +1115,24 @@ components:
           - eks:DescribeCluster
         list:
           - eks:ListClusters
+    FargateProfile_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 127
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 255
+      required:
+        - Key
+        - Value
     Selector:
       type: object
       additionalProperties: false
@@ -1240,7 +1195,7 @@ components:
           uniqueItems: true
           description: An array of key-value pairs to apply to this resource.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/FargateProfile_Tag'
       required:
         - ClusterName
         - PodExecutionRoleArn
@@ -1657,6 +1612,102 @@ components:
           - eks:UpdateNodegroupVersion
           - ec2:DescribeLaunchTemplateVersions
           - ec2:RunInstances
+    PodIdentityAssociation:
+      type: object
+      properties:
+        ClusterName:
+          description: The cluster that the pod identity association is created for.
+          type: string
+          minLength: 1
+        RoleArn:
+          description: The IAM role ARN that the pod identity association is created for.
+          type: string
+        Namespace:
+          description: The Kubernetes namespace that the pod identity association is created for.
+          type: string
+        ServiceAccount:
+          description: The Kubernetes service account that the pod identity association is created for.
+          type: string
+        AssociationArn:
+          description: The ARN of the pod identity association.
+          type: string
+        AssociationId:
+          description: The ID of the pod identity association.
+          type: string
+          minLength: 1
+        TargetRoleArn:
+          description: The Target Role Arn of the pod identity association.
+          type: string
+          minLength: 1
+        ExternalId:
+          description: The External Id of the pod identity association.
+          type: string
+          minLength: 1
+        DisableSessionTags:
+          description: The Disable Session Tags of the pod identity association.
+          type: boolean
+          minLength: 1
+        Tags:
+          description: An array of key-value pairs to apply to this resource.
+          type: array
+          uniqueItems: true
+          x-insertionOrder: false
+          items:
+            $ref: '#/components/schemas/Tag'
+      required:
+        - ClusterName
+        - RoleArn
+        - Namespace
+        - ServiceAccount
+      x-stackql-resource-name: pod_identity_association
+      description: An object representing an Amazon EKS PodIdentityAssociation.
+      x-type-name: AWS::EKS::PodIdentityAssociation
+      x-stackql-primary-identifier:
+        - AssociationArn
+      x-create-only-properties:
+        - ClusterName
+        - Namespace
+        - ServiceAccount
+      x-read-only-properties:
+        - AssociationArn
+        - AssociationId
+        - ExternalId
+      x-required-properties:
+        - ClusterName
+        - RoleArn
+        - Namespace
+        - ServiceAccount
+      x-replacement-strategy: create_then_delete
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: true
+        tagProperty: /properties/Tags
+        permissions:
+          - eks:TagResource
+          - eks:UntagResource
+      x-required-permissions:
+        create:
+          - eks:CreatePodIdentityAssociation
+          - eks:DescribePodIdentityAssociation
+          - eks:TagResource
+          - iam:PassRole
+          - iam:GetRole
+        read:
+          - eks:DescribePodIdentityAssociation
+        update:
+          - eks:DescribePodIdentityAssociation
+          - eks:UpdatePodIdentityAssociation
+          - eks:TagResource
+          - eks:UntagResource
+          - iam:PassRole
+          - iam:GetRole
+        delete:
+          - eks:DeletePodIdentityAssociation
+          - eks:DescribePodIdentityAssociation
+        list:
+          - eks:ListPodIdentityAssociations
     CreateAccessEntryRequest:
       properties:
         ClientToken:
@@ -1713,62 +1764,6 @@ components:
       x-title: CreateAccessEntryRequest
       type: object
       required: []
-    CreatePodIdentityAssociationRequest:
-      properties:
-        ClientToken:
-          type: string
-        RoleArn:
-          type: string
-        TypeName:
-          type: string
-        TypeVersionId:
-          type: string
-        DesiredState:
-          type: object
-          properties:
-            ClusterName:
-              description: The cluster that the pod identity association is created for.
-              type: string
-              minLength: 1
-            RoleArn:
-              description: The IAM role ARN that the pod identity association is created for.
-              type: string
-            Namespace:
-              description: The Kubernetes namespace that the pod identity association is created for.
-              type: string
-            ServiceAccount:
-              description: The Kubernetes service account that the pod identity association is created for.
-              type: string
-            AssociationArn:
-              description: The ARN of the pod identity association.
-              type: string
-            AssociationId:
-              description: The ID of the pod identity association.
-              type: string
-              minLength: 1
-            TargetRoleArn:
-              description: The Target Role Arn of the pod identity association.
-              type: string
-              minLength: 1
-            ExternalId:
-              description: The External Id of the pod identity association.
-              type: string
-              minLength: 1
-            DisableSessionTags:
-              description: The Disable Session Tags of the pod identity association.
-              type: boolean
-              minLength: 1
-            Tags:
-              description: An array of key-value pairs to apply to this resource.
-              type: array
-              uniqueItems: true
-              x-insertionOrder: false
-              items:
-                $ref: '#/components/schemas/Tag'
-          x-stackQL-stringOnly: true
-      x-title: CreatePodIdentityAssociationRequest
-      type: object
-      required: []
     CreateAddonRequest:
       properties:
         ClientToken:
@@ -1815,7 +1810,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/PodIdentityAssociation'
+                $ref: '#/components/schemas/Addon_PodIdentityAssociation'
             ConfigurationValues:
               description: The configuration values to use with the add-on
               type: string
@@ -1839,7 +1834,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Addon_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateAddonRequest
       type: object
@@ -1979,7 +1974,7 @@ components:
               uniqueItems: true
               description: An array of key-value pairs to apply to this resource.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/FargateProfile_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateFargateProfileRequest
       type: object
@@ -2124,6 +2119,62 @@ components:
       x-title: CreateNodegroupRequest
       type: object
       required: []
+    CreatePodIdentityAssociationRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            ClusterName:
+              description: The cluster that the pod identity association is created for.
+              type: string
+              minLength: 1
+            RoleArn:
+              description: The IAM role ARN that the pod identity association is created for.
+              type: string
+            Namespace:
+              description: The Kubernetes namespace that the pod identity association is created for.
+              type: string
+            ServiceAccount:
+              description: The Kubernetes service account that the pod identity association is created for.
+              type: string
+            AssociationArn:
+              description: The ARN of the pod identity association.
+              type: string
+            AssociationId:
+              description: The ID of the pod identity association.
+              type: string
+              minLength: 1
+            TargetRoleArn:
+              description: The Target Role Arn of the pod identity association.
+              type: string
+              minLength: 1
+            ExternalId:
+              description: The External Id of the pod identity association.
+              type: string
+              minLength: 1
+            DisableSessionTags:
+              description: The Disable Session Tags of the pod identity association.
+              type: boolean
+              minLength: 1
+            Tags:
+              description: An array of key-value pairs to apply to this resource.
+              type: array
+              uniqueItems: true
+              x-insertionOrder: false
+              items:
+                $ref: '#/components/schemas/Tag'
+          x-stackQL-stringOnly: true
+      x-title: CreatePodIdentityAssociationRequest
+      type: object
+      required: []
   securitySchemes:
     hmac:
       type: apiKey
@@ -2135,145 +2186,11 @@ components:
     access_entries:
       name: access_entries
       id: awscc.eks.access_entries
-      x-cfn-schema-name: AccessEntry
-      x-cfn-type-name: AWS::EKS::AccessEntry
-      x-identifiers:
-        - PrincipalArn
-        - ClusterName
-      x-type: cloud_control
-      methods:
-        create_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive_DesiredState
-          operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__AccessEntry&__detailTransformed=true/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::EKS::AccessEntry"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-        update_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive
-          operation:
-            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::EKS::AccessEntry"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-        delete_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive
-          operation:
-            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::EKS::AccessEntry"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-      sqlVerbs:
-        insert:
-          - $ref: '#/components/x-stackQL-resources/access_entries/methods/create_resource'
-        delete:
-          - $ref: '#/components/x-stackQL-resources/access_entries/methods/delete_resource'
-        update:
-          - $ref: '#/components/x-stackQL-resources/access_entries/methods/update_resource'
-      config:
-        views:
-          select:
-            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
-            ddl: |-
-              SELECT
-              region,
-              Identifier,
-              JSON_EXTRACT(Properties, '$.ClusterName') as cluster_name,
-              JSON_EXTRACT(Properties, '$.PrincipalArn') as principal_arn,
-              JSON_EXTRACT(Properties, '$.Username') as username,
-              JSON_EXTRACT(Properties, '$.Tags') as tags,
-              JSON_EXTRACT(Properties, '$.AccessEntryArn') as access_entry_arn,
-              JSON_EXTRACT(Properties, '$.KubernetesGroups') as kubernetes_groups,
-              JSON_EXTRACT(Properties, '$.AccessPolicies') as access_policies,
-              JSON_EXTRACT(Properties, '$.Type') as type
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EKS::AccessEntry'
-              AND Identifier = '<PrincipalArn>|<ClusterName>'
-              AND region = 'us-east-1'
-            fallback:
-              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
-              ddl: |-
-                SELECT
-                region,
-                Identifier,
-                json_extract_path_text(Properties, 'ClusterName') as cluster_name,
-                json_extract_path_text(Properties, 'PrincipalArn') as principal_arn,
-                json_extract_path_text(Properties, 'Username') as username,
-                json_extract_path_text(Properties, 'Tags') as tags,
-                json_extract_path_text(Properties, 'AccessEntryArn') as access_entry_arn,
-                json_extract_path_text(Properties, 'KubernetesGroups') as kubernetes_groups,
-                json_extract_path_text(Properties, 'AccessPolicies') as access_policies,
-                json_extract_path_text(Properties, 'Type') as type
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EKS::AccessEntry'
-                AND Identifier = '<PrincipalArn>|<ClusterName>'
-                AND region = 'us-east-1'
-    access_entries_list_only:
-      name: access_entries_list_only
-      id: awscc.eks.access_entries_list_only
-      x-cfn-schema-name: AccessEntry
-      x-cfn-type-name: AWS::EKS::AccessEntry
-      x-identifiers:
-        - PrincipalArn
-        - ClusterName
-      x-type: cloud_control_view
-      methods: {}
-      sqlVerbs:
-        insert: []
-        delete: []
-        update: []
-      config:
-        views:
-          select:
-            predicate: sqlDialect == "sqlite3"
-            ddl: |-
-              SELECT
-              region,
-              JSON_EXTRACT(Properties, '$.PrincipalArn') as principal_arn,
-              JSON_EXTRACT(Properties, '$.ClusterName') as cluster_name
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EKS::AccessEntry'
-              AND region = 'us-east-1'
-            fallback:
-              predicate: sqlDialect == "postgres"
-              ddl: |-
-                SELECT
-                region,
-                json_extract_path_text(Properties, 'PrincipalArn') as principal_arn,
-                json_extract_path_text(Properties, 'ClusterName') as cluster_name
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EKS::AccessEntry'
-                AND region = 'us-east-1'
-    pod_identity_associations:
-      name: pod_identity_associations
-      id: awscc.eks.pod_identity_associations
-      x-cfn-schema-name: PodIdentityAssociation
-      x-cfn-type-name: AWS::EKS::PodIdentityAssociation
-      x-identifiers:
-        - AssociationArn
+      x-cfn-schema-name: AccessEntry
+      x-cfn-type-name: AWS::EKS::AccessEntry
+      x-identifiers: &ref_0
+        - PrincipalArn
+        - ClusterName
       x-type: cloud_control
       methods:
         create_resource:
@@ -2281,12 +2198,12 @@ components:
             requestBodyTranslate:
               algorithm: naive_DesiredState
           operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__PodIdentityAssociation&__detailTransformed=true/post'
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__AccessEntry&__detailTransformed=true/post'
           request:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::EKS::PodIdentityAssociation"
+                "TypeName": "AWS::EKS::AccessEntry"
               }
           response:
             mediaType: application/json
@@ -2302,7 +2219,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::EKS::PodIdentityAssociation"
+                "TypeName": "AWS::EKS::AccessEntry"
               }
           response:
             mediaType: application/json
@@ -2318,7 +2235,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::EKS::PodIdentityAssociation"
+                "TypeName": "AWS::EKS::AccessEntry"
               }
           response:
             mediaType: application/json
@@ -2326,11 +2243,11 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/pod_identity_associations/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/access_entries/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/pod_identity_associations/methods/delete_resource'
+          - $ref: '#/components/x-stackQL-resources/access_entries/methods/delete_resource'
         update:
-          - $ref: '#/components/x-stackQL-resources/pod_identity_associations/methods/update_resource'
+          - $ref: '#/components/x-stackQL-resources/access_entries/methods/update_resource'
       config:
         views:
           select:
@@ -2340,17 +2257,15 @@ components:
               region,
               Identifier,
               JSON_EXTRACT(Properties, '$.ClusterName') as cluster_name,
-              JSON_EXTRACT(Properties, '$.RoleArn') as role_arn,
-              JSON_EXTRACT(Properties, '$.Namespace') as namespace,
-              JSON_EXTRACT(Properties, '$.ServiceAccount') as service_account,
-              JSON_EXTRACT(Properties, '$.AssociationArn') as association_arn,
-              JSON_EXTRACT(Properties, '$.AssociationId') as association_id,
-              JSON_EXTRACT(Properties, '$.TargetRoleArn') as target_role_arn,
-              JSON_EXTRACT(Properties, '$.ExternalId') as external_id,
-              JSON_EXTRACT(Properties, '$.DisableSessionTags') as disable_session_tags,
-              JSON_EXTRACT(Properties, '$.Tags') as tags
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EKS::PodIdentityAssociation'
-              AND Identifier = '<AssociationArn>'
+              JSON_EXTRACT(Properties, '$.PrincipalArn') as principal_arn,
+              JSON_EXTRACT(Properties, '$.Username') as username,
+              JSON_EXTRACT(Properties, '$.Tags') as tags,
+              JSON_EXTRACT(Properties, '$.AccessEntryArn') as access_entry_arn,
+              JSON_EXTRACT(Properties, '$.KubernetesGroups') as kubernetes_groups,
+              JSON_EXTRACT(Properties, '$.AccessPolicies') as access_policies,
+              JSON_EXTRACT(Properties, '$.Type') as type
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EKS::AccessEntry'
+              AND Identifier = '<PrincipalArn>|<ClusterName>'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
@@ -2359,25 +2274,22 @@ components:
                 region,
                 Identifier,
                 json_extract_path_text(Properties, 'ClusterName') as cluster_name,
-                json_extract_path_text(Properties, 'RoleArn') as role_arn,
-                json_extract_path_text(Properties, 'Namespace') as namespace,
-                json_extract_path_text(Properties, 'ServiceAccount') as service_account,
-                json_extract_path_text(Properties, 'AssociationArn') as association_arn,
-                json_extract_path_text(Properties, 'AssociationId') as association_id,
-                json_extract_path_text(Properties, 'TargetRoleArn') as target_role_arn,
-                json_extract_path_text(Properties, 'ExternalId') as external_id,
-                json_extract_path_text(Properties, 'DisableSessionTags') as disable_session_tags,
-                json_extract_path_text(Properties, 'Tags') as tags
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EKS::PodIdentityAssociation'
-                AND Identifier = '<AssociationArn>'
+                json_extract_path_text(Properties, 'PrincipalArn') as principal_arn,
+                json_extract_path_text(Properties, 'Username') as username,
+                json_extract_path_text(Properties, 'Tags') as tags,
+                json_extract_path_text(Properties, 'AccessEntryArn') as access_entry_arn,
+                json_extract_path_text(Properties, 'KubernetesGroups') as kubernetes_groups,
+                json_extract_path_text(Properties, 'AccessPolicies') as access_policies,
+                json_extract_path_text(Properties, 'Type') as type
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EKS::AccessEntry'
+                AND Identifier = '<PrincipalArn>|<ClusterName>'
                 AND region = 'us-east-1'
-    pod_identity_associations_list_only:
-      name: pod_identity_associations_list_only
-      id: awscc.eks.pod_identity_associations_list_only
-      x-cfn-schema-name: PodIdentityAssociation
-      x-cfn-type-name: AWS::EKS::PodIdentityAssociation
-      x-identifiers:
-        - AssociationArn
+    access_entries_list_only:
+      name: access_entries_list_only
+      id: awscc.eks.access_entries_list_only
+      x-cfn-schema-name: AccessEntry
+      x-cfn-type-name: AWS::EKS::AccessEntry
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2391,23 +2303,25 @@ components:
             ddl: |-
               SELECT
               region,
-              JSON_EXTRACT(Properties, '$.AssociationArn') as association_arn
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EKS::PodIdentityAssociation'
+              JSON_EXTRACT(Properties, '$.PrincipalArn') as principal_arn,
+              JSON_EXTRACT(Properties, '$.ClusterName') as cluster_name
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EKS::AccessEntry'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres"
               ddl: |-
                 SELECT
                 region,
-                json_extract_path_text(Properties, 'AssociationArn') as association_arn
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EKS::PodIdentityAssociation'
+                json_extract_path_text(Properties, 'PrincipalArn') as principal_arn,
+                json_extract_path_text(Properties, 'ClusterName') as cluster_name
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EKS::AccessEntry'
                 AND region = 'us-east-1'
     addons:
       name: addons
       id: awscc.eks.addons
       x-cfn-schema-name: Addon
       x-cfn-type-name: AWS::EKS::Addon
-      x-identifiers:
+      x-identifiers: &ref_1
         - ClusterName
         - AddonName
       x-type: cloud_control
@@ -2514,9 +2428,7 @@ components:
       id: awscc.eks.addons_list_only
       x-cfn-schema-name: Addon
       x-cfn-type-name: AWS::EKS::Addon
-      x-identifiers:
-        - ClusterName
-        - AddonName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2548,7 +2460,7 @@ components:
       id: awscc.eks.clusters
       x-cfn-schema-name: Cluster
       x-cfn-type-name: AWS::EKS::Cluster
-      x-identifiers:
+      x-identifiers: &ref_2
         - Name
       x-type: cloud_control
       methods:
@@ -2682,8 +2594,7 @@ components:
       id: awscc.eks.clusters_list_only
       x-cfn-schema-name: Cluster
       x-cfn-type-name: AWS::EKS::Cluster
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2713,7 +2624,7 @@ components:
       id: awscc.eks.fargate_profiles
       x-cfn-schema-name: FargateProfile
       x-cfn-type-name: AWS::EKS::FargateProfile
-      x-identifiers:
+      x-identifiers: &ref_3
         - ClusterName
         - FargateProfileName
       x-type: cloud_control
@@ -2812,9 +2723,7 @@ components:
       id: awscc.eks.fargate_profiles_list_only
       x-cfn-schema-name: FargateProfile
       x-cfn-type-name: AWS::EKS::FargateProfile
-      x-identifiers:
-        - ClusterName
-        - FargateProfileName
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2846,7 +2755,7 @@ components:
       id: awscc.eks.identity_provider_configs
       x-cfn-schema-name: IdentityProviderConfig
       x-cfn-type-name: AWS::EKS::IdentityProviderConfig
-      x-identifiers:
+      x-identifiers: &ref_4
         - IdentityProviderConfigName
         - ClusterName
         - Type
@@ -2944,10 +2853,7 @@ components:
       id: awscc.eks.identity_provider_configs_list_only
       x-cfn-schema-name: IdentityProviderConfig
       x-cfn-type-name: AWS::EKS::IdentityProviderConfig
-      x-identifiers:
-        - IdentityProviderConfigName
-        - ClusterName
-        - Type
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2981,7 +2887,7 @@ components:
       id: awscc.eks.nodegroups
       x-cfn-schema-name: Nodegroup
       x-cfn-type-name: AWS::EKS::Nodegroup
-      x-identifiers:
+      x-identifiers: &ref_5
         - Id
       x-type: cloud_control
       methods:
@@ -3107,8 +3013,7 @@ components:
       id: awscc.eks.nodegroups_list_only
       x-cfn-schema-name: Nodegroup
       x-cfn-type-name: AWS::EKS::Nodegroup
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3133,6 +3038,140 @@ components:
                 json_extract_path_text(Properties, 'Id') as id
                 FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EKS::Nodegroup'
                 AND region = 'us-east-1'
+    pod_identity_associations:
+      name: pod_identity_associations
+      id: awscc.eks.pod_identity_associations
+      x-cfn-schema-name: PodIdentityAssociation
+      x-cfn-type-name: AWS::EKS::PodIdentityAssociation
+      x-identifiers: &ref_6
+        - AssociationArn
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__PodIdentityAssociation&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::EKS::PodIdentityAssociation"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::EKS::PodIdentityAssociation"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::EKS::PodIdentityAssociation"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/pod_identity_associations/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/pod_identity_associations/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/pod_identity_associations/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.ClusterName') as cluster_name,
+              JSON_EXTRACT(Properties, '$.RoleArn') as role_arn,
+              JSON_EXTRACT(Properties, '$.Namespace') as namespace,
+              JSON_EXTRACT(Properties, '$.ServiceAccount') as service_account,
+              JSON_EXTRACT(Properties, '$.AssociationArn') as association_arn,
+              JSON_EXTRACT(Properties, '$.AssociationId') as association_id,
+              JSON_EXTRACT(Properties, '$.TargetRoleArn') as target_role_arn,
+              JSON_EXTRACT(Properties, '$.ExternalId') as external_id,
+              JSON_EXTRACT(Properties, '$.DisableSessionTags') as disable_session_tags,
+              JSON_EXTRACT(Properties, '$.Tags') as tags
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EKS::PodIdentityAssociation'
+              AND Identifier = '<AssociationArn>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'ClusterName') as cluster_name,
+                json_extract_path_text(Properties, 'RoleArn') as role_arn,
+                json_extract_path_text(Properties, 'Namespace') as namespace,
+                json_extract_path_text(Properties, 'ServiceAccount') as service_account,
+                json_extract_path_text(Properties, 'AssociationArn') as association_arn,
+                json_extract_path_text(Properties, 'AssociationId') as association_id,
+                json_extract_path_text(Properties, 'TargetRoleArn') as target_role_arn,
+                json_extract_path_text(Properties, 'ExternalId') as external_id,
+                json_extract_path_text(Properties, 'DisableSessionTags') as disable_session_tags,
+                json_extract_path_text(Properties, 'Tags') as tags
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EKS::PodIdentityAssociation'
+                AND Identifier = '<AssociationArn>'
+                AND region = 'us-east-1'
+    pod_identity_associations_list_only:
+      name: pod_identity_associations_list_only
+      id: awscc.eks.pod_identity_associations_list_only
+      x-cfn-schema-name: PodIdentityAssociation
+      x-cfn-type-name: AWS::EKS::PodIdentityAssociation
+      x-identifiers: *ref_6
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.AssociationArn') as association_arn
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EKS::PodIdentityAssociation'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'AssociationArn') as association_arn
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::EKS::PodIdentityAssociation'
+                AND region = 'us-east-1'
 paths:
   /?Action=CreateResource&Version=2021-09-30:
     parameters:
@@ -3319,7 +3358,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__PodIdentityAssociation&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__Addon&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3329,7 +3368,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreatePodIdentityAssociation
+      operationId: CreateAddon
       parameters:
         - description: Action Header
           in: header
@@ -3352,7 +3391,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreatePodIdentityAssociationRequest'
+              $ref: '#/components/schemas/CreateAddonRequest'
         required: true
       responses:
         '200':
@@ -3361,7 +3400,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__Addon&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__Cluster&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3371,7 +3410,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateAddon
+      operationId: CreateCluster
       parameters:
         - description: Action Header
           in: header
@@ -3394,7 +3433,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateAddonRequest'
+              $ref: '#/components/schemas/CreateClusterRequest'
         required: true
       responses:
         '200':
@@ -3403,7 +3442,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__Cluster&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__FargateProfile&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3413,7 +3452,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateCluster
+      operationId: CreateFargateProfile
       parameters:
         - description: Action Header
           in: header
@@ -3436,7 +3475,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateClusterRequest'
+              $ref: '#/components/schemas/CreateFargateProfileRequest'
         required: true
       responses:
         '200':
@@ -3445,7 +3484,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__FargateProfile&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__IdentityProviderConfig&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3455,7 +3494,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateFargateProfile
+      operationId: CreateIdentityProviderConfig
       parameters:
         - description: Action Header
           in: header
@@ -3478,7 +3517,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateFargateProfileRequest'
+              $ref: '#/components/schemas/CreateIdentityProviderConfigRequest'
         required: true
       responses:
         '200':
@@ -3487,7 +3526,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__IdentityProviderConfig&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__Nodegroup&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3497,7 +3536,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateIdentityProviderConfig
+      operationId: CreateNodegroup
       parameters:
         - description: Action Header
           in: header
@@ -3520,7 +3559,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateIdentityProviderConfigRequest'
+              $ref: '#/components/schemas/CreateNodegroupRequest'
         required: true
       responses:
         '200':
@@ -3529,7 +3568,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__Nodegroup&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__PodIdentityAssociation&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3539,7 +3578,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateNodegroup
+      operationId: CreatePodIdentityAssociation
       parameters:
         - description: Action Header
           in: header
@@ -3562,7 +3601,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateNodegroupRequest'
+              $ref: '#/components/schemas/CreatePodIdentityAssociationRequest'
         required: true
       responses:
         '200':
diff --git a/openapi/src/awscc/v00.00.00000/services/elasticache.yaml b/openapi/src/awscc/v00.00.00000/services/elasticache.yaml
index 21bb62208..9324e78c0 100644
--- a/openapi/src/awscc/v00.00.00000/services/elasticache.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/elasticache.yaml
@@ -521,23 +521,15 @@ components:
         list:
           - elasticache:DescribeGlobalReplicationGroups
     Tag:
-      description: A key-value pair to associate with a resource.
       type: object
       additionalProperties: false
       properties:
         Key:
-          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with ''aws:''. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
           type: string
-          pattern: ^(?!aws:)[a-zA-Z0-9 _\.\/=+:\-@]*$
-          minLength: 1
-          maxLength: 128
         Value:
-          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
           type: string
-          pattern: ^[a-zA-Z0-9 _\.\/=+:\-@]*$
-          minLength: 0
-          maxLength: 256
       required:
+        - Value
         - Key
     ParameterGroup:
       type: object
@@ -652,6 +644,25 @@ components:
           description: The maximum ECPU per second of the Serverless Cache.
           type: integer
       additionalProperties: false
+    ServerlessCache_Tag:
+      description: A key-value pair to associate with Serverless Cache.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with ''aws:''. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+          pattern: ^(?!aws:)[a-zA-Z0-9 _\.\/=+:\-@]*$
+          minLength: 1
+          maxLength: 128
+        Value:
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+          pattern: ^[a-zA-Z0-9 _\.\/=+:\-@]*$
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
     Endpoint:
       description: The address and the port.
       type: object
@@ -706,7 +717,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ServerlessCache_Tag'
         UserGroupId:
           description: The ID of the user group.
           type: string
@@ -802,6 +813,18 @@ components:
         list:
           - elasticache:DescribeServerlessCaches
           - elasticache:ListTagsForResource
+    SubnetGroup_Tag:
+      type: object
+      description: A tag that can be added to an ElastiCache subnet group. Tags are composed of a Key/Value pair. You can use tags to categorize and track all your subnet groups. A tag with a null Value is permitted.
+      additionalProperties: false
+      properties:
+        Value:
+          type: string
+        Key:
+          type: string
+      required:
+        - Value
+        - Key
     SubnetGroup:
       type: object
       properties:
@@ -823,7 +846,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/SubnetGroup_Tag'
       required:
         - Description
         - SubnetIds
@@ -867,6 +890,25 @@ components:
           - elasticache:DescribeCacheSubnetGroups
           - elasticache:AddTagsToResource
           - elasticache:RemoveTagsFromResource
+    User_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with ''aws:''. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+          pattern: ^(?!aws:)[a-zA-Z0-9 _\.\/=+:\-@]*$
+          minLength: 1
+          maxLength: 128
+        Value:
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+          pattern: ^[a-zA-Z0-9 _\.\/=+:\-@]*$
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
     User:
       type: object
       properties:
@@ -931,7 +973,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/User_Tag'
       required:
         - UserId
         - UserName
@@ -986,6 +1028,25 @@ components:
         list:
           - elasticache:DescribeUsers
           - elasticache:ListTagsForResource
+    UserGroup_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with ''aws:''. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+          pattern: ^(?!aws:)[a-zA-Z0-9 _\.\/=+:\-@]*$
+          minLength: 1
+          maxLength: 128
+        Value:
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+          pattern: ^[a-zA-Z0-9 _\.\/=+:\-@]*$
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
     UserGroup:
       type: object
       properties:
@@ -1020,7 +1081,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/UserGroup_Tag'
       required:
         - UserGroupId
         - Engine
@@ -1224,7 +1285,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ServerlessCache_Tag'
             UserGroupId:
               description: The ID of the user group.
               type: string
@@ -1292,7 +1353,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/SubnetGroup_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateSubnetGroupRequest
       type: object
@@ -1371,7 +1432,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/User_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateUserRequest
       type: object
@@ -1420,7 +1481,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/UserGroup_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateUserGroupRequest
       type: object
@@ -1438,7 +1499,7 @@ components:
       id: awscc.elasticache.global_replication_groups
       x-cfn-schema-name: GlobalReplicationGroup
       x-cfn-type-name: AWS::ElastiCache::GlobalReplicationGroup
-      x-identifiers:
+      x-identifiers: &ref_0
         - GlobalReplicationGroupId
       x-type: cloud_control
       methods:
@@ -1546,8 +1607,7 @@ components:
       id: awscc.elasticache.global_replication_groups_list_only
       x-cfn-schema-name: GlobalReplicationGroup
       x-cfn-type-name: AWS::ElastiCache::GlobalReplicationGroup
-      x-identifiers:
-        - GlobalReplicationGroupId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1577,7 +1637,7 @@ components:
       id: awscc.elasticache.parameter_groups
       x-cfn-schema-name: ParameterGroup
       x-cfn-type-name: AWS::ElastiCache::ParameterGroup
-      x-identifiers:
+      x-identifiers: &ref_1
         - CacheParameterGroupName
       x-type: cloud_control
       methods:
@@ -1671,8 +1731,7 @@ components:
       id: awscc.elasticache.parameter_groups_list_only
       x-cfn-schema-name: ParameterGroup
       x-cfn-type-name: AWS::ElastiCache::ParameterGroup
-      x-identifiers:
-        - CacheParameterGroupName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1702,7 +1761,7 @@ components:
       id: awscc.elasticache.serverless_caches
       x-cfn-schema-name: ServerlessCache
       x-cfn-type-name: AWS::ElastiCache::ServerlessCache
-      x-identifiers:
+      x-identifiers: &ref_2
         - ServerlessCacheName
       x-type: cloud_control
       methods:
@@ -1826,8 +1885,7 @@ components:
       id: awscc.elasticache.serverless_caches_list_only
       x-cfn-schema-name: ServerlessCache
       x-cfn-type-name: AWS::ElastiCache::ServerlessCache
-      x-identifiers:
-        - ServerlessCacheName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1857,7 +1915,7 @@ components:
       id: awscc.elasticache.subnet_groups
       x-cfn-schema-name: SubnetGroup
       x-cfn-type-name: AWS::ElastiCache::SubnetGroup
-      x-identifiers:
+      x-identifiers: &ref_3
         - CacheSubnetGroupName
       x-type: cloud_control
       methods:
@@ -1949,8 +2007,7 @@ components:
       id: awscc.elasticache.subnet_groups_list_only
       x-cfn-schema-name: SubnetGroup
       x-cfn-type-name: AWS::ElastiCache::SubnetGroup
-      x-identifiers:
-        - CacheSubnetGroupName
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1980,7 +2037,7 @@ components:
       id: awscc.elasticache.users
       x-cfn-schema-name: User
       x-cfn-type-name: AWS::ElastiCache::User
-      x-identifiers:
+      x-identifiers: &ref_4
         - UserId
       x-type: cloud_control
       methods:
@@ -2084,8 +2141,7 @@ components:
       id: awscc.elasticache.users_list_only
       x-cfn-schema-name: User
       x-cfn-type-name: AWS::ElastiCache::User
-      x-identifiers:
-        - UserId
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2115,7 +2171,7 @@ components:
       id: awscc.elasticache.user_groups
       x-cfn-schema-name: UserGroup
       x-cfn-type-name: AWS::ElastiCache::UserGroup
-      x-identifiers:
+      x-identifiers: &ref_5
         - UserGroupId
       x-type: cloud_control
       methods:
@@ -2211,8 +2267,7 @@ components:
       id: awscc.elasticache.user_groups_list_only
       x-cfn-schema-name: UserGroup
       x-cfn-type-name: AWS::ElastiCache::UserGroup
-      x-identifiers:
-        - UserGroupId
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/elasticbeanstalk.yaml b/openapi/src/awscc/v00.00.00000/services/elasticbeanstalk.yaml
index 175b1f4b4..a85e0b810 100644
--- a/openapi/src/awscc/v00.00.00000/services/elasticbeanstalk.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/elasticbeanstalk.yaml
@@ -1048,7 +1048,7 @@ components:
       id: awscc.elasticbeanstalk.applications
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::ElasticBeanstalk::Application
-      x-identifiers:
+      x-identifiers: &ref_0
         - ApplicationName
       x-type: cloud_control
       methods:
@@ -1138,8 +1138,7 @@ components:
       id: awscc.elasticbeanstalk.applications_list_only
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::ElasticBeanstalk::Application
-      x-identifiers:
-        - ApplicationName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1169,7 +1168,7 @@ components:
       id: awscc.elasticbeanstalk.application_versions
       x-cfn-schema-name: ApplicationVersion
       x-cfn-type-name: AWS::ElasticBeanstalk::ApplicationVersion
-      x-identifiers:
+      x-identifiers: &ref_1
         - ApplicationName
         - Id
       x-type: cloud_control
@@ -1262,9 +1261,7 @@ components:
       id: awscc.elasticbeanstalk.application_versions_list_only
       x-cfn-schema-name: ApplicationVersion
       x-cfn-type-name: AWS::ElasticBeanstalk::ApplicationVersion
-      x-identifiers:
-        - ApplicationName
-        - Id
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1296,7 +1293,7 @@ components:
       id: awscc.elasticbeanstalk.configuration_templates
       x-cfn-schema-name: ConfigurationTemplate
       x-cfn-type-name: AWS::ElasticBeanstalk::ConfigurationTemplate
-      x-identifiers:
+      x-identifiers: &ref_2
         - ApplicationName
         - TemplateName
       x-type: cloud_control
@@ -1397,9 +1394,7 @@ components:
       id: awscc.elasticbeanstalk.configuration_templates_list_only
       x-cfn-schema-name: ConfigurationTemplate
       x-cfn-type-name: AWS::ElasticBeanstalk::ConfigurationTemplate
-      x-identifiers:
-        - ApplicationName
-        - TemplateName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1431,7 +1426,7 @@ components:
       id: awscc.elasticbeanstalk.environments
       x-cfn-schema-name: Environment
       x-cfn-type-name: AWS::ElasticBeanstalk::Environment
-      x-identifiers:
+      x-identifiers: &ref_3
         - EnvironmentName
       x-type: cloud_control
       methods:
@@ -1541,8 +1536,7 @@ components:
       id: awscc.elasticbeanstalk.environments_list_only
       x-cfn-schema-name: Environment
       x-cfn-type-name: AWS::ElasticBeanstalk::Environment
-      x-identifiers:
-        - EnvironmentName
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/elasticloadbalancingv2.yaml b/openapi/src/awscc/v00.00.00000/services/elasticloadbalancingv2.yaml
index c785d773c..3d640ffe3 100644
--- a/openapi/src/awscc/v00.00.00000/services/elasticloadbalancingv2.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/elasticloadbalancingv2.yaml
@@ -480,6 +480,13 @@ components:
               +  authenticate```` - Redirect the request to the IdP authorization endpoint. This is the default value.
           type: string
         UserPoolClientId:
+          anyOf:
+            - relationshipRef:
+                typeName: AWS::Cognito::UserPoolClient
+                propertyPath: /properties/UserPoolId
+            - relationshipRef:
+                typeName: AWS::Cognito::UserPoolClient
+                propertyPath: /properties/ClientId
           description: The ID of the Amazon Cognito user pool client.
           type: string
         UserPoolDomain:
@@ -487,7 +494,7 @@ components:
           type: string
         SessionTimeout:
           description: The maximum duration of the authentication session, in seconds. The default is 604800 seconds (7 days).
-          type: integer
+          type: string
         Scope:
           description: |-
             The set of user claims to be requested from the IdP. The default is ``openid``.
@@ -504,7 +511,6 @@ components:
             '[a-zA-Z0-9]+':
               type: string
           description: The query parameters (up to 10) to include in the redirect request to the authorization endpoint.
-          additionalProperties: false
           type: object
       required:
         - UserPoolClientId
@@ -602,7 +608,6 @@ components:
         TargetGroups:
           uniqueItems: true
           description: Information about how traffic will be distributed between multiple target groups in a forward rule.
-          x-insertionOrder: false
           type: array
           items:
             $ref: '#/components/schemas/TargetGroupTuple'
@@ -631,7 +636,7 @@ components:
           type: boolean
         SessionTimeout:
           description: The maximum duration of the authentication session, in seconds. The default is 604800 seconds (7 days).
-          type: integer
+          type: string
         Scope:
           description: |-
             The set of user claims to be requested from the IdP. The default is ``openid``.
@@ -660,7 +665,6 @@ components:
             '[a-zA-Z0-9]+':
               type: string
           description: The query parameters (up to 10) to include in the redirect request to the authorization endpoint.
-          additionalProperties: false
           type: object
       required:
         - TokenEndpoint
@@ -777,6 +781,37 @@ components:
         delete:
           - elasticloadbalancing:DeleteListener
           - elasticloadbalancing:DescribeListeners
+    ListenerRule_Action:
+      description: Specifies an action for a listener rule.
+      additionalProperties: false
+      type: object
+      properties:
+        Order:
+          description: The order for the action. This value is required for rules with multiple actions. The action with the lowest value for order is performed first.
+          type: integer
+        TargetGroupArn:
+          description: The Amazon Resource Name (ARN) of the target group. Specify only when ``Type`` is ``forward`` and you want to route to a single target group. To route to one or more target groups, use ``ForwardConfig`` instead.
+          type: string
+        FixedResponseConfig:
+          description: '[Application Load Balancer] Information for creating an action that returns a custom HTTP response. Specify only when ``Type`` is ``fixed-response``.'
+          $ref: '#/components/schemas/FixedResponseConfig'
+        AuthenticateCognitoConfig:
+          description: '[HTTPS listeners] Information for using Amazon Cognito to authenticate users. Specify only when ``Type`` is ``authenticate-cognito``.'
+          $ref: '#/components/schemas/ListenerRule_AuthenticateCognitoConfig'
+        Type:
+          description: The type of action.
+          type: string
+        RedirectConfig:
+          description: '[Application Load Balancer] Information for creating a redirect action. Specify only when ``Type`` is ``redirect``.'
+          $ref: '#/components/schemas/RedirectConfig'
+        ForwardConfig:
+          description: Information for creating an action that distributes requests among one or more target groups. For Network Load Balancers, you can specify a single target group. Specify only when ``Type`` is ``forward``. If you specify both ``ForwardConfig`` and ``TargetGroupArn``, you can specify only one target group using ``ForwardConfig`` and it must be the same target group specified in ``TargetGroupArn``.
+          $ref: '#/components/schemas/ListenerRule_ForwardConfig'
+        AuthenticateOidcConfig:
+          description: '[HTTPS listeners] Information about an identity provider that is compliant with OpenID Connect (OIDC). Specify only when ``Type`` is ``authenticate-oidc``.'
+          $ref: '#/components/schemas/ListenerRule_AuthenticateOidcConfig'
+      required:
+        - Type
     RuleCondition:
       description: Specifies a condition for a listener rule.
       additionalProperties: false
@@ -874,6 +909,49 @@ components:
         HttpHeaderName:
           description: The name of the HTTP header field. The maximum size is 40 characters. The header name is case insensitive. The allowed characters are specified by RFC 7230. Wildcards are not supported.
           type: string
+    ListenerRule_AuthenticateCognitoConfig:
+      description: Specifies information required when integrating with Amazon Cognito to authenticate users.
+      additionalProperties: false
+      type: object
+      properties:
+        OnUnauthenticatedRequest:
+          description: |-
+            The behavior if the user is not authenticated. The following are possible values:
+              +  deny```` - Return an HTTP 401 Unauthorized error.
+              +  allow```` - Allow the request to be forwarded to the target.
+              +  authenticate```` - Redirect the request to the IdP authorization endpoint. This is the default value.
+          type: string
+        UserPoolClientId:
+          description: The ID of the Amazon Cognito user pool client.
+          type: string
+        UserPoolDomain:
+          description: The domain prefix or fully-qualified domain name of the Amazon Cognito user pool.
+          type: string
+        SessionTimeout:
+          description: The maximum duration of the authentication session, in seconds. The default is 604800 seconds (7 days).
+          type: integer
+        Scope:
+          description: |-
+            The set of user claims to be requested from the IdP. The default is ``openid``.
+             To verify which scope values your IdP supports and how to separate multiple values, see the documentation for your IdP.
+          type: string
+        SessionCookieName:
+          description: The name of the cookie used to maintain session information. The default is AWSELBAuthSessionCookie.
+          type: string
+        UserPoolArn:
+          description: The Amazon Resource Name (ARN) of the Amazon Cognito user pool.
+          type: string
+        AuthenticationRequestExtraParams:
+          x-patternProperties:
+            '[a-zA-Z0-9]+':
+              type: string
+          description: The query parameters (up to 10) to include in the redirect request to the authorization endpoint.
+          additionalProperties: false
+          type: object
+      required:
+        - UserPoolClientId
+        - UserPoolDomain
+        - UserPoolArn
     QueryStringKeyValue:
       description: Information about a key/value pair.
       additionalProperties: false
@@ -885,6 +963,21 @@ components:
         Key:
           description: The key. You can omit the key.
           type: string
+    ListenerRule_ForwardConfig:
+      description: Information for creating an action that distributes requests among one or more target groups. For Network Load Balancers, you can specify a single target group. Specify only when ``Type`` is ``forward``. If you specify both ``ForwardConfig`` and ``TargetGroupArn``, you can specify only one target group using ``ForwardConfig`` and it must be the same target group specified in ``TargetGroupArn``.
+      additionalProperties: false
+      type: object
+      properties:
+        TargetGroupStickinessConfig:
+          description: Information about the target group stickiness for a rule.
+          $ref: '#/components/schemas/TargetGroupStickinessConfig'
+        TargetGroups:
+          uniqueItems: true
+          description: Information about how traffic will be distributed between multiple target groups in a forward rule.
+          x-insertionOrder: false
+          type: array
+          items:
+            $ref: '#/components/schemas/TargetGroupTuple'
     HostHeaderConfig:
       description: Information about a host header condition.
       additionalProperties: false
@@ -907,6 +1000,68 @@ components:
             The name of the request method. The maximum size is 40 characters. The allowed characters are A-Z, hyphen (-), and underscore (_). The comparison is case sensitive. Wildcards are not supported; therefore, the method name must be an exact match.
              If you specify multiple strings, the condition is satisfied if one of the strings matches the HTTP request method. We recommend that you route GET and HEAD requests in the same way, because the response to a HEAD request may be cached.
           $ref: '#/components/schemas/ListOfStrings'
+    ListenerRule_AuthenticateOidcConfig:
+      anyOf:
+        - required:
+            - ClientSecret
+        - required:
+            - UseExistingClientSecret
+      description: Specifies information required using an identity provide (IdP) that is compliant with OpenID Connect (OIDC) to authenticate users.
+      additionalProperties: false
+      type: object
+      properties:
+        OnUnauthenticatedRequest:
+          description: |-
+            The behavior if the user is not authenticated. The following are possible values:
+              +  deny```` - Return an HTTP 401 Unauthorized error.
+              +  allow```` - Allow the request to be forwarded to the target.
+              +  authenticate```` - Redirect the request to the IdP authorization endpoint. This is the default value.
+          type: string
+        TokenEndpoint:
+          description: The token endpoint of the IdP. This must be a full URL, including the HTTPS protocol, the domain, and the path.
+          type: string
+        UseExistingClientSecret:
+          description: Indicates whether to use the existing client secret when modifying a rule. If you are creating a rule, you can omit this parameter or set it to false.
+          type: boolean
+        SessionTimeout:
+          description: The maximum duration of the authentication session, in seconds. The default is 604800 seconds (7 days).
+          type: integer
+        Scope:
+          description: |-
+            The set of user claims to be requested from the IdP. The default is ``openid``.
+             To verify which scope values your IdP supports and how to separate multiple values, see the documentation for your IdP.
+          type: string
+        Issuer:
+          description: The OIDC issuer identifier of the IdP. This must be a full URL, including the HTTPS protocol, the domain, and the path.
+          type: string
+        ClientSecret:
+          description: The OAuth 2.0 client secret. This parameter is required if you are creating a rule. If you are modifying a rule, you can omit this parameter if you set ``UseExistingClientSecret`` to true.
+          type: string
+        UserInfoEndpoint:
+          description: The user info endpoint of the IdP. This must be a full URL, including the HTTPS protocol, the domain, and the path.
+          type: string
+        ClientId:
+          description: The OAuth 2.0 client identifier.
+          type: string
+        AuthorizationEndpoint:
+          description: The authorization endpoint of the IdP. This must be a full URL, including the HTTPS protocol, the domain, and the path.
+          type: string
+        SessionCookieName:
+          description: The name of the cookie used to maintain session information. The default is AWSELBAuthSessionCookie.
+          type: string
+        AuthenticationRequestExtraParams:
+          x-patternProperties:
+            '[a-zA-Z0-9]+':
+              type: string
+          description: The query parameters (up to 10) to include in the redirect request to the authorization endpoint.
+          additionalProperties: false
+          type: object
+      required:
+        - TokenEndpoint
+        - Issuer
+        - UserInfoEndpoint
+        - ClientId
+        - AuthorizationEndpoint
     SourceIpConfig:
       description: |-
         Information about a source IP condition.
@@ -940,7 +1095,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Action'
+            $ref: '#/components/schemas/ListenerRule_Action'
         Priority:
           description: |-
             The rule priority. A listener can't have multiple rules with the same priority.
@@ -1084,11 +1239,13 @@ components:
       properties:
         Value:
           type: string
+          description: The value of the tag.
         Key:
           type: string
+          description: The key of the tag.
       required:
-        - Value
         - Key
+      description: Information about a tag.
     LoadBalancer:
       type: object
       properties:
@@ -1278,6 +1435,19 @@ components:
         Key:
           description: The value of the attribute.
           type: string
+    TargetGroup_Tag:
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          description: 'The key name of the tag. '
+          type: string
+        Key:
+          description: 'The value for the tag. '
+          type: string
+      required:
+        - Value
+        - Key
     TargetGroup:
       type: object
       properties:
@@ -1366,7 +1536,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/TargetGroup_Tag'
       x-stackql-resource-name: target_group
       description: Resource Type definition for AWS::ElasticLoadBalancingV2::TargetGroup
       x-type-name: AWS::ElasticLoadBalancingV2::TargetGroup
@@ -1422,6 +1592,17 @@ components:
         delete:
           - elasticloadbalancing:DeleteTargetGroup
           - elasticloadbalancing:DescribeTargetGroups
+    TrustStore_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Value:
+          type: string
+        Key:
+          type: string
+      required:
+        - Value
+        - Key
     TrustStore:
       type: object
       properties:
@@ -1449,7 +1630,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/TrustStore_Tag'
         TrustStoreArn:
           type: string
           description: The Amazon Resource Name (ARN) of the trust store.
@@ -1516,6 +1697,19 @@ components:
           type: string
         RevocationType:
           type: string
+    TrustStoreRevocation_TrustStoreRevocation:
+      type: object
+      additionalProperties: false
+      properties:
+        TrustStoreArn:
+          type: string
+        RevocationId:
+          type: string
+        RevocationType:
+          type: string
+        NumberOfRevokedEntries:
+          type: integer
+          format: int64
     TrustStoreRevocation:
       type: object
       properties:
@@ -1539,7 +1733,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/TrustStoreRevocation'
+            $ref: '#/components/schemas/TrustStoreRevocation_TrustStoreRevocation'
       x-stackql-resource-name: trust_store_revocation
       description: Resource Type definition for AWS::ElasticLoadBalancingV2::TrustStoreRevocation
       x-type-name: AWS::ElasticLoadBalancingV2::TrustStoreRevocation
@@ -1667,7 +1861,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Action'
+                $ref: '#/components/schemas/ListenerRule_Action'
             Priority:
               description: |-
                 The rule priority. A listener can't have multiple rules with the same priority.
@@ -1903,7 +2097,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/TargetGroup_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateTargetGroupRequest
       type: object
@@ -1945,7 +2139,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/TrustStore_Tag'
             TrustStoreArn:
               type: string
               description: The Amazon Resource Name (ARN) of the trust store.
@@ -1986,7 +2180,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/TrustStoreRevocation'
+                $ref: '#/components/schemas/TrustStoreRevocation_TrustStoreRevocation'
           x-stackQL-stringOnly: true
       x-title: CreateTrustStoreRevocationRequest
       type: object
@@ -2004,7 +2198,7 @@ components:
       id: awscc.elasticloadbalancingv2.listeners
       x-cfn-schema-name: Listener
       x-cfn-type-name: AWS::ElasticLoadBalancingV2::Listener
-      x-identifiers:
+      x-identifiers: &ref_0
         - ListenerArn
       x-type: cloud_control
       methods:
@@ -2108,8 +2302,7 @@ components:
       id: awscc.elasticloadbalancingv2.listeners_list_only
       x-cfn-schema-name: Listener
       x-cfn-type-name: AWS::ElasticLoadBalancingV2::Listener
-      x-identifiers:
-        - ListenerArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2139,7 +2332,7 @@ components:
       id: awscc.elasticloadbalancingv2.listener_rules
       x-cfn-schema-name: ListenerRule
       x-cfn-type-name: AWS::ElasticLoadBalancingV2::ListenerRule
-      x-identifiers:
+      x-identifiers: &ref_1
         - RuleArn
       x-type: cloud_control
       methods:
@@ -2235,8 +2428,7 @@ components:
       id: awscc.elasticloadbalancingv2.listener_rules_list_only
       x-cfn-schema-name: ListenerRule
       x-cfn-type-name: AWS::ElasticLoadBalancingV2::ListenerRule
-      x-identifiers:
-        - RuleArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2266,7 +2458,7 @@ components:
       id: awscc.elasticloadbalancingv2.load_balancers
       x-cfn-schema-name: LoadBalancer
       x-cfn-type-name: AWS::ElasticLoadBalancingV2::LoadBalancer
-      x-identifiers:
+      x-identifiers: &ref_2
         - LoadBalancerArn
       x-type: cloud_control
       methods:
@@ -2386,8 +2578,7 @@ components:
       id: awscc.elasticloadbalancingv2.load_balancers_list_only
       x-cfn-schema-name: LoadBalancer
       x-cfn-type-name: AWS::ElasticLoadBalancingV2::LoadBalancer
-      x-identifiers:
-        - LoadBalancerArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2417,7 +2608,7 @@ components:
       id: awscc.elasticloadbalancingv2.target_groups
       x-cfn-schema-name: TargetGroup
       x-cfn-type-name: AWS::ElasticLoadBalancingV2::TargetGroup
-      x-identifiers:
+      x-identifiers: &ref_3
         - TargetGroupArn
       x-type: cloud_control
       methods:
@@ -2547,8 +2738,7 @@ components:
       id: awscc.elasticloadbalancingv2.target_groups_list_only
       x-cfn-schema-name: TargetGroup
       x-cfn-type-name: AWS::ElasticLoadBalancingV2::TargetGroup
-      x-identifiers:
-        - TargetGroupArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2578,7 +2768,7 @@ components:
       id: awscc.elasticloadbalancingv2.trust_stores
       x-cfn-schema-name: TrustStore
       x-cfn-type-name: AWS::ElasticLoadBalancingV2::TrustStore
-      x-identifiers:
+      x-identifiers: &ref_4
         - TrustStoreArn
       x-type: cloud_control
       methods:
@@ -2678,8 +2868,7 @@ components:
       id: awscc.elasticloadbalancingv2.trust_stores_list_only
       x-cfn-schema-name: TrustStore
       x-cfn-type-name: AWS::ElasticLoadBalancingV2::TrustStore
-      x-identifiers:
-        - TrustStoreArn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2709,7 +2898,7 @@ components:
       id: awscc.elasticloadbalancingv2.trust_store_revocations
       x-cfn-schema-name: TrustStoreRevocation
       x-cfn-type-name: AWS::ElasticLoadBalancingV2::TrustStoreRevocation
-      x-identifiers:
+      x-identifiers: &ref_5
         - RevocationId
         - TrustStoreArn
       x-type: cloud_control
@@ -2785,9 +2974,7 @@ components:
       id: awscc.elasticloadbalancingv2.trust_store_revocations_list_only
       x-cfn-schema-name: TrustStoreRevocation
       x-cfn-type-name: AWS::ElasticLoadBalancingV2::TrustStoreRevocation
-      x-identifiers:
-        - RevocationId
-        - TrustStoreArn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/emr.yaml b/openapi/src/awscc/v00.00.00000/services/emr.yaml
index 5822b3d5a..e65bbc73a 100644
--- a/openapi/src/awscc/v00.00.00000/services/emr.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/emr.yaml
@@ -512,23 +512,25 @@ components:
       items:
         $ref: '#/components/schemas/Tag'
     Tag:
-      description: A key-value pair to associate with a resource.
+      description: An arbitrary set of tags (key-value pairs) for this EMR Studio.
       type: object
+      additionalProperties: false
       properties:
         Key:
           type: string
-          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
           minLength: 1
           maxLength: 128
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
         Value:
           type: string
-          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          description: 'The value for the tag. You can specify a value that is 0 to 255 Unicode characters in length. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
           minLength: 0
           maxLength: 256
+          pattern: '[a-zA-Z+-=._:/]+$'
       required:
-        - Key
         - Value
-      additionalProperties: false
+        - Key
     Studio:
       type: object
       properties:
@@ -807,6 +809,24 @@ components:
           - sso:DisassociateProfile
         list:
           - elasticmapreduce:ListStudioSessionMappings
+    WALWorkspace_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     WALWorkspace:
       type: object
       properties:
@@ -822,7 +842,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/WALWorkspace_Tag'
       x-stackql-resource-name: wal_workspace
       description: Resource schema for AWS::EMR::WALWorkspace Type
       x-type-name: AWS::EMR::WALWorkspace
@@ -1080,7 +1100,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/WALWorkspace_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateWALWorkspaceRequest
       type: object
@@ -1098,7 +1118,7 @@ components:
       id: awscc.emr.security_configurations
       x-cfn-schema-name: SecurityConfiguration
       x-cfn-type-name: AWS::EMR::SecurityConfiguration
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -1169,8 +1189,7 @@ components:
       id: awscc.emr.security_configurations_list_only
       x-cfn-schema-name: SecurityConfiguration
       x-cfn-type-name: AWS::EMR::SecurityConfiguration
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1230,7 +1249,7 @@ components:
       id: awscc.emr.studios
       x-cfn-schema-name: Studio
       x-cfn-type-name: AWS::EMR::Studio
-      x-identifiers:
+      x-identifiers: &ref_1
         - StudioId
       x-type: cloud_control
       methods:
@@ -1354,8 +1373,7 @@ components:
       id: awscc.emr.studios_list_only
       x-cfn-schema-name: Studio
       x-cfn-type-name: AWS::EMR::Studio
-      x-identifiers:
-        - StudioId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1385,7 +1403,7 @@ components:
       id: awscc.emr.studio_session_mappings
       x-cfn-schema-name: StudioSessionMapping
       x-cfn-type-name: AWS::EMR::StudioSessionMapping
-      x-identifiers:
+      x-identifiers: &ref_2
         - StudioId
         - IdentityType
         - IdentityName
@@ -1479,10 +1497,7 @@ components:
       id: awscc.emr.studio_session_mappings_list_only
       x-cfn-schema-name: StudioSessionMapping
       x-cfn-type-name: AWS::EMR::StudioSessionMapping
-      x-identifiers:
-        - StudioId
-        - IdentityType
-        - IdentityName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1516,7 +1531,7 @@ components:
       id: awscc.emr.wal_workspaces
       x-cfn-schema-name: WALWorkspace
       x-cfn-type-name: AWS::EMR::WALWorkspace
-      x-identifiers:
+      x-identifiers: &ref_3
         - WALWorkspaceName
       x-type: cloud_control
       methods:
@@ -1604,8 +1619,7 @@ components:
       id: awscc.emr.wal_workspaces_list_only
       x-cfn-schema-name: WALWorkspace
       x-cfn-type-name: AWS::EMR::WALWorkspace
-      x-identifiers:
-        - WALWorkspaceName
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/emrcontainers.yaml b/openapi/src/awscc/v00.00.00000/services/emrcontainers.yaml
index 4c2325eeb..13fda5b93 100644
--- a/openapi/src/awscc/v00.00.00000/services/emrcontainers.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/emrcontainers.yaml
@@ -576,7 +576,7 @@ components:
       id: awscc.emrcontainers.virtual_clusters
       x-cfn-schema-name: VirtualCluster
       x-cfn-type-name: AWS::EMRContainers::VirtualCluster
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
       x-type: cloud_control
       methods:
@@ -672,8 +672,7 @@ components:
       id: awscc.emrcontainers.virtual_clusters_list_only
       x-cfn-schema-name: VirtualCluster
       x-cfn-type-name: AWS::EMRContainers::VirtualCluster
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/emrserverless.yaml b/openapi/src/awscc/v00.00.00000/services/emrserverless.yaml
index 2d3634c75..f49f51e6f 100644
--- a/openapi/src/awscc/v00.00.00000/services/emrserverless.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/emrserverless.yaml
@@ -1075,7 +1075,7 @@ components:
       id: awscc.emrserverless.applications
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::EMRServerless::Application
-      x-identifiers:
+      x-identifiers: &ref_0
         - ApplicationId
       x-type: cloud_control
       methods:
@@ -1197,8 +1197,7 @@ components:
       id: awscc.emrserverless.applications_list_only
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::EMRServerless::Application
-      x-identifiers:
-        - ApplicationId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/entityresolution.yaml b/openapi/src/awscc/v00.00.00000/services/entityresolution.yaml
index 24ec29ddc..7ab7d27f3 100644
--- a/openapi/src/awscc/v00.00.00000/services/entityresolution.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/entityresolution.yaml
@@ -443,7 +443,7 @@ components:
             - PROVIDER
             - RULE_BASED
     CreatedAt:
-      description: The time of this SchemaMapping got created
+      description: The time of this IdMappingWorkflow got created
       type: string
     IdMappingWorkflowArn:
       pattern: ^arn:(aws|aws-us-gov|aws-cn):entityresolution:.*:[0-9]+:(idmappingworkflow/.*)$
@@ -460,7 +460,7 @@ components:
       required:
         - IncrementalRunType
     UpdatedAt:
-      description: The time of this SchemaMapping got last updated at
+      description: The time of this IdMappingWorkflow got last updated at
       type: string
     IdMappingRuleBasedProperties:
       additionalProperties: false
@@ -495,23 +495,24 @@ components:
       type: string
       pattern: ^arn:(aws|aws-us-gov|aws-cn):kms:.*:[0-9]+:.*$
     ProviderProperties:
+      additionalProperties: false
       type: object
       properties:
+        IntermediateSourceConfiguration:
+          $ref: '#/components/schemas/IntermediateSourceConfiguration'
         ProviderServiceArn:
+          pattern: ^arn:(aws|aws-us-gov|aws-cn):(entityresolution):([a-z]{2}-[a-z]{1,10}-[0-9])::providerservice/([a-zA-Z0-9_-]{1,255})/([a-zA-Z0-9_-]{1,255})$
+          description: Arn of the Provider Service being used.
           type: string
-          description: Arn of the Provider service being used.
         ProviderConfiguration:
-          type: object
-          additionalProperties: false
           x-patternProperties:
             ^.+$:
               type: string
           description: Additional Provider configuration that would be required for the provider service. The Configuration must be in JSON string format
-        IntermediateSourceConfiguration:
-          $ref: '#/components/schemas/IntermediateSourceConfiguration'
+          additionalProperties: false
+          type: object
       required:
         - ProviderServiceArn
-      additionalProperties: false
     IntermediateSourceConfiguration:
       type: object
       properties:
@@ -670,6 +671,11 @@ components:
           - entityresolution:DeleteIdMappingWorkflow
           - entityresolution:GetIdMappingWorkflow
           - entityresolution:UntagResource
+    IdNamespace_EntityName:
+      type: string
+      pattern: ^[a-zA-Z_0-9-]*$
+      minLength: 1
+      maxLength: 255
     IdNamespaceInputSource:
       type: object
       properties:
@@ -677,7 +683,7 @@ components:
           type: string
           pattern: ^arn:(aws|aws-us-gov|aws-cn):entityresolution:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(matchingworkflow/[a-zA-Z_0-9-]{1,255})$|^arn:(aws|aws-us-gov|aws-cn):glue:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(table/[a-zA-Z_0-9-]{1,255}/[a-zA-Z_0-9-]{1,255})$
         SchemaName:
-          $ref: '#/components/schemas/EntityName'
+          $ref: '#/components/schemas/IdNamespace_EntityName'
       required:
         - InputSourceARN
       additionalProperties: false
@@ -705,7 +711,7 @@ components:
           minItems: 1
           maxItems: 25
           items:
-            $ref: '#/components/schemas/Rule'
+            $ref: '#/components/schemas/IdNamespace_Rule'
         RuleDefinitionTypes:
           type: array
           x-insertionOrder: false
@@ -732,6 +738,25 @@ components:
       enum:
         - SOURCE
         - TARGET
+    IdNamespace_Rule:
+      type: object
+      properties:
+        RuleName:
+          type: string
+          pattern: ^[a-zA-Z_0-9- \t]*$
+          minLength: 0
+          maxLength: 255
+        MatchingKeys:
+          type: array
+          x-insertionOrder: false
+          minItems: 1
+          maxItems: 25
+          items:
+            $ref: '#/components/schemas/AttributeName'
+      required:
+        - RuleName
+        - MatchingKeys
+      additionalProperties: false
     NamespaceProviderProperties:
       type: object
       properties:
@@ -752,11 +777,29 @@ components:
       pattern: ^arn:(aws|aws-us-gov|aws-cn):(entityresolution):([a-z]{2}-[a-z]{1,10}-[0-9])::providerservice/([a-zA-Z0-9_-]{1,255})/([a-zA-Z0-9_-]{1,255})$
       minLength: 20
       maxLength: 255
+    IdNamespace_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     IdNamespace:
       type: object
       properties:
         IdNamespaceName:
-          $ref: '#/components/schemas/EntityName'
+          $ref: '#/components/schemas/IdNamespace_EntityName'
         Description:
           type: string
           minLength: 0
@@ -802,7 +845,7 @@ components:
           minItems: 0
           maxItems: 200
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/IdNamespace_Tag'
       required:
         - IdNamespaceName
         - Type
@@ -854,6 +897,12 @@ components:
       description: The default MatchingWorkflow arn
       type: string
       pattern: ^arn:(aws|aws-us-gov|aws-cn):entityresolution:.*:[0-9]+:(matchingworkflow/.*)$
+    MatchingWorkflow_CreatedAt:
+      description: The time of this MatchingWorkflow got created
+      type: string
+    MatchingWorkflow_UpdatedAt:
+      description: The time of this MatchingWorkflow got last updated at
+      type: string
     InputSource:
       type: object
       properties:
@@ -918,7 +967,7 @@ components:
         RuleConditionProperties:
           $ref: '#/components/schemas/RuleConditionProperties'
         ProviderProperties:
-          $ref: '#/components/schemas/ProviderProperties'
+          $ref: '#/components/schemas/MatchingWorkflow_ProviderProperties'
       additionalProperties: false
     IncrementalRunConfig:
       type: object
@@ -975,6 +1024,24 @@ components:
         Condition:
           type: string
       additionalProperties: false
+    MatchingWorkflow_ProviderProperties:
+      type: object
+      properties:
+        ProviderServiceArn:
+          type: string
+          description: Arn of the Provider service being used.
+        ProviderConfiguration:
+          type: object
+          additionalProperties: false
+          x-patternProperties:
+            ^.+$:
+              type: string
+          description: Additional Provider configuration that would be required for the provider service. The Configuration must be in JSON string format
+        IntermediateSourceConfiguration:
+          $ref: '#/components/schemas/IntermediateSourceConfiguration'
+      required:
+        - ProviderServiceArn
+      additionalProperties: false
     MatchingWorkflow:
       type: object
       properties:
@@ -1014,9 +1081,9 @@ components:
         WorkflowArn:
           $ref: '#/components/schemas/MatchingWorkflowArn'
         CreatedAt:
-          $ref: '#/components/schemas/CreatedAt'
+          $ref: '#/components/schemas/MatchingWorkflow_CreatedAt'
         UpdatedAt:
-          $ref: '#/components/schemas/UpdatedAt'
+          $ref: '#/components/schemas/MatchingWorkflow_UpdatedAt'
         IncrementalRunConfig:
           $ref: '#/components/schemas/IncrementalRunConfig'
       required:
@@ -1229,6 +1296,12 @@ components:
         - FieldName
         - Type
       additionalProperties: false
+    SchemaMapping_CreatedAt:
+      description: The time of this SchemaMapping got created
+      type: string
+    SchemaMapping_UpdatedAt:
+      description: The time of this SchemaMapping got last updated at
+      type: string
     HasWorkflows:
       description: The boolean value that indicates whether or not a SchemaMapping has MatchingWorkflows that are associated with
       type: boolean
@@ -1255,9 +1328,9 @@ components:
         SchemaArn:
           $ref: '#/components/schemas/SchemaMappingArn'
         CreatedAt:
-          $ref: '#/components/schemas/CreatedAt'
+          $ref: '#/components/schemas/SchemaMapping_CreatedAt'
         UpdatedAt:
-          $ref: '#/components/schemas/UpdatedAt'
+          $ref: '#/components/schemas/SchemaMapping_UpdatedAt'
         HasWorkflows:
           $ref: '#/components/schemas/HasWorkflows'
       required:
@@ -1379,7 +1452,7 @@ components:
           type: object
           properties:
             IdNamespaceName:
-              $ref: '#/components/schemas/EntityName'
+              $ref: '#/components/schemas/IdNamespace_EntityName'
             Description:
               type: string
               minLength: 0
@@ -1425,7 +1498,7 @@ components:
               minItems: 0
               maxItems: 200
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/IdNamespace_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateIdNamespaceRequest
       type: object
@@ -1479,9 +1552,9 @@ components:
             WorkflowArn:
               $ref: '#/components/schemas/MatchingWorkflowArn'
             CreatedAt:
-              $ref: '#/components/schemas/CreatedAt'
+              $ref: '#/components/schemas/MatchingWorkflow_CreatedAt'
             UpdatedAt:
-              $ref: '#/components/schemas/UpdatedAt'
+              $ref: '#/components/schemas/MatchingWorkflow_UpdatedAt'
             IncrementalRunConfig:
               $ref: '#/components/schemas/IncrementalRunConfig'
           x-stackQL-stringOnly: true
@@ -1550,9 +1623,9 @@ components:
             SchemaArn:
               $ref: '#/components/schemas/SchemaMappingArn'
             CreatedAt:
-              $ref: '#/components/schemas/CreatedAt'
+              $ref: '#/components/schemas/SchemaMapping_CreatedAt'
             UpdatedAt:
-              $ref: '#/components/schemas/UpdatedAt'
+              $ref: '#/components/schemas/SchemaMapping_UpdatedAt'
             HasWorkflows:
               $ref: '#/components/schemas/HasWorkflows'
           x-stackQL-stringOnly: true
@@ -1572,7 +1645,7 @@ components:
       id: awscc.entityresolution.id_mapping_workflows
       x-cfn-schema-name: IdMappingWorkflow
       x-cfn-type-name: AWS::EntityResolution::IdMappingWorkflow
-      x-identifiers:
+      x-identifiers: &ref_0
         - WorkflowName
       x-type: cloud_control
       methods:
@@ -1678,8 +1751,7 @@ components:
       id: awscc.entityresolution.id_mapping_workflows_list_only
       x-cfn-schema-name: IdMappingWorkflow
       x-cfn-type-name: AWS::EntityResolution::IdMappingWorkflow
-      x-identifiers:
-        - WorkflowName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1709,7 +1781,7 @@ components:
       id: awscc.entityresolution.id_namespaces
       x-cfn-schema-name: IdNamespace
       x-cfn-type-name: AWS::EntityResolution::IdNamespace
-      x-identifiers:
+      x-identifiers: &ref_1
         - IdNamespaceName
       x-type: cloud_control
       methods:
@@ -1813,8 +1885,7 @@ components:
       id: awscc.entityresolution.id_namespaces_list_only
       x-cfn-schema-name: IdNamespace
       x-cfn-type-name: AWS::EntityResolution::IdNamespace
-      x-identifiers:
-        - IdNamespaceName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1844,7 +1915,7 @@ components:
       id: awscc.entityresolution.matching_workflows
       x-cfn-schema-name: MatchingWorkflow
       x-cfn-type-name: AWS::EntityResolution::MatchingWorkflow
-      x-identifiers:
+      x-identifiers: &ref_2
         - WorkflowName
       x-type: cloud_control
       methods:
@@ -1950,8 +2021,7 @@ components:
       id: awscc.entityresolution.matching_workflows_list_only
       x-cfn-schema-name: MatchingWorkflow
       x-cfn-type-name: AWS::EntityResolution::MatchingWorkflow
-      x-identifiers:
-        - WorkflowName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1981,7 +2051,7 @@ components:
       id: awscc.entityresolution.policy_statements
       x-cfn-schema-name: PolicyStatement
       x-cfn-type-name: AWS::EntityResolution::PolicyStatement
-      x-identifiers:
+      x-identifiers: &ref_3
         - Arn
         - StatementId
       x-type: cloud_control
@@ -2078,9 +2148,7 @@ components:
       id: awscc.entityresolution.policy_statements_list_only
       x-cfn-schema-name: PolicyStatement
       x-cfn-type-name: AWS::EntityResolution::PolicyStatement
-      x-identifiers:
-        - Arn
-        - StatementId
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2112,7 +2180,7 @@ components:
       id: awscc.entityresolution.schema_mappings
       x-cfn-schema-name: SchemaMapping
       x-cfn-type-name: AWS::EntityResolution::SchemaMapping
-      x-identifiers:
+      x-identifiers: &ref_4
         - SchemaName
       x-type: cloud_control
       methods:
@@ -2212,8 +2280,7 @@ components:
       id: awscc.entityresolution.schema_mappings_list_only
       x-cfn-schema-name: SchemaMapping
       x-cfn-type-name: AWS::EntityResolution::SchemaMapping
-      x-identifiers:
-        - SchemaName
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/events.yaml b/openapi/src/awscc/v00.00.00000/services/events.yaml
index d0b811b35..6f2fa68a9 100644
--- a/openapi/src/awscc/v00.00.00000/services/events.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/events.yaml
@@ -945,13 +945,16 @@ components:
         list:
           - events:ListEndpoints
     Tag:
-      additionalProperties: false
       type: object
+      additionalProperties: false
       properties:
-        Value:
-          type: string
         Key:
           type: string
+        Value:
+          type: string
+      required:
+        - Value
+        - Key
     EventBus:
       type: object
       properties:
@@ -1358,7 +1361,7 @@ components:
           x-insertionOrder: true
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Rule_Tag'
         NetworkConfiguration:
           $ref: '#/components/schemas/NetworkConfiguration'
         TaskDefinitionArn:
@@ -1386,6 +1389,14 @@ components:
       properties:
         AwsVpcConfiguration:
           $ref: '#/components/schemas/AwsVpcConfiguration'
+    Rule_Tag:
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          type: string
+        Key:
+          type: string
     SageMakerPipelineParameters:
       additionalProperties: false
       type: object
@@ -1464,7 +1475,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Rule_Tag'
         Name:
           description: The name of the rule.
           type: string
@@ -1855,7 +1866,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Rule_Tag'
             Name:
               description: The name of the rule.
               type: string
@@ -1876,7 +1887,7 @@ components:
       id: awscc.events.api_destinations
       x-cfn-schema-name: ApiDestination
       x-cfn-type-name: AWS::Events::ApiDestination
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -1976,8 +1987,7 @@ components:
       id: awscc.events.api_destinations_list_only
       x-cfn-schema-name: ApiDestination
       x-cfn-type-name: AWS::Events::ApiDestination
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2007,7 +2017,7 @@ components:
       id: awscc.events.archives
       x-cfn-schema-name: Archive
       x-cfn-type-name: AWS::Events::Archive
-      x-identifiers:
+      x-identifiers: &ref_1
         - ArchiveName
       x-type: cloud_control
       methods:
@@ -2105,8 +2115,7 @@ components:
       id: awscc.events.archives_list_only
       x-cfn-schema-name: Archive
       x-cfn-type-name: AWS::Events::Archive
-      x-identifiers:
-        - ArchiveName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2136,7 +2145,7 @@ components:
       id: awscc.events.connections
       x-cfn-schema-name: Connection
       x-cfn-type-name: AWS::Events::Connection
-      x-identifiers:
+      x-identifiers: &ref_2
         - Name
       x-type: cloud_control
       methods:
@@ -2238,8 +2247,7 @@ components:
       id: awscc.events.connections_list_only
       x-cfn-schema-name: Connection
       x-cfn-type-name: AWS::Events::Connection
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2269,7 +2277,7 @@ components:
       id: awscc.events.endpoints
       x-cfn-schema-name: Endpoint
       x-cfn-type-name: AWS::Events::Endpoint
-      x-identifiers:
+      x-identifiers: &ref_3
         - Name
       x-type: cloud_control
       methods:
@@ -2375,8 +2383,7 @@ components:
       id: awscc.events.endpoints_list_only
       x-cfn-schema-name: Endpoint
       x-cfn-type-name: AWS::Events::Endpoint
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2406,7 +2413,7 @@ components:
       id: awscc.events.event_buses
       x-cfn-schema-name: EventBus
       x-cfn-type-name: AWS::Events::EventBus
-      x-identifiers:
+      x-identifiers: &ref_4
         - Name
       x-type: cloud_control
       methods:
@@ -2508,8 +2515,7 @@ components:
       id: awscc.events.event_buses_list_only
       x-cfn-schema-name: EventBus
       x-cfn-type-name: AWS::Events::EventBus
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2539,7 +2545,7 @@ components:
       id: awscc.events.rules
       x-cfn-schema-name: Rule
       x-cfn-type-name: AWS::Events::Rule
-      x-identifiers:
+      x-identifiers: &ref_5
         - Arn
       x-type: cloud_control
       methods:
@@ -2643,8 +2649,7 @@ components:
       id: awscc.events.rules_list_only
       x-cfn-schema-name: Rule
       x-cfn-type-name: AWS::Events::Rule
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/eventschemas.yaml b/openapi/src/awscc/v00.00.00000/services/eventschemas.yaml
index fb74f530a..1af02e7e8 100644
--- a/openapi/src/awscc/v00.00.00000/services/eventschemas.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/eventschemas.yaml
@@ -825,7 +825,7 @@ components:
       id: awscc.eventschemas.discoverers
       x-cfn-schema-name: Discoverer
       x-cfn-type-name: AWS::EventSchemas::Discoverer
-      x-identifiers:
+      x-identifiers: &ref_0
         - DiscovererArn
       x-type: cloud_control
       methods:
@@ -923,8 +923,7 @@ components:
       id: awscc.eventschemas.discoverers_list_only
       x-cfn-schema-name: Discoverer
       x-cfn-type-name: AWS::EventSchemas::Discoverer
-      x-identifiers:
-        - DiscovererArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -954,7 +953,7 @@ components:
       id: awscc.eventschemas.registries
       x-cfn-schema-name: Registry
       x-cfn-type-name: AWS::EventSchemas::Registry
-      x-identifiers:
+      x-identifiers: &ref_1
         - RegistryArn
       x-type: cloud_control
       methods:
@@ -1046,8 +1045,7 @@ components:
       id: awscc.eventschemas.registries_list_only
       x-cfn-schema-name: Registry
       x-cfn-type-name: AWS::EventSchemas::Registry
-      x-identifiers:
-        - RegistryArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1164,12 +1162,12 @@ components:
                 FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EventSchemas::RegistryPolicy'
                 AND Identifier = '<Id>'
                 AND region = 'us-east-1'
-    schemata:
-      name: schemata
-      id: awscc.eventschemas.schemata
+    schemas:
+      name: schemas
+      id: awscc.eventschemas.schemas
       x-cfn-schema-name: Schema
       x-cfn-type-name: AWS::EventSchemas::Schema
-      x-identifiers:
+      x-identifiers: &ref_2
         - SchemaArn
       x-type: cloud_control
       methods:
@@ -1223,11 +1221,11 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/schemata/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/schemas/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/schemata/methods/delete_resource'
+          - $ref: '#/components/x-stackQL-resources/schemas/methods/delete_resource'
         update:
-          - $ref: '#/components/x-stackQL-resources/schemata/methods/update_resource'
+          - $ref: '#/components/x-stackQL-resources/schemas/methods/update_resource'
       config:
         views:
           select:
@@ -1268,13 +1266,12 @@ components:
                 FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::EventSchemas::Schema'
                 AND Identifier = '<SchemaArn>'
                 AND region = 'us-east-1'
-    schemata_list_only:
-      name: schemata_list_only
-      id: awscc.eventschemas.schemata_list_only
+    schemas_list_only:
+      name: schemas_list_only
+      id: awscc.eventschemas.schemas_list_only
       x-cfn-schema-name: Schema
       x-cfn-type-name: AWS::EventSchemas::Schema
-      x-identifiers:
-        - SchemaArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/evidently.yaml b/openapi/src/awscc/v00.00.00000/services/evidently.yaml
index 4730245ff..97a63dbe2 100644
--- a/openapi/src/awscc/v00.00.00000/services/evidently.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/evidently.yaml
@@ -1923,7 +1923,7 @@ components:
       id: awscc.evidently.segments
       x-cfn-schema-name: Segment
       x-cfn-type-name: AWS::Evidently::Segment
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -2000,8 +2000,7 @@ components:
       id: awscc.evidently.segments_list_only
       x-cfn-schema-name: Segment
       x-cfn-type-name: AWS::Evidently::Segment
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/evs.yaml b/openapi/src/awscc/v00.00.00000/services/evs.yaml
index cd01a1b40..64545dc6c 100644
--- a/openapi/src/awscc/v00.00.00000/services/evs.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/evs.yaml
@@ -963,7 +963,7 @@ components:
       id: awscc.evs.environments
       x-cfn-schema-name: Environment
       x-cfn-type-name: AWS::EVS::Environment
-      x-identifiers:
+      x-identifiers: &ref_0
         - EnvironmentId
       x-type: cloud_control
       methods:
@@ -1091,8 +1091,7 @@ components:
       id: awscc.evs.environments_list_only
       x-cfn-schema-name: Environment
       x-cfn-type-name: AWS::EVS::Environment
-      x-identifiers:
-        - EnvironmentId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/finspace.yaml b/openapi/src/awscc/v00.00.00000/services/finspace.yaml
index a8396bf62..2b5e0a89c 100644
--- a/openapi/src/awscc/v00.00.00000/services/finspace.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/finspace.yaml
@@ -708,7 +708,7 @@ components:
       id: awscc.finspace.environments
       x-cfn-schema-name: Environment
       x-cfn-type-name: AWS::FinSpace::Environment
-      x-identifiers:
+      x-identifiers: &ref_0
         - EnvironmentId
       x-type: cloud_control
       methods:
@@ -822,8 +822,7 @@ components:
       id: awscc.finspace.environments_list_only
       x-cfn-schema-name: Environment
       x-cfn-type-name: AWS::FinSpace::Environment
-      x-identifiers:
-        - EnvironmentId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/fis.yaml b/openapi/src/awscc/v00.00.00000/services/fis.yaml
index da71987fd..c827931d9 100644
--- a/openapi/src/awscc/v00.00.00000/services/fis.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/fis.yaml
@@ -871,7 +871,7 @@ components:
       id: awscc.fis.experiment_templates
       x-cfn-schema-name: ExperimentTemplate
       x-cfn-type-name: AWS::FIS::ExperimentTemplate
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
       x-type: cloud_control
       methods:
@@ -975,8 +975,7 @@ components:
       id: awscc.fis.experiment_templates_list_only
       x-cfn-schema-name: ExperimentTemplate
       x-cfn-type-name: AWS::FIS::ExperimentTemplate
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1006,7 +1005,7 @@ components:
       id: awscc.fis.target_account_configurations
       x-cfn-schema-name: TargetAccountConfiguration
       x-cfn-type-name: AWS::FIS::TargetAccountConfiguration
-      x-identifiers:
+      x-identifiers: &ref_1
         - ExperimentTemplateId
         - AccountId
       x-type: cloud_control
@@ -1099,9 +1098,7 @@ components:
       id: awscc.fis.target_account_configurations_list_only
       x-cfn-schema-name: TargetAccountConfiguration
       x-cfn-type-name: AWS::FIS::TargetAccountConfiguration
-      x-identifiers:
-        - ExperimentTemplateId
-        - AccountId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/fms.yaml b/openapi/src/awscc/v00.00.00000/services/fms.yaml
index cc2cd3e7d..f1973af42 100644
--- a/openapi/src/awscc/v00.00.00000/services/fms.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/fms.yaml
@@ -393,7 +393,7 @@ components:
     ResourceArn:
       description: A resource ARN.
       type: string
-      pattern: ^([^\s]*)$
+      pattern: ^([^\s]+)$
       minLength: 1
       maxLength: 1024
     NotificationChannel:
@@ -436,7 +436,7 @@ components:
     Base62Id:
       description: A Base62 ID
       type: string
-      pattern: ^([a-z0-9A-Z]*)$
+      pattern: ^[a-z0-9A-Z]{22}$
       minLength: 22
       maxLength: 22
     OrganizationalUnitId:
@@ -497,6 +497,12 @@ components:
       pattern: ^([^\s]*)$
       minLength: 1
       maxLength: 128
+    Policy_ResourceArn:
+      description: A resource ARN.
+      type: string
+      pattern: ^([^\s]*)$
+      minLength: 1
+      maxLength: 1024
     SecurityServicePolicyData:
       description: Firewall security service policy data.
       type: object
@@ -727,7 +733,7 @@ components:
         SecurityServicePolicyData:
           $ref: '#/components/schemas/SecurityServicePolicyData'
         Arn:
-          $ref: '#/components/schemas/ResourceArn'
+          $ref: '#/components/schemas/Policy_ResourceArn'
         DeleteAllPolicyResources:
           type: boolean
         ResourcesCleanUp:
@@ -806,6 +812,12 @@ components:
         list:
           - fms:ListPolicies
           - fms:ListTagsForResource
+    ResourceSet_Base62Id:
+      description: A Base62 ID
+      type: string
+      pattern: ^([a-z0-9A-Z]*)$
+      minLength: 22
+      maxLength: 22
     Tag:
       description: A tag.
       type: object
@@ -833,7 +845,7 @@ components:
       type: object
       properties:
         Id:
-          $ref: '#/components/schemas/Base62Id'
+          $ref: '#/components/schemas/ResourceSet_Base62Id'
         Name:
           type: string
           pattern: ^([a-zA-Z0-9_.:/=+\-@\s]+)$
@@ -989,7 +1001,7 @@ components:
             SecurityServicePolicyData:
               $ref: '#/components/schemas/SecurityServicePolicyData'
             Arn:
-              $ref: '#/components/schemas/ResourceArn'
+              $ref: '#/components/schemas/Policy_ResourceArn'
             DeleteAllPolicyResources:
               type: boolean
             ResourcesCleanUp:
@@ -1017,7 +1029,7 @@ components:
           type: object
           properties:
             Id:
-              $ref: '#/components/schemas/Base62Id'
+              $ref: '#/components/schemas/ResourceSet_Base62Id'
             Name:
               type: string
               pattern: ^([a-zA-Z0-9_.:/=+\-@\s]+)$
@@ -1062,7 +1074,7 @@ components:
       id: awscc.fms.notification_channels
       x-cfn-schema-name: NotificationChannel
       x-cfn-type-name: AWS::FMS::NotificationChannel
-      x-identifiers:
+      x-identifiers: &ref_0
         - SnsTopicArn
       x-type: cloud_control
       methods:
@@ -1150,8 +1162,7 @@ components:
       id: awscc.fms.notification_channels_list_only
       x-cfn-schema-name: NotificationChannel
       x-cfn-type-name: AWS::FMS::NotificationChannel
-      x-identifiers:
-        - SnsTopicArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1181,7 +1192,7 @@ components:
       id: awscc.fms.policies
       x-cfn-schema-name: Policy
       x-cfn-type-name: AWS::FMS::Policy
-      x-identifiers:
+      x-identifiers: &ref_1
         - Id
       x-type: cloud_control
       methods:
@@ -1299,8 +1310,7 @@ components:
       id: awscc.fms.policies_list_only
       x-cfn-schema-name: Policy
       x-cfn-type-name: AWS::FMS::Policy
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1330,7 +1340,7 @@ components:
       id: awscc.fms.resource_sets
       x-cfn-schema-name: ResourceSet
       x-cfn-type-name: AWS::FMS::ResourceSet
-      x-identifiers:
+      x-identifiers: &ref_2
         - Id
       x-type: cloud_control
       methods:
@@ -1426,8 +1436,7 @@ components:
       id: awscc.fms.resource_sets_list_only
       x-cfn-schema-name: ResourceSet
       x-cfn-type-name: AWS::FMS::ResourceSet
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/forecast.yaml b/openapi/src/awscc/v00.00.00000/services/forecast.yaml
index c16c0ff71..3faa0b4b3 100644
--- a/openapi/src/awscc/v00.00.00000/services/forecast.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/forecast.yaml
@@ -770,7 +770,7 @@ components:
       id: awscc.forecast.datasets
       x-cfn-schema-name: Dataset
       x-cfn-type-name: AWS::Forecast::Dataset
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -853,8 +853,7 @@ components:
       id: awscc.forecast.datasets_list_only
       x-cfn-schema-name: Dataset
       x-cfn-type-name: AWS::Forecast::Dataset
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -884,7 +883,7 @@ components:
       id: awscc.forecast.dataset_groups
       x-cfn-schema-name: DatasetGroup
       x-cfn-type-name: AWS::Forecast::DatasetGroup
-      x-identifiers:
+      x-identifiers: &ref_1
         - DatasetGroupArn
       x-type: cloud_control
       methods:
@@ -978,8 +977,7 @@ components:
       id: awscc.forecast.dataset_groups_list_only
       x-cfn-schema-name: DatasetGroup
       x-cfn-type-name: AWS::Forecast::DatasetGroup
-      x-identifiers:
-        - DatasetGroupArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/frauddetector.yaml b/openapi/src/awscc/v00.00.00000/services/frauddetector.yaml
index f251864e0..eacdbd9cd 100644
--- a/openapi/src/awscc/v00.00.00000/services/frauddetector.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/frauddetector.yaml
@@ -469,7 +469,7 @@ components:
           minLength: 1
           maxLength: 256
         Tags:
-          description: Tags associated with this event type.
+          description: Tags associated with this event variable.
           type: array
           uniqueItems: false
           x-insertionOrder: false
@@ -477,21 +477,26 @@ components:
           items:
             $ref: '#/components/schemas/Tag'
         CreatedTime:
-          description: The time when the event type was created.
+          description: The time when the event variable was created.
           type: string
         LastUpdatedTime:
-          description: The time when the event type was last updated.
+          description: The time when the event variable was last updated.
           type: string
       additionalProperties: false
-    Label:
+    Detector_Label:
       type: object
       properties:
+        Arn:
+          type: string
+        Inline:
+          type: boolean
         Name:
-          description: The name of the label.
           type: string
-          pattern: ^[0-9a-z_-]+$
+        Description:
+          description: The description.
+          type: string
           minLength: 1
-          maxLength: 64
+          maxLength: 256
         Tags:
           description: Tags associated with this label.
           type: array
@@ -500,75 +505,27 @@ components:
           maxItems: 200
           items:
             $ref: '#/components/schemas/Tag'
-        Description:
-          description: The label description.
-          type: string
-          minLength: 1
-          maxLength: 128
-        Arn:
-          description: The label ARN.
-          type: string
         CreatedTime:
-          description: The timestamp when the label was created.
+          description: The time when the label was created.
           type: string
         LastUpdatedTime:
-          description: The timestamp when the label was last updated.
+          description: The time when the label was last updated.
           type: string
-      required:
-        - Name
-      x-stackql-resource-name: label
-      description: An label for fraud detector.
-      x-type-name: AWS::FraudDetector::Label
-      x-stackql-primary-identifier:
-        - Arn
-      x-create-only-properties:
-        - Name
-      x-read-only-properties:
-        - Arn
-        - CreatedTime
-        - LastUpdatedTime
-      x-required-properties:
-        - Name
-      x-tagging:
-        taggable: true
-        tagOnCreate: true
-        tagUpdatable: true
-        cloudFormationSystemTags: false
-        tagProperty: /properties/Tags
-        permissions:
-          - frauddetector:ListTagsForResource
-          - frauddetector:TagResource
-          - frauddetector:UntagResource
-      x-required-permissions:
-        create:
-          - frauddetector:GetLabels
-          - frauddetector:PutLabel
-          - frauddetector:ListTagsForResource
-          - frauddetector:TagResource
-        read:
-          - frauddetector:GetLabels
-          - frauddetector:ListTagsForResource
-        update:
-          - frauddetector:GetLabels
-          - frauddetector:PutLabel
-          - frauddetector:ListTagsForResource
-          - frauddetector:TagResource
-          - frauddetector:UntagResource
-        delete:
-          - frauddetector:GetLabels
-          - frauddetector:DeleteLabel
-        list:
-          - frauddetector:GetLabels
-          - frauddetector:ListTagsForResource
-    Outcome:
+      additionalProperties: false
+    Detector_Outcome:
       type: object
       properties:
+        Arn:
+          type: string
+        Inline:
+          type: boolean
         Name:
-          description: The name of the outcome.
           type: string
-          pattern: ^[0-9a-z_-]+$
+        Description:
+          description: The description.
+          type: string
           minLength: 1
-          maxLength: 64
+          maxLength: 256
         Tags:
           description: Tags associated with this outcome.
           type: array
@@ -577,66 +534,13 @@ components:
           maxItems: 200
           items:
             $ref: '#/components/schemas/Tag'
-        Description:
-          description: The outcome description.
-          type: string
-          minLength: 1
-          maxLength: 128
-        Arn:
-          description: The outcome ARN.
-          type: string
         CreatedTime:
-          description: The timestamp when the outcome was created.
+          description: The time when the outcome was created.
           type: string
         LastUpdatedTime:
-          description: The timestamp when the outcome was last updated.
+          description: The time when the outcome was last updated.
           type: string
-      required:
-        - Name
-      x-stackql-resource-name: outcome
-      description: An outcome for rule evaluation.
-      x-type-name: AWS::FraudDetector::Outcome
-      x-stackql-primary-identifier:
-        - Arn
-      x-create-only-properties:
-        - Name
-      x-read-only-properties:
-        - Arn
-        - CreatedTime
-        - LastUpdatedTime
-      x-required-properties:
-        - Name
-      x-tagging:
-        taggable: true
-        tagOnCreate: true
-        tagUpdatable: true
-        cloudFormationSystemTags: false
-        tagProperty: /properties/Tags
-        permissions:
-          - frauddetector:ListTagsForResource
-          - frauddetector:TagResource
-          - frauddetector:UntagResource
-      x-required-permissions:
-        create:
-          - frauddetector:GetOutcomes
-          - frauddetector:PutOutcome
-          - frauddetector:ListTagsForResource
-          - frauddetector:TagResource
-        read:
-          - frauddetector:GetOutcomes
-          - frauddetector:ListTagsForResource
-        update:
-          - frauddetector:GetOutcomes
-          - frauddetector:PutOutcome
-          - frauddetector:ListTagsForResource
-          - frauddetector:TagResource
-          - frauddetector:UntagResource
-        delete:
-          - frauddetector:GetOutcomes
-          - frauddetector:DeleteOutcome
-        list:
-          - frauddetector:GetOutcomes
-          - frauddetector:ListTagsForResource
+      additionalProperties: false
     Rule:
       type: object
       properties:
@@ -658,7 +562,7 @@ components:
           x-insertionOrder: false
           minItems: 1
           items:
-            $ref: '#/components/schemas/Outcome'
+            $ref: '#/components/schemas/Detector_Outcome'
         Arn:
           type: string
         Description:
@@ -681,7 +585,7 @@ components:
           description: The time when the event type was last updated.
           type: string
       additionalProperties: false
-    EntityType:
+    Detector_EntityType:
       type: object
       properties:
         Arn:
@@ -696,7 +600,7 @@ components:
           minLength: 1
           maxLength: 256
         Tags:
-          description: Tags associated with this event type.
+          description: Tags associated with this entity type.
           type: array
           uniqueItems: false
           x-insertionOrder: false
@@ -704,13 +608,13 @@ components:
           items:
             $ref: '#/components/schemas/Tag'
         CreatedTime:
-          description: The time when the event type was created.
+          description: The time when the entity type was created.
           type: string
         LastUpdatedTime:
-          description: The time when the event type was last updated.
+          description: The time when the entity type was last updated.
           type: string
       additionalProperties: false
-    EventType:
+    Detector_EventType:
       type: object
       properties:
         Name:
@@ -719,6 +623,8 @@ components:
           pattern: ^[0-9a-z_-]+$
           minLength: 1
           maxLength: 64
+        Inline:
+          type: boolean
         Tags:
           description: Tags associated with this event type.
           type: array
@@ -745,14 +651,14 @@ components:
           x-insertionOrder: false
           minItems: 2
           items:
-            $ref: '#/components/schemas/Label'
+            $ref: '#/components/schemas/Detector_Label'
         EntityTypes:
           type: array
           uniqueItems: false
           x-insertionOrder: false
           minItems: 1
           items:
-            $ref: '#/components/schemas/EntityType'
+            $ref: '#/components/schemas/Detector_EntityType'
         Arn:
           description: The ARN of the event type.
           type: string
@@ -762,94 +668,7 @@ components:
         LastUpdatedTime:
           description: The time when the event type was last updated.
           type: string
-      required:
-        - EntityTypes
-        - EventVariables
-        - Labels
-        - Name
-      x-stackql-resource-name: event_type
-      description: A resource schema for an EventType in Amazon Fraud Detector.
-      x-type-name: AWS::FraudDetector::EventType
-      x-stackql-primary-identifier:
-        - Arn
-      x-create-only-properties:
-        - Name
-      x-read-only-properties:
-        - Arn
-        - CreatedTime
-        - LastUpdatedTime
-        - EventVariables/*/Arn
-        - EventVariables/*/CreatedTime
-        - EventVariables/*/LastUpdatedTime
-        - Labels/*/Arn
-        - Labels/*/CreatedTime
-        - Labels/*/LastUpdatedTime
-        - EntityTypes/*/Arn
-        - EntityTypes/*/CreatedTime
-        - EntityTypes/*/LastUpdatedTime
-      x-required-properties:
-        - EntityTypes
-        - EventVariables
-        - Labels
-        - Name
-      x-required-permissions:
-        create:
-          - frauddetector:BatchCreateVariable
-          - frauddetector:BatchGetVariable
-          - frauddetector:CreateVariable
-          - frauddetector:GetVariables
-          - frauddetector:PutLabel
-          - frauddetector:PutEntityType
-          - frauddetector:PutEventType
-          - frauddetector:GetEventTypes
-          - frauddetector:GetLabels
-          - frauddetector:GetEntityTypes
-          - frauddetector:ListTagsForResource
-          - frauddetector:TagResource
-        update:
-          - frauddetector:BatchCreateVariable
-          - frauddetector:BatchGetVariable
-          - frauddetector:CreateVariable
-          - frauddetector:UpdateVariable
-          - frauddetector:GetVariables
-          - frauddetector:PutLabel
-          - frauddetector:PutEntityType
-          - frauddetector:PutEventType
-          - frauddetector:GetEventTypes
-          - frauddetector:GetLabels
-          - frauddetector:GetEntityTypes
-          - frauddetector:DeleteEventType
-          - frauddetector:DeleteVariable
-          - frauddetector:DeleteLabel
-          - frauddetector:DeleteEntityType
-          - frauddetector:ListTagsForResource
-          - frauddetector:TagResource
-          - frauddetector:UntagResource
-        delete:
-          - frauddetector:BatchGetVariable
-          - frauddetector:GetVariables
-          - frauddetector:GetEventTypes
-          - frauddetector:GetLabels
-          - frauddetector:GetEntityTypes
-          - frauddetector:DeleteEventType
-          - frauddetector:DeleteVariable
-          - frauddetector:DeleteLabel
-          - frauddetector:DeleteEntityType
-          - frauddetector:ListTagsForResource
-        read:
-          - frauddetector:BatchGetVariable
-          - frauddetector:GetVariables
-          - frauddetector:GetEventTypes
-          - frauddetector:GetLabels
-          - frauddetector:GetEntityTypes
-          - frauddetector:ListTagsForResource
-        list:
-          - frauddetector:BatchGetVariable
-          - frauddetector:GetVariables
-          - frauddetector:GetEventTypes
-          - frauddetector:GetLabels
-          - frauddetector:GetEntityTypes
-          - frauddetector:ListTagsForResource
+      additionalProperties: false
     Model:
       description: A model to associate with a detector.
       type: object
@@ -902,7 +721,7 @@ components:
             $ref: '#/components/schemas/Rule'
         EventType:
           description: The event type to associate this detector with.
-          $ref: '#/components/schemas/EventType'
+          $ref: '#/components/schemas/Detector_EventType'
         Arn:
           description: The ARN of the detector.
           type: string
@@ -1059,29 +878,477 @@ components:
           - frauddetector:GetOutcomes
           - frauddetector:GetEntityTypes
           - frauddetector:ListTagsForResource
-    Element:
-      description: An element in a list.
-      type: string
-      pattern: ^\S+( +\S+)*$
-      minLength: 1
-      maxLength: 64
-    List:
+    EntityType:
       type: object
       properties:
-        Arn:
-          description: The list ARN.
-          type: string
         Name:
-          description: The name of the list.
+          description: The name of the entity type.
           type: string
-          pattern: ^[0-9a-z_]+$
+          pattern: ^[0-9a-z_-]+$
           minLength: 1
           maxLength: 64
-        Description:
-          description: The description of the list.
-          type: string
-          minLength: 1
-          maxLength: 128
+        Tags:
+          description: Tags associated with this entity type.
+          type: array
+          uniqueItems: false
+          x-insertionOrder: false
+          maxItems: 200
+          items:
+            $ref: '#/components/schemas/Tag'
+        Description:
+          description: The entity type description.
+          type: string
+          minLength: 1
+          maxLength: 128
+        Arn:
+          description: The entity type ARN.
+          type: string
+        CreatedTime:
+          description: The timestamp when the entity type was created.
+          type: string
+        LastUpdatedTime:
+          description: The timestamp when the entity type was last updated.
+          type: string
+      required:
+        - Name
+      x-stackql-resource-name: entity_type
+      description: An entity type for fraud detector.
+      x-type-name: AWS::FraudDetector::EntityType
+      x-stackql-primary-identifier:
+        - Arn
+      x-create-only-properties:
+        - Name
+      x-read-only-properties:
+        - Arn
+        - CreatedTime
+        - LastUpdatedTime
+      x-required-properties:
+        - Name
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: false
+        tagProperty: /properties/Tags
+        permissions:
+          - frauddetector:ListTagsForResource
+          - frauddetector:TagResource
+          - frauddetector:UntagResource
+      x-required-permissions:
+        create:
+          - frauddetector:GetEntityTypes
+          - frauddetector:PutEntityType
+          - frauddetector:ListTagsForResource
+          - frauddetector:TagResource
+        read:
+          - frauddetector:GetEntityTypes
+          - frauddetector:ListTagsForResource
+        update:
+          - frauddetector:GetEntityTypes
+          - frauddetector:PutEntityType
+          - frauddetector:ListTagsForResource
+          - frauddetector:TagResource
+          - frauddetector:UntagResource
+        delete:
+          - frauddetector:GetEntityTypes
+          - frauddetector:DeleteEntityType
+        list:
+          - frauddetector:GetEntityTypes
+          - frauddetector:ListTagsForResource
+    EventType_EventVariable:
+      type: object
+      properties:
+        Arn:
+          type: string
+        Inline:
+          type: boolean
+        Name:
+          type: string
+        DataSource:
+          type: string
+          enum:
+            - EVENT
+        DataType:
+          type: string
+          enum:
+            - STRING
+            - INTEGER
+            - FLOAT
+            - BOOLEAN
+        DefaultValue:
+          type: string
+        VariableType:
+          type: string
+          enum:
+            - AUTH_CODE
+            - AVS
+            - BILLING_ADDRESS_L1
+            - BILLING_ADDRESS_L2
+            - BILLING_CITY
+            - BILLING_COUNTRY
+            - BILLING_NAME
+            - BILLING_PHONE
+            - BILLING_STATE
+            - BILLING_ZIP
+            - CARD_BIN
+            - CATEGORICAL
+            - CURRENCY_CODE
+            - EMAIL_ADDRESS
+            - FINGERPRINT
+            - FRAUD_LABEL
+            - FREE_FORM_TEXT
+            - IP_ADDRESS
+            - NUMERIC
+            - ORDER_ID
+            - PAYMENT_TYPE
+            - PHONE_NUMBER
+            - PRICE
+            - PRODUCT_CATEGORY
+            - SHIPPING_ADDRESS_L1
+            - SHIPPING_ADDRESS_L2
+            - SHIPPING_CITY
+            - SHIPPING_COUNTRY
+            - SHIPPING_NAME
+            - SHIPPING_PHONE
+            - SHIPPING_STATE
+            - SHIPPING_ZIP
+            - USERAGENT
+        Description:
+          description: The description.
+          type: string
+          minLength: 1
+          maxLength: 256
+        Tags:
+          description: Tags associated with this event type.
+          type: array
+          uniqueItems: false
+          x-insertionOrder: false
+          maxItems: 200
+          items:
+            $ref: '#/components/schemas/Tag'
+        CreatedTime:
+          description: The time when the event type was created.
+          type: string
+        LastUpdatedTime:
+          description: The time when the event type was last updated.
+          type: string
+      additionalProperties: false
+    EventType_Label:
+      type: object
+      properties:
+        Arn:
+          type: string
+        Inline:
+          type: boolean
+        Name:
+          type: string
+        Description:
+          description: The description.
+          type: string
+          minLength: 1
+          maxLength: 256
+        Tags:
+          description: Tags associated with this event type.
+          type: array
+          uniqueItems: false
+          x-insertionOrder: false
+          maxItems: 200
+          items:
+            $ref: '#/components/schemas/Tag'
+        CreatedTime:
+          description: The time when the event type was created.
+          type: string
+        LastUpdatedTime:
+          description: The time when the event type was last updated.
+          type: string
+      additionalProperties: false
+    EventType_EntityType:
+      type: object
+      properties:
+        Arn:
+          type: string
+        Inline:
+          type: boolean
+        Name:
+          type: string
+        Description:
+          description: The description.
+          type: string
+          minLength: 1
+          maxLength: 256
+        Tags:
+          description: Tags associated with this event type.
+          type: array
+          uniqueItems: false
+          x-insertionOrder: false
+          maxItems: 200
+          items:
+            $ref: '#/components/schemas/Tag'
+        CreatedTime:
+          description: The time when the event type was created.
+          type: string
+        LastUpdatedTime:
+          description: The time when the event type was last updated.
+          type: string
+      additionalProperties: false
+    EventType:
+      type: object
+      properties:
+        Name:
+          description: The name for the event type
+          type: string
+          pattern: ^[0-9a-z_-]+$
+          minLength: 1
+          maxLength: 64
+        Tags:
+          description: Tags associated with this event type.
+          type: array
+          uniqueItems: false
+          x-insertionOrder: false
+          maxItems: 200
+          items:
+            $ref: '#/components/schemas/Tag'
+        Description:
+          description: The description of the event type.
+          type: string
+          minLength: 1
+          maxLength: 128
+        EventVariables:
+          type: array
+          uniqueItems: false
+          x-insertionOrder: false
+          minItems: 1
+          items:
+            $ref: '#/components/schemas/EventType_EventVariable'
+        Labels:
+          type: array
+          uniqueItems: false
+          x-insertionOrder: false
+          minItems: 2
+          items:
+            $ref: '#/components/schemas/EventType_Label'
+        EntityTypes:
+          type: array
+          uniqueItems: false
+          x-insertionOrder: false
+          minItems: 1
+          items:
+            $ref: '#/components/schemas/EventType_EntityType'
+        Arn:
+          description: The ARN of the event type.
+          type: string
+        CreatedTime:
+          description: The time when the event type was created.
+          type: string
+        LastUpdatedTime:
+          description: The time when the event type was last updated.
+          type: string
+      required:
+        - EntityTypes
+        - EventVariables
+        - Labels
+        - Name
+      x-stackql-resource-name: event_type
+      description: A resource schema for an EventType in Amazon Fraud Detector.
+      x-type-name: AWS::FraudDetector::EventType
+      x-stackql-primary-identifier:
+        - Arn
+      x-create-only-properties:
+        - Name
+      x-read-only-properties:
+        - Arn
+        - CreatedTime
+        - LastUpdatedTime
+        - EventVariables/*/Arn
+        - EventVariables/*/CreatedTime
+        - EventVariables/*/LastUpdatedTime
+        - Labels/*/Arn
+        - Labels/*/CreatedTime
+        - Labels/*/LastUpdatedTime
+        - EntityTypes/*/Arn
+        - EntityTypes/*/CreatedTime
+        - EntityTypes/*/LastUpdatedTime
+      x-required-properties:
+        - EntityTypes
+        - EventVariables
+        - Labels
+        - Name
+      x-required-permissions:
+        create:
+          - frauddetector:BatchCreateVariable
+          - frauddetector:BatchGetVariable
+          - frauddetector:CreateVariable
+          - frauddetector:GetVariables
+          - frauddetector:PutLabel
+          - frauddetector:PutEntityType
+          - frauddetector:PutEventType
+          - frauddetector:GetEventTypes
+          - frauddetector:GetLabels
+          - frauddetector:GetEntityTypes
+          - frauddetector:ListTagsForResource
+          - frauddetector:TagResource
+        update:
+          - frauddetector:BatchCreateVariable
+          - frauddetector:BatchGetVariable
+          - frauddetector:CreateVariable
+          - frauddetector:UpdateVariable
+          - frauddetector:GetVariables
+          - frauddetector:PutLabel
+          - frauddetector:PutEntityType
+          - frauddetector:PutEventType
+          - frauddetector:GetEventTypes
+          - frauddetector:GetLabels
+          - frauddetector:GetEntityTypes
+          - frauddetector:DeleteEventType
+          - frauddetector:DeleteVariable
+          - frauddetector:DeleteLabel
+          - frauddetector:DeleteEntityType
+          - frauddetector:ListTagsForResource
+          - frauddetector:TagResource
+          - frauddetector:UntagResource
+        delete:
+          - frauddetector:BatchGetVariable
+          - frauddetector:GetVariables
+          - frauddetector:GetEventTypes
+          - frauddetector:GetLabels
+          - frauddetector:GetEntityTypes
+          - frauddetector:DeleteEventType
+          - frauddetector:DeleteVariable
+          - frauddetector:DeleteLabel
+          - frauddetector:DeleteEntityType
+          - frauddetector:ListTagsForResource
+        read:
+          - frauddetector:BatchGetVariable
+          - frauddetector:GetVariables
+          - frauddetector:GetEventTypes
+          - frauddetector:GetLabels
+          - frauddetector:GetEntityTypes
+          - frauddetector:ListTagsForResource
+        list:
+          - frauddetector:BatchGetVariable
+          - frauddetector:GetVariables
+          - frauddetector:GetEventTypes
+          - frauddetector:GetLabels
+          - frauddetector:GetEntityTypes
+          - frauddetector:ListTagsForResource
+    Label:
+      type: object
+      properties:
+        Name:
+          description: The name of the label.
+          type: string
+          pattern: ^[0-9a-z_-]+$
+          minLength: 1
+          maxLength: 64
+        Tags:
+          description: Tags associated with this label.
+          type: array
+          uniqueItems: false
+          x-insertionOrder: false
+          maxItems: 200
+          items:
+            $ref: '#/components/schemas/Tag'
+        Description:
+          description: The label description.
+          type: string
+          minLength: 1
+          maxLength: 128
+        Arn:
+          description: The label ARN.
+          type: string
+        CreatedTime:
+          description: The timestamp when the label was created.
+          type: string
+        LastUpdatedTime:
+          description: The timestamp when the label was last updated.
+          type: string
+      required:
+        - Name
+      x-stackql-resource-name: label
+      description: An label for fraud detector.
+      x-type-name: AWS::FraudDetector::Label
+      x-stackql-primary-identifier:
+        - Arn
+      x-create-only-properties:
+        - Name
+      x-read-only-properties:
+        - Arn
+        - CreatedTime
+        - LastUpdatedTime
+      x-required-properties:
+        - Name
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: false
+        tagProperty: /properties/Tags
+        permissions:
+          - frauddetector:ListTagsForResource
+          - frauddetector:TagResource
+          - frauddetector:UntagResource
+      x-required-permissions:
+        create:
+          - frauddetector:GetLabels
+          - frauddetector:PutLabel
+          - frauddetector:ListTagsForResource
+          - frauddetector:TagResource
+        read:
+          - frauddetector:GetLabels
+          - frauddetector:ListTagsForResource
+        update:
+          - frauddetector:GetLabels
+          - frauddetector:PutLabel
+          - frauddetector:ListTagsForResource
+          - frauddetector:TagResource
+          - frauddetector:UntagResource
+        delete:
+          - frauddetector:GetLabels
+          - frauddetector:DeleteLabel
+        list:
+          - frauddetector:GetLabels
+          - frauddetector:ListTagsForResource
+    List_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
+    Element:
+      description: An element in a list.
+      type: string
+      pattern: ^\S+( +\S+)*$
+      minLength: 1
+      maxLength: 64
+    List:
+      type: object
+      properties:
+        Arn:
+          description: The list ARN.
+          type: string
+        Name:
+          description: The name of the list.
+          type: string
+          pattern: ^[0-9a-z_]+$
+          minLength: 1
+          maxLength: 64
+        Description:
+          description: The description of the list.
+          type: string
+          minLength: 1
+          maxLength: 128
         VariableType:
           description: The variable type of the list.
           type: string
@@ -1101,7 +1368,7 @@ components:
           x-insertionOrder: false
           maxItems: 200
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/List_Tag'
         Elements:
           description: The elements in this list.
           type: array
@@ -1137,29 +1404,106 @@ components:
           - frauddetector:UntagResource
       x-required-permissions:
         create:
-          - frauddetector:CreateList
-          - frauddetector:GetListElements
-          - frauddetector:GetListsMetadata
+          - frauddetector:CreateList
+          - frauddetector:GetListElements
+          - frauddetector:GetListsMetadata
+          - frauddetector:ListTagsForResource
+          - frauddetector:TagResource
+          - frauddetector:UpdateList
+        read:
+          - frauddetector:GetListElements
+          - frauddetector:GetListsMetadata
+          - frauddetector:ListTagsForResource
+        update:
+          - frauddetector:GetListElements
+          - frauddetector:GetListsMetadata
+          - frauddetector:ListTagsForResource
+          - frauddetector:UntagResource
+          - frauddetector:UpdateList
+          - frauddetector:TagResource
+        delete:
+          - frauddetector:DeleteList
+          - frauddetector:GetListsMetadata
+        list:
+          - frauddetector:GetListElements
+          - frauddetector:GetListsMetadata
+          - frauddetector:ListTagsForResource
+    Outcome:
+      type: object
+      properties:
+        Name:
+          description: The name of the outcome.
+          type: string
+          pattern: ^[0-9a-z_-]+$
+          minLength: 1
+          maxLength: 64
+        Tags:
+          description: Tags associated with this outcome.
+          type: array
+          uniqueItems: false
+          x-insertionOrder: false
+          maxItems: 200
+          items:
+            $ref: '#/components/schemas/Tag'
+        Description:
+          description: The outcome description.
+          type: string
+          minLength: 1
+          maxLength: 128
+        Arn:
+          description: The outcome ARN.
+          type: string
+        CreatedTime:
+          description: The timestamp when the outcome was created.
+          type: string
+        LastUpdatedTime:
+          description: The timestamp when the outcome was last updated.
+          type: string
+      required:
+        - Name
+      x-stackql-resource-name: outcome
+      description: An outcome for rule evaluation.
+      x-type-name: AWS::FraudDetector::Outcome
+      x-stackql-primary-identifier:
+        - Arn
+      x-create-only-properties:
+        - Name
+      x-read-only-properties:
+        - Arn
+        - CreatedTime
+        - LastUpdatedTime
+      x-required-properties:
+        - Name
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: false
+        tagProperty: /properties/Tags
+        permissions:
+          - frauddetector:ListTagsForResource
+          - frauddetector:TagResource
+          - frauddetector:UntagResource
+      x-required-permissions:
+        create:
+          - frauddetector:GetOutcomes
+          - frauddetector:PutOutcome
           - frauddetector:ListTagsForResource
           - frauddetector:TagResource
-          - frauddetector:UpdateList
         read:
-          - frauddetector:GetListElements
-          - frauddetector:GetListsMetadata
+          - frauddetector:GetOutcomes
           - frauddetector:ListTagsForResource
         update:
-          - frauddetector:GetListElements
-          - frauddetector:GetListsMetadata
+          - frauddetector:GetOutcomes
+          - frauddetector:PutOutcome
           - frauddetector:ListTagsForResource
-          - frauddetector:UntagResource
-          - frauddetector:UpdateList
           - frauddetector:TagResource
+          - frauddetector:UntagResource
         delete:
-          - frauddetector:DeleteList
-          - frauddetector:GetListsMetadata
+          - frauddetector:GetOutcomes
+          - frauddetector:DeleteOutcome
         list:
-          - frauddetector:GetListElements
-          - frauddetector:GetListsMetadata
+          - frauddetector:GetOutcomes
           - frauddetector:ListTagsForResource
     Variable:
       type: object
@@ -1296,7 +1640,7 @@ components:
         list:
           - frauddetector:GetVariables
           - frauddetector:ListTagsForResource
-    CreateLabelRequest:
+    CreateDetectorRequest:
       properties:
         ClientToken:
           type: string
@@ -1309,14 +1653,28 @@ components:
         DesiredState:
           type: object
           properties:
-            Name:
-              description: The name of the label.
+            DetectorId:
+              description: The ID of the detector
               type: string
               pattern: ^[0-9a-z_-]+$
               minLength: 1
               maxLength: 64
+            DetectorVersionStatus:
+              description: The desired detector version status for the detector
+              type: string
+              enum:
+                - DRAFT
+                - ACTIVE
+            DetectorVersionId:
+              description: The active version ID of the detector
+              type: string
+            RuleExecutionMode:
+              type: string
+              enum:
+                - FIRST_MATCHED
+                - ALL_MATCHED
             Tags:
-              description: Tags associated with this label.
+              description: Tags associated with this detector.
               type: array
               uniqueItems: false
               x-insertionOrder: false
@@ -1324,24 +1682,42 @@ components:
               items:
                 $ref: '#/components/schemas/Tag'
             Description:
-              description: The label description.
+              description: The description of the detector.
               type: string
               minLength: 1
               maxLength: 128
+            Rules:
+              type: array
+              uniqueItems: false
+              x-insertionOrder: false
+              minItems: 1
+              items:
+                $ref: '#/components/schemas/Rule'
+            EventType:
+              description: The event type to associate this detector with.
+              $ref: '#/components/schemas/Detector_EventType'
             Arn:
-              description: The label ARN.
+              description: The ARN of the detector.
               type: string
             CreatedTime:
-              description: The timestamp when the label was created.
+              description: The time when the detector was created.
               type: string
             LastUpdatedTime:
-              description: The timestamp when the label was last updated.
+              description: The time when the detector was last updated.
               type: string
+            AssociatedModels:
+              description: The models to associate with this detector.
+              type: array
+              uniqueItems: false
+              x-insertionOrder: false
+              maxItems: 10
+              items:
+                $ref: '#/components/schemas/Model'
           x-stackQL-stringOnly: true
-      x-title: CreateLabelRequest
+      x-title: CreateDetectorRequest
       type: object
       required: []
-    CreateOutcomeRequest:
+    CreateEntityTypeRequest:
       properties:
         ClientToken:
           type: string
@@ -1355,13 +1731,13 @@ components:
           type: object
           properties:
             Name:
-              description: The name of the outcome.
+              description: The name of the entity type.
               type: string
               pattern: ^[0-9a-z_-]+$
               minLength: 1
               maxLength: 64
             Tags:
-              description: Tags associated with this outcome.
+              description: Tags associated with this entity type.
               type: array
               uniqueItems: false
               x-insertionOrder: false
@@ -1369,21 +1745,21 @@ components:
               items:
                 $ref: '#/components/schemas/Tag'
             Description:
-              description: The outcome description.
+              description: The entity type description.
               type: string
               minLength: 1
               maxLength: 128
             Arn:
-              description: The outcome ARN.
+              description: The entity type ARN.
               type: string
             CreatedTime:
-              description: The timestamp when the outcome was created.
+              description: The timestamp when the entity type was created.
               type: string
             LastUpdatedTime:
-              description: The timestamp when the outcome was last updated.
+              description: The timestamp when the entity type was last updated.
               type: string
           x-stackQL-stringOnly: true
-      x-title: CreateOutcomeRequest
+      x-title: CreateEntityTypeRequest
       type: object
       required: []
     CreateEventTypeRequest:
@@ -1424,21 +1800,21 @@ components:
               x-insertionOrder: false
               minItems: 1
               items:
-                $ref: '#/components/schemas/EventVariable'
+                $ref: '#/components/schemas/EventType_EventVariable'
             Labels:
               type: array
               uniqueItems: false
               x-insertionOrder: false
               minItems: 2
               items:
-                $ref: '#/components/schemas/Label'
+                $ref: '#/components/schemas/EventType_Label'
             EntityTypes:
               type: array
               uniqueItems: false
               x-insertionOrder: false
               minItems: 1
               items:
-                $ref: '#/components/schemas/EntityType'
+                $ref: '#/components/schemas/EventType_EntityType'
             Arn:
               description: The ARN of the event type.
               type: string
@@ -1452,7 +1828,7 @@ components:
       x-title: CreateEventTypeRequest
       type: object
       required: []
-    CreateDetectorRequest:
+    CreateLabelRequest:
       properties:
         ClientToken:
           type: string
@@ -1465,28 +1841,14 @@ components:
         DesiredState:
           type: object
           properties:
-            DetectorId:
-              description: The ID of the detector
+            Name:
+              description: The name of the label.
               type: string
               pattern: ^[0-9a-z_-]+$
               minLength: 1
               maxLength: 64
-            DetectorVersionStatus:
-              description: The desired detector version status for the detector
-              type: string
-              enum:
-                - DRAFT
-                - ACTIVE
-            DetectorVersionId:
-              description: The active version ID of the detector
-              type: string
-            RuleExecutionMode:
-              type: string
-              enum:
-                - FIRST_MATCHED
-                - ALL_MATCHED
             Tags:
-              description: Tags associated with this detector.
+              description: Tags associated with this label.
               type: array
               uniqueItems: false
               x-insertionOrder: false
@@ -1494,39 +1856,21 @@ components:
               items:
                 $ref: '#/components/schemas/Tag'
             Description:
-              description: The description of the detector.
+              description: The label description.
               type: string
               minLength: 1
               maxLength: 128
-            Rules:
-              type: array
-              uniqueItems: false
-              x-insertionOrder: false
-              minItems: 1
-              items:
-                $ref: '#/components/schemas/Rule'
-            EventType:
-              description: The event type to associate this detector with.
-              $ref: '#/components/schemas/EventType'
             Arn:
-              description: The ARN of the detector.
+              description: The label ARN.
               type: string
             CreatedTime:
-              description: The time when the detector was created.
+              description: The timestamp when the label was created.
               type: string
             LastUpdatedTime:
-              description: The time when the detector was last updated.
+              description: The timestamp when the label was last updated.
               type: string
-            AssociatedModels:
-              description: The models to associate with this detector.
-              type: array
-              uniqueItems: false
-              x-insertionOrder: false
-              maxItems: 10
-              items:
-                $ref: '#/components/schemas/Model'
           x-stackQL-stringOnly: true
-      x-title: CreateDetectorRequest
+      x-title: CreateLabelRequest
       type: object
       required: []
     CreateListRequest:
@@ -1575,7 +1919,7 @@ components:
               x-insertionOrder: false
               maxItems: 200
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/List_Tag'
             Elements:
               description: The elements in this list.
               type: array
@@ -1588,6 +1932,51 @@ components:
       x-title: CreateListRequest
       type: object
       required: []
+    CreateOutcomeRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            Name:
+              description: The name of the outcome.
+              type: string
+              pattern: ^[0-9a-z_-]+$
+              minLength: 1
+              maxLength: 64
+            Tags:
+              description: Tags associated with this outcome.
+              type: array
+              uniqueItems: false
+              x-insertionOrder: false
+              maxItems: 200
+              items:
+                $ref: '#/components/schemas/Tag'
+            Description:
+              description: The outcome description.
+              type: string
+              minLength: 1
+              maxLength: 128
+            Arn:
+              description: The outcome ARN.
+              type: string
+            CreatedTime:
+              description: The timestamp when the outcome was created.
+              type: string
+            LastUpdatedTime:
+              description: The timestamp when the outcome was last updated.
+              type: string
+          x-stackQL-stringOnly: true
+      x-title: CreateOutcomeRequest
+      type: object
+      required: []
     CreateVariableRequest:
       properties:
         ClientToken:
@@ -1693,12 +2082,12 @@ components:
       description: Amazon Signature authorization v4
       x-amazon-apigateway-authtype: awsSigv4
   x-stackQL-resources:
-    labels:
-      name: labels
-      id: awscc.frauddetector.labels
-      x-cfn-schema-name: Label
-      x-cfn-type-name: AWS::FraudDetector::Label
-      x-identifiers:
+    detectors:
+      name: detectors
+      id: awscc.frauddetector.detectors
+      x-cfn-schema-name: Detector
+      x-cfn-type-name: AWS::FraudDetector::Detector
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -1707,12 +2096,12 @@ components:
             requestBodyTranslate:
               algorithm: naive_DesiredState
           operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Label&__detailTransformed=true/post'
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Detector&__detailTransformed=true/post'
           request:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::FraudDetector::Label"
+                "TypeName": "AWS::FraudDetector::Detector"
               }
           response:
             mediaType: application/json
@@ -1728,7 +2117,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::FraudDetector::Label"
+                "TypeName": "AWS::FraudDetector::Detector"
               }
           response:
             mediaType: application/json
@@ -1744,7 +2133,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::FraudDetector::Label"
+                "TypeName": "AWS::FraudDetector::Detector"
               }
           response:
             mediaType: application/json
@@ -1752,11 +2141,11 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/labels/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/detectors/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/labels/methods/delete_resource'
+          - $ref: '#/components/x-stackQL-resources/detectors/methods/delete_resource'
         update:
-          - $ref: '#/components/x-stackQL-resources/labels/methods/update_resource'
+          - $ref: '#/components/x-stackQL-resources/detectors/methods/update_resource'
       config:
         views:
           select:
@@ -1765,13 +2154,19 @@ components:
               SELECT
               region,
               Identifier,
-              JSON_EXTRACT(Properties, '$.Name') as name,
+              JSON_EXTRACT(Properties, '$.DetectorId') as detector_id,
+              JSON_EXTRACT(Properties, '$.DetectorVersionStatus') as detector_version_status,
+              JSON_EXTRACT(Properties, '$.DetectorVersionId') as detector_version_id,
+              JSON_EXTRACT(Properties, '$.RuleExecutionMode') as rule_execution_mode,
               JSON_EXTRACT(Properties, '$.Tags') as tags,
               JSON_EXTRACT(Properties, '$.Description') as description,
+              JSON_EXTRACT(Properties, '$.Rules') as rules,
+              JSON_EXTRACT(Properties, '$.EventType') as event_type,
               JSON_EXTRACT(Properties, '$.Arn') as arn,
               JSON_EXTRACT(Properties, '$.CreatedTime') as created_time,
-              JSON_EXTRACT(Properties, '$.LastUpdatedTime') as last_updated_time
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::FraudDetector::Label'
+              JSON_EXTRACT(Properties, '$.LastUpdatedTime') as last_updated_time,
+              JSON_EXTRACT(Properties, '$.AssociatedModels') as associated_models
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::FraudDetector::Detector'
               AND Identifier = '<Arn>'
               AND region = 'us-east-1'
             fallback:
@@ -1780,22 +2175,27 @@ components:
                 SELECT
                 region,
                 Identifier,
-                json_extract_path_text(Properties, 'Name') as name,
+                json_extract_path_text(Properties, 'DetectorId') as detector_id,
+                json_extract_path_text(Properties, 'DetectorVersionStatus') as detector_version_status,
+                json_extract_path_text(Properties, 'DetectorVersionId') as detector_version_id,
+                json_extract_path_text(Properties, 'RuleExecutionMode') as rule_execution_mode,
                 json_extract_path_text(Properties, 'Tags') as tags,
                 json_extract_path_text(Properties, 'Description') as description,
+                json_extract_path_text(Properties, 'Rules') as rules,
+                json_extract_path_text(Properties, 'EventType') as event_type,
                 json_extract_path_text(Properties, 'Arn') as arn,
                 json_extract_path_text(Properties, 'CreatedTime') as created_time,
-                json_extract_path_text(Properties, 'LastUpdatedTime') as last_updated_time
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::FraudDetector::Label'
+                json_extract_path_text(Properties, 'LastUpdatedTime') as last_updated_time,
+                json_extract_path_text(Properties, 'AssociatedModels') as associated_models
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::FraudDetector::Detector'
                 AND Identifier = '<Arn>'
                 AND region = 'us-east-1'
-    labels_list_only:
-      name: labels_list_only
-      id: awscc.frauddetector.labels_list_only
-      x-cfn-schema-name: Label
-      x-cfn-type-name: AWS::FraudDetector::Label
-      x-identifiers:
-        - Arn
+    detectors_list_only:
+      name: detectors_list_only
+      id: awscc.frauddetector.detectors_list_only
+      x-cfn-schema-name: Detector
+      x-cfn-type-name: AWS::FraudDetector::Detector
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1810,7 +2210,7 @@ components:
               SELECT
               region,
               JSON_EXTRACT(Properties, '$.Arn') as arn
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::FraudDetector::Label'
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::FraudDetector::Detector'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres"
@@ -1818,14 +2218,14 @@ components:
                 SELECT
                 region,
                 json_extract_path_text(Properties, 'Arn') as arn
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::FraudDetector::Label'
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::FraudDetector::Detector'
                 AND region = 'us-east-1'
-    outcomes:
-      name: outcomes
-      id: awscc.frauddetector.outcomes
-      x-cfn-schema-name: Outcome
-      x-cfn-type-name: AWS::FraudDetector::Outcome
-      x-identifiers:
+    entity_types:
+      name: entity_types
+      id: awscc.frauddetector.entity_types
+      x-cfn-schema-name: EntityType
+      x-cfn-type-name: AWS::FraudDetector::EntityType
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -1834,12 +2234,12 @@ components:
             requestBodyTranslate:
               algorithm: naive_DesiredState
           operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Outcome&__detailTransformed=true/post'
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__EntityType&__detailTransformed=true/post'
           request:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::FraudDetector::Outcome"
+                "TypeName": "AWS::FraudDetector::EntityType"
               }
           response:
             mediaType: application/json
@@ -1855,7 +2255,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::FraudDetector::Outcome"
+                "TypeName": "AWS::FraudDetector::EntityType"
               }
           response:
             mediaType: application/json
@@ -1871,7 +2271,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::FraudDetector::Outcome"
+                "TypeName": "AWS::FraudDetector::EntityType"
               }
           response:
             mediaType: application/json
@@ -1879,11 +2279,11 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/outcomes/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/entity_types/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/outcomes/methods/delete_resource'
+          - $ref: '#/components/x-stackQL-resources/entity_types/methods/delete_resource'
         update:
-          - $ref: '#/components/x-stackQL-resources/outcomes/methods/update_resource'
+          - $ref: '#/components/x-stackQL-resources/entity_types/methods/update_resource'
       config:
         views:
           select:
@@ -1898,7 +2298,7 @@ components:
               JSON_EXTRACT(Properties, '$.Arn') as arn,
               JSON_EXTRACT(Properties, '$.CreatedTime') as created_time,
               JSON_EXTRACT(Properties, '$.LastUpdatedTime') as last_updated_time
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::FraudDetector::Outcome'
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::FraudDetector::EntityType'
               AND Identifier = '<Arn>'
               AND region = 'us-east-1'
             fallback:
@@ -1913,16 +2313,15 @@ components:
                 json_extract_path_text(Properties, 'Arn') as arn,
                 json_extract_path_text(Properties, 'CreatedTime') as created_time,
                 json_extract_path_text(Properties, 'LastUpdatedTime') as last_updated_time
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::FraudDetector::Outcome'
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::FraudDetector::EntityType'
                 AND Identifier = '<Arn>'
                 AND region = 'us-east-1'
-    outcomes_list_only:
-      name: outcomes_list_only
-      id: awscc.frauddetector.outcomes_list_only
-      x-cfn-schema-name: Outcome
-      x-cfn-type-name: AWS::FraudDetector::Outcome
-      x-identifiers:
-        - Arn
+    entity_types_list_only:
+      name: entity_types_list_only
+      id: awscc.frauddetector.entity_types_list_only
+      x-cfn-schema-name: EntityType
+      x-cfn-type-name: AWS::FraudDetector::EntityType
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1937,7 +2336,7 @@ components:
               SELECT
               region,
               JSON_EXTRACT(Properties, '$.Arn') as arn
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::FraudDetector::Outcome'
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::FraudDetector::EntityType'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres"
@@ -1945,14 +2344,14 @@ components:
                 SELECT
                 region,
                 json_extract_path_text(Properties, 'Arn') as arn
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::FraudDetector::Outcome'
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::FraudDetector::EntityType'
                 AND region = 'us-east-1'
     event_types:
       name: event_types
       id: awscc.frauddetector.event_types
       x-cfn-schema-name: EventType
       x-cfn-type-name: AWS::FraudDetector::EventType
-      x-identifiers:
+      x-identifiers: &ref_2
         - Arn
       x-type: cloud_control
       methods:
@@ -2054,8 +2453,7 @@ components:
       id: awscc.frauddetector.event_types_list_only
       x-cfn-schema-name: EventType
       x-cfn-type-name: AWS::FraudDetector::EventType
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2080,12 +2478,12 @@ components:
                 json_extract_path_text(Properties, 'Arn') as arn
                 FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::FraudDetector::EventType'
                 AND region = 'us-east-1'
-    detectors:
-      name: detectors
-      id: awscc.frauddetector.detectors
-      x-cfn-schema-name: Detector
-      x-cfn-type-name: AWS::FraudDetector::Detector
-      x-identifiers:
+    labels:
+      name: labels
+      id: awscc.frauddetector.labels
+      x-cfn-schema-name: Label
+      x-cfn-type-name: AWS::FraudDetector::Label
+      x-identifiers: &ref_3
         - Arn
       x-type: cloud_control
       methods:
@@ -2094,12 +2492,12 @@ components:
             requestBodyTranslate:
               algorithm: naive_DesiredState
           operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Detector&__detailTransformed=true/post'
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Label&__detailTransformed=true/post'
           request:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::FraudDetector::Detector"
+                "TypeName": "AWS::FraudDetector::Label"
               }
           response:
             mediaType: application/json
@@ -2115,7 +2513,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::FraudDetector::Detector"
+                "TypeName": "AWS::FraudDetector::Label"
               }
           response:
             mediaType: application/json
@@ -2131,7 +2529,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::FraudDetector::Detector"
+                "TypeName": "AWS::FraudDetector::Label"
               }
           response:
             mediaType: application/json
@@ -2139,11 +2537,11 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/detectors/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/labels/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/detectors/methods/delete_resource'
+          - $ref: '#/components/x-stackQL-resources/labels/methods/delete_resource'
         update:
-          - $ref: '#/components/x-stackQL-resources/detectors/methods/update_resource'
+          - $ref: '#/components/x-stackQL-resources/labels/methods/update_resource'
       config:
         views:
           select:
@@ -2152,19 +2550,13 @@ components:
               SELECT
               region,
               Identifier,
-              JSON_EXTRACT(Properties, '$.DetectorId') as detector_id,
-              JSON_EXTRACT(Properties, '$.DetectorVersionStatus') as detector_version_status,
-              JSON_EXTRACT(Properties, '$.DetectorVersionId') as detector_version_id,
-              JSON_EXTRACT(Properties, '$.RuleExecutionMode') as rule_execution_mode,
+              JSON_EXTRACT(Properties, '$.Name') as name,
               JSON_EXTRACT(Properties, '$.Tags') as tags,
               JSON_EXTRACT(Properties, '$.Description') as description,
-              JSON_EXTRACT(Properties, '$.Rules') as rules,
-              JSON_EXTRACT(Properties, '$.EventType') as event_type,
               JSON_EXTRACT(Properties, '$.Arn') as arn,
               JSON_EXTRACT(Properties, '$.CreatedTime') as created_time,
-              JSON_EXTRACT(Properties, '$.LastUpdatedTime') as last_updated_time,
-              JSON_EXTRACT(Properties, '$.AssociatedModels') as associated_models
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::FraudDetector::Detector'
+              JSON_EXTRACT(Properties, '$.LastUpdatedTime') as last_updated_time
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::FraudDetector::Label'
               AND Identifier = '<Arn>'
               AND region = 'us-east-1'
             fallback:
@@ -2173,28 +2565,21 @@ components:
                 SELECT
                 region,
                 Identifier,
-                json_extract_path_text(Properties, 'DetectorId') as detector_id,
-                json_extract_path_text(Properties, 'DetectorVersionStatus') as detector_version_status,
-                json_extract_path_text(Properties, 'DetectorVersionId') as detector_version_id,
-                json_extract_path_text(Properties, 'RuleExecutionMode') as rule_execution_mode,
+                json_extract_path_text(Properties, 'Name') as name,
                 json_extract_path_text(Properties, 'Tags') as tags,
                 json_extract_path_text(Properties, 'Description') as description,
-                json_extract_path_text(Properties, 'Rules') as rules,
-                json_extract_path_text(Properties, 'EventType') as event_type,
                 json_extract_path_text(Properties, 'Arn') as arn,
                 json_extract_path_text(Properties, 'CreatedTime') as created_time,
-                json_extract_path_text(Properties, 'LastUpdatedTime') as last_updated_time,
-                json_extract_path_text(Properties, 'AssociatedModels') as associated_models
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::FraudDetector::Detector'
+                json_extract_path_text(Properties, 'LastUpdatedTime') as last_updated_time
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::FraudDetector::Label'
                 AND Identifier = '<Arn>'
                 AND region = 'us-east-1'
-    detectors_list_only:
-      name: detectors_list_only
-      id: awscc.frauddetector.detectors_list_only
-      x-cfn-schema-name: Detector
-      x-cfn-type-name: AWS::FraudDetector::Detector
-      x-identifiers:
-        - Arn
+    labels_list_only:
+      name: labels_list_only
+      id: awscc.frauddetector.labels_list_only
+      x-cfn-schema-name: Label
+      x-cfn-type-name: AWS::FraudDetector::Label
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2209,7 +2594,7 @@ components:
               SELECT
               region,
               JSON_EXTRACT(Properties, '$.Arn') as arn
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::FraudDetector::Detector'
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::FraudDetector::Label'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres"
@@ -2217,14 +2602,14 @@ components:
                 SELECT
                 region,
                 json_extract_path_text(Properties, 'Arn') as arn
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::FraudDetector::Detector'
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::FraudDetector::Label'
                 AND region = 'us-east-1'
     lists:
       name: lists
       id: awscc.frauddetector.lists
       x-cfn-schema-name: List
       x-cfn-type-name: AWS::FraudDetector::List
-      x-identifiers:
+      x-identifiers: &ref_4
         - Arn
       x-type: cloud_control
       methods:
@@ -2324,8 +2709,7 @@ components:
       id: awscc.frauddetector.lists_list_only
       x-cfn-schema-name: List
       x-cfn-type-name: AWS::FraudDetector::List
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2350,12 +2734,138 @@ components:
                 json_extract_path_text(Properties, 'Arn') as arn
                 FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::FraudDetector::List'
                 AND region = 'us-east-1'
+    outcomes:
+      name: outcomes
+      id: awscc.frauddetector.outcomes
+      x-cfn-schema-name: Outcome
+      x-cfn-type-name: AWS::FraudDetector::Outcome
+      x-identifiers: &ref_5
+        - Arn
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Outcome&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::FraudDetector::Outcome"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::FraudDetector::Outcome"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::FraudDetector::Outcome"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/outcomes/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/outcomes/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/outcomes/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.Name') as name,
+              JSON_EXTRACT(Properties, '$.Tags') as tags,
+              JSON_EXTRACT(Properties, '$.Description') as description,
+              JSON_EXTRACT(Properties, '$.Arn') as arn,
+              JSON_EXTRACT(Properties, '$.CreatedTime') as created_time,
+              JSON_EXTRACT(Properties, '$.LastUpdatedTime') as last_updated_time
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::FraudDetector::Outcome'
+              AND Identifier = '<Arn>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'Name') as name,
+                json_extract_path_text(Properties, 'Tags') as tags,
+                json_extract_path_text(Properties, 'Description') as description,
+                json_extract_path_text(Properties, 'Arn') as arn,
+                json_extract_path_text(Properties, 'CreatedTime') as created_time,
+                json_extract_path_text(Properties, 'LastUpdatedTime') as last_updated_time
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::FraudDetector::Outcome'
+                AND Identifier = '<Arn>'
+                AND region = 'us-east-1'
+    outcomes_list_only:
+      name: outcomes_list_only
+      id: awscc.frauddetector.outcomes_list_only
+      x-cfn-schema-name: Outcome
+      x-cfn-type-name: AWS::FraudDetector::Outcome
+      x-identifiers: *ref_5
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.Arn') as arn
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::FraudDetector::Outcome'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'Arn') as arn
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::FraudDetector::Outcome'
+                AND region = 'us-east-1'
     variables:
       name: variables
       id: awscc.frauddetector.variables
       x-cfn-schema-name: Variable
       x-cfn-type-name: AWS::FraudDetector::Variable
-      x-identifiers:
+      x-identifiers: &ref_6
         - Arn
       x-type: cloud_control
       methods:
@@ -2459,8 +2969,7 @@ components:
       id: awscc.frauddetector.variables_list_only
       x-cfn-schema-name: Variable
       x-cfn-type-name: AWS::FraudDetector::Variable
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2629,7 +3138,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__Label&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__Detector&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -2639,7 +3148,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateLabel
+      operationId: CreateDetector
       parameters:
         - description: Action Header
           in: header
@@ -2662,7 +3171,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateLabelRequest'
+              $ref: '#/components/schemas/CreateDetectorRequest'
         required: true
       responses:
         '200':
@@ -2671,7 +3180,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__Outcome&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__EntityType&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -2681,7 +3190,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateOutcome
+      operationId: CreateEntityType
       parameters:
         - description: Action Header
           in: header
@@ -2704,7 +3213,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateOutcomeRequest'
+              $ref: '#/components/schemas/CreateEntityTypeRequest'
         required: true
       responses:
         '200':
@@ -2755,7 +3264,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__Detector&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__Label&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -2765,7 +3274,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateDetector
+      operationId: CreateLabel
       parameters:
         - description: Action Header
           in: header
@@ -2788,7 +3297,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateDetectorRequest'
+              $ref: '#/components/schemas/CreateLabelRequest'
         required: true
       responses:
         '200':
@@ -2839,6 +3348,48 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
+  /?Action=CreateResource&Version=2021-09-30&__Outcome&__detailTransformed=true:
+    parameters:
+      - $ref: '#/components/parameters/X-Amz-Content-Sha256'
+      - $ref: '#/components/parameters/X-Amz-Date'
+      - $ref: '#/components/parameters/X-Amz-Algorithm'
+      - $ref: '#/components/parameters/X-Amz-Credential'
+      - $ref: '#/components/parameters/X-Amz-Security-Token'
+      - $ref: '#/components/parameters/X-Amz-Signature'
+      - $ref: '#/components/parameters/X-Amz-SignedHeaders'
+    post:
+      operationId: CreateOutcome
+      parameters:
+        - description: Action Header
+          in: header
+          name: X-Amz-Target
+          required: false
+          schema:
+            default: CloudApiService.CreateResource
+            enum:
+              - CloudApiService.CreateResource
+            type: string
+        - in: header
+          name: Content-Type
+          required: false
+          schema:
+            default: application/x-amz-json-1.0
+            enum:
+              - application/x-amz-json-1.0
+            type: string
+      requestBody:
+        content:
+          application/x-amz-json-1.0:
+            schema:
+              $ref: '#/components/schemas/CreateOutcomeRequest'
+        required: true
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
+          description: Success
   /?Action=CreateResource&Version=2021-09-30&__Variable&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
diff --git a/openapi/src/awscc/v00.00.00000/services/fsx.yaml b/openapi/src/awscc/v00.00.00000/services/fsx.yaml
index d753f60bb..c15890d10 100644
--- a/openapi/src/awscc/v00.00.00000/services/fsx.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/fsx.yaml
@@ -840,7 +840,7 @@ components:
       id: awscc.fsx.data_repository_associations
       x-cfn-schema-name: DataRepositoryAssociation
       x-cfn-type-name: AWS::FSx::DataRepositoryAssociation
-      x-identifiers:
+      x-identifiers: &ref_0
         - AssociationId
       x-type: cloud_control
       methods:
@@ -942,8 +942,7 @@ components:
       id: awscc.fsx.data_repository_associations_list_only
       x-cfn-schema-name: DataRepositoryAssociation
       x-cfn-type-name: AWS::FSx::DataRepositoryAssociation
-      x-identifiers:
-        - AssociationId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -973,7 +972,7 @@ components:
       id: awscc.fsx.s3access_point_attachments
       x-cfn-schema-name: S3AccessPointAttachment
       x-cfn-type-name: AWS::FSx::S3AccessPointAttachment
-      x-identifiers:
+      x-identifiers: &ref_1
         - Name
       x-type: cloud_control
       methods:
@@ -1048,8 +1047,7 @@ components:
       id: awscc.fsx.s3access_point_attachments_list_only
       x-cfn-schema-name: S3AccessPointAttachment
       x-cfn-type-name: AWS::FSx::S3AccessPointAttachment
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/gamelift.yaml b/openapi/src/awscc/v00.00.00000/services/gamelift.yaml
index 16ce5d05b..2a967e8a3 100644
--- a/openapi/src/awscc/v00.00.00000/services/gamelift.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/gamelift.yaml
@@ -703,80 +703,27 @@ components:
           minLength: 1
           maxLength: 1024
       additionalProperties: false
-    Location:
-      type: object
-      properties:
-        LocationName:
-          type: string
-          minLength: 8
-          maxLength: 64
-          pattern: ^custom-[A-Za-z0-9\-]+
-        LocationArn:
-          type: string
-          pattern: ^arn:.*:location/custom-\S+
-        Tags:
-          description: An array of key-value pairs to apply to this resource.
-          type: array
-          uniqueItems: true
-          x-insertionOrder: false
-          maxItems: 200
-          items:
-            $ref: '#/components/schemas/Tag'
-      required:
-        - LocationName
-      x-stackql-resource-name: location
-      description: The AWS::GameLift::Location resource creates an Amazon GameLift (GameLift) custom location.
-      x-type-name: AWS::GameLift::Location
-      x-stackql-primary-identifier:
-        - LocationName
-      x-create-only-properties:
-        - LocationName
-      x-read-only-properties:
-        - LocationArn
-      x-required-properties:
-        - LocationName
-      x-tagging:
-        taggable: true
-        cloudFormationSystemTags: false
-        tagProperty: /properties/Tags
-        tagOnCreate: true
-        tagUpdatable: true
-        permissions:
-          - gamelift:ListTagsForResource
-          - gamelift:TagResource
-          - gamelift:UntagResource
-      x-required-permissions:
-        create:
-          - gamelift:CreateLocation
-          - gamelift:ListLocations
-          - gamelift:ListTagsForResource
-          - gamelift:TagResource
-        read:
-          - gamelift:ListLocations
-          - gamelift:ListTagsForResource
-        delete:
-          - gamelift:DeleteLocation
-        list:
-          - gamelift:ListLocations
-        update:
-          - gamelift:ListLocations
-          - gamelift:ListTagsForResource
-          - gamelift:TagResource
-          - gamelift:UntagResource
+    ContainerFleet_Location:
+      type: string
+      minLength: 1
+      maxLength: 64
+      pattern: ^[A-Za-z0-9\-]+
     LocationCapacity:
       description: Current resource capacity settings in a specified fleet or location. The location value might refer to a fleet's remote location or its home Region.
       type: object
       properties:
         DesiredEC2Instances:
-          description: The number of EC2 instances you want to maintain in the specified fleet location. This value must fall between the minimum and maximum size limits.
+          description: >-
+            The number of EC2 instances you want to maintain in the specified fleet location. This value must fall between the minimum and maximum size limits. If any auto-scaling policy is defined for the container fleet, the desired instance will only be applied once during fleet creation and will be ignored in updates to avoid conflicts with auto-scaling. During updates with any auto-scaling policy defined, if current desired instance is lower than the new MinSize, it will be increased to the
+            new MinSize; if current desired instance is larger than the new MaxSize, it will be decreased to the new MaxSize.
           type: integer
           minimum: 0
         MinSize:
-          description: The minimum value allowed for the fleet's instance count for a location. When creating a new fleet, GameLift automatically sets this value to "0". After the fleet is active, you can change this value.
+          description: The minimum value allowed for the fleet's instance count for a location.
           type: integer
           minimum: 0
         MaxSize:
-          description: The maximum value that is allowed for the fleet's instance count for a location. When creating a new fleet, GameLift automatically sets this value to "1". Once the fleet is active, you can change this value.
+          description: The maximum value that is allowed for the fleet's instance count for a location.
           type: integer
           minimum: 0
       additionalProperties: false
@@ -789,9 +736,11 @@ components:
       type: object
       properties:
         Location:
-          $ref: '#/components/schemas/Location'
+          $ref: '#/components/schemas/ContainerFleet_Location'
         LocationCapacity:
           $ref: '#/components/schemas/LocationCapacity'
+        StoppedActions:
+          $ref: '#/components/schemas/StoppedActions'
       additionalProperties: false
       required:
         - Location
@@ -811,8 +760,6 @@ components:
           description: Length of time (in minutes) the metric must be at or beyond the threshold before a scaling event is triggered.
           type: integer
           minimum: 1
-        Location:
-          $ref: '#/components/schemas/Location'
         MetricName:
           description: Name of the Amazon GameLift-defined metric that is used to trigger a scaling adjustment.
           type: string
@@ -850,28 +797,12 @@ components:
             - ChangeInCapacity
             - ExactCapacity
             - PercentChangeInCapacity
-        Status:
-          description: Current status of the scaling policy. The scaling policy can be in force only when in an ACTIVE status. Scaling policies can be suspended for individual fleets. If the policy is suspended for a fleet, the policy status does not change.
-          type: string
-          enum:
-            - ACTIVE
-            - UPDATE_REQUESTED
-            - UPDATING
-            - DELETE_REQUESTED
-            - DELETING
-            - DELETED
-            - ERROR
         TargetConfiguration:
           description: An object that contains settings for a target-based scaling policy.
           $ref: '#/components/schemas/TargetConfiguration'
         Threshold:
           description: Metric value used to trigger a scaling event.
           type: number
-        UpdateStatus:
-          description: The current status of the fleet's scaling policies in a requested fleet location. The status PENDING_UPDATE indicates that an update was requested for the fleet but has not yet been completed for the location.
-          type: string
-          enum:
-            - PENDING_UPDATE
       additionalProperties: false
       required:
         - MetricName
@@ -1289,6 +1220,26 @@ components:
         - ContainerName
         - Condition
       additionalProperties: false
+    ContainerGroupDefinition_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          description: The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length.
+          type: string
+          minLength: 1
+          maxLength: 128
+          pattern: ^.*$
+        Value:
+          description: The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length.
+          type: string
+          minLength: 0
+          maxLength: 256
+          pattern: ^.*$
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     GameServerContainerDefinition:
       description: Specifies the information required to run game servers with this container group
       type: object
@@ -1500,7 +1451,7 @@ components:
           minItems: 0
           maxItems: 200
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ContainerGroupDefinition_Tag'
       required:
         - Name
         - OperatingSystem
@@ -1585,6 +1536,43 @@ components:
       additionalProperties: false
       required:
         - CertificateType
+    Fleet_Location:
+      type: string
+      minLength: 1
+      maxLength: 64
+      pattern: ^[A-Za-z0-9\-]+
+    Fleet_LocationCapacity:
+      description: Current resource capacity settings in a specified fleet or location. The location value might refer to a fleet's remote location or its home Region.
+      type: object
+      properties:
+        DesiredEC2Instances:
+          description: The number of EC2 instances you want to maintain in the specified fleet location. This value must fall between the minimum and maximum size limits.
+          type: integer
+          minimum: 0
+        MinSize:
+          description: The minimum value allowed for the fleet's instance count for a location. When creating a new fleet, GameLift automatically sets this value to "0". After the fleet is active, you can change this value.
+          type: integer
+          minimum: 0
+        MaxSize:
+          description: The maximum value that is allowed for the fleet's instance count for a location. When creating a new fleet, GameLift automatically sets this value to "1". Once the fleet is active, you can change this value.
+          type: integer
+          minimum: 0
+      additionalProperties: false
+      required:
+        - DesiredEC2Instances
+        - MinSize
+        - MaxSize
+    Fleet_LocationConfiguration:
+      description: A remote location where a multi-location fleet can deploy EC2 instances for game hosting.
+      type: object
+      properties:
+        Location:
+          $ref: '#/components/schemas/Fleet_Location'
+        LocationCapacity:
+          $ref: '#/components/schemas/Fleet_LocationCapacity'
+      additionalProperties: false
+      required:
+        - Location
     ResourceCreationLimitPolicy:
       description: |-
         A policy that limits the number of game sessions a player can create on the same fleet. This optional policy gives game owners control over how players can consume available game server resources. A resource creation policy makes the following statement: "An individual player can create a maximum number of new game sessions within a specified time period".
@@ -1631,6 +1619,87 @@ components:
             $ref: '#/components/schemas/ServerProcess'
           x-insertionOrder: false
       additionalProperties: false
+    Fleet_ScalingPolicy:
+      description: Rule that controls how a fleet is scaled. Scaling policies are uniquely identified by the combination of name and fleet ID.
+      type: object
+      properties:
+        ComparisonOperator:
+          description: Comparison operator to use when measuring a metric against the threshold value.
+          type: string
+          enum:
+            - GreaterThanOrEqualToThreshold
+            - GreaterThanThreshold
+            - LessThanThreshold
+            - LessThanOrEqualToThreshold
+        EvaluationPeriods:
+          description: Length of time (in minutes) the metric must be at or beyond the threshold before a scaling event is triggered.
+          type: integer
+          minimum: 1
+        Location:
+          $ref: '#/components/schemas/Fleet_Location'
+        MetricName:
+          description: Name of the Amazon GameLift-defined metric that is used to trigger a scaling adjustment.
+          type: string
+          enum:
+            - ActivatingGameSessions
+            - ActiveGameSessions
+            - ActiveInstances
+            - AvailableGameSessions
+            - AvailablePlayerSessions
+            - CurrentPlayerSessions
+            - IdleInstances
+            - PercentAvailableGameSessions
+            - PercentIdleInstances
+            - QueueDepth
+            - WaitTime
+            - ConcurrentActivatableGameSessions
+        Name:
+          description: A descriptive label that is associated with a fleet's scaling policy. Policy names do not need to be unique.
+          type: string
+          minLength: 1
+          maxLength: 1024
+        PolicyType:
+          description: 'The type of scaling policy to create. For a target-based policy, set the parameter MetricName to ''PercentAvailableGameSessions'' and specify a TargetConfiguration. For a rule-based policy set the following parameters: MetricName, ComparisonOperator, Threshold, EvaluationPeriods, ScalingAdjustmentType, and ScalingAdjustment.'
+          type: string
+          enum:
+            - RuleBased
+            - TargetBased
+        ScalingAdjustment:
+          description: Amount of adjustment to make, based on the scaling adjustment type.
+          type: integer
+        ScalingAdjustmentType:
+          description: The type of adjustment to make to a fleet's instance count.
+          type: string
+          enum:
+            - ChangeInCapacity
+            - ExactCapacity
+            - PercentChangeInCapacity
+        Status:
+          description: Current status of the scaling policy. The scaling policy can be in force only when in an ACTIVE status. Scaling policies can be suspended for individual fleets. If the policy is suspended for a fleet, the policy status does not change.
+          type: string
+          enum:
+            - ACTIVE
+            - UPDATE_REQUESTED
+            - UPDATING
+            - DELETE_REQUESTED
+            - DELETING
+            - DELETED
+            - ERROR
+        TargetConfiguration:
+          description: An object that contains settings for a target-based scaling policy.
+          $ref: '#/components/schemas/TargetConfiguration'
+        Threshold:
+          description: Metric value used to trigger a scaling event.
+          type: number
+        UpdateStatus:
+          description: The current status of the fleet's scaling policies in a requested fleet location. The status PENDING_UPDATE indicates that an update was requested for the fleet but has not yet been completed for the location.
+          type: string
+          enum:
+            - PENDING_UPDATE
+      additionalProperties: false
+      required:
+        - MetricName
+        - Name
     ServerProcess:
       description: A set of instructions for launching server processes on each instance in a fleet. Each instruction set identifies the location of the server executable, optional launch parameters, and the number of server processes with this configuration to maintain concurrently on the instance. Server process configurations make up a fleet's RuntimeConfiguration.
       type: object
@@ -1667,7 +1736,7 @@ components:
           type: array
           maxItems: 50
           items:
-            $ref: '#/components/schemas/ScalingPolicy'
+            $ref: '#/components/schemas/Fleet_ScalingPolicy'
           x-insertionOrder: false
         AnywhereConfiguration:
           description: Configuration for Anywhere fleet.
@@ -1731,7 +1800,7 @@ components:
           minItems: 1
           maxItems: 100
           items:
-            $ref: '#/components/schemas/LocationConfiguration'
+            $ref: '#/components/schemas/Fleet_LocationConfiguration'
           x-insertionOrder: false
         LogPaths:
           description: This parameter is no longer used. When hosting a custom game build, specify where Amazon GameLift should store log files using the Amazon GameLift server API call ProcessReady()
@@ -2038,10 +2107,20 @@ components:
       type: array
       description: A list of labels to assign to the new game server group resource.
       items:
-        $ref: '#/components/schemas/Tag'
+        $ref: '#/components/schemas/GameServerGroup_Tag'
       minItems: 0
       maxItems: 200
       x-insertionOrder: false
+    GameServerGroup_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          description: The key for a developer-defined key:value pair for tagging an AWS resource.
+        Value:
+          type: string
+          description: The value for a developer-defined key:value pair for tagging an AWS resource.
+      additionalProperties: false
     VpcSubnets:
       type: array
       description: A list of virtual private cloud (VPC) subnets to use with instances in the game server group. Updating this game server group property will not take effect for the created EC2 Auto Scaling group, please update the EC2 Auto Scaling group directly after creating the resource.
@@ -2053,6 +2132,69 @@ components:
       minItems: 1
       maxItems: 20
       x-insertionOrder: false
+    GameServerGroup_GameServerGroup:
+      type: object
+      description: Properties that describe a game server group resource. A game server group manages certain properties of a corresponding EC2 Auto Scaling group.
+      properties:
+        AutoScalingGroupArn:
+          $ref: '#/components/schemas/AutoScalingGroupArn'
+        BalancingStrategy:
+          $ref: '#/components/schemas/BalancingStrategy'
+        CreationTime:
+          $ref: '#/components/schemas/CreationTime'
+        GameServerGroupArn:
+          $ref: '#/components/schemas/GameServerGroupArn'
+        GameServerGroupName:
+          $ref: '#/components/schemas/GameServerGroupName'
+        GameServerProtectionPolicy:
+          $ref: '#/components/schemas/GameServerProtectionPolicy'
+        InstanceDefinitions:
+          $ref: '#/components/schemas/InstanceDefinitions'
+        LastUpdatedTime:
+          $ref: '#/components/schemas/LastUpdatedTime'
+        RoleArn:
+          $ref: '#/components/schemas/RoleArn'
+        Status:
+          $ref: '#/components/schemas/Status'
+        StatusReason:
+          $ref: '#/components/schemas/StatusReason'
+        SuspendedActions:
+          $ref: '#/components/schemas/SuspendedActions'
+      additionalProperties: false
+    AutoScalingGroupArn:
+      type: string
+      description: A generated unique ID for the EC2 Auto Scaling group that is associated with this game server group.
+      minLength: 0
+      maxLength: 256
+      pattern: "[ -퟿-�𐀀-􏿿\r\n\t]*"
+    CreationTime:
+      type: string
+      description: A timestamp that indicates when this data object was created.
+    LastUpdatedTime:
+      type: string
+      description: A timestamp that indicates when this game server group was last updated.
+    Status:
+      type: string
+      description: The current status of the game server group.
+      enum:
+        - NEW
+        - ACTIVATING
+        - ACTIVE
+        - DELETE_SCHEDULED
+        - DELETING
+        - DELETED
+        - ERROR
+    StatusReason:
+      type: string
+      description: Additional information about the current game server group status.
+      minLength: 1
+      maxLength: 1024
+    SuspendedActions:
+      type: array
+      items:
+        type: string
+        enum:
+          - REPLACE_INSTANCE_TYPES
     GameServerGroup:
       type: object
       properties:
@@ -2196,40 +2338,24 @@ components:
           - events:PutTargets
         list:
           - gamelift:ListGameServerGroups
-    AutoScalingGroupArn:
-      type: string
-      description: A generated unique ID for the EC2 Auto Scaling group that is associated with this game server group.
-      minLength: 0
-      maxLength: 256
-      pattern: "[ -퟿-�𐀀-􏿿\r\n\t]*"
-    CreationTime:
-      type: string
-      description: A timestamp that indicates when this data object was created.
-    LastUpdatedTime:
-      type: string
-      description: A timestamp that indicates when this game server group was last updated.
-    Status:
-      type: string
-      description: The current status of the game server group.
-      enum:
-        - NEW
-        - ACTIVATING
-        - ACTIVE
-        - DELETE_SCHEDULED
-        - DELETING
-        - DELETED
-        - ERROR
-    StatusReason:
-      type: string
-      description: Additional information about the current game server group status.
-      minLength: 1
-      maxLength: 1024
-    SuspendedActions:
-      type: array
-      items:
-        type: string
-        enum:
-          - REPLACE_INSTANCE_TYPES
+    GameSessionQueue_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length.
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: The value for the tag. You can specify a value that is 1 to 256 Unicode characters in length.
+          minLength: 1
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     GameSessionQueueDestination:
       type: object
       description: A fleet or alias designated in a game session queue.
@@ -2353,6 +2479,68 @@ components:
           minLength: 1
           maxLength: 256
           pattern: ^arn:.*:gamesessionqueue\/[a-zA-Z0-9-]+
+        Tags:
+          description: An array of key-value pairs to apply to this resource.
+          type: array
+          uniqueItems: true
+          x-insertionOrder: false
+          maxItems: 200
+          items:
+            $ref: '#/components/schemas/GameSessionQueue_Tag'
+      required:
+        - Name
+      x-stackql-resource-name: game_session_queue
+      description: The AWS::GameLift::GameSessionQueue resource creates an Amazon GameLift (GameLift) game session queue.
+      x-type-name: AWS::GameLift::GameSessionQueue
+      x-stackql-primary-identifier:
+        - Name
+      x-create-only-properties:
+        - Name
+      x-read-only-properties:
+        - Arn
+      x-required-properties:
+        - Name
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: false
+        tagProperty: /properties/Tags
+        permissions:
+          - gamelift:ListTagsForResource
+          - gamelift:TagResource
+          - gamelift:UntagResource
+      x-required-permissions:
+        create:
+          - gamelift:CreateGameSessionQueue
+          - gamelift:DescribeGameSessionQueues
+          - gamelift:ListTagsForResource
+          - gamelift:TagResource
+        read:
+          - gamelift:DescribeGameSessionQueues
+          - gamelift:ListTagsForResource
+        delete:
+          - gamelift:DescribeGameSessionQueues
+          - gamelift:DeleteGameSessionQueue
+        update:
+          - gamelift:UpdateGameSessionQueue
+          - gamelift:ListTagsForResource
+          - gamelift:TagResource
+          - gamelift:UntagResource
+          - gamelift:DescribeGameSessionQueues
+        list:
+          - gamelift:DescribeGameSessionQueues
+    Location:
+      type: object
+      properties:
+        LocationName:
+          type: string
+          minLength: 8
+          maxLength: 64
+          pattern: ^custom-[A-Za-z0-9\-]+
+        LocationArn:
+          type: string
+          pattern: ^arn:.*:location/custom-\S+
         Tags:
           description: An array of key-value pairs to apply to this resource.
           type: array
@@ -2362,48 +2550,46 @@ components:
           items:
             $ref: '#/components/schemas/Tag'
       required:
-        - Name
-      x-stackql-resource-name: game_session_queue
-      description: The AWS::GameLift::GameSessionQueue resource creates an Amazon GameLift (GameLift) game session queue.
-      x-type-name: AWS::GameLift::GameSessionQueue
+        - LocationName
+      x-stackql-resource-name: location
+      description: The AWS::GameLift::Location resource creates an Amazon GameLift (GameLift) custom location.
+      x-type-name: AWS::GameLift::Location
       x-stackql-primary-identifier:
-        - Name
+        - LocationName
       x-create-only-properties:
-        - Name
+        - LocationName
       x-read-only-properties:
-        - Arn
+        - LocationArn
       x-required-properties:
-        - Name
+        - LocationName
       x-tagging:
         taggable: true
-        tagOnCreate: true
-        tagUpdatable: true
         cloudFormationSystemTags: false
         tagProperty: /properties/Tags
+        tagOnCreate: true
+        tagUpdatable: true
         permissions:
           - gamelift:ListTagsForResource
           - gamelift:TagResource
           - gamelift:UntagResource
       x-required-permissions:
         create:
-          - gamelift:CreateGameSessionQueue
-          - gamelift:DescribeGameSessionQueues
+          - gamelift:CreateLocation
+          - gamelift:ListLocations
           - gamelift:ListTagsForResource
           - gamelift:TagResource
         read:
-          - gamelift:DescribeGameSessionQueues
+          - gamelift:ListLocations
           - gamelift:ListTagsForResource
         delete:
-          - gamelift:DescribeGameSessionQueues
-          - gamelift:DeleteGameSessionQueue
+          - gamelift:DeleteLocation
+        list:
+          - gamelift:ListLocations
         update:
-          - gamelift:UpdateGameSessionQueue
+          - gamelift:ListLocations
           - gamelift:ListTagsForResource
           - gamelift:TagResource
           - gamelift:UntagResource
-          - gamelift:DescribeGameSessionQueues
-        list:
-          - gamelift:DescribeGameSessionQueues
     GameProperty:
       description: A key-value pair that contains information about a game session.
       type: object
@@ -2568,6 +2754,24 @@ components:
           - gamelift:ListTagsForResource
           - gamelift:TagResource
           - gamelift:UntagResource
+    MatchmakingRuleSet_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length.
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: The value for the tag. You can specify a value that is 1 to 256 Unicode characters in length.
+          minLength: 1
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     MatchmakingRuleSet:
       type: object
       properties:
@@ -2596,7 +2800,7 @@ components:
           minItems: 1
           maxItems: 200
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/MatchmakingRuleSet_Tag'
       required:
         - Name
         - RuleSetBody
@@ -2857,39 +3061,6 @@ components:
       x-title: CreateBuildRequest
       type: object
       required: []
-    CreateLocationRequest:
-      properties:
-        ClientToken:
-          type: string
-        RoleArn:
-          type: string
-        TypeName:
-          type: string
-        TypeVersionId:
-          type: string
-        DesiredState:
-          type: object
-          properties:
-            LocationName:
-              type: string
-              minLength: 8
-              maxLength: 64
-              pattern: ^custom-[A-Za-z0-9\-]+
-            LocationArn:
-              type: string
-              pattern: ^arn:.*:location/custom-\S+
-            Tags:
-              description: An array of key-value pairs to apply to this resource.
-              type: array
-              uniqueItems: true
-              x-insertionOrder: false
-              maxItems: 200
-              items:
-                $ref: '#/components/schemas/Tag'
-          x-stackQL-stringOnly: true
-      x-title: CreateLocationRequest
-      type: object
-      required: []
     CreateContainerFleetRequest:
       properties:
         ClientToken:
@@ -3130,7 +3301,7 @@ components:
               minItems: 0
               maxItems: 200
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ContainerGroupDefinition_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateContainerGroupDefinitionRequest
       type: object
@@ -3153,7 +3324,7 @@ components:
               type: array
               maxItems: 50
               items:
-                $ref: '#/components/schemas/ScalingPolicy'
+                $ref: '#/components/schemas/Fleet_ScalingPolicy'
               x-insertionOrder: false
             AnywhereConfiguration:
               description: Configuration for Anywhere fleet.
@@ -3217,7 +3388,7 @@ components:
               minItems: 1
               maxItems: 100
               items:
-                $ref: '#/components/schemas/LocationConfiguration'
+                $ref: '#/components/schemas/Fleet_LocationConfiguration'
               x-insertionOrder: false
             LogPaths:
               description: This parameter is no longer used. When hosting a custom game build, specify where Amazon GameLift should store log files using the Amazon GameLift server API call ProcessReady()
@@ -3442,11 +3613,44 @@ components:
               x-insertionOrder: false
               maxItems: 200
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/GameSessionQueue_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateGameSessionQueueRequest
       type: object
       required: []
+    CreateLocationRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            LocationName:
+              type: string
+              minLength: 8
+              maxLength: 64
+              pattern: ^custom-[A-Za-z0-9\-]+
+            LocationArn:
+              type: string
+              pattern: ^arn:.*:location/custom-\S+
+            Tags:
+              description: An array of key-value pairs to apply to this resource.
+              type: array
+              uniqueItems: true
+              x-insertionOrder: false
+              maxItems: 200
+              items:
+                $ref: '#/components/schemas/Tag'
+          x-stackQL-stringOnly: true
+      x-title: CreateLocationRequest
+      type: object
+      required: []
     CreateMatchmakingConfigurationRequest:
       properties:
         ClientToken:
@@ -3598,7 +3802,7 @@ components:
               minItems: 1
               maxItems: 200
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/MatchmakingRuleSet_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateMatchmakingRuleSetRequest
       type: object
@@ -3672,7 +3876,7 @@ components:
       id: awscc.gamelift.aliases
       x-cfn-schema-name: Alias
       x-cfn-type-name: AWS::GameLift::Alias
-      x-identifiers:
+      x-identifiers: &ref_0
         - AliasId
       x-type: cloud_control
       methods:
@@ -3763,144 +3967,12 @@ components:
                 FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::GameLift::Alias'
                 AND Identifier = '<AliasId>'
                 AND region = 'us-east-1'
-    aliases_list_only:
-      name: aliases_list_only
-      id: awscc.gamelift.aliases_list_only
-      x-cfn-schema-name: Alias
-      x-cfn-type-name: AWS::GameLift::Alias
-      x-identifiers:
-        - AliasId
-      x-type: cloud_control_view
-      methods: {}
-      sqlVerbs:
-        insert: []
-        delete: []
-        update: []
-      config:
-        views:
-          select:
-            predicate: sqlDialect == "sqlite3"
-            ddl: |-
-              SELECT
-              region,
-              JSON_EXTRACT(Properties, '$.AliasId') as alias_id
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::GameLift::Alias'
-              AND region = 'us-east-1'
-            fallback:
-              predicate: sqlDialect == "postgres"
-              ddl: |-
-                SELECT
-                region,
-                json_extract_path_text(Properties, 'AliasId') as alias_id
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::GameLift::Alias'
-                AND region = 'us-east-1'
-    builds:
-      name: builds
-      id: awscc.gamelift.builds
-      x-cfn-schema-name: Build
-      x-cfn-type-name: AWS::GameLift::Build
-      x-identifiers:
-        - BuildId
-      x-type: cloud_control
-      methods:
-        create_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive_DesiredState
-          operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Build&__detailTransformed=true/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::GameLift::Build"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-        update_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive
-          operation:
-            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::GameLift::Build"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-        delete_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive
-          operation:
-            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::GameLift::Build"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-      sqlVerbs:
-        insert:
-          - $ref: '#/components/x-stackQL-resources/builds/methods/create_resource'
-        delete:
-          - $ref: '#/components/x-stackQL-resources/builds/methods/delete_resource'
-        update:
-          - $ref: '#/components/x-stackQL-resources/builds/methods/update_resource'
-      config:
-        views:
-          select:
-            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
-            ddl: |-
-              SELECT
-              region,
-              Identifier,
-              JSON_EXTRACT(Properties, '$.BuildId') as build_id,
-              JSON_EXTRACT(Properties, '$.Name') as name,
-              JSON_EXTRACT(Properties, '$.OperatingSystem') as operating_system,
-              JSON_EXTRACT(Properties, '$.StorageLocation') as storage_location,
-              JSON_EXTRACT(Properties, '$.Version') as version,
-              JSON_EXTRACT(Properties, '$.ServerSdkVersion') as server_sdk_version,
-              JSON_EXTRACT(Properties, '$.Tags') as tags,
-              JSON_EXTRACT(Properties, '$.BuildArn') as build_arn
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::GameLift::Build'
-              AND Identifier = '<BuildId>'
-              AND region = 'us-east-1'
-            fallback:
-              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
-              ddl: |-
-                SELECT
-                region,
-                Identifier,
-                json_extract_path_text(Properties, 'BuildId') as build_id,
-                json_extract_path_text(Properties, 'Name') as name,
-                json_extract_path_text(Properties, 'OperatingSystem') as operating_system,
-                json_extract_path_text(Properties, 'StorageLocation') as storage_location,
-                json_extract_path_text(Properties, 'Version') as version,
-                json_extract_path_text(Properties, 'ServerSdkVersion') as server_sdk_version,
-                json_extract_path_text(Properties, 'Tags') as tags,
-                json_extract_path_text(Properties, 'BuildArn') as build_arn
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::GameLift::Build'
-                AND Identifier = '<BuildId>'
-                AND region = 'us-east-1'
-    builds_list_only:
-      name: builds_list_only
-      id: awscc.gamelift.builds_list_only
-      x-cfn-schema-name: Build
-      x-cfn-type-name: AWS::GameLift::Build
-      x-identifiers:
-        - BuildId
+    aliases_list_only:
+      name: aliases_list_only
+      id: awscc.gamelift.aliases_list_only
+      x-cfn-schema-name: Alias
+      x-cfn-type-name: AWS::GameLift::Alias
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3914,24 +3986,24 @@ components:
             ddl: |-
               SELECT
               region,
-              JSON_EXTRACT(Properties, '$.BuildId') as build_id
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::GameLift::Build'
+              JSON_EXTRACT(Properties, '$.AliasId') as alias_id
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::GameLift::Alias'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres"
               ddl: |-
                 SELECT
                 region,
-                json_extract_path_text(Properties, 'BuildId') as build_id
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::GameLift::Build'
+                json_extract_path_text(Properties, 'AliasId') as alias_id
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::GameLift::Alias'
                 AND region = 'us-east-1'
-    locations:
-      name: locations
-      id: awscc.gamelift.locations
-      x-cfn-schema-name: Location
-      x-cfn-type-name: AWS::GameLift::Location
-      x-identifiers:
-        - LocationName
+    builds:
+      name: builds
+      id: awscc.gamelift.builds
+      x-cfn-schema-name: Build
+      x-cfn-type-name: AWS::GameLift::Build
+      x-identifiers: &ref_1
+        - BuildId
       x-type: cloud_control
       methods:
         create_resource:
@@ -3939,12 +4011,12 @@ components:
             requestBodyTranslate:
               algorithm: naive_DesiredState
           operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Location&__detailTransformed=true/post'
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Build&__detailTransformed=true/post'
           request:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::GameLift::Location"
+                "TypeName": "AWS::GameLift::Build"
               }
           response:
             mediaType: application/json
@@ -3960,7 +4032,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::GameLift::Location"
+                "TypeName": "AWS::GameLift::Build"
               }
           response:
             mediaType: application/json
@@ -3976,7 +4048,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::GameLift::Location"
+                "TypeName": "AWS::GameLift::Build"
               }
           response:
             mediaType: application/json
@@ -3984,11 +4056,11 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/locations/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/builds/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/locations/methods/delete_resource'
+          - $ref: '#/components/x-stackQL-resources/builds/methods/delete_resource'
         update:
-          - $ref: '#/components/x-stackQL-resources/locations/methods/update_resource'
+          - $ref: '#/components/x-stackQL-resources/builds/methods/update_resource'
       config:
         views:
           select:
@@ -3997,11 +4069,16 @@ components:
               SELECT
               region,
               Identifier,
-              JSON_EXTRACT(Properties, '$.LocationName') as location_name,
-              JSON_EXTRACT(Properties, '$.LocationArn') as location_arn,
-              JSON_EXTRACT(Properties, '$.Tags') as tags
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::GameLift::Location'
-              AND Identifier = '<LocationName>'
+              JSON_EXTRACT(Properties, '$.BuildId') as build_id,
+              JSON_EXTRACT(Properties, '$.Name') as name,
+              JSON_EXTRACT(Properties, '$.OperatingSystem') as operating_system,
+              JSON_EXTRACT(Properties, '$.StorageLocation') as storage_location,
+              JSON_EXTRACT(Properties, '$.Version') as version,
+              JSON_EXTRACT(Properties, '$.ServerSdkVersion') as server_sdk_version,
+              JSON_EXTRACT(Properties, '$.Tags') as tags,
+              JSON_EXTRACT(Properties, '$.BuildArn') as build_arn
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::GameLift::Build'
+              AND Identifier = '<BuildId>'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
@@ -4009,19 +4086,23 @@ components:
                 SELECT
                 region,
                 Identifier,
-                json_extract_path_text(Properties, 'LocationName') as location_name,
-                json_extract_path_text(Properties, 'LocationArn') as location_arn,
-                json_extract_path_text(Properties, 'Tags') as tags
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::GameLift::Location'
-                AND Identifier = '<LocationName>'
+                json_extract_path_text(Properties, 'BuildId') as build_id,
+                json_extract_path_text(Properties, 'Name') as name,
+                json_extract_path_text(Properties, 'OperatingSystem') as operating_system,
+                json_extract_path_text(Properties, 'StorageLocation') as storage_location,
+                json_extract_path_text(Properties, 'Version') as version,
+                json_extract_path_text(Properties, 'ServerSdkVersion') as server_sdk_version,
+                json_extract_path_text(Properties, 'Tags') as tags,
+                json_extract_path_text(Properties, 'BuildArn') as build_arn
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::GameLift::Build'
+                AND Identifier = '<BuildId>'
                 AND region = 'us-east-1'
-    locations_list_only:
-      name: locations_list_only
-      id: awscc.gamelift.locations_list_only
-      x-cfn-schema-name: Location
-      x-cfn-type-name: AWS::GameLift::Location
-      x-identifiers:
-        - LocationName
+    builds_list_only:
+      name: builds_list_only
+      id: awscc.gamelift.builds_list_only
+      x-cfn-schema-name: Build
+      x-cfn-type-name: AWS::GameLift::Build
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4035,23 +4116,23 @@ components:
             ddl: |-
               SELECT
               region,
-              JSON_EXTRACT(Properties, '$.LocationName') as location_name
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::GameLift::Location'
+              JSON_EXTRACT(Properties, '$.BuildId') as build_id
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::GameLift::Build'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres"
               ddl: |-
                 SELECT
                 region,
-                json_extract_path_text(Properties, 'LocationName') as location_name
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::GameLift::Location'
+                json_extract_path_text(Properties, 'BuildId') as build_id
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::GameLift::Build'
                 AND region = 'us-east-1'
     container_fleets:
       name: container_fleets
       id: awscc.gamelift.container_fleets
       x-cfn-schema-name: ContainerFleet
       x-cfn-type-name: AWS::GameLift::ContainerFleet
-      x-identifiers:
+      x-identifiers: &ref_2
         - FleetId
       x-type: cloud_control
       methods:
@@ -4185,8 +4266,7 @@ components:
       id: awscc.gamelift.container_fleets_list_only
       x-cfn-schema-name: ContainerFleet
       x-cfn-type-name: AWS::GameLift::ContainerFleet
-      x-identifiers:
-        - FleetId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4216,7 +4296,7 @@ components:
       id: awscc.gamelift.container_group_definitions
       x-cfn-schema-name: ContainerGroupDefinition
       x-cfn-type-name: AWS::GameLift::ContainerGroupDefinition
-      x-identifiers:
+      x-identifiers: &ref_3
         - Name
       x-type: cloud_control
       methods:
@@ -4330,8 +4410,7 @@ components:
       id: awscc.gamelift.container_group_definitions_list_only
       x-cfn-schema-name: ContainerGroupDefinition
       x-cfn-type-name: AWS::GameLift::ContainerGroupDefinition
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4361,7 +4440,7 @@ components:
       id: awscc.gamelift.fleets
       x-cfn-schema-name: Fleet
       x-cfn-type-name: AWS::GameLift::Fleet
-      x-identifiers:
+      x-identifiers: &ref_4
         - FleetId
       x-type: cloud_control
       methods:
@@ -4505,8 +4584,7 @@ components:
       id: awscc.gamelift.fleets_list_only
       x-cfn-schema-name: Fleet
       x-cfn-type-name: AWS::GameLift::Fleet
-      x-identifiers:
-        - FleetId
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4536,7 +4614,7 @@ components:
       id: awscc.gamelift.game_server_groups
       x-cfn-schema-name: GameServerGroup
       x-cfn-type-name: AWS::GameLift::GameServerGroup
-      x-identifiers:
+      x-identifiers: &ref_5
         - GameServerGroupArn
       x-type: cloud_control
       methods:
@@ -4648,8 +4726,7 @@ components:
       id: awscc.gamelift.game_server_groups_list_only
       x-cfn-schema-name: GameServerGroup
       x-cfn-type-name: AWS::GameLift::GameServerGroup
-      x-identifiers:
-        - GameServerGroupArn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4679,7 +4756,7 @@ components:
       id: awscc.gamelift.game_session_queues
       x-cfn-schema-name: GameSessionQueue
       x-cfn-type-name: AWS::GameLift::GameSessionQueue
-      x-identifiers:
+      x-identifiers: &ref_6
         - Name
       x-type: cloud_control
       methods:
@@ -4783,8 +4860,7 @@ components:
       id: awscc.gamelift.game_session_queues_list_only
       x-cfn-schema-name: GameSessionQueue
       x-cfn-type-name: AWS::GameLift::GameSessionQueue
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4809,12 +4885,132 @@ components:
                 json_extract_path_text(Properties, 'Name') as name
                 FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::GameLift::GameSessionQueue'
                 AND region = 'us-east-1'
+    locations:
+      name: locations
+      id: awscc.gamelift.locations
+      x-cfn-schema-name: Location
+      x-cfn-type-name: AWS::GameLift::Location
+      x-identifiers: &ref_7
+        - LocationName
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Location&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::GameLift::Location"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::GameLift::Location"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::GameLift::Location"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/locations/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/locations/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/locations/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.LocationName') as location_name,
+              JSON_EXTRACT(Properties, '$.LocationArn') as location_arn,
+              JSON_EXTRACT(Properties, '$.Tags') as tags
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::GameLift::Location'
+              AND Identifier = '<LocationName>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'LocationName') as location_name,
+                json_extract_path_text(Properties, 'LocationArn') as location_arn,
+                json_extract_path_text(Properties, 'Tags') as tags
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::GameLift::Location'
+                AND Identifier = '<LocationName>'
+                AND region = 'us-east-1'
+    locations_list_only:
+      name: locations_list_only
+      id: awscc.gamelift.locations_list_only
+      x-cfn-schema-name: Location
+      x-cfn-type-name: AWS::GameLift::Location
+      x-identifiers: *ref_7
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.LocationName') as location_name
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::GameLift::Location'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'LocationName') as location_name
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::GameLift::Location'
+                AND region = 'us-east-1'
     matchmaking_configurations:
       name: matchmaking_configurations
       id: awscc.gamelift.matchmaking_configurations
       x-cfn-schema-name: MatchmakingConfiguration
       x-cfn-type-name: AWS::GameLift::MatchmakingConfiguration
-      x-identifiers:
+      x-identifiers: &ref_8
         - Name
       x-type: cloud_control
       methods:
@@ -4934,8 +5130,7 @@ components:
       id: awscc.gamelift.matchmaking_configurations_list_only
       x-cfn-schema-name: MatchmakingConfiguration
       x-cfn-type-name: AWS::GameLift::MatchmakingConfiguration
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4965,7 +5160,7 @@ components:
       id: awscc.gamelift.matchmaking_rule_sets
       x-cfn-schema-name: MatchmakingRuleSet
       x-cfn-type-name: AWS::GameLift::MatchmakingRuleSet
-      x-identifiers:
+      x-identifiers: &ref_9
         - Name
       x-type: cloud_control
       methods:
@@ -5059,8 +5254,7 @@ components:
       id: awscc.gamelift.matchmaking_rule_sets_list_only
       x-cfn-schema-name: MatchmakingRuleSet
       x-cfn-type-name: AWS::GameLift::MatchmakingRuleSet
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5090,7 +5284,7 @@ components:
       id: awscc.gamelift.scripts
       x-cfn-schema-name: Script
       x-cfn-type-name: AWS::GameLift::Script
-      x-identifiers:
+      x-identifiers: &ref_10
         - Id
       x-type: cloud_control
       methods:
@@ -5190,8 +5384,7 @@ components:
       id: awscc.gamelift.scripts_list_only
       x-cfn-schema-name: Script
       x-cfn-type-name: AWS::GameLift::Script
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5444,7 +5637,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__Location&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__ContainerFleet&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -5454,7 +5647,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateLocation
+      operationId: CreateContainerFleet
       parameters:
         - description: Action Header
           in: header
@@ -5477,7 +5670,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateLocationRequest'
+              $ref: '#/components/schemas/CreateContainerFleetRequest'
         required: true
       responses:
         '200':
@@ -5486,7 +5679,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__ContainerFleet&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__ContainerGroupDefinition&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -5496,7 +5689,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateContainerFleet
+      operationId: CreateContainerGroupDefinition
       parameters:
         - description: Action Header
           in: header
@@ -5519,7 +5712,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateContainerFleetRequest'
+              $ref: '#/components/schemas/CreateContainerGroupDefinitionRequest'
         required: true
       responses:
         '200':
@@ -5528,7 +5721,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__ContainerGroupDefinition&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__Fleet&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -5538,7 +5731,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateContainerGroupDefinition
+      operationId: CreateFleet
       parameters:
         - description: Action Header
           in: header
@@ -5561,7 +5754,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateContainerGroupDefinitionRequest'
+              $ref: '#/components/schemas/CreateFleetRequest'
         required: true
       responses:
         '200':
@@ -5570,7 +5763,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__Fleet&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__GameServerGroup&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -5580,7 +5773,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateFleet
+      operationId: CreateGameServerGroup
       parameters:
         - description: Action Header
           in: header
@@ -5603,7 +5796,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateFleetRequest'
+              $ref: '#/components/schemas/CreateGameServerGroupRequest'
         required: true
       responses:
         '200':
@@ -5612,7 +5805,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__GameServerGroup&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__GameSessionQueue&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -5622,7 +5815,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateGameServerGroup
+      operationId: CreateGameSessionQueue
       parameters:
         - description: Action Header
           in: header
@@ -5645,7 +5838,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateGameServerGroupRequest'
+              $ref: '#/components/schemas/CreateGameSessionQueueRequest'
         required: true
       responses:
         '200':
@@ -5654,7 +5847,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__GameSessionQueue&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__Location&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -5664,7 +5857,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateGameSessionQueue
+      operationId: CreateLocation
       parameters:
         - description: Action Header
           in: header
@@ -5687,7 +5880,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateGameSessionQueueRequest'
+              $ref: '#/components/schemas/CreateLocationRequest'
         required: true
       responses:
         '200':
diff --git a/openapi/src/awscc/v00.00.00000/services/globalaccelerator.yaml b/openapi/src/awscc/v00.00.00000/services/globalaccelerator.yaml
index 102ce4e38..7a6f4c7d8 100644
--- a/openapi/src/awscc/v00.00.00000/services/globalaccelerator.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/globalaccelerator.yaml
@@ -391,7 +391,7 @@ components:
       type: object
   schemas:
     Tag:
-      description: Tag is a key-value pair associated with Cross Account Attachment.
+      description: Tag is a key-value pair associated with accelerator.
       type: object
       properties:
         Key:
@@ -505,6 +505,24 @@ components:
           - globalaccelerator:DescribeAccelerator
         list:
           - globalaccelerator:ListAccelerators
+    CrossAccountAttachment_Tag:
+      description: Tag is a key-value pair associated with Cross Account Attachment.
+      type: object
+      properties:
+        Key:
+          description: Key of the tag. Value can be 1 to 127 characters.
+          type: string
+          minLength: 1
+          maxLength: 127
+        Value:
+          description: Value for the tag. Value can be 1 to 255 characters.
+          type: string
+          minLength: 1
+          maxLength: 255
+      required:
+        - Value
+        - Key
+      additionalProperties: false
     Resource:
       description: ARN of resource to share.
       type: object
@@ -541,7 +559,7 @@ components:
         Tags:
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/CrossAccountAttachment_Tag'
       required:
         - Name
       x-stackql-resource-name: cross_account_attachment
@@ -890,7 +908,7 @@ components:
             Tags:
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/CrossAccountAttachment_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateCrossAccountAttachmentRequest
       type: object
@@ -1016,7 +1034,7 @@ components:
       id: awscc.globalaccelerator.accelerators
       x-cfn-schema-name: Accelerator
       x-cfn-type-name: AWS::GlobalAccelerator::Accelerator
-      x-identifiers:
+      x-identifiers: &ref_0
         - AcceleratorArn
       x-type: cloud_control
       methods:
@@ -1120,8 +1138,7 @@ components:
       id: awscc.globalaccelerator.accelerators_list_only
       x-cfn-schema-name: Accelerator
       x-cfn-type-name: AWS::GlobalAccelerator::Accelerator
-      x-identifiers:
-        - AcceleratorArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1151,7 +1168,7 @@ components:
       id: awscc.globalaccelerator.cross_account_attachments
       x-cfn-schema-name: CrossAccountAttachment
       x-cfn-type-name: AWS::GlobalAccelerator::CrossAccountAttachment
-      x-identifiers:
+      x-identifiers: &ref_1
         - AttachmentArn
       x-type: cloud_control
       methods:
@@ -1245,8 +1262,7 @@ components:
       id: awscc.globalaccelerator.cross_account_attachments_list_only
       x-cfn-schema-name: CrossAccountAttachment
       x-cfn-type-name: AWS::GlobalAccelerator::CrossAccountAttachment
-      x-identifiers:
-        - AttachmentArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1276,7 +1292,7 @@ components:
       id: awscc.globalaccelerator.endpoint_groups
       x-cfn-schema-name: EndpointGroup
       x-cfn-type-name: AWS::GlobalAccelerator::EndpointGroup
-      x-identifiers:
+      x-identifiers: &ref_2
         - EndpointGroupArn
       x-type: cloud_control
       methods:
@@ -1382,8 +1398,7 @@ components:
       id: awscc.globalaccelerator.endpoint_groups_list_only
       x-cfn-schema-name: EndpointGroup
       x-cfn-type-name: AWS::GlobalAccelerator::EndpointGroup
-      x-identifiers:
-        - EndpointGroupArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1413,7 +1428,7 @@ components:
       id: awscc.globalaccelerator.listeners
       x-cfn-schema-name: Listener
       x-cfn-type-name: AWS::GlobalAccelerator::Listener
-      x-identifiers:
+      x-identifiers: &ref_3
         - ListenerArn
       x-type: cloud_control
       methods:
@@ -1507,8 +1522,7 @@ components:
       id: awscc.globalaccelerator.listeners_list_only
       x-cfn-schema-name: Listener
       x-cfn-type-name: AWS::GlobalAccelerator::Listener
-      x-identifiers:
-        - ListenerArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/glue.yaml b/openapi/src/awscc/v00.00.00000/services/glue.yaml
index 8059007fd..497fb7111 100644
--- a/openapi/src/awscc/v00.00.00000/services/glue.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/glue.yaml
@@ -937,12 +937,11 @@ components:
       additionalProperties: false
     NotificationProperty:
       type: object
-      description: Specifies configuration properties of a job run notification.
-      additionalProperties: false
       properties:
         NotifyDelayAfter:
+          description: It is the number of minutes to wait before sending a job run delay notification after a job run starts
           type: integer
-          description: After a job run starts, the number of minutes to wait before sending a job run delay notification
+      additionalProperties: false
     Job:
       type: object
       properties:
@@ -1091,6 +1090,73 @@ components:
         - Value
       additionalProperties: false
     Registry:
+      type: object
+      properties:
+        Arn:
+          description: Amazon Resource Name for the created Registry.
+          type: string
+          pattern: arn:aws(-(cn|us-gov|iso(-[bef])?))?:glue:.*
+        Name:
+          description: Name of the registry to be created of max length of 255, and may only contain letters, numbers, hyphen, underscore, dollar sign, or hash mark.  No whitespace.
+          type: string
+          maxLength: 255
+          minLength: 1
+        Description:
+          description: A description of the registry. If description is not provided, there will not be any default value for this.
+          type: string
+          maxLength: 1000
+          minLength: 0
+        Tags:
+          description: List of tags to tag the Registry
+          type: array
+          minItems: 0
+          maxItems: 10
+          items:
+            $ref: '#/components/schemas/Tag'
+      required:
+        - Name
+      x-stackql-resource-name: registry
+      description: This resource creates a Registry for authoring schemas as part of Glue Schema Registry.
+      x-type-name: AWS::Glue::Registry
+      x-stackql-primary-identifier:
+        - Arn
+      x-create-only-properties:
+        - Name
+      x-read-only-properties:
+        - Arn
+      x-required-properties:
+        - Name
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: true
+        tagProperty: /properties/Tags
+        permissions:
+          - glue:GetTags
+          - glue:TagResource
+          - glue:UntagResource
+      x-required-permissions:
+        create:
+          - glue:CreateRegistry
+          - glue:GetRegistry
+          - glue:GetTags
+          - glue:TagResource
+        read:
+          - glue:GetRegistry
+          - glue:GetTags
+        delete:
+          - glue:GetRegistry
+          - glue:DeleteRegistry
+        update:
+          - glue:UpdateRegistry
+          - glue:GetRegistry
+          - glue:TagResource
+          - glue:UntagResource
+          - glue:GetTags
+        list:
+          - glue:ListRegistries
+    Schema_Registry:
       type: object
       description: Identifier for the registry which the schema is part of.
       properties:
@@ -1104,11 +1170,152 @@ components:
           type: string
           pattern: arn:aws(-(cn|us-gov|iso(-[bef])?))?:glue:.*
       additionalProperties: false
+    Schema_SchemaVersion:
+      type: object
+      description: Specify checkpoint version for update. This is only required to update the Compatibility.
+      properties:
+        IsLatest:
+          description: Indicates if the latest version needs to be updated.
+          type: boolean
+        VersionNumber:
+          description: Indicates the version number in the schema to update.
+          type: integer
+          minimum: 1
+          maximum: 100000
+      additionalProperties: false
+    Schema:
+      type: object
+      properties:
+        Arn:
+          description: Amazon Resource Name for the Schema.
+          type: string
+          pattern: arn:aws(-(cn|us-gov|iso(-[bef])?))?:glue:.*
+        Registry:
+          $ref: '#/components/schemas/Schema_Registry'
+        Name:
+          description: Name of the schema.
+          type: string
+          minLength: 1
+          maxLength: 255
+        Description:
+          description: A description of the schema. If description is not provided, there will not be any default value for this.
+          type: string
+          minLength: 0
+          maxLength: 1000
+        DataFormat:
+          description: 'Data format name to use for the schema. Accepted values: ''AVRO'', ''JSON'', ''PROTOBUF'''
+          type: string
+          enum:
+            - AVRO
+            - JSON
+            - PROTOBUF
+        Compatibility:
+          description: Compatibility setting for the schema.
+          type: string
+          enum:
+            - NONE
+            - DISABLED
+            - BACKWARD
+            - BACKWARD_ALL
+            - FORWARD
+            - FORWARD_ALL
+            - FULL
+            - FULL_ALL
+        SchemaDefinition:
+          description: Definition for the initial schema version in plain-text.
+          type: string
+          minLength: 1
+          maxLength: 170000
+        CheckpointVersion:
+          $ref: '#/components/schemas/Schema_SchemaVersion'
+        Tags:
+          description: List of tags to tag the schema
+          type: array
+          minItems: 0
+          maxItems: 10
+          items:
+            $ref: '#/components/schemas/Tag'
+        InitialSchemaVersionId:
+          type: string
+          description: Represents the version ID associated with the initial schema version.
+          pattern: '[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}'
+      required:
+        - Name
+        - DataFormat
+        - Compatibility
+      x-stackql-resource-name: schema
+      description: This resource represents a schema of Glue Schema Registry.
+      x-type-name: AWS::Glue::Schema
+      x-stackql-primary-identifier:
+        - Arn
+      x-create-only-properties:
+        - Registry
+        - Name
+        - DataFormat
+        - SchemaDefinition
+      x-write-only-properties:
+        - SchemaDefinition
+      x-read-only-properties:
+        - Arn
+        - InitialSchemaVersionId
+      x-required-properties:
+        - Name
+        - DataFormat
+        - Compatibility
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: true
+        tagProperty: /properties/Tags
+        permissions:
+          - glue:GetTags
+          - glue:TagResource
+          - glue:UntagResource
+      x-required-permissions:
+        create:
+          - glue:CreateSchema
+          - glue:TagResource
+        read:
+          - glue:GetSchemaVersion
+          - glue:GetSchema
+          - glue:GetTags
+        delete:
+          - glue:DeleteSchema
+          - glue:GetSchema
+        update:
+          - glue:UpdateSchema
+          - glue:GetSchemaVersion
+          - glue:GetSchema
+          - glue:GetTags
+          - glue:TagResource
+          - glue:UntagResource
+        list:
+          - glue:ListSchemas
+    SchemaVersion_Schema:
+      description: Identifier for the schema where the schema version will be created.
+      type: object
+      properties:
+        SchemaArn:
+          description: Amazon Resource Name for the Schema. This attribute can be used to uniquely represent the Schema.
+          type: string
+          pattern: arn:(aws|aws-us-gov|aws-cn):glue:.*
+        SchemaName:
+          description: Name of the schema. This parameter requires RegistryName to be provided.
+          type: string
+          minLength: 1
+          maxLength: 255
+        RegistryName:
+          description: Name of the registry to identify where the Schema is located.
+          type: string
+          maxLength: 255
+          minLength: 1
+      additionalProperties: false
     SchemaVersion:
       type: object
       properties:
         Schema:
-          $ref: '#/components/schemas/Schema'
+          $ref: '#/components/schemas/SchemaVersion_Schema'
         SchemaDefinition:
           type: string
           description: Complete definition of the schema in plain-text.
@@ -1146,25 +1353,6 @@ components:
           - glue:GetSchemaVersion
         list:
           - glue:ListSchemaVersions
-    Schema:
-      description: Identifier for the schema where the schema version will be created.
-      type: object
-      properties:
-        SchemaArn:
-          description: Amazon Resource Name for the Schema. This attribute can be used to uniquely represent the Schema.
-          type: string
-          pattern: arn:(aws|aws-us-gov|aws-cn):glue:.*
-        SchemaName:
-          description: Name of the schema. This parameter requires RegistryName to be provided.
-          type: string
-          minLength: 1
-          maxLength: 255
-        RegistryName:
-          description: Name of the registry to identify where the Schema is located.
-          type: string
-          maxLength: 255
-          minLength: 1
-      additionalProperties: false
     SchemaVersionMetadata:
       type: object
       properties:
@@ -1230,13 +1418,21 @@ components:
         LogicalOperator:
           type: string
           description: A logical operator.
+    Trigger_NotificationProperty:
+      type: object
+      description: Specifies configuration properties of a job run notification.
+      additionalProperties: false
+      properties:
+        NotifyDelayAfter:
+          type: integer
+          description: After a job run starts, the number of minutes to wait before sending a job run delay notification
     Action:
       type: object
       description: The actions initiated by this trigger.
       additionalProperties: false
       properties:
         NotificationProperty:
-          $ref: '#/components/schemas/NotificationProperty'
+          $ref: '#/components/schemas/Trigger_NotificationProperty'
           description: Specifies configuration properties of a job run notification.
         CrawlerName:
           type: string
@@ -1658,6 +1854,114 @@ components:
       x-title: CreateJobRequest
       type: object
       required: []
+    CreateRegistryRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            Arn:
+              description: Amazon Resource Name for the created Registry.
+              type: string
+              pattern: arn:aws(-(cn|us-gov|iso(-[bef])?))?:glue:.*
+            Name:
+              description: Name of the registry to be created of max length of 255, and may only contain letters, numbers, hyphen, underscore, dollar sign, or hash mark.  No whitespace.
+              type: string
+              maxLength: 255
+              minLength: 1
+            Description:
+              description: A description of the registry. If description is not provided, there will not be any default value for this.
+              type: string
+              maxLength: 1000
+              minLength: 0
+            Tags:
+              description: List of tags to tag the Registry
+              type: array
+              minItems: 0
+              maxItems: 10
+              items:
+                $ref: '#/components/schemas/Tag'
+          x-stackQL-stringOnly: true
+      x-title: CreateRegistryRequest
+      type: object
+      required: []
+    CreateSchemaRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            Arn:
+              description: Amazon Resource Name for the Schema.
+              type: string
+              pattern: arn:aws(-(cn|us-gov|iso(-[bef])?))?:glue:.*
+            Registry:
+              $ref: '#/components/schemas/Schema_Registry'
+            Name:
+              description: Name of the schema.
+              type: string
+              minLength: 1
+              maxLength: 255
+            Description:
+              description: A description of the schema. If description is not provided, there will not be any default value for this.
+              type: string
+              minLength: 0
+              maxLength: 1000
+            DataFormat:
+              description: 'Data format name to use for the schema. Accepted values: ''AVRO'', ''JSON'', ''PROTOBUF'''
+              type: string
+              enum:
+                - AVRO
+                - JSON
+                - PROTOBUF
+            Compatibility:
+              description: Compatibility setting for the schema.
+              type: string
+              enum:
+                - NONE
+                - DISABLED
+                - BACKWARD
+                - BACKWARD_ALL
+                - FORWARD
+                - FORWARD_ALL
+                - FULL
+                - FULL_ALL
+            SchemaDefinition:
+              description: Definition for the initial schema version in plain-text.
+              type: string
+              minLength: 1
+              maxLength: 170000
+            CheckpointVersion:
+              $ref: '#/components/schemas/Schema_SchemaVersion'
+            Tags:
+              description: List of tags to tag the schema
+              type: array
+              minItems: 0
+              maxItems: 10
+              items:
+                $ref: '#/components/schemas/Tag'
+            InitialSchemaVersionId:
+              type: string
+              description: Represents the version ID associated with the initial schema version.
+              pattern: '[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}'
+          x-stackQL-stringOnly: true
+      x-title: CreateSchemaRequest
+      type: object
+      required: []
     CreateSchemaVersionRequest:
       properties:
         ClientToken:
@@ -1672,7 +1976,7 @@ components:
           type: object
           properties:
             Schema:
-              $ref: '#/components/schemas/Schema'
+              $ref: '#/components/schemas/SchemaVersion_Schema'
             SchemaDefinition:
               type: string
               description: Complete definition of the schema in plain-text.
@@ -1826,7 +2130,7 @@ components:
       id: awscc.glue.crawlers
       x-cfn-schema-name: Crawler
       x-cfn-type-name: AWS::Glue::Crawler
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -1938,8 +2242,7 @@ components:
       id: awscc.glue.crawlers_list_only
       x-cfn-schema-name: Crawler
       x-cfn-type-name: AWS::Glue::Crawler
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1969,7 +2272,7 @@ components:
       id: awscc.glue.databases
       x-cfn-schema-name: Database
       x-cfn-type-name: AWS::Glue::Database
-      x-identifiers:
+      x-identifiers: &ref_1
         - DatabaseName
       x-type: cloud_control
       methods:
@@ -2059,8 +2362,7 @@ components:
       id: awscc.glue.databases_list_only
       x-cfn-schema-name: Database
       x-cfn-type-name: AWS::Glue::Database
-      x-identifiers:
-        - DatabaseName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2090,7 +2392,7 @@ components:
       id: awscc.glue.jobs
       x-cfn-schema-name: Job
       x-cfn-type-name: AWS::Glue::Job
-      x-identifiers:
+      x-identifiers: &ref_2
         - Name
       x-type: cloud_control
       methods:
@@ -2220,8 +2522,7 @@ components:
       id: awscc.glue.jobs_list_only
       x-cfn-schema-name: Job
       x-cfn-type-name: AWS::Glue::Job
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2246,12 +2547,268 @@ components:
                 json_extract_path_text(Properties, 'Name') as name
                 FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Glue::Job'
                 AND region = 'us-east-1'
+    registries:
+      name: registries
+      id: awscc.glue.registries
+      x-cfn-schema-name: Registry
+      x-cfn-type-name: AWS::Glue::Registry
+      x-identifiers: &ref_3
+        - Arn
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Registry&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::Glue::Registry"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::Glue::Registry"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::Glue::Registry"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/registries/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/registries/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/registries/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.Arn') as arn,
+              JSON_EXTRACT(Properties, '$.Name') as name,
+              JSON_EXTRACT(Properties, '$.Description') as description,
+              JSON_EXTRACT(Properties, '$.Tags') as tags
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::Glue::Registry'
+              AND Identifier = '<Arn>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'Arn') as arn,
+                json_extract_path_text(Properties, 'Name') as name,
+                json_extract_path_text(Properties, 'Description') as description,
+                json_extract_path_text(Properties, 'Tags') as tags
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::Glue::Registry'
+                AND Identifier = '<Arn>'
+                AND region = 'us-east-1'
+    registries_list_only:
+      name: registries_list_only
+      id: awscc.glue.registries_list_only
+      x-cfn-schema-name: Registry
+      x-cfn-type-name: AWS::Glue::Registry
+      x-identifiers: *ref_3
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.Arn') as arn
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Glue::Registry'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'Arn') as arn
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Glue::Registry'
+                AND region = 'us-east-1'
+    schemas:
+      name: schemas
+      id: awscc.glue.schemas
+      x-cfn-schema-name: Schema
+      x-cfn-type-name: AWS::Glue::Schema
+      x-identifiers: &ref_4
+        - Arn
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Schema&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::Glue::Schema"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::Glue::Schema"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::Glue::Schema"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/schemas/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/schemas/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/schemas/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.Arn') as arn,
+              JSON_EXTRACT(Properties, '$.Registry') as _registry,
+              JSON_EXTRACT(Properties, '$.Name') as name,
+              JSON_EXTRACT(Properties, '$.Description') as description,
+              JSON_EXTRACT(Properties, '$.DataFormat') as data_format,
+              JSON_EXTRACT(Properties, '$.Compatibility') as compatibility,
+              JSON_EXTRACT(Properties, '$.SchemaDefinition') as schema_definition,
+              JSON_EXTRACT(Properties, '$.CheckpointVersion') as checkpoint_version,
+              JSON_EXTRACT(Properties, '$.Tags') as tags,
+              JSON_EXTRACT(Properties, '$.InitialSchemaVersionId') as initial_schema_version_id
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::Glue::Schema'
+              AND Identifier = '<Arn>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'Arn') as arn,
+                json_extract_path_text(Properties, 'Registry') as _registry,
+                json_extract_path_text(Properties, 'Name') as name,
+                json_extract_path_text(Properties, 'Description') as description,
+                json_extract_path_text(Properties, 'DataFormat') as data_format,
+                json_extract_path_text(Properties, 'Compatibility') as compatibility,
+                json_extract_path_text(Properties, 'SchemaDefinition') as schema_definition,
+                json_extract_path_text(Properties, 'CheckpointVersion') as checkpoint_version,
+                json_extract_path_text(Properties, 'Tags') as tags,
+                json_extract_path_text(Properties, 'InitialSchemaVersionId') as initial_schema_version_id
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::Glue::Schema'
+                AND Identifier = '<Arn>'
+                AND region = 'us-east-1'
+    schemas_list_only:
+      name: schemas_list_only
+      id: awscc.glue.schemas_list_only
+      x-cfn-schema-name: Schema
+      x-cfn-type-name: AWS::Glue::Schema
+      x-identifiers: *ref_4
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.Arn') as arn
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Glue::Schema'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'Arn') as arn
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Glue::Schema'
+                AND region = 'us-east-1'
     schema_versions:
       name: schema_versions
       id: awscc.glue.schema_versions
       x-cfn-schema-name: SchemaVersion
       x-cfn-type-name: AWS::Glue::SchemaVersion
-      x-identifiers:
+      x-identifiers: &ref_5
         - VersionId
       x-type: cloud_control
       methods:
@@ -2324,8 +2881,7 @@ components:
       id: awscc.glue.schema_versions_list_only
       x-cfn-schema-name: SchemaVersion
       x-cfn-type-name: AWS::Glue::SchemaVersion
-      x-identifiers:
-        - VersionId
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2355,7 +2911,7 @@ components:
       id: awscc.glue.schema_version_metadata
       x-cfn-schema-name: SchemaVersionMetadata
       x-cfn-type-name: AWS::Glue::SchemaVersionMetadata
-      x-identifiers:
+      x-identifiers: &ref_6
         - SchemaVersionId
         - Key
         - Value
@@ -2430,10 +2986,7 @@ components:
       id: awscc.glue.schema_version_metadata_list_only
       x-cfn-schema-name: SchemaVersionMetadata
       x-cfn-type-name: AWS::Glue::SchemaVersionMetadata
-      x-identifiers:
-        - SchemaVersionId
-        - Key
-        - Value
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2467,7 +3020,7 @@ components:
       id: awscc.glue.triggers
       x-cfn-schema-name: Trigger
       x-cfn-type-name: AWS::Glue::Trigger
-      x-identifiers:
+      x-identifiers: &ref_7
         - Name
       x-type: cloud_control
       methods:
@@ -2571,8 +3124,7 @@ components:
       id: awscc.glue.triggers_list_only
       x-cfn-schema-name: Trigger
       x-cfn-type-name: AWS::Glue::Trigger
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2602,7 +3154,7 @@ components:
       id: awscc.glue.usage_profiles
       x-cfn-schema-name: UsageProfile
       x-cfn-type-name: AWS::Glue::UsageProfile
-      x-identifiers:
+      x-identifiers: &ref_8
         - Name
       x-type: cloud_control
       methods:
@@ -2696,8 +3248,7 @@ components:
       id: awscc.glue.usage_profiles_list_only
       x-cfn-schema-name: UsageProfile
       x-cfn-type-name: AWS::Glue::UsageProfile
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2992,6 +3543,90 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
+  /?Action=CreateResource&Version=2021-09-30&__Registry&__detailTransformed=true:
+    parameters:
+      - $ref: '#/components/parameters/X-Amz-Content-Sha256'
+      - $ref: '#/components/parameters/X-Amz-Date'
+      - $ref: '#/components/parameters/X-Amz-Algorithm'
+      - $ref: '#/components/parameters/X-Amz-Credential'
+      - $ref: '#/components/parameters/X-Amz-Security-Token'
+      - $ref: '#/components/parameters/X-Amz-Signature'
+      - $ref: '#/components/parameters/X-Amz-SignedHeaders'
+    post:
+      operationId: CreateRegistry
+      parameters:
+        - description: Action Header
+          in: header
+          name: X-Amz-Target
+          required: false
+          schema:
+            default: CloudApiService.CreateResource
+            enum:
+              - CloudApiService.CreateResource
+            type: string
+        - in: header
+          name: Content-Type
+          required: false
+          schema:
+            default: application/x-amz-json-1.0
+            enum:
+              - application/x-amz-json-1.0
+            type: string
+      requestBody:
+        content:
+          application/x-amz-json-1.0:
+            schema:
+              $ref: '#/components/schemas/CreateRegistryRequest'
+        required: true
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
+          description: Success
+  /?Action=CreateResource&Version=2021-09-30&__Schema&__detailTransformed=true:
+    parameters:
+      - $ref: '#/components/parameters/X-Amz-Content-Sha256'
+      - $ref: '#/components/parameters/X-Amz-Date'
+      - $ref: '#/components/parameters/X-Amz-Algorithm'
+      - $ref: '#/components/parameters/X-Amz-Credential'
+      - $ref: '#/components/parameters/X-Amz-Security-Token'
+      - $ref: '#/components/parameters/X-Amz-Signature'
+      - $ref: '#/components/parameters/X-Amz-SignedHeaders'
+    post:
+      operationId: CreateSchema
+      parameters:
+        - description: Action Header
+          in: header
+          name: X-Amz-Target
+          required: false
+          schema:
+            default: CloudApiService.CreateResource
+            enum:
+              - CloudApiService.CreateResource
+            type: string
+        - in: header
+          name: Content-Type
+          required: false
+          schema:
+            default: application/x-amz-json-1.0
+            enum:
+              - application/x-amz-json-1.0
+            type: string
+      requestBody:
+        content:
+          application/x-amz-json-1.0:
+            schema:
+              $ref: '#/components/schemas/CreateSchemaRequest'
+        required: true
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
+          description: Success
   /?Action=CreateResource&Version=2021-09-30&__SchemaVersion&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
diff --git a/openapi/src/awscc/v00.00.00000/services/grafana.yaml b/openapi/src/awscc/v00.00.00000/services/grafana.yaml
index d173f2bca..588c7bcbf 100644
--- a/openapi/src/awscc/v00.00.00000/services/grafana.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/grafana.yaml
@@ -907,7 +907,7 @@ components:
       id: awscc.grafana.workspaces
       x-cfn-schema-name: Workspace
       x-cfn-type-name: AWS::Grafana::Workspace
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
       x-type: cloud_control
       methods:
@@ -1039,8 +1039,7 @@ components:
       id: awscc.grafana.workspaces_list_only
       x-cfn-schema-name: Workspace
       x-cfn-type-name: AWS::Grafana::Workspace
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/greengrassv2.yaml b/openapi/src/awscc/v00.00.00000/services/greengrassv2.yaml
index ae42f8364..aaf444211 100644
--- a/openapi/src/awscc/v00.00.00000/services/greengrassv2.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/greengrassv2.yaml
@@ -999,7 +999,7 @@ components:
       id: awscc.greengrassv2.component_versions
       x-cfn-schema-name: ComponentVersion
       x-cfn-type-name: AWS::GreengrassV2::ComponentVersion
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -1095,8 +1095,7 @@ components:
       id: awscc.greengrassv2.component_versions_list_only
       x-cfn-schema-name: ComponentVersion
       x-cfn-type-name: AWS::GreengrassV2::ComponentVersion
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1126,7 +1125,7 @@ components:
       id: awscc.greengrassv2.deployments
       x-cfn-schema-name: Deployment
       x-cfn-type-name: AWS::GreengrassV2::Deployment
-      x-identifiers:
+      x-identifiers: &ref_1
         - DeploymentId
       x-type: cloud_control
       methods:
@@ -1226,8 +1225,7 @@ components:
       id: awscc.greengrassv2.deployments_list_only
       x-cfn-schema-name: Deployment
       x-cfn-type-name: AWS::GreengrassV2::Deployment
-      x-identifiers:
-        - DeploymentId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/groundstation.yaml b/openapi/src/awscc/v00.00.00000/services/groundstation.yaml
index dbb19fcc3..42ef10a9a 100644
--- a/openapi/src/awscc/v00.00.00000/services/groundstation.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/groundstation.yaml
@@ -571,9 +571,6 @@ components:
           type: string
           pattern: ^[ a-zA-Z0-9\+\-=._:/@]{1,256}$
       additionalProperties: false
-      required:
-        - Key
-        - Value
     Config:
       type: object
       properties:
@@ -758,6 +755,19 @@ components:
         - required:
             - AwsGroundStationAgentEndpoint
       additionalProperties: false
+    DataflowEndpointGroup_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          pattern: ^[ a-zA-Z0-9\+\-=._:/@]{1,128}$
+        Value:
+          type: string
+          pattern: ^[ a-zA-Z0-9\+\-=._:/@]{1,256}$
+      additionalProperties: false
+      required:
+        - Key
+        - Value
     DataflowEndpointGroup:
       type: object
       properties:
@@ -780,7 +790,7 @@ components:
         Tags:
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/DataflowEndpointGroup_Tag'
       required:
         - EndpointDetails
       x-stackql-resource-name: dataflow_endpoint_group
@@ -836,6 +846,19 @@ components:
         Destination:
           type: string
       additionalProperties: false
+    MissionProfile_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          pattern: ^[ a-zA-Z0-9\+\-=._:/@]{1,128}$
+        Value:
+          type: string
+          pattern: ^[ a-zA-Z0-9\+\-=._:/@]{1,256}$
+      additionalProperties: false
+      required:
+        - Key
+        - Value
     StreamsKmsKey:
       type: object
       properties:
@@ -890,7 +913,7 @@ components:
         Tags:
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/MissionProfile_Tag'
         Id:
           type: string
         Arn:
@@ -1020,7 +1043,7 @@ components:
             Tags:
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/DataflowEndpointGroup_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateDataflowEndpointGroupRequest
       type: object
@@ -1069,7 +1092,7 @@ components:
             Tags:
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/MissionProfile_Tag'
             Id:
               type: string
             Arn:
@@ -1094,7 +1117,7 @@ components:
       id: awscc.groundstation.configs
       x-cfn-schema-name: Config
       x-cfn-type-name: AWS::GroundStation::Config
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -1190,8 +1213,7 @@ components:
       id: awscc.groundstation.configs_list_only
       x-cfn-schema-name: Config
       x-cfn-type-name: AWS::GroundStation::Config
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1221,7 +1243,7 @@ components:
       id: awscc.groundstation.dataflow_endpoint_groups
       x-cfn-schema-name: DataflowEndpointGroup
       x-cfn-type-name: AWS::GroundStation::DataflowEndpointGroup
-      x-identifiers:
+      x-identifiers: &ref_1
         - Id
       x-type: cloud_control
       methods:
@@ -1317,8 +1339,7 @@ components:
       id: awscc.groundstation.dataflow_endpoint_groups_list_only
       x-cfn-schema-name: DataflowEndpointGroup
       x-cfn-type-name: AWS::GroundStation::DataflowEndpointGroup
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1348,7 +1369,7 @@ components:
       id: awscc.groundstation.mission_profiles
       x-cfn-schema-name: MissionProfile
       x-cfn-type-name: AWS::GroundStation::MissionProfile
-      x-identifiers:
+      x-identifiers: &ref_2
         - Id
         - Arn
       x-type: cloud_control
@@ -1457,9 +1478,7 @@ components:
       id: awscc.groundstation.mission_profiles_list_only
       x-cfn-schema-name: MissionProfile
       x-cfn-type-name: AWS::GroundStation::MissionProfile
-      x-identifiers:
-        - Id
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/guardduty.yaml b/openapi/src/awscc/v00.00.00000/services/guardduty.yaml
index ce4588721..847c60d64 100644
--- a/openapi/src/awscc/v00.00.00000/services/guardduty.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/guardduty.yaml
@@ -754,6 +754,17 @@ components:
           - guardduty:UntagResource
         list:
           - guardduty:ListIPSets
+    MalwareProtectionPlan_TagItem:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+        Value:
+          type: string
+      required:
+        - Key
+        - Value
     CFNProtectedResource:
       type: object
       additionalProperties: false
@@ -830,7 +841,7 @@ components:
           type: array
           description: The tags to be added to the created Malware Protection plan resource. Each tag consists of a key and an optional value, both of which you need to specify.
           items:
-            $ref: '#/components/schemas/TagItem'
+            $ref: '#/components/schemas/MalwareProtectionPlan_TagItem'
       required:
         - Role
         - ProtectedResource
@@ -1499,7 +1510,7 @@ components:
               type: array
               description: The tags to be added to the created Malware Protection plan resource. Each tag consists of a key and an optional value, both of which you need to specify.
               items:
-                $ref: '#/components/schemas/TagItem'
+                $ref: '#/components/schemas/MalwareProtectionPlan_TagItem'
           x-stackQL-stringOnly: true
       x-title: CreateMalwareProtectionPlanRequest
       type: object
@@ -1769,7 +1780,7 @@ components:
       id: awscc.guardduty.detectors
       x-cfn-schema-name: Detector
       x-cfn-type-name: AWS::GuardDuty::Detector
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
       x-type: cloud_control
       methods:
@@ -1865,8 +1876,7 @@ components:
       id: awscc.guardduty.detectors_list_only
       x-cfn-schema-name: Detector
       x-cfn-type-name: AWS::GuardDuty::Detector
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1896,7 +1906,7 @@ components:
       id: awscc.guardduty.filters
       x-cfn-schema-name: Filter
       x-cfn-type-name: AWS::GuardDuty::Filter
-      x-identifiers:
+      x-identifiers: &ref_1
         - DetectorId
         - Name
       x-type: cloud_control
@@ -1995,9 +2005,7 @@ components:
       id: awscc.guardduty.filters_list_only
       x-cfn-schema-name: Filter
       x-cfn-type-name: AWS::GuardDuty::Filter
-      x-identifiers:
-        - DetectorId
-        - Name
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2029,7 +2037,7 @@ components:
       id: awscc.guardduty.ip_sets
       x-cfn-schema-name: IPSet
       x-cfn-type-name: AWS::GuardDuty::IPSet
-      x-identifiers:
+      x-identifiers: &ref_2
         - Id
         - DetectorId
       x-type: cloud_control
@@ -2130,9 +2138,7 @@ components:
       id: awscc.guardduty.ip_sets_list_only
       x-cfn-schema-name: IPSet
       x-cfn-type-name: AWS::GuardDuty::IPSet
-      x-identifiers:
-        - Id
-        - DetectorId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2164,7 +2170,7 @@ components:
       id: awscc.guardduty.malware_protection_plans
       x-cfn-schema-name: MalwareProtectionPlan
       x-cfn-type-name: AWS::GuardDuty::MalwareProtectionPlan
-      x-identifiers:
+      x-identifiers: &ref_3
         - MalwareProtectionPlanId
       x-type: cloud_control
       methods:
@@ -2266,8 +2272,7 @@ components:
       id: awscc.guardduty.malware_protection_plans_list_only
       x-cfn-schema-name: MalwareProtectionPlan
       x-cfn-type-name: AWS::GuardDuty::MalwareProtectionPlan
-      x-identifiers:
-        - MalwareProtectionPlanId
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2297,7 +2302,7 @@ components:
       id: awscc.guardduty.masters
       x-cfn-schema-name: Master
       x-cfn-type-name: AWS::GuardDuty::Master
-      x-identifiers:
+      x-identifiers: &ref_4
         - DetectorId
         - MasterId
       x-type: cloud_control
@@ -2371,9 +2376,7 @@ components:
       id: awscc.guardduty.masters_list_only
       x-cfn-schema-name: Master
       x-cfn-type-name: AWS::GuardDuty::Master
-      x-identifiers:
-        - DetectorId
-        - MasterId
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2405,7 +2408,7 @@ components:
       id: awscc.guardduty.members
       x-cfn-schema-name: Member
       x-cfn-type-name: AWS::GuardDuty::Member
-      x-identifiers:
+      x-identifiers: &ref_5
         - DetectorId
         - MemberId
       x-type: cloud_control
@@ -2502,9 +2505,7 @@ components:
       id: awscc.guardduty.members_list_only
       x-cfn-schema-name: Member
       x-cfn-type-name: AWS::GuardDuty::Member
-      x-identifiers:
-        - DetectorId
-        - MemberId
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2536,7 +2537,7 @@ components:
       id: awscc.guardduty.publishing_destinations
       x-cfn-schema-name: PublishingDestination
       x-cfn-type-name: AWS::GuardDuty::PublishingDestination
-      x-identifiers:
+      x-identifiers: &ref_6
         - DetectorId
         - Id
       x-type: cloud_control
@@ -2635,9 +2636,7 @@ components:
       id: awscc.guardduty.publishing_destinations_list_only
       x-cfn-schema-name: PublishingDestination
       x-cfn-type-name: AWS::GuardDuty::PublishingDestination
-      x-identifiers:
-        - DetectorId
-        - Id
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2669,7 +2668,7 @@ components:
       id: awscc.guardduty.threat_entity_sets
       x-cfn-schema-name: ThreatEntitySet
       x-cfn-type-name: AWS::GuardDuty::ThreatEntitySet
-      x-identifiers:
+      x-identifiers: &ref_7
         - Id
         - DetectorId
       x-type: cloud_control
@@ -2778,9 +2777,7 @@ components:
       id: awscc.guardduty.threat_entity_sets_list_only
       x-cfn-schema-name: ThreatEntitySet
       x-cfn-type-name: AWS::GuardDuty::ThreatEntitySet
-      x-identifiers:
-        - Id
-        - DetectorId
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2812,7 +2809,7 @@ components:
       id: awscc.guardduty.threat_intel_sets
       x-cfn-schema-name: ThreatIntelSet
       x-cfn-type-name: AWS::GuardDuty::ThreatIntelSet
-      x-identifiers:
+      x-identifiers: &ref_8
         - Id
         - DetectorId
       x-type: cloud_control
@@ -2913,9 +2910,7 @@ components:
       id: awscc.guardduty.threat_intel_sets_list_only
       x-cfn-schema-name: ThreatIntelSet
       x-cfn-type-name: AWS::GuardDuty::ThreatIntelSet
-      x-identifiers:
-        - Id
-        - DetectorId
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2947,7 +2942,7 @@ components:
       id: awscc.guardduty.trusted_entity_sets
       x-cfn-schema-name: TrustedEntitySet
       x-cfn-type-name: AWS::GuardDuty::TrustedEntitySet
-      x-identifiers:
+      x-identifiers: &ref_9
         - Id
         - DetectorId
       x-type: cloud_control
@@ -3056,9 +3051,7 @@ components:
       id: awscc.guardduty.trusted_entity_sets_list_only
       x-cfn-schema-name: TrustedEntitySet
       x-cfn-type-name: AWS::GuardDuty::TrustedEntitySet
-      x-identifiers:
-        - Id
-        - DetectorId
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/healthimaging.yaml b/openapi/src/awscc/v00.00.00000/services/healthimaging.yaml
index c10759d45..83f594aa0 100644
--- a/openapi/src/awscc/v00.00.00000/services/healthimaging.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/healthimaging.yaml
@@ -557,7 +557,7 @@ components:
       id: awscc.healthimaging.datastores
       x-cfn-schema-name: Datastore
       x-cfn-type-name: AWS::HealthImaging::Datastore
-      x-identifiers:
+      x-identifiers: &ref_0
         - DatastoreId
       x-type: cloud_control
       methods:
@@ -640,8 +640,7 @@ components:
       id: awscc.healthimaging.datastores_list_only
       x-cfn-schema-name: Datastore
       x-cfn-type-name: AWS::HealthImaging::Datastore
-      x-identifiers:
-        - DatastoreId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/healthlake.yaml b/openapi/src/awscc/v00.00.00000/services/healthlake.yaml
index 6b06554d6..d52343c6d 100644
--- a/openapi/src/awscc/v00.00.00000/services/healthlake.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/healthlake.yaml
@@ -682,7 +682,7 @@ components:
       id: awscc.healthlake.fhir_datastores
       x-cfn-schema-name: FHIRDatastore
       x-cfn-type-name: AWS::HealthLake::FHIRDatastore
-      x-identifiers:
+      x-identifiers: &ref_0
         - DatastoreId
       x-type: cloud_control
       methods:
@@ -788,8 +788,7 @@ components:
       id: awscc.healthlake.fhir_datastores_list_only
       x-cfn-schema-name: FHIRDatastore
       x-cfn-type-name: AWS::HealthLake::FHIRDatastore
-      x-identifiers:
-        - DatastoreId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/iam.yaml b/openapi/src/awscc/v00.00.00000/services/iam.yaml
index 6efcf61ad..ce2efe85f 100644
--- a/openapi/src/awscc/v00.00.00000/services/iam.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/iam.yaml
@@ -391,22 +391,22 @@ components:
       type: object
   schemas:
     Policy:
-      description: |-
-        Contains information about an attached policy.
-         An attached policy is a managed policy that has been attached to a user, group, or role.
-         For more information about managed policies, refer to [Managed Policies and Inline Policies](https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html) in the *User Guide*.
       type: object
       additionalProperties: false
       properties:
         PolicyDocument:
-          description: The entire contents of the policy that defines permissions. For more information, see [Overview of JSON policies](https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#access_policies-json).
+          description: The policy document.
           type: object
         PolicyName:
           description: The friendly name (not ARN) identifying the policy.
           type: string
       required:
-        - PolicyName
         - PolicyDocument
+        - PolicyName
+      description: |-
+        Contains information about an attached policy.
+         An attached policy is a managed policy that has been attached to a user, group, or role.
+         For more information about managed policies, see [Managed Policies and Inline Policies](https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html) in the *User Guide*.
     Group:
       type: object
       properties:
@@ -854,6 +854,37 @@ components:
         list:
           - iam:ListOpenIDConnectProviders
           - iam:GetOpenIDConnectProvider
+    Role_Policy:
+      description: |-
+        Contains information about an attached policy.
+         An attached policy is a managed policy that has been attached to a user, group, or role.
+         For more information about managed policies, refer to [Managed Policies and Inline Policies](https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html) in the *User Guide*.
+      type: object
+      additionalProperties: false
+      properties:
+        PolicyDocument:
+          description: The entire contents of the policy that defines permissions. For more information, see [Overview of JSON policies](https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#access_policies-json).
+          type: object
+        PolicyName:
+          description: The friendly name (not ARN) identifying the policy.
+          type: string
+      required:
+        - PolicyName
+        - PolicyDocument
+    Role_Tag:
+      description: A structure that represents user-provided metadata that can be associated with an IAM resource. For more information about tagging, see [Tagging IAM resources](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_tags.html) in the *IAM User Guide*.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: The key name that can be used to look up or retrieve the associated value. For example, ``Department`` or ``Cost Center`` are common choices.
+        Value:
+          type: string
+          description: The value associated with this tag. For example, tags with a key name of ``Department`` could have values such as ``Human Resources``, ``Accounting``, and ``Support``. Tags with a key name of ``Cost Center`` might have values that consist of the number associated with the different cost centers in your company. Typically, many resources have tags with the same key name but with different values.
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     Role:
       type: object
       properties:
@@ -905,7 +936,7 @@ components:
           x-insertionOrder: false
           uniqueItems: false
           items:
-            $ref: '#/components/schemas/Policy'
+            $ref: '#/components/schemas/Role_Policy'
         RoleId:
           description: ''
           type: string
@@ -923,7 +954,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Role_Tag'
       required:
         - AssumeRolePolicyDocument
       x-stackql-resource-name: role
@@ -1290,6 +1321,37 @@ components:
           - iam:DeleteServiceLinkedRole
           - iam:GetServiceLinkedRoleDeletionStatus
           - iam:GetRole
+    User_Policy:
+      description: |-
+        Contains information about an attached policy.
+         An attached policy is a managed policy that has been attached to a user, group, or role.
+         For more information about managed policies, refer to [Managed Policies and Inline Policies](https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html) in the *User Guide*.
+      type: object
+      additionalProperties: false
+      properties:
+        PolicyDocument:
+          description: The entire contents of the policy that defines permissions. For more information, see [Overview of JSON policies](https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#access_policies-json).
+          type: object
+        PolicyName:
+          description: The friendly name (not ARN) identifying the policy.
+          type: string
+      required:
+        - PolicyName
+        - PolicyDocument
+    User_Tag:
+      description: A structure that represents user-provided metadata that can be associated with an IAM resource. For more information about tagging, see [Tagging IAM resources](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_tags.html) in the *IAM User Guide*.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: The key name that can be used to look up or retrieve the associated value. For example, ``Department`` or ``Cost Center`` are common choices.
+        Value:
+          type: string
+          description: The value associated with this tag. For example, tags with a key name of ``Department`` could have values such as ``Human Resources``, ``Accounting``, and ``Support``. Tags with a key name of ``Cost Center`` might have values that consist of the number associated with the different cost centers in your company. Typically, many resources have tags with the same key name but with different values.
+      required:
+        - Key
+        - Value
     LoginProfile:
       description: Creates a password for the specified user, giving the user the ability to access AWS services through the console. For more information about managing passwords, see [Managing Passwords](https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_ManagingLogins.html) in the *User Guide*.
       type: object
@@ -1330,7 +1392,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Policy'
+            $ref: '#/components/schemas/User_Policy'
         UserName:
           description: |-
             The name of the user to create. Do not include the path in this value.
@@ -1363,7 +1425,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/User_Tag'
         PermissionsBoundary:
           description: |-
             The ARN of the managed policy that is used to set the permissions boundary for the user.
@@ -1896,7 +1958,7 @@ components:
               x-insertionOrder: false
               uniqueItems: false
               items:
-                $ref: '#/components/schemas/Policy'
+                $ref: '#/components/schemas/Role_Policy'
             RoleId:
               description: ''
               type: string
@@ -1914,7 +1976,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Role_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateRoleRequest
       type: object
@@ -2141,7 +2203,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Policy'
+                $ref: '#/components/schemas/User_Policy'
             UserName:
               description: |-
                 The name of the user to create. Do not include the path in this value.
@@ -2174,7 +2236,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/User_Tag'
             PermissionsBoundary:
               description: |-
                 The ARN of the managed policy that is used to set the permissions boundary for the user.
@@ -2276,7 +2338,7 @@ components:
       id: awscc.iam.groups
       x-cfn-schema-name: Group
       x-cfn-type-name: AWS::IAM::Group
-      x-identifiers:
+      x-identifiers: &ref_0
         - GroupName
       x-type: cloud_control
       methods:
@@ -2370,8 +2432,7 @@ components:
       id: awscc.iam.groups_list_only
       x-cfn-schema-name: Group
       x-cfn-type-name: AWS::IAM::Group
-      x-identifiers:
-        - GroupName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2492,7 +2553,7 @@ components:
       id: awscc.iam.instance_profiles
       x-cfn-schema-name: InstanceProfile
       x-cfn-type-name: AWS::IAM::InstanceProfile
-      x-identifiers:
+      x-identifiers: &ref_1
         - InstanceProfileName
       x-type: cloud_control
       methods:
@@ -2584,8 +2645,7 @@ components:
       id: awscc.iam.instance_profiles_list_only
       x-cfn-schema-name: InstanceProfile
       x-cfn-type-name: AWS::IAM::InstanceProfile
-      x-identifiers:
-        - InstanceProfileName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2615,7 +2675,7 @@ components:
       id: awscc.iam.managed_policies
       x-cfn-schema-name: ManagedPolicy
       x-cfn-type-name: AWS::IAM::ManagedPolicy
-      x-identifiers:
+      x-identifiers: &ref_2
         - PolicyArn
       x-type: cloud_control
       methods:
@@ -2729,8 +2789,7 @@ components:
       id: awscc.iam.managed_policies_list_only
       x-cfn-schema-name: ManagedPolicy
       x-cfn-type-name: AWS::IAM::ManagedPolicy
-      x-identifiers:
-        - PolicyArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2760,7 +2819,7 @@ components:
       id: awscc.iam.oidc_providers
       x-cfn-schema-name: OIDCProvider
       x-cfn-type-name: AWS::IAM::OIDCProvider
-      x-identifiers:
+      x-identifiers: &ref_3
         - Arn
       x-type: cloud_control
       methods:
@@ -2854,8 +2913,7 @@ components:
       id: awscc.iam.oidc_providers_list_only
       x-cfn-schema-name: OIDCProvider
       x-cfn-type-name: AWS::IAM::OIDCProvider
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2885,7 +2943,7 @@ components:
       id: awscc.iam.roles
       x-cfn-schema-name: Role
       x-cfn-type-name: AWS::IAM::Role
-      x-identifiers:
+      x-identifiers: &ref_4
         - RoleName
       x-type: cloud_control
       methods:
@@ -2991,8 +3049,7 @@ components:
       id: awscc.iam.roles_list_only
       x-cfn-schema-name: Role
       x-cfn-type-name: AWS::IAM::Role
-      x-identifiers:
-        - RoleName
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3113,7 +3170,7 @@ components:
       id: awscc.iam.saml_providers
       x-cfn-schema-name: SAMLProvider
       x-cfn-type-name: AWS::IAM::SAMLProvider
-      x-identifiers:
+      x-identifiers: &ref_5
         - Arn
       x-type: cloud_control
       methods:
@@ -3215,8 +3272,7 @@ components:
       id: awscc.iam.saml_providers_list_only
       x-cfn-schema-name: SAMLProvider
       x-cfn-type-name: AWS::IAM::SAMLProvider
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3246,7 +3302,7 @@ components:
       id: awscc.iam.server_certificates
       x-cfn-schema-name: ServerCertificate
       x-cfn-type-name: AWS::IAM::ServerCertificate
-      x-identifiers:
+      x-identifiers: &ref_6
         - ServerCertificateName
       x-type: cloud_control
       methods:
@@ -3344,8 +3400,7 @@ components:
       id: awscc.iam.server_certificates_list_only
       x-cfn-schema-name: ServerCertificate
       x-cfn-type-name: AWS::IAM::ServerCertificate
-      x-identifiers:
-        - ServerCertificateName
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3467,7 +3522,7 @@ components:
       id: awscc.iam.users
       x-cfn-schema-name: User
       x-cfn-type-name: AWS::IAM::User
-      x-identifiers:
+      x-identifiers: &ref_7
         - UserName
       x-type: cloud_control
       methods:
@@ -3569,8 +3624,7 @@ components:
       id: awscc.iam.users_list_only
       x-cfn-schema-name: User
       x-cfn-type-name: AWS::IAM::User
-      x-identifiers:
-        - UserName
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3691,7 +3745,7 @@ components:
       id: awscc.iam.virtualmfa_devices
       x-cfn-schema-name: VirtualMFADevice
       x-cfn-type-name: AWS::IAM::VirtualMFADevice
-      x-identifiers:
+      x-identifiers: &ref_8
         - SerialNumber
       x-type: cloud_control
       methods:
@@ -3785,8 +3839,7 @@ components:
       id: awscc.iam.virtualmfa_devices_list_only
       x-cfn-schema-name: VirtualMFADevice
       x-cfn-type-name: AWS::IAM::VirtualMFADevice
-      x-identifiers:
-        - SerialNumber
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/identitystore.yaml b/openapi/src/awscc/v00.00.00000/services/identitystore.yaml
index 2a149c99d..3948001b1 100644
--- a/openapi/src/awscc/v00.00.00000/services/identitystore.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/identitystore.yaml
@@ -618,7 +618,7 @@ components:
       id: awscc.identitystore.groups
       x-cfn-schema-name: Group
       x-cfn-type-name: AWS::IdentityStore::Group
-      x-identifiers:
+      x-identifiers: &ref_0
         - GroupId
         - IdentityStoreId
       x-type: cloud_control
@@ -711,9 +711,7 @@ components:
       id: awscc.identitystore.groups_list_only
       x-cfn-schema-name: Group
       x-cfn-type-name: AWS::IdentityStore::Group
-      x-identifiers:
-        - GroupId
-        - IdentityStoreId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -745,7 +743,7 @@ components:
       id: awscc.identitystore.group_memberships
       x-cfn-schema-name: GroupMembership
       x-cfn-type-name: AWS::IdentityStore::GroupMembership
-      x-identifiers:
+      x-identifiers: &ref_1
         - MembershipId
         - IdentityStoreId
       x-type: cloud_control
@@ -821,9 +819,7 @@ components:
       id: awscc.identitystore.group_memberships_list_only
       x-cfn-schema-name: GroupMembership
       x-cfn-type-name: AWS::IdentityStore::GroupMembership
-      x-identifiers:
-        - MembershipId
-        - IdentityStoreId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/imagebuilder.yaml b/openapi/src/awscc/v00.00.00000/services/imagebuilder.yaml
index dd7e8e015..65919f618 100644
--- a/openapi/src/awscc/v00.00.00000/services/imagebuilder.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/imagebuilder.yaml
@@ -599,17 +599,17 @@ components:
             - sc1
             - st1
     TargetContainerRepository:
-      description: The destination repository for the container image.
+      description: The container repository where the output container image is stored.
       type: object
       additionalProperties: false
       properties:
         Service:
-          description: The service of target container repository.
+          description: Specifies the service in which this image was registered.
           type: string
           enum:
             - ECR
         RepositoryName:
-          description: The repository name of target container repository.
+          description: The name of the container repository where the output container image is stored. This name is prefixed by the repository location.
           type: string
     ComponentParameter:
       additionalProperties: false
@@ -844,7 +844,7 @@ components:
             type: string
         TargetRepository:
           description: The destination repository for the container distribution configuration.
-          $ref: '#/components/schemas/TargetContainerRepository'
+          $ref: '#/components/schemas/DistributionConfiguration_TargetContainerRepository'
     LaunchTemplateConfiguration:
       description: launchTemplateConfiguration settings that apply to image distribution.
       type: object
@@ -911,6 +911,19 @@ components:
     LicenseConfigurationArn:
       description: The Amazon Resource Name (ARN) of the License Manager configuration.
       type: string
+    DistributionConfiguration_TargetContainerRepository:
+      description: The destination repository for the container image.
+      type: object
+      additionalProperties: false
+      properties:
+        Service:
+          description: The service of target container repository.
+          type: string
+          enum:
+            - ECR
+        RepositoryName:
+          description: The repository name of target container repository.
+          type: string
     FastLaunchLaunchTemplateSpecification:
       description: The launch template that the fast-launch enabled Windows AMI uses when it launches Windows instances to create pre-provisioned snapshots.
       type: object
@@ -1030,9 +1043,9 @@ components:
         list:
           - imagebuilder:ListDistributionConfigurations
     ImageScanningConfiguration:
-      description: Determines if tests should run after building the image. Image Builder defaults to enable tests to run following the image build, before image distribution.
-      type: object
+      description: Contains settings for Image Builder image resource and container image scans.
       additionalProperties: false
+      type: object
       properties:
         EcrConfiguration:
           description: Contains ECR settings for vulnerability scans.
@@ -1065,34 +1078,34 @@ components:
             - ABORT
     EcrConfiguration:
       description: Settings for Image Builder to configure the ECR repository and output container images that are scanned.
-      type: object
       additionalProperties: false
+      type: object
       properties:
         ContainerTags:
           description: Tags for Image Builder to apply the output container image that is scanned. Tags can help you identify and manage your scanned images.
-          type: array
           x-insertionOrder: true
+          type: array
           items:
             type: string
         RepositoryName:
-          description: The name of the container repository that Amazon Inspector scans to identify findings for your container images. The name includes the path for the repository location. If you don't provide this information, Image Builder creates a repository in your account named image-builder-image-scanning-repository to use for vulnerability scans for your output container images.
+          description: The name of the container repository that Amazon Inspector scans to identify findings for your container images. The name includes the path for the repository location. If you don’t provide this information, Image Builder creates a repository in your account named image-builder-image-scanning-repository to use for vulnerability scans for your output container images.
           type: string
     WorkflowParameterValue:
       description: The value associated with the workflow parameter
       type: string
     ImageTestsConfiguration:
-      description: Image tests configuration.
-      type: object
+      description: The image tests configuration used when creating this image.
       additionalProperties: false
+      type: object
       properties:
-        ImageTestsEnabled:
-          description: Defines if tests should be executed when building this image.
-          type: boolean
         TimeoutMinutes:
-          description: The maximum time in minutes that tests are permitted to run.
+          description: TimeoutMinutes
+          maximum: 1440
           type: integer
           minimum: 60
-          maximum: 1440
+        ImageTestsEnabled:
+          description: ImageTestsEnabled
+          type: boolean
     WorkflowParameter:
       description: A parameter associated with the workflow
       type: object
@@ -1212,6 +1225,44 @@ components:
           - imagebuilder:DeleteImage
           - imagebuilder:UntagResource
           - imagebuilder:CancelImageCreation
+    ImagePipeline_ImageTestsConfiguration:
+      description: Image tests configuration.
+      type: object
+      additionalProperties: false
+      properties:
+        ImageTestsEnabled:
+          description: Defines if tests should be executed when building this image.
+          type: boolean
+        TimeoutMinutes:
+          description: The maximum time in minutes that tests are permitted to run.
+          type: integer
+          minimum: 60
+          maximum: 1440
+    ImagePipeline_ImageScanningConfiguration:
+      description: Determines if tests should run after building the image. Image Builder defaults to enable tests to run following the image build, before image distribution.
+      type: object
+      additionalProperties: false
+      properties:
+        EcrConfiguration:
+          description: Contains ECR settings for vulnerability scans.
+          $ref: '#/components/schemas/ImagePipeline_EcrConfiguration'
+        ImageScanningEnabled:
+          description: This sets whether Image Builder keeps a snapshot of the vulnerability scans that Amazon Inspector runs against the build instance when you create a new image.
+          type: boolean
+    ImagePipeline_EcrConfiguration:
+      description: Settings for Image Builder to configure the ECR repository and output container images that are scanned.
+      type: object
+      additionalProperties: false
+      properties:
+        ContainerTags:
+          description: Tags for Image Builder to apply the output container image that is scanned. Tags can help you identify and manage your scanned images.
+          type: array
+          x-insertionOrder: true
+          items:
+            type: string
+        RepositoryName:
+          description: The name of the container repository that Amazon Inspector scans to identify findings for your container images. The name includes the path for the repository location. If you don't provide this information, Image Builder creates a repository in your account named image-builder-image-scanning-repository to use for vulnerability scans for your output container images.
+          type: string
     Schedule:
       description: The schedule of the image pipeline.
       type: object
@@ -1240,7 +1291,7 @@ components:
           type: string
         ImageTestsConfiguration:
           description: The image tests configuration of the image pipeline.
-          $ref: '#/components/schemas/ImageTestsConfiguration'
+          $ref: '#/components/schemas/ImagePipeline_ImageTestsConfiguration'
         Status:
           description: The status of the image pipeline.
           type: string
@@ -1273,7 +1324,7 @@ components:
           type: boolean
         ImageScanningConfiguration:
           description: Contains settings for vulnerability scans.
-          $ref: '#/components/schemas/ImageScanningConfiguration'
+          $ref: '#/components/schemas/ImagePipeline_ImageScanningConfiguration'
         ExecutionRole:
           description: The execution role name/ARN for the image build, if provided
           type: string
@@ -2271,7 +2322,7 @@ components:
               type: string
             ImageTestsConfiguration:
               description: The image tests configuration of the image pipeline.
-              $ref: '#/components/schemas/ImageTestsConfiguration'
+              $ref: '#/components/schemas/ImagePipeline_ImageTestsConfiguration'
             Status:
               description: The status of the image pipeline.
               type: string
@@ -2304,7 +2355,7 @@ components:
               type: boolean
             ImageScanningConfiguration:
               description: Contains settings for vulnerability scans.
-              $ref: '#/components/schemas/ImageScanningConfiguration'
+              $ref: '#/components/schemas/ImagePipeline_ImageScanningConfiguration'
             ExecutionRole:
               description: The execution role name/ARN for the image build, if provided
               type: string
@@ -2579,7 +2630,7 @@ components:
       id: awscc.imagebuilder.components
       x-cfn-schema-name: Component
       x-cfn-type-name: AWS::ImageBuilder::Component
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -2689,8 +2740,7 @@ components:
       id: awscc.imagebuilder.components_list_only
       x-cfn-schema-name: Component
       x-cfn-type-name: AWS::ImageBuilder::Component
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2720,7 +2770,7 @@ components:
       id: awscc.imagebuilder.container_recipes
       x-cfn-schema-name: ContainerRecipe
       x-cfn-type-name: AWS::ImageBuilder::ContainerRecipe
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -2836,8 +2886,7 @@ components:
       id: awscc.imagebuilder.container_recipes_list_only
       x-cfn-schema-name: ContainerRecipe
       x-cfn-type-name: AWS::ImageBuilder::ContainerRecipe
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2867,7 +2916,7 @@ components:
       id: awscc.imagebuilder.distribution_configurations
       x-cfn-schema-name: DistributionConfiguration
       x-cfn-type-name: AWS::ImageBuilder::DistributionConfiguration
-      x-identifiers:
+      x-identifiers: &ref_2
         - Arn
       x-type: cloud_control
       methods:
@@ -2961,8 +3010,7 @@ components:
       id: awscc.imagebuilder.distribution_configurations_list_only
       x-cfn-schema-name: DistributionConfiguration
       x-cfn-type-name: AWS::ImageBuilder::DistributionConfiguration
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2992,7 +3040,7 @@ components:
       id: awscc.imagebuilder.images
       x-cfn-schema-name: Image
       x-cfn-type-name: AWS::ImageBuilder::Image
-      x-identifiers:
+      x-identifiers: &ref_3
         - Arn
       x-type: cloud_control
       methods:
@@ -3104,8 +3152,7 @@ components:
       id: awscc.imagebuilder.images_list_only
       x-cfn-schema-name: Image
       x-cfn-type-name: AWS::ImageBuilder::Image
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3135,7 +3182,7 @@ components:
       id: awscc.imagebuilder.image_pipelines
       x-cfn-schema-name: ImagePipeline
       x-cfn-type-name: AWS::ImageBuilder::ImagePipeline
-      x-identifiers:
+      x-identifiers: &ref_4
         - Arn
       x-type: cloud_control
       methods:
@@ -3249,8 +3296,7 @@ components:
       id: awscc.imagebuilder.image_pipelines_list_only
       x-cfn-schema-name: ImagePipeline
       x-cfn-type-name: AWS::ImageBuilder::ImagePipeline
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3280,7 +3326,7 @@ components:
       id: awscc.imagebuilder.image_recipes
       x-cfn-schema-name: ImageRecipe
       x-cfn-type-name: AWS::ImageBuilder::ImageRecipe
-      x-identifiers:
+      x-identifiers: &ref_5
         - Arn
       x-type: cloud_control
       methods:
@@ -3384,8 +3430,7 @@ components:
       id: awscc.imagebuilder.image_recipes_list_only
       x-cfn-schema-name: ImageRecipe
       x-cfn-type-name: AWS::ImageBuilder::ImageRecipe
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3415,7 +3460,7 @@ components:
       id: awscc.imagebuilder.infrastructure_configurations
       x-cfn-schema-name: InfrastructureConfiguration
       x-cfn-type-name: AWS::ImageBuilder::InfrastructureConfiguration
-      x-identifiers:
+      x-identifiers: &ref_6
         - Arn
       x-type: cloud_control
       methods:
@@ -3529,8 +3574,7 @@ components:
       id: awscc.imagebuilder.infrastructure_configurations_list_only
       x-cfn-schema-name: InfrastructureConfiguration
       x-cfn-type-name: AWS::ImageBuilder::InfrastructureConfiguration
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3560,7 +3604,7 @@ components:
       id: awscc.imagebuilder.lifecycle_policies
       x-cfn-schema-name: LifecyclePolicy
       x-cfn-type-name: AWS::ImageBuilder::LifecyclePolicy
-      x-identifiers:
+      x-identifiers: &ref_7
         - Arn
       x-type: cloud_control
       methods:
@@ -3662,8 +3706,7 @@ components:
       id: awscc.imagebuilder.lifecycle_policies_list_only
       x-cfn-schema-name: LifecyclePolicy
       x-cfn-type-name: AWS::ImageBuilder::LifecyclePolicy
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3693,7 +3736,7 @@ components:
       id: awscc.imagebuilder.workflows
       x-cfn-schema-name: Workflow
       x-cfn-type-name: AWS::ImageBuilder::Workflow
-      x-identifiers:
+      x-identifiers: &ref_8
         - Arn
       x-type: cloud_control
       methods:
@@ -3797,8 +3840,7 @@ components:
       id: awscc.imagebuilder.workflows_list_only
       x-cfn-schema-name: Workflow
       x-cfn-type-name: AWS::ImageBuilder::Workflow
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/inspector.yaml b/openapi/src/awscc/v00.00.00000/services/inspector.yaml
index c8987a5b1..eba831dfb 100644
--- a/openapi/src/awscc/v00.00.00000/services/inspector.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/inspector.yaml
@@ -611,7 +611,7 @@ components:
       id: awscc.inspector.assessment_targets
       x-cfn-schema-name: AssessmentTarget
       x-cfn-type-name: AWS::Inspector::AssessmentTarget
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -701,8 +701,7 @@ components:
       id: awscc.inspector.assessment_targets_list_only
       x-cfn-schema-name: AssessmentTarget
       x-cfn-type-name: AWS::Inspector::AssessmentTarget
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -732,7 +731,7 @@ components:
       id: awscc.inspector.assessment_templates
       x-cfn-schema-name: AssessmentTemplate
       x-cfn-type-name: AWS::Inspector::AssessmentTemplate
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -811,8 +810,7 @@ components:
       id: awscc.inspector.assessment_templates_list_only
       x-cfn-schema-name: AssessmentTemplate
       x-cfn-type-name: AWS::Inspector::AssessmentTemplate
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/inspectorv2.yaml b/openapi/src/awscc/v00.00.00000/services/inspectorv2.yaml
index e9ae68bbd..819e71a51 100644
--- a/openapi/src/awscc/v00.00.00000/services/inspectorv2.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/inspectorv2.yaml
@@ -788,6 +788,22 @@ components:
         projectSelectionScope:
           $ref: '#/components/schemas/ProjectSelectionScope'
       additionalProperties: false
+    CodeSecurityScanConfiguration_CodeSecurityScanConfiguration:
+      type: object
+      required:
+        - ruleSetCategories
+      properties:
+        periodicScanConfiguration:
+          $ref: '#/components/schemas/PeriodicScanConfiguration'
+        continuousIntegrationScanConfiguration:
+          $ref: '#/components/schemas/ContinuousIntegrationScanConfiguration'
+        ruleSetCategories:
+          type: array
+          items:
+            $ref: '#/components/schemas/RuleSetCategory'
+          minItems: 1
+          maxItems: 3
+      additionalProperties: false
     CodeSecurityScanConfiguration:
       type: object
       properties:
@@ -802,7 +818,7 @@ components:
           $ref: '#/components/schemas/ConfigurationLevel'
         Configuration:
           description: Code Security Scan Configuration
-          $ref: '#/components/schemas/CodeSecurityScanConfiguration'
+          $ref: '#/components/schemas/CodeSecurityScanConfiguration_CodeSecurityScanConfiguration'
         ScopeSettings:
           description: Scope Settings
           $ref: '#/components/schemas/ScopeSettings'
@@ -1271,7 +1287,7 @@ components:
               $ref: '#/components/schemas/ConfigurationLevel'
             Configuration:
               description: Code Security Scan Configuration
-              $ref: '#/components/schemas/CodeSecurityScanConfiguration'
+              $ref: '#/components/schemas/CodeSecurityScanConfiguration_CodeSecurityScanConfiguration'
             ScopeSettings:
               description: Scope Settings
               $ref: '#/components/schemas/ScopeSettings'
@@ -1338,7 +1354,7 @@ components:
       id: awscc.inspectorv2.cis_scan_configurations
       x-cfn-schema-name: CisScanConfiguration
       x-cfn-type-name: AWS::InspectorV2::CisScanConfiguration
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -1434,8 +1450,7 @@ components:
       id: awscc.inspectorv2.cis_scan_configurations_list_only
       x-cfn-schema-name: CisScanConfiguration
       x-cfn-type-name: AWS::InspectorV2::CisScanConfiguration
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1465,7 +1480,7 @@ components:
       id: awscc.inspectorv2.code_security_integrations
       x-cfn-schema-name: CodeSecurityIntegration
       x-cfn-type-name: AWS::InspectorV2::CodeSecurityIntegration
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -1571,8 +1586,7 @@ components:
       id: awscc.inspectorv2.code_security_integrations_list_only
       x-cfn-schema-name: CodeSecurityIntegration
       x-cfn-type-name: AWS::InspectorV2::CodeSecurityIntegration
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1602,7 +1616,7 @@ components:
       id: awscc.inspectorv2.code_security_scan_configurations
       x-cfn-schema-name: CodeSecurityScanConfiguration
       x-cfn-type-name: AWS::InspectorV2::CodeSecurityScanConfiguration
-      x-identifiers:
+      x-identifiers: &ref_2
         - Arn
       x-type: cloud_control
       methods:
@@ -1698,8 +1712,7 @@ components:
       id: awscc.inspectorv2.code_security_scan_configurations_list_only
       x-cfn-schema-name: CodeSecurityScanConfiguration
       x-cfn-type-name: AWS::InspectorV2::CodeSecurityScanConfiguration
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1729,7 +1742,7 @@ components:
       id: awscc.inspectorv2.filters
       x-cfn-schema-name: Filter
       x-cfn-type-name: AWS::InspectorV2::Filter
-      x-identifiers:
+      x-identifiers: &ref_3
         - Arn
       x-type: cloud_control
       methods:
@@ -1825,8 +1838,7 @@ components:
       id: awscc.inspectorv2.filters_list_only
       x-cfn-schema-name: Filter
       x-cfn-type-name: AWS::InspectorV2::Filter
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/internetmonitor.yaml b/openapi/src/awscc/v00.00.00000/services/internetmonitor.yaml
index 22dcf21a8..9cbe427a4 100644
--- a/openapi/src/awscc/v00.00.00000/services/internetmonitor.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/internetmonitor.yaml
@@ -710,7 +710,7 @@ components:
       id: awscc.internetmonitor.monitors
       x-cfn-schema-name: Monitor
       x-cfn-type-name: AWS::InternetMonitor::Monitor
-      x-identifiers:
+      x-identifiers: &ref_0
         - MonitorName
       x-type: cloud_control
       methods:
@@ -828,8 +828,7 @@ components:
       id: awscc.internetmonitor.monitors_list_only
       x-cfn-schema-name: Monitor
       x-cfn-type-name: AWS::InternetMonitor::Monitor
-      x-identifiers:
-        - MonitorName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/invoicing.yaml b/openapi/src/awscc/v00.00.00000/services/invoicing.yaml
index 2eb02c2dc..3326419ca 100644
--- a/openapi/src/awscc/v00.00.00000/services/invoicing.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/invoicing.yaml
@@ -555,7 +555,7 @@ components:
       id: awscc.invoicing.invoice_units
       x-cfn-schema-name: InvoiceUnit
       x-cfn-type-name: AWS::Invoicing::InvoiceUnit
-      x-identifiers:
+      x-identifiers: &ref_0
         - InvoiceUnitArn
       x-type: cloud_control
       methods:
@@ -655,8 +655,7 @@ components:
       id: awscc.invoicing.invoice_units_list_only
       x-cfn-schema-name: InvoiceUnit
       x-cfn-type-name: AWS::Invoicing::InvoiceUnit
-      x-identifiers:
-        - InvoiceUnitArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/iot.yaml b/openapi/src/awscc/v00.00.00000/services/iot.yaml
index 9c7253fcb..e6b08ee03 100644
--- a/openapi/src/awscc/v00.00.00000/services/iot.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/iot.yaml
@@ -645,6 +645,25 @@ components:
           - kms:Decrypt
         list:
           - iot:ListAuthorizers
+    BillingGroup_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'Tag key (1-128 chars). No ''aws:'' prefix. Allows: [A-Za-z0-9 _.:/=+-]'
+          minLength: 1
+          maxLength: 128
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+        Value:
+          type: string
+          description: 'Tag value (1-256 chars). No ''aws:'' prefix. Allows: [A-Za-z0-9 _.:/=+-]'
+          minLength: 1
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     BillingGroup:
       type: object
       properties:
@@ -664,7 +683,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/BillingGroup_Tag'
         BillingGroupProperties:
           type: object
           additionalProperties: false
@@ -733,6 +752,24 @@ components:
           pattern: ^[0-9A-Za-z_-]+$
           minLength: 1
           maxLength: 36
+    CACertificate_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 127
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 255
+      required:
+        - Value
+        - Key
     CACertificate:
       type: object
       properties:
@@ -776,7 +813,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/CACertificate_Tag'
       required:
         - CACertificatePem
         - Status
@@ -913,6 +950,24 @@ components:
           - kms:Decrypt
         list:
           - iot:ListCertificates
+    CertificateProvider_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 127
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 255
+      required:
+        - Value
+        - Key
     CertificateProviderOperation:
       type: string
       enum:
@@ -944,7 +999,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/CertificateProvider_Tag'
         Arn:
           type: string
       required:
@@ -1063,6 +1118,24 @@ components:
         ContentType:
           $ref: '#/components/schemas/MimeType'
       additionalProperties: false
+    Command_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: The tag's key.
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: The tag's value.
+          minLength: 1
+          maxLength: 256
+      required:
+        - Value
+        - Key
+      additionalProperties: false
     Command:
       type: object
       properties:
@@ -1114,7 +1187,7 @@ components:
         Tags:
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Command_Tag'
           description: The tags to be associated with the command.
           x-insertionOrder: true
       required:
@@ -1163,6 +1236,24 @@ components:
           - iot:DeleteCommand
         list:
           - iot:ListCommands
+    CustomMetric_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: The tag's key.
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: The tag's value.
+          minLength: 1
+          maxLength: 256
+      required:
+        - Value
+        - Key
+      additionalProperties: false
     CustomMetric:
       type: object
       properties:
@@ -1196,7 +1287,7 @@ components:
           x-insertionOrder: false
           description: An array of key-value pairs to apply to this resource.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/CustomMetric_Tag'
       required:
         - MetricType
       x-stackql-resource-name: custom_metric
@@ -1238,6 +1329,24 @@ components:
           - iot:DeleteCustomMetric
         list:
           - iot:ListCustomMetrics
+    Dimension_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: The tag's key.
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: The tag's value.
+          minLength: 1
+          maxLength: 256
+      required:
+        - Value
+        - Key
+      additionalProperties: false
     Dimension:
       type: object
       properties:
@@ -1270,7 +1379,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Dimension_Tag'
         Arn:
           description: The ARN (Amazon resource name) of the created dimension.
           type: string
@@ -1583,6 +1692,24 @@ components:
           - kms:Decrypt
         list:
           - iot:DescribeEncryptionConfiguration
+    FleetMetric_Tag:
+      description: A key-value pair to associate with a resource
+      type: object
+      properties:
+        Key:
+          type: string
+          description: The tag's key
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: The tag's value
+          minLength: 1
+          maxLength: 256
+      required:
+        - Value
+        - Key
+      additionalProperties: false
     AggregationType:
       description: Aggregation types supported by Fleet Indexing
       type: object
@@ -1652,7 +1779,7 @@ components:
           x-insertionOrder: false
           description: An array of key-value pairs to apply to this resource
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/FleetMetric_Tag'
       required:
         - MetricName
       x-stackql-resource-name: fleet_metric
@@ -1764,53 +1891,9 @@ components:
         - MinNumberOfExecutedThings
         - ThresholdPercentage
     Action:
-      type: object
-      additionalProperties: false
-      properties:
-        CloudwatchAlarm:
-          $ref: '#/components/schemas/CloudwatchAlarmAction'
-        CloudwatchLogs:
-          $ref: '#/components/schemas/CloudwatchLogsAction'
-        CloudwatchMetric:
-          $ref: '#/components/schemas/CloudwatchMetricAction'
-        DynamoDB:
-          $ref: '#/components/schemas/DynamoDBAction'
-        DynamoDBv2:
-          $ref: '#/components/schemas/DynamoDBv2Action'
-        Elasticsearch:
-          $ref: '#/components/schemas/ElasticsearchAction'
-        Firehose:
-          $ref: '#/components/schemas/FirehoseAction'
-        Http:
-          $ref: '#/components/schemas/HttpAction'
-        IotAnalytics:
-          $ref: '#/components/schemas/IotAnalyticsAction'
-        IotEvents:
-          $ref: '#/components/schemas/IotEventsAction'
-        IotSiteWise:
-          $ref: '#/components/schemas/IotSiteWiseAction'
-        Kafka:
-          $ref: '#/components/schemas/KafkaAction'
-        Kinesis:
-          $ref: '#/components/schemas/KinesisAction'
-        Lambda:
-          $ref: '#/components/schemas/LambdaAction'
-        Location:
-          $ref: '#/components/schemas/LocationAction'
-        OpenSearch:
-          $ref: '#/components/schemas/OpenSearchAction'
-        Republish:
-          $ref: '#/components/schemas/RepublishAction'
-        S3:
-          $ref: '#/components/schemas/S3Action'
-        Sns:
-          $ref: '#/components/schemas/SnsAction'
-        Sqs:
-          $ref: '#/components/schemas/SqsAction'
-        StepFunctions:
-          $ref: '#/components/schemas/StepFunctionsAction'
-        Timestream:
-          $ref: '#/components/schemas/TimestreamAction'
+      type: string
+      enum:
+        - CANCEL
     FailureType:
       type: string
       enum:
@@ -1830,7 +1913,10 @@ components:
       minimum: 1
       maximum: 10080
     RoleArn:
+      description: The ARN of an IAM role that grants grants permission to download files from the S3 bucket where the job data/updates are stored. The role must also grant permission for IoT to download the files.
       type: string
+      minLength: 20
+      maxLength: 2048
     ExpiresInSec:
       description: How number (in seconds) pre-signed URLs are valid.
       type: integer
@@ -1871,6 +1957,24 @@ components:
       type: string
       minLength: 1
       maxLength: 1600
+    JobTemplate_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: The tag's key.
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: The tag's value.
+          minLength: 1
+          maxLength: 256
+      required:
+        - Value
+        - Key
+      additionalProperties: false
     JobTemplate:
       type: object
       properties:
@@ -1970,7 +2074,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/JobTemplate_Tag'
       required:
         - JobTemplateId
         - Description
@@ -2088,6 +2192,24 @@ components:
           - iot:GetV2LoggingOptions
         list:
           - iot:GetV2LoggingOptions
+    MitigationAction_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: The tag's key.
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: The tag's value.
+          minLength: 1
+          maxLength: 256
+      required:
+        - Value
+        - Key
+      additionalProperties: false
     ActionParams:
       type: object
       description: The set of parameters for this mitigation action. You can specify only one type of parameter (in other words, you can apply only one action for each defined mitigation action).
@@ -2214,7 +2336,7 @@ components:
           x-insertionOrder: false
           description: An array of key-value pairs to apply to this resource.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/MitigationAction_Tag'
         ActionParams:
           $ref: '#/components/schemas/ActionParams'
         MitigationActionArn:
@@ -2502,6 +2624,26 @@ components:
           - iot:DeleteV2LoggingLevel
         list:
           - iot:ListV2LoggingLevels
+    RoleAlias_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+          minLength: 1
+          maxLength: 127
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+          minLength: 1
+          maxLength: 255
+      required:
+        - Value
+        - Key
     RoleAlias:
       type: object
       properties:
@@ -2530,7 +2672,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/RoleAlias_Tag'
       required:
         - RoleArn
       x-stackql-resource-name: role_alias
@@ -2584,6 +2726,24 @@ components:
           - kms:Decrypt
         list:
           - iot:ListRoleAliases
+    ScheduledAudit_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: The tag's key.
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: The tag's value.
+          minLength: 1
+          maxLength: 256
+      required:
+        - Value
+        - Key
+      additionalProperties: false
     ScheduledAudit:
       type: object
       properties:
@@ -2636,7 +2796,7 @@ components:
           x-insertionOrder: false
           description: An array of key-value pairs to apply to this resource.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ScheduledAudit_Tag'
       required:
         - Frequency
         - TargetCheckNames
@@ -2877,6 +3037,24 @@ components:
       required:
         - Metric
       additionalProperties: false
+    SecurityProfile_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: The tag's key.
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: The tag's value.
+          minLength: 1
+          maxLength: 256
+      required:
+        - Value
+        - Key
+      additionalProperties: false
     SecurityProfile:
       type: object
       properties:
@@ -2937,7 +3115,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/SecurityProfile_Tag'
         TargetArns:
           description: A set of target ARNs that the security profile is attached to.
           type: array
@@ -2996,6 +3174,25 @@ components:
           - iot:DeleteSecurityProfile
         list:
           - iot:ListSecurityProfiles
+    SoftwarePackage_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     SoftwarePackage:
       type: object
       properties:
@@ -3018,7 +3215,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/SoftwarePackage_Tag'
       x-stackql-resource-name: software_package
       description: resource definition
       x-type-name: AWS::IoT::SoftwarePackage
@@ -3089,6 +3286,25 @@ components:
           minLength: 1
           pattern: ^[^\p{C}]+$
       additionalProperties: false
+    SoftwarePackageVersion_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     Sbom:
       description: The sbom zip archive location of the package version
       type: object
@@ -3164,7 +3380,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/SoftwarePackageVersion_Tag'
         VersionName:
           type: string
           maxLength: 64
@@ -3280,6 +3496,25 @@ components:
         update:
           - iot:UpdateThing
           - iot:DescribeThing
+    ThingGroup_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'Tag key (1-128 chars). No ''aws:'' prefix. Allows: [A-Za-z0-9 _.:/=+-]'
+          minLength: 1
+          maxLength: 128
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+        Value:
+          type: string
+          description: 'Tag value (1-256 chars). No ''aws:'' prefix. Allows: [A-Za-z0-9 _.:/=+-]'
+          minLength: 1
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     ThingGroup:
       type: object
       properties:
@@ -3318,7 +3553,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ThingGroup_Tag'
       x-stackql-resource-name: thing_group
       description: Resource Type definition for AWS::IoT::ThingGroup
       x-type-name: AWS::IoT::ThingGroup
@@ -3364,6 +3599,25 @@ components:
           - iot:UpdateDynamicThingGroup
           - iot:TagResource
           - iot:UntagResource
+    ThingType_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'Tag key (1-128 chars). No ''aws:'' prefix. Allows: [A-Za-z0-9 _.:/=+-]'
+          minLength: 1
+          maxLength: 128
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+        Value:
+          type: string
+          description: 'Tag value (1-256 chars). No ''aws:'' prefix. Allows: [A-Za-z0-9 _.:/=+-]'
+          minLength: 1
+          maxLength: 256
+      required:
+        - Key
+        - Value
     PropagatingAttribute:
       type: object
       additionalProperties: false
@@ -3430,7 +3684,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ThingType_Tag'
       x-stackql-resource-name: thing_type
       description: Resource Type definition for AWS::IoT::ThingType
       x-type-name: AWS::IoT::ThingType
@@ -3482,7 +3736,7 @@ components:
         RuleDisabled:
           type: boolean
         ErrorAction:
-          $ref: '#/components/schemas/Action'
+          $ref: '#/components/schemas/TopicRule_Action'
         Description:
           type: string
         AwsIotSqlVersion:
@@ -3490,12 +3744,60 @@ components:
         Actions:
           type: array
           items:
-            $ref: '#/components/schemas/Action'
+            $ref: '#/components/schemas/TopicRule_Action'
         Sql:
           type: string
       required:
         - Actions
         - Sql
+    TopicRule_Action:
+      type: object
+      additionalProperties: false
+      properties:
+        CloudwatchAlarm:
+          $ref: '#/components/schemas/CloudwatchAlarmAction'
+        CloudwatchLogs:
+          $ref: '#/components/schemas/CloudwatchLogsAction'
+        CloudwatchMetric:
+          $ref: '#/components/schemas/CloudwatchMetricAction'
+        DynamoDB:
+          $ref: '#/components/schemas/DynamoDBAction'
+        DynamoDBv2:
+          $ref: '#/components/schemas/DynamoDBv2Action'
+        Elasticsearch:
+          $ref: '#/components/schemas/ElasticsearchAction'
+        Firehose:
+          $ref: '#/components/schemas/FirehoseAction'
+        Http:
+          $ref: '#/components/schemas/HttpAction'
+        IotAnalytics:
+          $ref: '#/components/schemas/IotAnalyticsAction'
+        IotEvents:
+          $ref: '#/components/schemas/IotEventsAction'
+        IotSiteWise:
+          $ref: '#/components/schemas/IotSiteWiseAction'
+        Kafka:
+          $ref: '#/components/schemas/KafkaAction'
+        Kinesis:
+          $ref: '#/components/schemas/KinesisAction'
+        Lambda:
+          $ref: '#/components/schemas/LambdaAction'
+        Location:
+          $ref: '#/components/schemas/LocationAction'
+        OpenSearch:
+          $ref: '#/components/schemas/OpenSearchAction'
+        Republish:
+          $ref: '#/components/schemas/RepublishAction'
+        S3:
+          $ref: '#/components/schemas/S3Action'
+        Sns:
+          $ref: '#/components/schemas/SnsAction'
+        Sqs:
+          $ref: '#/components/schemas/SqsAction'
+        StepFunctions:
+          $ref: '#/components/schemas/StepFunctionsAction'
+        Timestream:
+          $ref: '#/components/schemas/TimestreamAction'
     CloudwatchAlarmAction:
       type: object
       additionalProperties: false
@@ -4055,6 +4357,8 @@ components:
       required:
         - Value
         - Unit
+    TopicRule_RoleArn:
+      type: string
     TopicRule:
       type: object
       properties:
@@ -4305,7 +4609,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/BillingGroup_Tag'
             BillingGroupProperties:
               type: object
               additionalProperties: false
@@ -4371,7 +4675,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/CACertificate_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateCACertificateRequest
       type: object
@@ -4457,7 +4761,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/CertificateProvider_Tag'
             Arn:
               type: string
           x-stackQL-stringOnly: true
@@ -4525,7 +4829,7 @@ components:
             Tags:
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Command_Tag'
               description: The tags to be associated with the command.
               x-insertionOrder: true
           x-stackQL-stringOnly: true
@@ -4575,7 +4879,7 @@ components:
               x-insertionOrder: false
               description: An array of key-value pairs to apply to this resource.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/CustomMetric_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateCustomMetricRequest
       type: object
@@ -4622,7 +4926,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Dimension_Tag'
             Arn:
               description: The ARN (Amazon resource name) of the created dimension.
               type: string
@@ -4827,7 +5131,7 @@ components:
               x-insertionOrder: false
               description: An array of key-value pairs to apply to this resource
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/FleetMetric_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateFleetMetricRequest
       type: object
@@ -4941,7 +5245,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/JobTemplate_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateJobTemplateRequest
       type: object
@@ -5011,7 +5315,7 @@ components:
               x-insertionOrder: false
               description: An array of key-value pairs to apply to this resource.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/MitigationAction_Tag'
             ActionParams:
               $ref: '#/components/schemas/ActionParams'
             MitigationActionArn:
@@ -5186,7 +5490,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/RoleAlias_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateRoleAliasRequest
       type: object
@@ -5253,7 +5557,7 @@ components:
               x-insertionOrder: false
               description: An array of key-value pairs to apply to this resource.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ScheduledAudit_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateScheduledAuditRequest
       type: object
@@ -5328,7 +5632,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/SecurityProfile_Tag'
             TargetArns:
               description: A set of target ARNs that the security profile is attached to.
               type: array
@@ -5377,7 +5681,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/SoftwarePackage_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateSoftwarePackageRequest
       type: object
@@ -5430,7 +5734,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/SoftwarePackageVersion_Tag'
             VersionName:
               type: string
               maxLength: 64
@@ -5516,7 +5820,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ThingGroup_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateThingGroupRequest
       type: object
@@ -5578,7 +5882,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ThingType_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateThingTypeRequest
       type: object
@@ -5656,7 +5960,7 @@ components:
       id: awscc.iot.account_audit_configurations
       x-cfn-schema-name: AccountAuditConfiguration
       x-cfn-type-name: AWS::IoT::AccountAuditConfiguration
-      x-identifiers:
+      x-identifiers: &ref_0
         - AccountId
       x-type: cloud_control
       methods:
@@ -5748,8 +6052,7 @@ components:
       id: awscc.iot.account_audit_configurations_list_only
       x-cfn-schema-name: AccountAuditConfiguration
       x-cfn-type-name: AWS::IoT::AccountAuditConfiguration
-      x-identifiers:
-        - AccountId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5779,7 +6082,7 @@ components:
       id: awscc.iot.authorizers
       x-cfn-schema-name: Authorizer
       x-cfn-type-name: AWS::IoT::Authorizer
-      x-identifiers:
+      x-identifiers: &ref_1
         - AuthorizerName
       x-type: cloud_control
       methods:
@@ -5881,8 +6184,7 @@ components:
       id: awscc.iot.authorizers_list_only
       x-cfn-schema-name: Authorizer
       x-cfn-type-name: AWS::IoT::Authorizer
-      x-identifiers:
-        - AuthorizerName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5912,7 +6214,7 @@ components:
       id: awscc.iot.billing_groups
       x-cfn-schema-name: BillingGroup
       x-cfn-type-name: AWS::IoT::BillingGroup
-      x-identifiers:
+      x-identifiers: &ref_2
         - BillingGroupName
       x-type: cloud_control
       methods:
@@ -6006,8 +6308,7 @@ components:
       id: awscc.iot.billing_groups_list_only
       x-cfn-schema-name: BillingGroup
       x-cfn-type-name: AWS::IoT::BillingGroup
-      x-identifiers:
-        - BillingGroupName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6037,7 +6338,7 @@ components:
       id: awscc.iot.ca_certificates
       x-cfn-schema-name: CACertificate
       x-cfn-type-name: AWS::IoT::CACertificate
-      x-identifiers:
+      x-identifiers: &ref_3
         - Id
       x-type: cloud_control
       methods:
@@ -6141,8 +6442,7 @@ components:
       id: awscc.iot.ca_certificates_list_only
       x-cfn-schema-name: CACertificate
       x-cfn-type-name: AWS::IoT::CACertificate
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6172,7 +6472,7 @@ components:
       id: awscc.iot.certificates
       x-cfn-schema-name: Certificate
       x-cfn-type-name: AWS::IoT::Certificate
-      x-identifiers:
+      x-identifiers: &ref_4
         - Id
       x-type: cloud_control
       methods:
@@ -6270,8 +6570,7 @@ components:
       id: awscc.iot.certificates_list_only
       x-cfn-schema-name: Certificate
       x-cfn-type-name: AWS::IoT::Certificate
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6301,7 +6600,7 @@ components:
       id: awscc.iot.certificate_providers
       x-cfn-schema-name: CertificateProvider
       x-cfn-type-name: AWS::IoT::CertificateProvider
-      x-identifiers:
+      x-identifiers: &ref_5
         - CertificateProviderName
       x-type: cloud_control
       methods:
@@ -6395,8 +6694,7 @@ components:
       id: awscc.iot.certificate_providers_list_only
       x-cfn-schema-name: CertificateProvider
       x-cfn-type-name: AWS::IoT::CertificateProvider
-      x-identifiers:
-        - CertificateProviderName
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6426,7 +6724,7 @@ components:
       id: awscc.iot.commands
       x-cfn-schema-name: Command
       x-cfn-type-name: AWS::IoT::Command
-      x-identifiers:
+      x-identifiers: &ref_6
         - CommandId
       x-type: cloud_control
       methods:
@@ -6536,8 +6834,7 @@ components:
       id: awscc.iot.commands_list_only
       x-cfn-schema-name: Command
       x-cfn-type-name: AWS::IoT::Command
-      x-identifiers:
-        - CommandId
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6567,7 +6864,7 @@ components:
       id: awscc.iot.custom_metrics
       x-cfn-schema-name: CustomMetric
       x-cfn-type-name: AWS::IoT::CustomMetric
-      x-identifiers:
+      x-identifiers: &ref_7
         - MetricName
       x-type: cloud_control
       methods:
@@ -6661,8 +6958,7 @@ components:
       id: awscc.iot.custom_metrics_list_only
       x-cfn-schema-name: CustomMetric
       x-cfn-type-name: AWS::IoT::CustomMetric
-      x-identifiers:
-        - MetricName
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6692,7 +6988,7 @@ components:
       id: awscc.iot.dimensions
       x-cfn-schema-name: Dimension
       x-cfn-type-name: AWS::IoT::Dimension
-      x-identifiers:
+      x-identifiers: &ref_8
         - Name
       x-type: cloud_control
       methods:
@@ -6786,8 +7082,7 @@ components:
       id: awscc.iot.dimensions_list_only
       x-cfn-schema-name: Dimension
       x-cfn-type-name: AWS::IoT::Dimension
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6817,7 +7112,7 @@ components:
       id: awscc.iot.domain_configurations
       x-cfn-schema-name: DomainConfiguration
       x-cfn-type-name: AWS::IoT::DomainConfiguration
-      x-identifiers:
+      x-identifiers: &ref_9
         - DomainConfigurationName
       x-type: cloud_control
       methods:
@@ -6933,8 +7228,7 @@ components:
       id: awscc.iot.domain_configurations_list_only
       x-cfn-schema-name: DomainConfiguration
       x-cfn-type-name: AWS::IoT::DomainConfiguration
-      x-identifiers:
-        - DomainConfigurationName
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6964,7 +7258,7 @@ components:
       id: awscc.iot.encryption_configurations
       x-cfn-schema-name: EncryptionConfiguration
       x-cfn-type-name: AWS::IoT::EncryptionConfiguration
-      x-identifiers:
+      x-identifiers: &ref_10
         - AccountId
       x-type: cloud_control
       methods:
@@ -7060,8 +7354,7 @@ components:
       id: awscc.iot.encryption_configurations_list_only
       x-cfn-schema-name: EncryptionConfiguration
       x-cfn-type-name: AWS::IoT::EncryptionConfiguration
-      x-identifiers:
-        - AccountId
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7091,7 +7384,7 @@ components:
       id: awscc.iot.fleet_metrics
       x-cfn-schema-name: FleetMetric
       x-cfn-type-name: AWS::IoT::FleetMetric
-      x-identifiers:
+      x-identifiers: &ref_11
         - MetricName
       x-type: cloud_control
       methods:
@@ -7203,8 +7496,7 @@ components:
       id: awscc.iot.fleet_metrics_list_only
       x-cfn-schema-name: FleetMetric
       x-cfn-type-name: AWS::IoT::FleetMetric
-      x-identifiers:
-        - MetricName
+      x-identifiers: *ref_11
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7234,7 +7526,7 @@ components:
       id: awscc.iot.job_templates
       x-cfn-schema-name: JobTemplate
       x-cfn-type-name: AWS::IoT::JobTemplate
-      x-identifiers:
+      x-identifiers: &ref_12
         - JobTemplateId
       x-type: cloud_control
       methods:
@@ -7329,8 +7621,7 @@ components:
       id: awscc.iot.job_templates_list_only
       x-cfn-schema-name: JobTemplate
       x-cfn-type-name: AWS::IoT::JobTemplate
-      x-identifiers:
-        - JobTemplateId
+      x-identifiers: *ref_12
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7360,7 +7651,7 @@ components:
       id: awscc.iot.loggings
       x-cfn-schema-name: Logging
       x-cfn-type-name: AWS::IoT::Logging
-      x-identifiers:
+      x-identifiers: &ref_13
         - AccountId
       x-type: cloud_control
       methods:
@@ -7450,8 +7741,7 @@ components:
       id: awscc.iot.loggings_list_only
       x-cfn-schema-name: Logging
       x-cfn-type-name: AWS::IoT::Logging
-      x-identifiers:
-        - AccountId
+      x-identifiers: *ref_13
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7481,7 +7771,7 @@ components:
       id: awscc.iot.mitigation_actions
       x-cfn-schema-name: MitigationAction
       x-cfn-type-name: AWS::IoT::MitigationAction
-      x-identifiers:
+      x-identifiers: &ref_14
         - ActionName
       x-type: cloud_control
       methods:
@@ -7577,8 +7867,7 @@ components:
       id: awscc.iot.mitigation_actions_list_only
       x-cfn-schema-name: MitigationAction
       x-cfn-type-name: AWS::IoT::MitigationAction
-      x-identifiers:
-        - ActionName
+      x-identifiers: *ref_14
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7608,7 +7897,7 @@ components:
       id: awscc.iot.policies
       x-cfn-schema-name: Policy
       x-cfn-type-name: AWS::IoT::Policy
-      x-identifiers:
+      x-identifiers: &ref_15
         - Id
       x-type: cloud_control
       methods:
@@ -7702,8 +7991,7 @@ components:
       id: awscc.iot.policies_list_only
       x-cfn-schema-name: Policy
       x-cfn-type-name: AWS::IoT::Policy
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_15
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7733,7 +8021,7 @@ components:
       id: awscc.iot.provisioning_templates
       x-cfn-schema-name: ProvisioningTemplate
       x-cfn-type-name: AWS::IoT::ProvisioningTemplate
-      x-identifiers:
+      x-identifiers: &ref_16
         - TemplateName
       x-type: cloud_control
       methods:
@@ -7835,8 +8123,7 @@ components:
       id: awscc.iot.provisioning_templates_list_only
       x-cfn-schema-name: ProvisioningTemplate
       x-cfn-type-name: AWS::IoT::ProvisioningTemplate
-      x-identifiers:
-        - TemplateName
+      x-identifiers: *ref_16
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7866,7 +8153,7 @@ components:
       id: awscc.iot.resource_specific_loggings
       x-cfn-schema-name: ResourceSpecificLogging
       x-cfn-type-name: AWS::IoT::ResourceSpecificLogging
-      x-identifiers:
+      x-identifiers: &ref_17
         - TargetId
       x-type: cloud_control
       methods:
@@ -7958,8 +8245,7 @@ components:
       id: awscc.iot.resource_specific_loggings_list_only
       x-cfn-schema-name: ResourceSpecificLogging
       x-cfn-type-name: AWS::IoT::ResourceSpecificLogging
-      x-identifiers:
-        - TargetId
+      x-identifiers: *ref_17
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7989,7 +8275,7 @@ components:
       id: awscc.iot.role_aliases
       x-cfn-schema-name: RoleAlias
       x-cfn-type-name: AWS::IoT::RoleAlias
-      x-identifiers:
+      x-identifiers: &ref_18
         - RoleAlias
       x-type: cloud_control
       methods:
@@ -8083,8 +8369,7 @@ components:
       id: awscc.iot.role_aliases_list_only
       x-cfn-schema-name: RoleAlias
       x-cfn-type-name: AWS::IoT::RoleAlias
-      x-identifiers:
-        - RoleAlias
+      x-identifiers: *ref_18
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -8114,7 +8399,7 @@ components:
       id: awscc.iot.scheduled_audits
       x-cfn-schema-name: ScheduledAudit
       x-cfn-type-name: AWS::IoT::ScheduledAudit
-      x-identifiers:
+      x-identifiers: &ref_19
         - ScheduledAuditName
       x-type: cloud_control
       methods:
@@ -8212,8 +8497,7 @@ components:
       id: awscc.iot.scheduled_audits_list_only
       x-cfn-schema-name: ScheduledAudit
       x-cfn-type-name: AWS::IoT::ScheduledAudit
-      x-identifiers:
-        - ScheduledAuditName
+      x-identifiers: *ref_19
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -8243,7 +8527,7 @@ components:
       id: awscc.iot.security_profiles
       x-cfn-schema-name: SecurityProfile
       x-cfn-type-name: AWS::IoT::SecurityProfile
-      x-identifiers:
+      x-identifiers: &ref_20
         - SecurityProfileName
       x-type: cloud_control
       methods:
@@ -8345,8 +8629,7 @@ components:
       id: awscc.iot.security_profiles_list_only
       x-cfn-schema-name: SecurityProfile
       x-cfn-type-name: AWS::IoT::SecurityProfile
-      x-identifiers:
-        - SecurityProfileName
+      x-identifiers: *ref_20
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -8376,7 +8659,7 @@ components:
       id: awscc.iot.software_packages
       x-cfn-schema-name: SoftwarePackage
       x-cfn-type-name: AWS::IoT::SoftwarePackage
-      x-identifiers:
+      x-identifiers: &ref_21
         - PackageName
       x-type: cloud_control
       methods:
@@ -8468,8 +8751,7 @@ components:
       id: awscc.iot.software_packages_list_only
       x-cfn-schema-name: SoftwarePackage
       x-cfn-type-name: AWS::IoT::SoftwarePackage
-      x-identifiers:
-        - PackageName
+      x-identifiers: *ref_21
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -8499,7 +8781,7 @@ components:
       id: awscc.iot.software_package_versions
       x-cfn-schema-name: SoftwarePackageVersion
       x-cfn-type-name: AWS::IoT::SoftwarePackageVersion
-      x-identifiers:
+      x-identifiers: &ref_22
         - PackageName
         - VersionName
       x-type: cloud_control
@@ -8608,9 +8890,7 @@ components:
       id: awscc.iot.software_package_versions_list_only
       x-cfn-schema-name: SoftwarePackageVersion
       x-cfn-type-name: AWS::IoT::SoftwarePackageVersion
-      x-identifiers:
-        - PackageName
-        - VersionName
+      x-identifiers: *ref_22
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -8642,7 +8922,7 @@ components:
       id: awscc.iot.things
       x-cfn-schema-name: Thing
       x-cfn-type-name: AWS::IoT::Thing
-      x-identifiers:
+      x-identifiers: &ref_23
         - ThingName
       x-type: cloud_control
       methods:
@@ -8734,8 +9014,7 @@ components:
       id: awscc.iot.things_list_only
       x-cfn-schema-name: Thing
       x-cfn-type-name: AWS::IoT::Thing
-      x-identifiers:
-        - ThingName
+      x-identifiers: *ref_23
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -8765,7 +9044,7 @@ components:
       id: awscc.iot.thing_groups
       x-cfn-schema-name: ThingGroup
       x-cfn-type-name: AWS::IoT::ThingGroup
-      x-identifiers:
+      x-identifiers: &ref_24
         - ThingGroupName
       x-type: cloud_control
       methods:
@@ -8863,8 +9142,7 @@ components:
       id: awscc.iot.thing_groups_list_only
       x-cfn-schema-name: ThingGroup
       x-cfn-type-name: AWS::IoT::ThingGroup
-      x-identifiers:
-        - ThingGroupName
+      x-identifiers: *ref_24
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -8894,7 +9172,7 @@ components:
       id: awscc.iot.thing_types
       x-cfn-schema-name: ThingType
       x-cfn-type-name: AWS::IoT::ThingType
-      x-identifiers:
+      x-identifiers: &ref_25
         - ThingTypeName
       x-type: cloud_control
       methods:
@@ -8990,8 +9268,7 @@ components:
       id: awscc.iot.thing_types_list_only
       x-cfn-schema-name: ThingType
       x-cfn-type-name: AWS::IoT::ThingType
-      x-identifiers:
-        - ThingTypeName
+      x-identifiers: *ref_25
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -9021,7 +9298,7 @@ components:
       id: awscc.iot.topic_rules
       x-cfn-schema-name: TopicRule
       x-cfn-type-name: AWS::IoT::TopicRule
-      x-identifiers:
+      x-identifiers: &ref_26
         - RuleName
       x-type: cloud_control
       methods:
@@ -9113,8 +9390,7 @@ components:
       id: awscc.iot.topic_rules_list_only
       x-cfn-schema-name: TopicRule
       x-cfn-type-name: AWS::IoT::TopicRule
-      x-identifiers:
-        - RuleName
+      x-identifiers: *ref_26
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -9144,7 +9420,7 @@ components:
       id: awscc.iot.topic_rule_destinations
       x-cfn-schema-name: TopicRuleDestination
       x-cfn-type-name: AWS::IoT::TopicRuleDestination
-      x-identifiers:
+      x-identifiers: &ref_27
         - Arn
       x-type: cloud_control
       methods:
@@ -9238,8 +9514,7 @@ components:
       id: awscc.iot.topic_rule_destinations_list_only
       x-cfn-schema-name: TopicRuleDestination
       x-cfn-type-name: AWS::IoT::TopicRuleDestination
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_27
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/iotanalytics.yaml b/openapi/src/awscc/v00.00.00000/services/iotanalytics.yaml
index cf5732ae5..511f055b5 100644
--- a/openapi/src/awscc/v00.00.00000/services/iotanalytics.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/iotanalytics.yaml
@@ -396,7 +396,7 @@ components:
       properties:
         Bucket:
           type: string
-          pattern: '[a-zA-Z0-9.\-_]*'
+          pattern: ^[a-zA-Z0-9.\-_]*$
           minLength: 3
           maxLength: 255
         RoleArn:
@@ -405,7 +405,7 @@ components:
           maxLength: 2048
         KeyPrefix:
           type: string
-          pattern: '[a-zA-Z0-9!_.*''()/{}:-]*/'
+          pattern: ^[a-zA-Z0-9!_.*'()/{}:-]*/$
           minLength: 1
           maxLength: 255
       required:
@@ -449,24 +449,50 @@ components:
           type: boolean
     Channel:
       type: object
-      additionalProperties: false
       properties:
+        ChannelStorage:
+          $ref: '#/components/schemas/ChannelStorage'
         ChannelName:
           type: string
-          pattern: '[a-zA-Z0-9_]+'
-          minLength: 1
-          maxLength: 128
-        Next:
-          type: string
+          pattern: (^(?!_{2}))(^[a-zA-Z0-9_]+$)
           minLength: 1
           maxLength: 128
-        Name:
+        Id:
           type: string
-          minLength: 1
-          maxLength: 128
-      required:
+        RetentionPeriod:
+          $ref: '#/components/schemas/RetentionPeriod'
+        Tags:
+          type: array
+          uniqueItems: false
+          x-insertionOrder: false
+          minItems: 1
+          maxItems: 50
+          items:
+            $ref: '#/components/schemas/Tag'
+      x-stackql-resource-name: channel
+      description: Resource Type definition for AWS::IoTAnalytics::Channel
+      x-type-name: AWS::IoTAnalytics::Channel
+      x-stackql-primary-identifier:
         - ChannelName
-        - Name
+      x-create-only-properties:
+        - ChannelName
+      x-read-only-properties:
+        - Id
+      x-taggable: true
+      x-required-permissions:
+        create:
+          - iotanalytics:CreateChannel
+        read:
+          - iotanalytics:DescribeChannel
+          - iotanalytics:ListTagsForResource
+        update:
+          - iotanalytics:UpdateChannel
+          - iotanalytics:TagResource
+          - iotanalytics:UntagResource
+        delete:
+          - iotanalytics:DeleteChannel
+        list:
+          - iotanalytics:ListChannels
     DatasetContentVersionValue:
       type: object
       additionalProperties: false
@@ -667,21 +693,8 @@ components:
       type: object
       additionalProperties: false
       properties:
-        Filter:
-          type: string
-          minLength: 1
-          maxLength: 256
-        Next:
-          type: string
-          minLength: 1
-          maxLength: 128
-        Name:
-          type: string
-          minLength: 1
-          maxLength: 128
-      required:
-        - Filter
-        - Name
+        DeltaTime:
+          $ref: '#/components/schemas/DeltaTime'
     OutputFileUriValue:
       type: object
       additionalProperties: false
@@ -837,7 +850,7 @@ components:
         ServiceManagedS3:
           $ref: '#/components/schemas/ServiceManagedS3'
         CustomerManagedS3:
-          $ref: '#/components/schemas/CustomerManagedS3'
+          $ref: '#/components/schemas/Datastore_CustomerManagedS3'
         IotSiteWiseMultiLayerStorage:
           $ref: '#/components/schemas/IotSiteWiseMultiLayerStorage'
     SchemaDefinition:
@@ -880,6 +893,27 @@ components:
       required:
         - Type
         - Name
+    Datastore_CustomerManagedS3:
+      type: object
+      additionalProperties: false
+      properties:
+        Bucket:
+          type: string
+          pattern: '[a-zA-Z0-9.\-_]*'
+          minLength: 3
+          maxLength: 255
+        RoleArn:
+          type: string
+          minLength: 20
+          maxLength: 2048
+        KeyPrefix:
+          type: string
+          pattern: '[a-zA-Z0-9!_.*''()/{}:-]*/'
+          minLength: 1
+          maxLength: 255
+      required:
+        - Bucket
+        - RoleArn
     IotSiteWiseMultiLayerStorage:
       type: object
       additionalProperties: false
@@ -945,20 +979,54 @@ components:
         - AttributeName
     Datastore:
       type: object
-      additionalProperties: false
       properties:
+        DatastoreStorage:
+          $ref: '#/components/schemas/DatastoreStorage'
         DatastoreName:
           type: string
           pattern: '[a-zA-Z0-9_]+'
           minLength: 1
           maxLength: 128
-        Name:
+        DatastorePartitions:
+          $ref: '#/components/schemas/DatastorePartitions'
+        Id:
           type: string
-          minLength: 1
-          maxLength: 128
-      required:
+        FileFormatConfiguration:
+          $ref: '#/components/schemas/FileFormatConfiguration'
+        RetentionPeriod:
+          $ref: '#/components/schemas/RetentionPeriod'
+        Tags:
+          type: array
+          uniqueItems: false
+          x-insertionOrder: false
+          minItems: 1
+          maxItems: 50
+          items:
+            $ref: '#/components/schemas/Tag'
+      x-stackql-resource-name: datastore
+      description: Resource Type definition for AWS::IoTAnalytics::Datastore
+      x-type-name: AWS::IoTAnalytics::Datastore
+      x-stackql-primary-identifier:
         - DatastoreName
-        - Name
+      x-create-only-properties:
+        - DatastoreName
+      x-read-only-properties:
+        - Id
+      x-taggable: true
+      x-required-permissions:
+        create:
+          - iotanalytics:CreateDatastore
+        read:
+          - iotanalytics:DescribeDatastore
+          - iotanalytics:ListTagsForResource
+        update:
+          - iotanalytics:UpdateDatastore
+          - iotanalytics:TagResource
+          - iotanalytics:UntagResource
+        delete:
+          - iotanalytics:DeleteDatastore
+        list:
+          - iotanalytics:ListDatastores
     Activity:
       type: object
       additionalProperties: false
@@ -966,13 +1034,13 @@ components:
         SelectAttributes:
           $ref: '#/components/schemas/SelectAttributes'
         Datastore:
-          $ref: '#/components/schemas/Datastore'
+          $ref: '#/components/schemas/Pipeline_Datastore'
         Filter:
-          $ref: '#/components/schemas/Filter'
+          $ref: '#/components/schemas/Pipeline_Filter'
         AddAttributes:
           $ref: '#/components/schemas/AddAttributes'
         Channel:
-          $ref: '#/components/schemas/Channel'
+          $ref: '#/components/schemas/Pipeline_Channel'
         DeviceShadowEnrich:
           $ref: '#/components/schemas/DeviceShadowEnrich'
         Math:
@@ -1012,6 +1080,25 @@ components:
         - ThingName
         - RoleArn
         - Name
+    Pipeline_Filter:
+      type: object
+      additionalProperties: false
+      properties:
+        Filter:
+          type: string
+          minLength: 1
+          maxLength: 256
+        Next:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Name:
+          type: string
+          minLength: 1
+          maxLength: 128
+      required:
+        - Filter
+        - Name
     RemoveAttributes:
       type: object
       additionalProperties: false
@@ -1037,6 +1124,42 @@ components:
       required:
         - Attributes
         - Name
+    Pipeline_Datastore:
+      type: object
+      additionalProperties: false
+      properties:
+        DatastoreName:
+          type: string
+          pattern: '[a-zA-Z0-9_]+'
+          minLength: 1
+          maxLength: 128
+        Name:
+          type: string
+          minLength: 1
+          maxLength: 128
+      required:
+        - DatastoreName
+        - Name
+    Pipeline_Channel:
+      type: object
+      additionalProperties: false
+      properties:
+        ChannelName:
+          type: string
+          pattern: '[a-zA-Z0-9_]+'
+          minLength: 1
+          maxLength: 128
+        Next:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Name:
+          type: string
+          minLength: 1
+          maxLength: 128
+      required:
+        - ChannelName
+        - Name
     SelectAttributes:
       type: object
       additionalProperties: false
@@ -1219,6 +1342,42 @@ components:
           - iotanalytics:DeletePipeline
         list:
           - iotanalytics:ListPipelines
+    CreateChannelRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            ChannelStorage:
+              $ref: '#/components/schemas/ChannelStorage'
+            ChannelName:
+              type: string
+              pattern: (^(?!_{2}))(^[a-zA-Z0-9_]+$)
+              minLength: 1
+              maxLength: 128
+            Id:
+              type: string
+            RetentionPeriod:
+              $ref: '#/components/schemas/RetentionPeriod'
+            Tags:
+              type: array
+              uniqueItems: false
+              x-insertionOrder: false
+              minItems: 1
+              maxItems: 50
+              items:
+                $ref: '#/components/schemas/Tag'
+          x-stackQL-stringOnly: true
+      x-title: CreateChannelRequest
+      type: object
+      required: []
     CreateDatasetRequest:
       properties:
         ClientToken:
@@ -1287,6 +1446,46 @@ components:
       x-title: CreateDatasetRequest
       type: object
       required: []
+    CreateDatastoreRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            DatastoreStorage:
+              $ref: '#/components/schemas/DatastoreStorage'
+            DatastoreName:
+              type: string
+              pattern: '[a-zA-Z0-9_]+'
+              minLength: 1
+              maxLength: 128
+            DatastorePartitions:
+              $ref: '#/components/schemas/DatastorePartitions'
+            Id:
+              type: string
+            FileFormatConfiguration:
+              $ref: '#/components/schemas/FileFormatConfiguration'
+            RetentionPeriod:
+              $ref: '#/components/schemas/RetentionPeriod'
+            Tags:
+              type: array
+              uniqueItems: false
+              x-insertionOrder: false
+              minItems: 1
+              maxItems: 50
+              items:
+                $ref: '#/components/schemas/Tag'
+          x-stackQL-stringOnly: true
+      x-title: CreateDatastoreRequest
+      type: object
+      required: []
     CreatePipelineRequest:
       properties:
         ClientToken:
@@ -1335,12 +1534,136 @@ components:
       description: Amazon Signature authorization v4
       x-amazon-apigateway-authtype: awsSigv4
   x-stackQL-resources:
+    channels:
+      name: channels
+      id: awscc.iotanalytics.channels
+      x-cfn-schema-name: Channel
+      x-cfn-type-name: AWS::IoTAnalytics::Channel
+      x-identifiers: &ref_0
+        - ChannelName
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Channel&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::IoTAnalytics::Channel"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::IoTAnalytics::Channel"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::IoTAnalytics::Channel"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/channels/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/channels/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/channels/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.ChannelStorage') as channel_storage,
+              JSON_EXTRACT(Properties, '$.ChannelName') as channel_name,
+              JSON_EXTRACT(Properties, '$.Id') as id,
+              JSON_EXTRACT(Properties, '$.RetentionPeriod') as retention_period,
+              JSON_EXTRACT(Properties, '$.Tags') as tags
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTAnalytics::Channel'
+              AND Identifier = '<ChannelName>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'ChannelStorage') as channel_storage,
+                json_extract_path_text(Properties, 'ChannelName') as channel_name,
+                json_extract_path_text(Properties, 'Id') as id,
+                json_extract_path_text(Properties, 'RetentionPeriod') as retention_period,
+                json_extract_path_text(Properties, 'Tags') as tags
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTAnalytics::Channel'
+                AND Identifier = '<ChannelName>'
+                AND region = 'us-east-1'
+    channels_list_only:
+      name: channels_list_only
+      id: awscc.iotanalytics.channels_list_only
+      x-cfn-schema-name: Channel
+      x-cfn-type-name: AWS::IoTAnalytics::Channel
+      x-identifiers: *ref_0
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.ChannelName') as channel_name
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTAnalytics::Channel'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'ChannelName') as channel_name
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTAnalytics::Channel'
+                AND region = 'us-east-1'
     datasets:
       name: datasets
       id: awscc.iotanalytics.datasets
       x-cfn-schema-name: Dataset
       x-cfn-type-name: AWS::IoTAnalytics::Dataset
-      x-identifiers:
+      x-identifiers: &ref_1
         - DatasetName
       x-type: cloud_control
       methods:
@@ -1442,8 +1765,7 @@ components:
       id: awscc.iotanalytics.datasets_list_only
       x-cfn-schema-name: Dataset
       x-cfn-type-name: AWS::IoTAnalytics::Dataset
-      x-identifiers:
-        - DatasetName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1468,12 +1790,140 @@ components:
                 json_extract_path_text(Properties, 'DatasetName') as dataset_name
                 FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTAnalytics::Dataset'
                 AND region = 'us-east-1'
+    datastores:
+      name: datastores
+      id: awscc.iotanalytics.datastores
+      x-cfn-schema-name: Datastore
+      x-cfn-type-name: AWS::IoTAnalytics::Datastore
+      x-identifiers: &ref_2
+        - DatastoreName
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Datastore&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::IoTAnalytics::Datastore"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::IoTAnalytics::Datastore"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::IoTAnalytics::Datastore"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/datastores/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/datastores/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/datastores/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.DatastoreStorage') as datastore_storage,
+              JSON_EXTRACT(Properties, '$.DatastoreName') as datastore_name,
+              JSON_EXTRACT(Properties, '$.DatastorePartitions') as datastore_partitions,
+              JSON_EXTRACT(Properties, '$.Id') as id,
+              JSON_EXTRACT(Properties, '$.FileFormatConfiguration') as file_format_configuration,
+              JSON_EXTRACT(Properties, '$.RetentionPeriod') as retention_period,
+              JSON_EXTRACT(Properties, '$.Tags') as tags
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTAnalytics::Datastore'
+              AND Identifier = '<DatastoreName>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'DatastoreStorage') as datastore_storage,
+                json_extract_path_text(Properties, 'DatastoreName') as datastore_name,
+                json_extract_path_text(Properties, 'DatastorePartitions') as datastore_partitions,
+                json_extract_path_text(Properties, 'Id') as id,
+                json_extract_path_text(Properties, 'FileFormatConfiguration') as file_format_configuration,
+                json_extract_path_text(Properties, 'RetentionPeriod') as retention_period,
+                json_extract_path_text(Properties, 'Tags') as tags
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTAnalytics::Datastore'
+                AND Identifier = '<DatastoreName>'
+                AND region = 'us-east-1'
+    datastores_list_only:
+      name: datastores_list_only
+      id: awscc.iotanalytics.datastores_list_only
+      x-cfn-schema-name: Datastore
+      x-cfn-type-name: AWS::IoTAnalytics::Datastore
+      x-identifiers: *ref_2
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.DatastoreName') as datastore_name
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTAnalytics::Datastore'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'DatastoreName') as datastore_name
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTAnalytics::Datastore'
+                AND region = 'us-east-1'
     pipelines:
       name: pipelines
       id: awscc.iotanalytics.pipelines
       x-cfn-schema-name: Pipeline
       x-cfn-type-name: AWS::IoTAnalytics::Pipeline
-      x-identifiers:
+      x-identifiers: &ref_3
         - PipelineName
       x-type: cloud_control
       methods:
@@ -1565,8 +2015,7 @@ components:
       id: awscc.iotanalytics.pipelines_list_only
       x-cfn-schema-name: Pipeline
       x-cfn-type-name: AWS::IoTAnalytics::Pipeline
-      x-identifiers:
-        - PipelineName
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1735,6 +2184,48 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
+  /?Action=CreateResource&Version=2021-09-30&__Channel&__detailTransformed=true:
+    parameters:
+      - $ref: '#/components/parameters/X-Amz-Content-Sha256'
+      - $ref: '#/components/parameters/X-Amz-Date'
+      - $ref: '#/components/parameters/X-Amz-Algorithm'
+      - $ref: '#/components/parameters/X-Amz-Credential'
+      - $ref: '#/components/parameters/X-Amz-Security-Token'
+      - $ref: '#/components/parameters/X-Amz-Signature'
+      - $ref: '#/components/parameters/X-Amz-SignedHeaders'
+    post:
+      operationId: CreateChannel
+      parameters:
+        - description: Action Header
+          in: header
+          name: X-Amz-Target
+          required: false
+          schema:
+            default: CloudApiService.CreateResource
+            enum:
+              - CloudApiService.CreateResource
+            type: string
+        - in: header
+          name: Content-Type
+          required: false
+          schema:
+            default: application/x-amz-json-1.0
+            enum:
+              - application/x-amz-json-1.0
+            type: string
+      requestBody:
+        content:
+          application/x-amz-json-1.0:
+            schema:
+              $ref: '#/components/schemas/CreateChannelRequest'
+        required: true
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
+          description: Success
   /?Action=CreateResource&Version=2021-09-30&__Dataset&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
@@ -1777,6 +2268,48 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
+  /?Action=CreateResource&Version=2021-09-30&__Datastore&__detailTransformed=true:
+    parameters:
+      - $ref: '#/components/parameters/X-Amz-Content-Sha256'
+      - $ref: '#/components/parameters/X-Amz-Date'
+      - $ref: '#/components/parameters/X-Amz-Algorithm'
+      - $ref: '#/components/parameters/X-Amz-Credential'
+      - $ref: '#/components/parameters/X-Amz-Security-Token'
+      - $ref: '#/components/parameters/X-Amz-Signature'
+      - $ref: '#/components/parameters/X-Amz-SignedHeaders'
+    post:
+      operationId: CreateDatastore
+      parameters:
+        - description: Action Header
+          in: header
+          name: X-Amz-Target
+          required: false
+          schema:
+            default: CloudApiService.CreateResource
+            enum:
+              - CloudApiService.CreateResource
+            type: string
+        - in: header
+          name: Content-Type
+          required: false
+          schema:
+            default: application/x-amz-json-1.0
+            enum:
+              - application/x-amz-json-1.0
+            type: string
+      requestBody:
+        content:
+          application/x-amz-json-1.0:
+            schema:
+              $ref: '#/components/schemas/CreateDatastoreRequest'
+        required: true
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
+          description: Success
   /?Action=CreateResource&Version=2021-09-30&__Pipeline&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
diff --git a/openapi/src/awscc/v00.00.00000/services/iotcoredeviceadvisor.yaml b/openapi/src/awscc/v00.00.00000/services/iotcoredeviceadvisor.yaml
index 82129f600..349478d92 100644
--- a/openapi/src/awscc/v00.00.00000/services/iotcoredeviceadvisor.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/iotcoredeviceadvisor.yaml
@@ -614,7 +614,7 @@ components:
       id: awscc.iotcoredeviceadvisor.suite_definitions
       x-cfn-schema-name: SuiteDefinition
       x-cfn-type-name: AWS::IoTCoreDeviceAdvisor::SuiteDefinition
-      x-identifiers:
+      x-identifiers: &ref_0
         - SuiteDefinitionId
       x-type: cloud_control
       methods:
@@ -708,8 +708,7 @@ components:
       id: awscc.iotcoredeviceadvisor.suite_definitions_list_only
       x-cfn-schema-name: SuiteDefinition
       x-cfn-type-name: AWS::IoTCoreDeviceAdvisor::SuiteDefinition
-      x-identifiers:
-        - SuiteDefinitionId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/iotevents.yaml b/openapi/src/awscc/v00.00.00000/services/iotevents.yaml
index 794a595c3..8492ffd5e 100644
--- a/openapi/src/awscc/v00.00.00000/services/iotevents.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/iotevents.yaml
@@ -690,8 +690,6 @@ components:
         PropertyValue:
           $ref: '#/components/schemas/AssetPropertyValue'
           description: The value to send to the asset property. This value contains timestamp, quality, and value (TQV) information.
-      required:
-        - PropertyValue
     IotTopicPublish:
       type: object
       additionalProperties: false
@@ -1135,7 +1133,7 @@ components:
           $ref: '#/components/schemas/IotEvents'
           description: Sends ITE input, which passes information about the detector model instance and the event that triggered the action.
         IotSiteWise:
-          $ref: '#/components/schemas/IotSiteWise'
+          $ref: '#/components/schemas/DetectorModel_IotSiteWise'
           description: Sends information about the detector model instance and the event that triggered the action to an asset property in ITSW .
         IotTopicPublish:
           $ref: '#/components/schemas/IotTopicPublish'
@@ -1170,6 +1168,39 @@ components:
           description: The name of the timer to clear.
       required:
         - TimerName
+    DetectorModel_IotSiteWise:
+      type: object
+      additionalProperties: false
+      description: |-
+        Sends information about the detector model instance and the event that triggered the action to a specified asset property in ITSW.
+         You must use expressions for all parameters in ``IotSiteWiseAction``. The expressions accept literals, operators, functions, references, and substitutions templates.
+          **Examples**
+         +  For literal values, the expressions must contain single quotes. For example, the value for the ``propertyAlias`` parameter can be ``'/company/windfarm/3/turbine/7/temperature'``.
+          +  For references, you must specify either variables or input values. For example, the value for the ``assetId`` parameter can be ``$input.TurbineInput.assetId1``.
+          +  For a substitution template, you must use ``${}``, and the template must be in single quotes. A substitution template can also contain a combination of literals, operators, functions, references, and substitution templates.
+         In the following example, the value for the ``propertyAlias`` parameter uses a substitution template. 
+          ``'company/windfarm/${$input.TemperatureInput.sensorData.windfarmID}/turbine/ ${$input.TemperatureInput.sensorData.turbineID}/temperature'`` 
+          
+         You must specify either ``propertyAlias`` or both ``assetId`` and ``propertyId`` to identify the target asset property in ITSW.
+         For more information, see [Expressions](https://docs.aws.amazon.com/iotevents/latest/developerguide/iotevents-expressions.html) in the *Developer Guide*.
+      properties:
+        AssetId:
+          type: string
+          description: The ID of the asset that has the specified property.
+        EntryId:
+          type: string
+          description: A unique identifier for this entry. You can use the entry ID to track which data entry causes an error in case of failure. The default is a new unique identifier.
+        PropertyAlias:
+          type: string
+          description: The alias of the asset property.
+        PropertyId:
+          type: string
+          description: The ID of the asset property.
+        PropertyValue:
+          $ref: '#/components/schemas/AssetPropertyValue'
+          description: The value to send to the asset property. This value contains timestamp, quality, and value (TQV) information.
+      required:
+        - PropertyValue
     ResetTimer:
       type: object
       additionalProperties: false
@@ -1591,7 +1622,7 @@ components:
       id: awscc.iotevents.alarm_models
       x-cfn-schema-name: AlarmModel
       x-cfn-type-name: AWS::IoTEvents::AlarmModel
-      x-identifiers:
+      x-identifiers: &ref_0
         - AlarmModelName
       x-type: cloud_control
       methods:
@@ -1693,8 +1724,7 @@ components:
       id: awscc.iotevents.alarm_models_list_only
       x-cfn-schema-name: AlarmModel
       x-cfn-type-name: AWS::IoTEvents::AlarmModel
-      x-identifiers:
-        - AlarmModelName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1724,7 +1754,7 @@ components:
       id: awscc.iotevents.detector_models
       x-cfn-schema-name: DetectorModel
       x-cfn-type-name: AWS::IoTEvents::DetectorModel
-      x-identifiers:
+      x-identifiers: &ref_1
         - DetectorModelName
       x-type: cloud_control
       methods:
@@ -1822,8 +1852,7 @@ components:
       id: awscc.iotevents.detector_models_list_only
       x-cfn-schema-name: DetectorModel
       x-cfn-type-name: AWS::IoTEvents::DetectorModel
-      x-identifiers:
-        - DetectorModelName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1853,7 +1882,7 @@ components:
       id: awscc.iotevents.inputs
       x-cfn-schema-name: Input
       x-cfn-type-name: AWS::IoTEvents::Input
-      x-identifiers:
+      x-identifiers: &ref_2
         - InputName
       x-type: cloud_control
       methods:
@@ -1945,8 +1974,7 @@ components:
       id: awscc.iotevents.inputs_list_only
       x-cfn-schema-name: Input
       x-cfn-type-name: AWS::IoTEvents::Input
-      x-identifiers:
-        - InputName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/iotfleetwise.yaml b/openapi/src/awscc/v00.00.00000/services/iotfleetwise.yaml
index 4df6be394..e3506ab9b 100644
--- a/openapi/src/awscc/v00.00.00000/services/iotfleetwise.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/iotfleetwise.yaml
@@ -2509,7 +2509,7 @@ components:
       id: awscc.iotfleetwise.campaigns
       x-cfn-schema-name: Campaign
       x-cfn-type-name: AWS::IoTFleetWise::Campaign
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -2639,8 +2639,7 @@ components:
       id: awscc.iotfleetwise.campaigns_list_only
       x-cfn-schema-name: Campaign
       x-cfn-type-name: AWS::IoTFleetWise::Campaign
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2670,7 +2669,7 @@ components:
       id: awscc.iotfleetwise.decoder_manifests
       x-cfn-schema-name: DecoderManifest
       x-cfn-type-name: AWS::IoTFleetWise::DecoderManifest
-      x-identifiers:
+      x-identifiers: &ref_1
         - Name
       x-type: cloud_control
       methods:
@@ -2776,8 +2775,7 @@ components:
       id: awscc.iotfleetwise.decoder_manifests_list_only
       x-cfn-schema-name: DecoderManifest
       x-cfn-type-name: AWS::IoTFleetWise::DecoderManifest
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2807,7 +2805,7 @@ components:
       id: awscc.iotfleetwise.fleets
       x-cfn-schema-name: Fleet
       x-cfn-type-name: AWS::IoTFleetWise::Fleet
-      x-identifiers:
+      x-identifiers: &ref_2
         - Id
       x-type: cloud_control
       methods:
@@ -2905,8 +2903,7 @@ components:
       id: awscc.iotfleetwise.fleets_list_only
       x-cfn-schema-name: Fleet
       x-cfn-type-name: AWS::IoTFleetWise::Fleet
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2936,7 +2933,7 @@ components:
       id: awscc.iotfleetwise.model_manifests
       x-cfn-schema-name: ModelManifest
       x-cfn-type-name: AWS::IoTFleetWise::ModelManifest
-      x-identifiers:
+      x-identifiers: &ref_3
         - Name
       x-type: cloud_control
       methods:
@@ -3038,8 +3035,7 @@ components:
       id: awscc.iotfleetwise.model_manifests_list_only
       x-cfn-schema-name: ModelManifest
       x-cfn-type-name: AWS::IoTFleetWise::ModelManifest
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3069,7 +3065,7 @@ components:
       id: awscc.iotfleetwise.signal_catalogs
       x-cfn-schema-name: SignalCatalog
       x-cfn-type-name: AWS::IoTFleetWise::SignalCatalog
-      x-identifiers:
+      x-identifiers: &ref_4
         - Name
       x-type: cloud_control
       methods:
@@ -3169,8 +3165,7 @@ components:
       id: awscc.iotfleetwise.signal_catalogs_list_only
       x-cfn-schema-name: SignalCatalog
       x-cfn-type-name: AWS::IoTFleetWise::SignalCatalog
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3200,7 +3195,7 @@ components:
       id: awscc.iotfleetwise.state_templates
       x-cfn-schema-name: StateTemplate
       x-cfn-type-name: AWS::IoTFleetWise::StateTemplate
-      x-identifiers:
+      x-identifiers: &ref_5
         - Name
       x-type: cloud_control
       methods:
@@ -3306,8 +3301,7 @@ components:
       id: awscc.iotfleetwise.state_templates_list_only
       x-cfn-schema-name: StateTemplate
       x-cfn-type-name: AWS::IoTFleetWise::StateTemplate
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3337,7 +3331,7 @@ components:
       id: awscc.iotfleetwise.vehicles
       x-cfn-schema-name: Vehicle
       x-cfn-type-name: AWS::IoTFleetWise::Vehicle
-      x-identifiers:
+      x-identifiers: &ref_6
         - Name
       x-type: cloud_control
       methods:
@@ -3441,8 +3435,7 @@ components:
       id: awscc.iotfleetwise.vehicles_list_only
       x-cfn-schema-name: Vehicle
       x-cfn-type-name: AWS::IoTFleetWise::Vehicle
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/iotsitewise.yaml b/openapi/src/awscc/v00.00.00000/services/iotsitewise.yaml
index 44141c2b1..95a7be41f 100644
--- a/openapi/src/awscc/v00.00.00000/services/iotsitewise.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/iotsitewise.yaml
@@ -414,211 +414,22 @@ components:
         arn:
           description: The ARN of the IAM role.
           type: string
-    Portal:
+    AccessPolicy_Portal:
+      description: A portal resource.
       type: object
+      additionalProperties: false
       properties:
-        PortalAuthMode:
-          description: The service to use to authenticate users to the portal. Choose from SSO or IAM. You can't change this value after you create a portal.
-          type: string
-        PortalArn:
-          description: The ARN of the portal, which has the following format.
-          type: string
-        PortalClientId:
-          description: The AWS SSO application generated client ID (used with AWS SSO APIs).
-          type: string
-        PortalContactEmail:
-          description: The AWS administrator's contact email address.
-          type: string
-        PortalDescription:
-          description: A description for the portal.
-          type: string
-        PortalId:
+        id:
           description: The ID of the portal.
           type: string
-        PortalName:
-          description: A friendly name for the portal.
-          type: string
-        PortalStartUrl:
-          description: The public root URL for the AWS IoT AWS IoT SiteWise Monitor application portal.
-          type: string
-        PortalType:
-          description: The type of portal
-          type: string
-          enum:
-            - SITEWISE_PORTAL_V1
-            - SITEWISE_PORTAL_V2
-        PortalTypeConfiguration:
-          $ref: '#/components/schemas/PortalTypeConfiguration'
-        RoleArn:
-          description: The ARN of a service role that allows the portal's users to access your AWS IoT SiteWise resources on your behalf.
-          type: string
-        NotificationSenderEmail:
-          description: The email address that sends alarm notifications.
-          type: string
-        Alarms:
-          type: object
-          description: Contains the configuration information of an alarm created in an AWS IoT SiteWise Monitor portal. You can use the alarm to monitor an asset property and get notified when the asset property value is outside a specified range.
-          additionalProperties: false
-          properties:
-            AlarmRoleArn:
-              type: string
-              description: The ARN of the IAM role that allows the alarm to perform actions and access AWS resources and services, such as AWS IoT Events.
-            NotificationLambdaArn:
-              type: string
-              description: The ARN of the AWS Lambda function that manages alarm notifications. For more information, see Managing alarm notifications in the AWS IoT Events Developer Guide.
-        Tags:
-          description: A list of key-value pairs that contain metadata for the portal.
-          type: array
-          uniqueItems: false
-          x-insertionOrder: false
-          items:
-            $ref: '#/components/schemas/Tag'
-      required:
-        - PortalContactEmail
-        - PortalName
-        - RoleArn
-      x-stackql-resource-name: portal
-      description: Resource schema for AWS::IoTSiteWise::Portal
-      x-type-name: AWS::IoTSiteWise::Portal
-      x-stackql-primary-identifier:
-        - PortalId
-      x-stackql-additional-identifiers:
-        - - PortalArn
-      x-create-only-properties:
-        - PortalAuthMode
-        - PortalType
-      x-read-only-properties:
-        - PortalArn
-        - PortalClientId
-        - PortalId
-        - PortalStartUrl
-      x-required-properties:
-        - PortalContactEmail
-        - PortalName
-        - RoleArn
-      x-tagging:
-        taggable: true
-        tagOnCreate: true
-        tagUpdatable: true
-        cloudFormationSystemTags: true
-        tagProperty: /properties/Tags
-        permissions:
-          - iotsitewise:TagResource
-          - iotsitewise:UntagResource
-          - iotsitewise:ListTagsForResource
-      x-required-permissions:
-        create:
-          - iotsitewise:CreatePortal
-          - iotsitewise:DescribePortal
-          - iotsitewise:ListTagsForResource
-          - iotsitewise:TagResource
-          - iam:PassRole
-          - sso:CreateManagedApplicationInstance
-          - sso:DescribeRegisteredRegions
-        read:
-          - iotsitewise:DescribePortal
-          - iotsitewise:ListTagsForResource
-        update:
-          - iotsitewise:DescribePortal
-          - iotsitewise:ListTagsForResource
-          - iotsitewise:TagResource
-          - iotsitewise:UpdatePortal
-          - iotsitewise:UntagResource
-          - iam:PassRole
-          - sso:GetManagedApplicationInstance
-          - sso:UpdateApplicationInstanceDisplayData
-        delete:
-          - iotsitewise:DescribePortal
-          - iotsitewise:DeletePortal
-          - sso:DeleteManagedApplicationInstance
-        list:
-          - iotsitewise:ListPortals
-          - iotsitewise:ListTagsForResource
-    Project:
+    AccessPolicy_Project:
+      description: A project resource.
       type: object
+      additionalProperties: false
       properties:
-        PortalId:
-          description: The ID of the portal in which to create the project.
-          type: string
-        ProjectId:
+        id:
           description: The ID of the project.
           type: string
-        ProjectName:
-          description: A friendly name for the project.
-          type: string
-        ProjectDescription:
-          description: A description for the project.
-          type: string
-        ProjectArn:
-          description: The ARN of the project.
-          type: string
-        AssetIds:
-          description: The IDs of the assets to be associated to the project.
-          type: array
-          uniqueItems: true
-          items:
-            $ref: '#/components/schemas/AssetId'
-        Tags:
-          description: A list of key-value pairs that contain metadata for the project.
-          type: array
-          uniqueItems: false
-          x-insertionOrder: false
-          items:
-            $ref: '#/components/schemas/Tag'
-      required:
-        - PortalId
-        - ProjectName
-      x-stackql-resource-name: project
-      description: Resource schema for AWS::IoTSiteWise::Project
-      x-type-name: AWS::IoTSiteWise::Project
-      x-stackql-primary-identifier:
-        - ProjectId
-      x-create-only-properties:
-        - PortalId
-      x-read-only-properties:
-        - ProjectId
-        - ProjectArn
-      x-required-properties:
-        - PortalId
-        - ProjectName
-      x-tagging:
-        taggable: true
-        tagOnCreate: true
-        tagUpdatable: true
-        cloudFormationSystemTags: true
-        tagProperty: /properties/Tags
-        permissions:
-          - iotsitewise:TagResource
-          - iotsitewise:UntagResource
-          - iotsitewise:ListTagsForResource
-      x-required-permissions:
-        create:
-          - iotsitewise:CreateProject
-          - iotsitewise:DescribeProject
-          - iotsitewise:ListProjectAssets
-          - iotsitewise:ListTagsForResource
-          - iotsitewise:TagResource
-          - iotsitewise:BatchAssociateProjectAssets
-        read:
-          - iotsitewise:DescribeProject
-          - iotsitewise:ListTagsForResource
-          - iotsitewise:ListProjectAssets
-        update:
-          - iotsitewise:DescribeProject
-          - iotsitewise:UpdateProject
-          - iotsitewise:BatchAssociateProjectAssets
-          - iotsitewise:BatchDisAssociateProjectAssets
-          - iotsitewise:ListProjectAssets
-          - iotsitewise:TagResource
-          - iotsitewise:UntagResource
-          - iotsitewise:ListTagsForResource
-        delete:
-          - iotsitewise:DescribeProject
-          - iotsitewise:DeleteProject
-        list:
-          - iotsitewise:ListPortals
-          - iotsitewise:ListProjects
-          - iotsitewise:ListTagsForResource
     AccessPolicyIdentity:
       description: The identity for this access policy. Choose either an SSO user or group or an IAM user or role.
       type: object
@@ -636,9 +447,9 @@ components:
       additionalProperties: false
       properties:
         Portal:
-          $ref: '#/components/schemas/Portal'
+          $ref: '#/components/schemas/AccessPolicy_Portal'
         Project:
-          $ref: '#/components/schemas/Project'
+          $ref: '#/components/schemas/AccessPolicy_Project'
     AccessPolicy:
       type: object
       properties:
@@ -754,7 +565,6 @@ components:
           description: The ID of the child asset to be associated.
           type: string
     Tag:
-      description: To add or update tag, provide both key and value. To delete tag, provide only tag key to be deleted
       type: object
       additionalProperties: false
       properties:
@@ -763,8 +573,8 @@ components:
         Value:
           type: string
       required:
-        - Key
         - Value
+        - Key
     Asset:
       type: object
       properties:
@@ -1443,6 +1253,21 @@ components:
           maxLength: 36
           pattern: ^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$
           description: The ID of the asset property.
+    ComputationModel_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          minLength: 0
+          maxLength: 256
+      required:
+        - Value
+        - Key
     ComputationModel:
       type: object
       properties:
@@ -1482,7 +1307,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ComputationModel_Tag'
       required:
         - ComputationModelName
         - ComputationModelConfiguration
@@ -1531,6 +1356,18 @@ components:
         list:
           - iotsitewise:ListComputationModels
           - iotsitewise:ListTagsForResource
+    Dashboard_Tag:
+      description: To add or update tag, provide both key and value. To delete tag, provide only tag key to be deleted
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+        Value:
+          type: string
+      required:
+        - Key
+        - Value
     Dashboard:
       type: object
       properties:
@@ -1558,7 +1395,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Dashboard_Tag'
       required:
         - DashboardDefinition
         - DashboardDescription
@@ -1779,6 +1616,18 @@ components:
           type: string
       required:
         - IotCoreThingName
+    Gateway_Tag:
+      description: To add or update tag, provide both key and value. To delete tag, provide only tag key to be deleted
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+        Value:
+          type: string
+      required:
+        - Key
+        - Value
     GatewayVersion:
       description: The version of the gateway you want to create.
       type: string
@@ -1817,7 +1666,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Gateway_Tag'
         GatewayId:
           description: The ID of the gateway device.
           type: string
@@ -1904,170 +1753,281 @@ components:
       x-patternProperties:
         ^[a-z][a-zA-Z0-9_]*$:
           $ref: '#/components/schemas/PortalTypeEntry'
-    AssetId:
-      description: The ID of the asset
-      type: string
-    CreatePortalRequest:
+    Portal_Tag:
+      description: To add or update tag, provide both key and value. To delete tag, provide only tag key to be deleted.
+      type: object
+      additionalProperties: false
       properties:
-        ClientToken:
-          type: string
-        RoleArn:
-          type: string
-        TypeName:
+        Key:
           type: string
-        TypeVersionId:
+        Value:
           type: string
-        DesiredState:
-          type: object
-          properties:
-            PortalAuthMode:
-              description: The service to use to authenticate users to the portal. Choose from SSO or IAM. You can't change this value after you create a portal.
-              type: string
-            PortalArn:
-              description: The ARN of the portal, which has the following format.
-              type: string
-            PortalClientId:
-              description: The AWS SSO application generated client ID (used with AWS SSO APIs).
-              type: string
-            PortalContactEmail:
-              description: The AWS administrator's contact email address.
-              type: string
-            PortalDescription:
-              description: A description for the portal.
-              type: string
-            PortalId:
-              description: The ID of the portal.
-              type: string
-            PortalName:
-              description: A friendly name for the portal.
-              type: string
-            PortalStartUrl:
-              description: The public root URL for the AWS IoT AWS IoT SiteWise Monitor application portal.
-              type: string
-            PortalType:
-              description: The type of portal
-              type: string
-              enum:
-                - SITEWISE_PORTAL_V1
-                - SITEWISE_PORTAL_V2
-            PortalTypeConfiguration:
-              $ref: '#/components/schemas/PortalTypeConfiguration'
-            RoleArn:
-              description: The ARN of a service role that allows the portal's users to access your AWS IoT SiteWise resources on your behalf.
-              type: string
-            NotificationSenderEmail:
-              description: The email address that sends alarm notifications.
-              type: string
-            Alarms:
-              type: object
-              description: Contains the configuration information of an alarm created in an AWS IoT SiteWise Monitor portal. You can use the alarm to monitor an asset property and get notified when the asset property value is outside a specified range.
-              additionalProperties: false
-              properties:
-                AlarmRoleArn:
-                  type: string
-                  description: The ARN of the IAM role that allows the alarm to perform actions and access AWS resources and services, such as AWS IoT Events.
-                NotificationLambdaArn:
-                  type: string
-                  description: The ARN of the AWS Lambda function that manages alarm notifications. For more information, see Managing alarm notifications in the AWS IoT Events Developer Guide.
-            Tags:
-              description: A list of key-value pairs that contain metadata for the portal.
-              type: array
-              uniqueItems: false
-              x-insertionOrder: false
-              items:
-                $ref: '#/components/schemas/Tag'
-          x-stackQL-stringOnly: true
-      x-title: CreatePortalRequest
+      required:
+        - Key
+        - Value
+    Portal:
       type: object
-      required: []
-    CreateProjectRequest:
       properties:
-        ClientToken:
+        PortalAuthMode:
+          description: The service to use to authenticate users to the portal. Choose from SSO or IAM. You can't change this value after you create a portal.
           type: string
-        RoleArn:
+        PortalArn:
+          description: The ARN of the portal, which has the following format.
           type: string
-        TypeName:
+        PortalClientId:
+          description: The AWS SSO application generated client ID (used with AWS SSO APIs).
           type: string
-        TypeVersionId:
+        PortalContactEmail:
+          description: The AWS administrator's contact email address.
           type: string
-        DesiredState:
-          type: object
-          properties:
-            PortalId:
-              description: The ID of the portal in which to create the project.
-              type: string
-            ProjectId:
-              description: The ID of the project.
-              type: string
-            ProjectName:
-              description: A friendly name for the project.
-              type: string
-            ProjectDescription:
-              description: A description for the project.
-              type: string
-            ProjectArn:
-              description: The ARN of the project.
-              type: string
-            AssetIds:
-              description: The IDs of the assets to be associated to the project.
-              type: array
-              uniqueItems: true
-              items:
-                $ref: '#/components/schemas/AssetId'
-            Tags:
-              description: A list of key-value pairs that contain metadata for the project.
-              type: array
-              uniqueItems: false
-              x-insertionOrder: false
-              items:
-                $ref: '#/components/schemas/Tag'
-          x-stackQL-stringOnly: true
-      x-title: CreateProjectRequest
-      type: object
-      required: []
-    CreateAccessPolicyRequest:
-      properties:
-        ClientToken:
+        PortalDescription:
+          description: A description for the portal.
           type: string
-        RoleArn:
+        PortalId:
+          description: The ID of the portal.
           type: string
-        TypeName:
+        PortalName:
+          description: A friendly name for the portal.
           type: string
-        TypeVersionId:
+        PortalStartUrl:
+          description: The public root URL for the AWS IoT AWS IoT SiteWise Monitor application portal.
           type: string
-        DesiredState:
+        PortalType:
+          description: The type of portal
+          type: string
+          enum:
+            - SITEWISE_PORTAL_V1
+            - SITEWISE_PORTAL_V2
+        PortalTypeConfiguration:
+          $ref: '#/components/schemas/PortalTypeConfiguration'
+        RoleArn:
+          description: The ARN of a service role that allows the portal's users to access your AWS IoT SiteWise resources on your behalf.
+          type: string
+        NotificationSenderEmail:
+          description: The email address that sends alarm notifications.
+          type: string
+        Alarms:
           type: object
+          description: Contains the configuration information of an alarm created in an AWS IoT SiteWise Monitor portal. You can use the alarm to monitor an asset property and get notified when the asset property value is outside a specified range.
+          additionalProperties: false
           properties:
-            AccessPolicyId:
-              description: The ID of the access policy.
-              type: string
-            AccessPolicyArn:
-              description: The ARN of the access policy.
+            AlarmRoleArn:
               type: string
-            AccessPolicyIdentity:
-              description: The identity for this access policy. Choose either a user or a group but not both.
-              $ref: '#/components/schemas/AccessPolicyIdentity'
-            AccessPolicyPermission:
-              description: The permission level for this access policy. Valid values are ADMINISTRATOR or VIEWER.
+              description: The ARN of the IAM role that allows the alarm to perform actions and access AWS resources and services, such as AWS IoT Events.
+            NotificationLambdaArn:
               type: string
-            AccessPolicyResource:
-              description: The AWS IoT SiteWise Monitor resource for this access policy. Choose either portal or project but not both.
-              $ref: '#/components/schemas/AccessPolicyResource'
-          x-stackQL-stringOnly: true
-      x-title: CreateAccessPolicyRequest
+              description: The ARN of the AWS Lambda function that manages alarm notifications. For more information, see Managing alarm notifications in the AWS IoT Events Developer Guide.
+        Tags:
+          description: A list of key-value pairs that contain metadata for the portal.
+          type: array
+          uniqueItems: false
+          x-insertionOrder: false
+          items:
+            $ref: '#/components/schemas/Portal_Tag'
+      required:
+        - PortalContactEmail
+        - PortalName
+        - RoleArn
+      x-stackql-resource-name: portal
+      description: Resource schema for AWS::IoTSiteWise::Portal
+      x-type-name: AWS::IoTSiteWise::Portal
+      x-stackql-primary-identifier:
+        - PortalId
+      x-stackql-additional-identifiers:
+        - - PortalArn
+      x-create-only-properties:
+        - PortalAuthMode
+        - PortalType
+      x-read-only-properties:
+        - PortalArn
+        - PortalClientId
+        - PortalId
+        - PortalStartUrl
+      x-required-properties:
+        - PortalContactEmail
+        - PortalName
+        - RoleArn
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: true
+        tagProperty: /properties/Tags
+        permissions:
+          - iotsitewise:TagResource
+          - iotsitewise:UntagResource
+          - iotsitewise:ListTagsForResource
+      x-required-permissions:
+        create:
+          - iotsitewise:CreatePortal
+          - iotsitewise:DescribePortal
+          - iotsitewise:ListTagsForResource
+          - iotsitewise:TagResource
+          - iam:PassRole
+          - sso:CreateManagedApplicationInstance
+          - sso:DescribeRegisteredRegions
+        read:
+          - iotsitewise:DescribePortal
+          - iotsitewise:ListTagsForResource
+        update:
+          - iotsitewise:DescribePortal
+          - iotsitewise:ListTagsForResource
+          - iotsitewise:TagResource
+          - iotsitewise:UpdatePortal
+          - iotsitewise:UntagResource
+          - iam:PassRole
+          - sso:GetManagedApplicationInstance
+          - sso:UpdateApplicationInstanceDisplayData
+        delete:
+          - iotsitewise:DescribePortal
+          - iotsitewise:DeletePortal
+          - sso:DeleteManagedApplicationInstance
+        list:
+          - iotsitewise:ListPortals
+          - iotsitewise:ListTagsForResource
+    AssetId:
+      description: The ID of the asset
+      type: string
+    Project_Tag:
+      description: To add or update tag, provide both key and value. To delete tag, provide only tag key to be deleted
       type: object
-      required: []
-    CreateAssetRequest:
+      additionalProperties: false
       properties:
-        ClientToken:
+        Key:
           type: string
-        RoleArn:
+        Value:
           type: string
-        TypeName:
+      required:
+        - Key
+        - Value
+    Project:
+      type: object
+      properties:
+        PortalId:
+          description: The ID of the portal in which to create the project.
           type: string
-        TypeVersionId:
+        ProjectId:
+          description: The ID of the project.
           type: string
-        DesiredState:
+        ProjectName:
+          description: A friendly name for the project.
+          type: string
+        ProjectDescription:
+          description: A description for the project.
+          type: string
+        ProjectArn:
+          description: The ARN of the project.
+          type: string
+        AssetIds:
+          description: The IDs of the assets to be associated to the project.
+          type: array
+          uniqueItems: true
+          items:
+            $ref: '#/components/schemas/AssetId'
+        Tags:
+          description: A list of key-value pairs that contain metadata for the project.
+          type: array
+          uniqueItems: false
+          x-insertionOrder: false
+          items:
+            $ref: '#/components/schemas/Project_Tag'
+      required:
+        - PortalId
+        - ProjectName
+      x-stackql-resource-name: project
+      description: Resource schema for AWS::IoTSiteWise::Project
+      x-type-name: AWS::IoTSiteWise::Project
+      x-stackql-primary-identifier:
+        - ProjectId
+      x-create-only-properties:
+        - PortalId
+      x-read-only-properties:
+        - ProjectId
+        - ProjectArn
+      x-required-properties:
+        - PortalId
+        - ProjectName
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: true
+        tagProperty: /properties/Tags
+        permissions:
+          - iotsitewise:TagResource
+          - iotsitewise:UntagResource
+          - iotsitewise:ListTagsForResource
+      x-required-permissions:
+        create:
+          - iotsitewise:CreateProject
+          - iotsitewise:DescribeProject
+          - iotsitewise:ListProjectAssets
+          - iotsitewise:ListTagsForResource
+          - iotsitewise:TagResource
+          - iotsitewise:BatchAssociateProjectAssets
+        read:
+          - iotsitewise:DescribeProject
+          - iotsitewise:ListTagsForResource
+          - iotsitewise:ListProjectAssets
+        update:
+          - iotsitewise:DescribeProject
+          - iotsitewise:UpdateProject
+          - iotsitewise:BatchAssociateProjectAssets
+          - iotsitewise:BatchDisAssociateProjectAssets
+          - iotsitewise:ListProjectAssets
+          - iotsitewise:TagResource
+          - iotsitewise:UntagResource
+          - iotsitewise:ListTagsForResource
+        delete:
+          - iotsitewise:DescribeProject
+          - iotsitewise:DeleteProject
+        list:
+          - iotsitewise:ListPortals
+          - iotsitewise:ListProjects
+          - iotsitewise:ListTagsForResource
+    CreateAccessPolicyRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            AccessPolicyId:
+              description: The ID of the access policy.
+              type: string
+            AccessPolicyArn:
+              description: The ARN of the access policy.
+              type: string
+            AccessPolicyIdentity:
+              description: The identity for this access policy. Choose either a user or a group but not both.
+              $ref: '#/components/schemas/AccessPolicyIdentity'
+            AccessPolicyPermission:
+              description: The permission level for this access policy. Valid values are ADMINISTRATOR or VIEWER.
+              type: string
+            AccessPolicyResource:
+              description: The AWS IoT SiteWise Monitor resource for this access policy. Choose either portal or project but not both.
+              $ref: '#/components/schemas/AccessPolicyResource'
+          x-stackQL-stringOnly: true
+      x-title: CreateAccessPolicyRequest
+      type: object
+      required: []
+    CreateAssetRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
           type: object
           properties:
             AssetId:
@@ -2235,7 +2195,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ComputationModel_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateComputationModelRequest
       type: object
@@ -2277,7 +2237,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Dashboard_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateDashboardRequest
       type: object
@@ -2352,7 +2312,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Gateway_Tag'
             GatewayId:
               description: The ID of the gateway device.
               type: string
@@ -2367,292 +2327,138 @@ components:
       x-title: CreateGatewayRequest
       type: object
       required: []
-  securitySchemes:
-    hmac:
-      type: apiKey
-      name: Authorization
-      in: header
-      description: Amazon Signature authorization v4
-      x-amazon-apigateway-authtype: awsSigv4
-  x-stackQL-resources:
-    portals:
-      name: portals
-      id: awscc.iotsitewise.portals
-      x-cfn-schema-name: Portal
-      x-cfn-type-name: AWS::IoTSiteWise::Portal
-      x-identifiers:
-        - PortalId
-      x-type: cloud_control
-      methods:
-        create_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive_DesiredState
-          operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Portal&__detailTransformed=true/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::IoTSiteWise::Portal"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-        update_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive
-          operation:
-            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::IoTSiteWise::Portal"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-        delete_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive
-          operation:
-            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::IoTSiteWise::Portal"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-      sqlVerbs:
-        insert:
-          - $ref: '#/components/x-stackQL-resources/portals/methods/create_resource'
-        delete:
-          - $ref: '#/components/x-stackQL-resources/portals/methods/delete_resource'
-        update:
-          - $ref: '#/components/x-stackQL-resources/portals/methods/update_resource'
-      config:
-        views:
-          select:
-            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
-            ddl: |-
-              SELECT
-              region,
-              Identifier,
-              JSON_EXTRACT(Properties, '$.PortalAuthMode') as portal_auth_mode,
-              JSON_EXTRACT(Properties, '$.PortalArn') as portal_arn,
-              JSON_EXTRACT(Properties, '$.PortalClientId') as portal_client_id,
-              JSON_EXTRACT(Properties, '$.PortalContactEmail') as portal_contact_email,
-              JSON_EXTRACT(Properties, '$.PortalDescription') as portal_description,
-              JSON_EXTRACT(Properties, '$.PortalId') as portal_id,
-              JSON_EXTRACT(Properties, '$.PortalName') as portal_name,
-              JSON_EXTRACT(Properties, '$.PortalStartUrl') as portal_start_url,
-              JSON_EXTRACT(Properties, '$.PortalType') as portal_type,
-              JSON_EXTRACT(Properties, '$.PortalTypeConfiguration') as portal_type_configuration,
-              JSON_EXTRACT(Properties, '$.RoleArn') as role_arn,
-              JSON_EXTRACT(Properties, '$.NotificationSenderEmail') as notification_sender_email,
-              JSON_EXTRACT(Properties, '$.Alarms') as alarms,
-              JSON_EXTRACT(Properties, '$.Tags') as tags
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTSiteWise::Portal'
-              AND Identifier = '<PortalId>'
-              AND region = 'us-east-1'
-            fallback:
-              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
-              ddl: |-
-                SELECT
-                region,
-                Identifier,
-                json_extract_path_text(Properties, 'PortalAuthMode') as portal_auth_mode,
-                json_extract_path_text(Properties, 'PortalArn') as portal_arn,
-                json_extract_path_text(Properties, 'PortalClientId') as portal_client_id,
-                json_extract_path_text(Properties, 'PortalContactEmail') as portal_contact_email,
-                json_extract_path_text(Properties, 'PortalDescription') as portal_description,
-                json_extract_path_text(Properties, 'PortalId') as portal_id,
-                json_extract_path_text(Properties, 'PortalName') as portal_name,
-                json_extract_path_text(Properties, 'PortalStartUrl') as portal_start_url,
-                json_extract_path_text(Properties, 'PortalType') as portal_type,
-                json_extract_path_text(Properties, 'PortalTypeConfiguration') as portal_type_configuration,
-                json_extract_path_text(Properties, 'RoleArn') as role_arn,
-                json_extract_path_text(Properties, 'NotificationSenderEmail') as notification_sender_email,
-                json_extract_path_text(Properties, 'Alarms') as alarms,
-                json_extract_path_text(Properties, 'Tags') as tags
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTSiteWise::Portal'
-                AND Identifier = '<PortalId>'
-                AND region = 'us-east-1'
-    portals_list_only:
-      name: portals_list_only
-      id: awscc.iotsitewise.portals_list_only
-      x-cfn-schema-name: Portal
-      x-cfn-type-name: AWS::IoTSiteWise::Portal
-      x-identifiers:
-        - PortalId
-      x-type: cloud_control_view
-      methods: {}
-      sqlVerbs:
-        insert: []
-        delete: []
-        update: []
-      config:
-        views:
-          select:
-            predicate: sqlDialect == "sqlite3"
-            ddl: |-
-              SELECT
-              region,
-              JSON_EXTRACT(Properties, '$.PortalId') as portal_id
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTSiteWise::Portal'
-              AND region = 'us-east-1'
-            fallback:
-              predicate: sqlDialect == "postgres"
-              ddl: |-
-                SELECT
-                region,
-                json_extract_path_text(Properties, 'PortalId') as portal_id
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTSiteWise::Portal'
-                AND region = 'us-east-1'
-    projects:
-      name: projects
-      id: awscc.iotsitewise.projects
-      x-cfn-schema-name: Project
-      x-cfn-type-name: AWS::IoTSiteWise::Project
-      x-identifiers:
-        - ProjectId
-      x-type: cloud_control
-      methods:
-        create_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive_DesiredState
-          operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Project&__detailTransformed=true/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::IoTSiteWise::Project"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-        update_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive
-          operation:
-            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::IoTSiteWise::Project"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-        delete_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive
-          operation:
-            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::IoTSiteWise::Project"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-      sqlVerbs:
-        insert:
-          - $ref: '#/components/x-stackQL-resources/projects/methods/create_resource'
-        delete:
-          - $ref: '#/components/x-stackQL-resources/projects/methods/delete_resource'
-        update:
-          - $ref: '#/components/x-stackQL-resources/projects/methods/update_resource'
-      config:
-        views:
-          select:
-            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
-            ddl: |-
-              SELECT
-              region,
-              Identifier,
-              JSON_EXTRACT(Properties, '$.PortalId') as portal_id,
-              JSON_EXTRACT(Properties, '$.ProjectId') as project_id,
-              JSON_EXTRACT(Properties, '$.ProjectName') as project_name,
-              JSON_EXTRACT(Properties, '$.ProjectDescription') as project_description,
-              JSON_EXTRACT(Properties, '$.ProjectArn') as project_arn,
-              JSON_EXTRACT(Properties, '$.AssetIds') as asset_ids,
-              JSON_EXTRACT(Properties, '$.Tags') as tags
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTSiteWise::Project'
-              AND Identifier = '<ProjectId>'
-              AND region = 'us-east-1'
-            fallback:
-              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
-              ddl: |-
-                SELECT
-                region,
-                Identifier,
-                json_extract_path_text(Properties, 'PortalId') as portal_id,
-                json_extract_path_text(Properties, 'ProjectId') as project_id,
-                json_extract_path_text(Properties, 'ProjectName') as project_name,
-                json_extract_path_text(Properties, 'ProjectDescription') as project_description,
-                json_extract_path_text(Properties, 'ProjectArn') as project_arn,
-                json_extract_path_text(Properties, 'AssetIds') as asset_ids,
-                json_extract_path_text(Properties, 'Tags') as tags
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTSiteWise::Project'
-                AND Identifier = '<ProjectId>'
-                AND region = 'us-east-1'
-    projects_list_only:
-      name: projects_list_only
-      id: awscc.iotsitewise.projects_list_only
-      x-cfn-schema-name: Project
-      x-cfn-type-name: AWS::IoTSiteWise::Project
-      x-identifiers:
-        - ProjectId
-      x-type: cloud_control_view
-      methods: {}
-      sqlVerbs:
-        insert: []
-        delete: []
-        update: []
-      config:
-        views:
-          select:
-            predicate: sqlDialect == "sqlite3"
-            ddl: |-
-              SELECT
-              region,
-              JSON_EXTRACT(Properties, '$.ProjectId') as project_id
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTSiteWise::Project'
-              AND region = 'us-east-1'
-            fallback:
-              predicate: sqlDialect == "postgres"
-              ddl: |-
-                SELECT
-                region,
-                json_extract_path_text(Properties, 'ProjectId') as project_id
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTSiteWise::Project'
-                AND region = 'us-east-1'
+    CreatePortalRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            PortalAuthMode:
+              description: The service to use to authenticate users to the portal. Choose from SSO or IAM. You can't change this value after you create a portal.
+              type: string
+            PortalArn:
+              description: The ARN of the portal, which has the following format.
+              type: string
+            PortalClientId:
+              description: The AWS SSO application generated client ID (used with AWS SSO APIs).
+              type: string
+            PortalContactEmail:
+              description: The AWS administrator's contact email address.
+              type: string
+            PortalDescription:
+              description: A description for the portal.
+              type: string
+            PortalId:
+              description: The ID of the portal.
+              type: string
+            PortalName:
+              description: A friendly name for the portal.
+              type: string
+            PortalStartUrl:
+              description: The public root URL for the AWS IoT AWS IoT SiteWise Monitor application portal.
+              type: string
+            PortalType:
+              description: The type of portal
+              type: string
+              enum:
+                - SITEWISE_PORTAL_V1
+                - SITEWISE_PORTAL_V2
+            PortalTypeConfiguration:
+              $ref: '#/components/schemas/PortalTypeConfiguration'
+            RoleArn:
+              description: The ARN of a service role that allows the portal's users to access your AWS IoT SiteWise resources on your behalf.
+              type: string
+            NotificationSenderEmail:
+              description: The email address that sends alarm notifications.
+              type: string
+            Alarms:
+              type: object
+              description: Contains the configuration information of an alarm created in an AWS IoT SiteWise Monitor portal. You can use the alarm to monitor an asset property and get notified when the asset property value is outside a specified range.
+              additionalProperties: false
+              properties:
+                AlarmRoleArn:
+                  type: string
+                  description: The ARN of the IAM role that allows the alarm to perform actions and access AWS resources and services, such as AWS IoT Events.
+                NotificationLambdaArn:
+                  type: string
+                  description: The ARN of the AWS Lambda function that manages alarm notifications. For more information, see Managing alarm notifications in the AWS IoT Events Developer Guide.
+            Tags:
+              description: A list of key-value pairs that contain metadata for the portal.
+              type: array
+              uniqueItems: false
+              x-insertionOrder: false
+              items:
+                $ref: '#/components/schemas/Portal_Tag'
+          x-stackQL-stringOnly: true
+      x-title: CreatePortalRequest
+      type: object
+      required: []
+    CreateProjectRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            PortalId:
+              description: The ID of the portal in which to create the project.
+              type: string
+            ProjectId:
+              description: The ID of the project.
+              type: string
+            ProjectName:
+              description: A friendly name for the project.
+              type: string
+            ProjectDescription:
+              description: A description for the project.
+              type: string
+            ProjectArn:
+              description: The ARN of the project.
+              type: string
+            AssetIds:
+              description: The IDs of the assets to be associated to the project.
+              type: array
+              uniqueItems: true
+              items:
+                $ref: '#/components/schemas/AssetId'
+            Tags:
+              description: A list of key-value pairs that contain metadata for the project.
+              type: array
+              uniqueItems: false
+              x-insertionOrder: false
+              items:
+                $ref: '#/components/schemas/Project_Tag'
+          x-stackQL-stringOnly: true
+      x-title: CreateProjectRequest
+      type: object
+      required: []
+  securitySchemes:
+    hmac:
+      type: apiKey
+      name: Authorization
+      in: header
+      description: Amazon Signature authorization v4
+      x-amazon-apigateway-authtype: awsSigv4
+  x-stackQL-resources:
     access_policies:
       name: access_policies
       id: awscc.iotsitewise.access_policies
       x-cfn-schema-name: AccessPolicy
       x-cfn-type-name: AWS::IoTSiteWise::AccessPolicy
-      x-identifiers:
+      x-identifiers: &ref_0
         - AccessPolicyId
       x-type: cloud_control
       methods:
@@ -2746,8 +2552,7 @@ components:
       id: awscc.iotsitewise.access_policies_list_only
       x-cfn-schema-name: AccessPolicy
       x-cfn-type-name: AWS::IoTSiteWise::AccessPolicy
-      x-identifiers:
-        - AccessPolicyId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2777,7 +2582,7 @@ components:
       id: awscc.iotsitewise.assets
       x-cfn-schema-name: Asset
       x-cfn-type-name: AWS::IoTSiteWise::Asset
-      x-identifiers:
+      x-identifiers: &ref_1
         - AssetId
       x-type: cloud_control
       methods:
@@ -2879,8 +2684,7 @@ components:
       id: awscc.iotsitewise.assets_list_only
       x-cfn-schema-name: Asset
       x-cfn-type-name: AWS::IoTSiteWise::Asset
-      x-identifiers:
-        - AssetId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2910,7 +2714,7 @@ components:
       id: awscc.iotsitewise.asset_models
       x-cfn-schema-name: AssetModel
       x-cfn-type-name: AWS::IoTSiteWise::AssetModel
-      x-identifiers:
+      x-identifiers: &ref_2
         - AssetModelId
       x-type: cloud_control
       methods:
@@ -3016,8 +2820,7 @@ components:
       id: awscc.iotsitewise.asset_models_list_only
       x-cfn-schema-name: AssetModel
       x-cfn-type-name: AWS::IoTSiteWise::AssetModel
-      x-identifiers:
-        - AssetModelId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3047,7 +2850,7 @@ components:
       id: awscc.iotsitewise.computation_models
       x-cfn-schema-name: ComputationModel
       x-cfn-type-name: AWS::IoTSiteWise::ComputationModel
-      x-identifiers:
+      x-identifiers: &ref_3
         - ComputationModelId
       x-type: cloud_control
       methods:
@@ -3145,8 +2948,7 @@ components:
       id: awscc.iotsitewise.computation_models_list_only
       x-cfn-schema-name: ComputationModel
       x-cfn-type-name: AWS::IoTSiteWise::ComputationModel
-      x-identifiers:
-        - ComputationModelId
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3176,7 +2978,7 @@ components:
       id: awscc.iotsitewise.dashboards
       x-cfn-schema-name: Dashboard
       x-cfn-type-name: AWS::IoTSiteWise::Dashboard
-      x-identifiers:
+      x-identifiers: &ref_4
         - DashboardId
       x-type: cloud_control
       methods:
@@ -3269,13 +3071,264 @@ components:
                 FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTSiteWise::Dashboard'
                 AND Identifier = '<DashboardId>'
                 AND region = 'us-east-1'
-    dashboards_list_only:
-      name: dashboards_list_only
-      id: awscc.iotsitewise.dashboards_list_only
-      x-cfn-schema-name: Dashboard
-      x-cfn-type-name: AWS::IoTSiteWise::Dashboard
-      x-identifiers:
-        - DashboardId
+    dashboards_list_only:
+      name: dashboards_list_only
+      id: awscc.iotsitewise.dashboards_list_only
+      x-cfn-schema-name: Dashboard
+      x-cfn-type-name: AWS::IoTSiteWise::Dashboard
+      x-identifiers: *ref_4
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.DashboardId') as dashboard_id
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTSiteWise::Dashboard'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'DashboardId') as dashboard_id
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTSiteWise::Dashboard'
+                AND region = 'us-east-1'
+    datasets:
+      name: datasets
+      id: awscc.iotsitewise.datasets
+      x-cfn-schema-name: Dataset
+      x-cfn-type-name: AWS::IoTSiteWise::Dataset
+      x-identifiers: &ref_5
+        - DatasetId
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Dataset&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::IoTSiteWise::Dataset"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::IoTSiteWise::Dataset"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::IoTSiteWise::Dataset"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/datasets/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/datasets/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/datasets/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.DatasetId') as dataset_id,
+              JSON_EXTRACT(Properties, '$.DatasetArn') as dataset_arn,
+              JSON_EXTRACT(Properties, '$.DatasetName') as dataset_name,
+              JSON_EXTRACT(Properties, '$.DatasetDescription') as dataset_description,
+              JSON_EXTRACT(Properties, '$.DatasetSource') as dataset_source,
+              JSON_EXTRACT(Properties, '$.Tags') as tags
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTSiteWise::Dataset'
+              AND Identifier = '<DatasetId>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'DatasetId') as dataset_id,
+                json_extract_path_text(Properties, 'DatasetArn') as dataset_arn,
+                json_extract_path_text(Properties, 'DatasetName') as dataset_name,
+                json_extract_path_text(Properties, 'DatasetDescription') as dataset_description,
+                json_extract_path_text(Properties, 'DatasetSource') as dataset_source,
+                json_extract_path_text(Properties, 'Tags') as tags
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTSiteWise::Dataset'
+                AND Identifier = '<DatasetId>'
+                AND region = 'us-east-1'
+    datasets_list_only:
+      name: datasets_list_only
+      id: awscc.iotsitewise.datasets_list_only
+      x-cfn-schema-name: Dataset
+      x-cfn-type-name: AWS::IoTSiteWise::Dataset
+      x-identifiers: *ref_5
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.DatasetId') as dataset_id
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTSiteWise::Dataset'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'DatasetId') as dataset_id
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTSiteWise::Dataset'
+                AND region = 'us-east-1'
+    gateways:
+      name: gateways
+      id: awscc.iotsitewise.gateways
+      x-cfn-schema-name: Gateway
+      x-cfn-type-name: AWS::IoTSiteWise::Gateway
+      x-identifiers: &ref_6
+        - GatewayId
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Gateway&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::IoTSiteWise::Gateway"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::IoTSiteWise::Gateway"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::IoTSiteWise::Gateway"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/gateways/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/gateways/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/gateways/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.GatewayName') as gateway_name,
+              JSON_EXTRACT(Properties, '$.GatewayPlatform') as gateway_platform,
+              JSON_EXTRACT(Properties, '$.GatewayVersion') as gateway_version,
+              JSON_EXTRACT(Properties, '$.Tags') as tags,
+              JSON_EXTRACT(Properties, '$.GatewayId') as gateway_id,
+              JSON_EXTRACT(Properties, '$.GatewayCapabilitySummaries') as gateway_capability_summaries
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTSiteWise::Gateway'
+              AND Identifier = '<GatewayId>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'GatewayName') as gateway_name,
+                json_extract_path_text(Properties, 'GatewayPlatform') as gateway_platform,
+                json_extract_path_text(Properties, 'GatewayVersion') as gateway_version,
+                json_extract_path_text(Properties, 'Tags') as tags,
+                json_extract_path_text(Properties, 'GatewayId') as gateway_id,
+                json_extract_path_text(Properties, 'GatewayCapabilitySummaries') as gateway_capability_summaries
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTSiteWise::Gateway'
+                AND Identifier = '<GatewayId>'
+                AND region = 'us-east-1'
+    gateways_list_only:
+      name: gateways_list_only
+      id: awscc.iotsitewise.gateways_list_only
+      x-cfn-schema-name: Gateway
+      x-cfn-type-name: AWS::IoTSiteWise::Gateway
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3289,24 +3342,24 @@ components:
             ddl: |-
               SELECT
               region,
-              JSON_EXTRACT(Properties, '$.DashboardId') as dashboard_id
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTSiteWise::Dashboard'
+              JSON_EXTRACT(Properties, '$.GatewayId') as gateway_id
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTSiteWise::Gateway'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres"
               ddl: |-
                 SELECT
                 region,
-                json_extract_path_text(Properties, 'DashboardId') as dashboard_id
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTSiteWise::Dashboard'
+                json_extract_path_text(Properties, 'GatewayId') as gateway_id
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTSiteWise::Gateway'
                 AND region = 'us-east-1'
-    datasets:
-      name: datasets
-      id: awscc.iotsitewise.datasets
-      x-cfn-schema-name: Dataset
-      x-cfn-type-name: AWS::IoTSiteWise::Dataset
-      x-identifiers:
-        - DatasetId
+    portals:
+      name: portals
+      id: awscc.iotsitewise.portals
+      x-cfn-schema-name: Portal
+      x-cfn-type-name: AWS::IoTSiteWise::Portal
+      x-identifiers: &ref_7
+        - PortalId
       x-type: cloud_control
       methods:
         create_resource:
@@ -3314,12 +3367,12 @@ components:
             requestBodyTranslate:
               algorithm: naive_DesiredState
           operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Dataset&__detailTransformed=true/post'
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Portal&__detailTransformed=true/post'
           request:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::IoTSiteWise::Dataset"
+                "TypeName": "AWS::IoTSiteWise::Portal"
               }
           response:
             mediaType: application/json
@@ -3335,7 +3388,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::IoTSiteWise::Dataset"
+                "TypeName": "AWS::IoTSiteWise::Portal"
               }
           response:
             mediaType: application/json
@@ -3351,7 +3404,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::IoTSiteWise::Dataset"
+                "TypeName": "AWS::IoTSiteWise::Portal"
               }
           response:
             mediaType: application/json
@@ -3359,11 +3412,11 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/datasets/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/portals/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/datasets/methods/delete_resource'
+          - $ref: '#/components/x-stackQL-resources/portals/methods/delete_resource'
         update:
-          - $ref: '#/components/x-stackQL-resources/datasets/methods/update_resource'
+          - $ref: '#/components/x-stackQL-resources/portals/methods/update_resource'
       config:
         views:
           select:
@@ -3372,14 +3425,22 @@ components:
               SELECT
               region,
               Identifier,
-              JSON_EXTRACT(Properties, '$.DatasetId') as dataset_id,
-              JSON_EXTRACT(Properties, '$.DatasetArn') as dataset_arn,
-              JSON_EXTRACT(Properties, '$.DatasetName') as dataset_name,
-              JSON_EXTRACT(Properties, '$.DatasetDescription') as dataset_description,
-              JSON_EXTRACT(Properties, '$.DatasetSource') as dataset_source,
+              JSON_EXTRACT(Properties, '$.PortalAuthMode') as portal_auth_mode,
+              JSON_EXTRACT(Properties, '$.PortalArn') as portal_arn,
+              JSON_EXTRACT(Properties, '$.PortalClientId') as portal_client_id,
+              JSON_EXTRACT(Properties, '$.PortalContactEmail') as portal_contact_email,
+              JSON_EXTRACT(Properties, '$.PortalDescription') as portal_description,
+              JSON_EXTRACT(Properties, '$.PortalId') as portal_id,
+              JSON_EXTRACT(Properties, '$.PortalName') as portal_name,
+              JSON_EXTRACT(Properties, '$.PortalStartUrl') as portal_start_url,
+              JSON_EXTRACT(Properties, '$.PortalType') as portal_type,
+              JSON_EXTRACT(Properties, '$.PortalTypeConfiguration') as portal_type_configuration,
+              JSON_EXTRACT(Properties, '$.RoleArn') as role_arn,
+              JSON_EXTRACT(Properties, '$.NotificationSenderEmail') as notification_sender_email,
+              JSON_EXTRACT(Properties, '$.Alarms') as alarms,
               JSON_EXTRACT(Properties, '$.Tags') as tags
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTSiteWise::Dataset'
-              AND Identifier = '<DatasetId>'
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTSiteWise::Portal'
+              AND Identifier = '<PortalId>'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
@@ -3387,22 +3448,29 @@ components:
                 SELECT
                 region,
                 Identifier,
-                json_extract_path_text(Properties, 'DatasetId') as dataset_id,
-                json_extract_path_text(Properties, 'DatasetArn') as dataset_arn,
-                json_extract_path_text(Properties, 'DatasetName') as dataset_name,
-                json_extract_path_text(Properties, 'DatasetDescription') as dataset_description,
-                json_extract_path_text(Properties, 'DatasetSource') as dataset_source,
+                json_extract_path_text(Properties, 'PortalAuthMode') as portal_auth_mode,
+                json_extract_path_text(Properties, 'PortalArn') as portal_arn,
+                json_extract_path_text(Properties, 'PortalClientId') as portal_client_id,
+                json_extract_path_text(Properties, 'PortalContactEmail') as portal_contact_email,
+                json_extract_path_text(Properties, 'PortalDescription') as portal_description,
+                json_extract_path_text(Properties, 'PortalId') as portal_id,
+                json_extract_path_text(Properties, 'PortalName') as portal_name,
+                json_extract_path_text(Properties, 'PortalStartUrl') as portal_start_url,
+                json_extract_path_text(Properties, 'PortalType') as portal_type,
+                json_extract_path_text(Properties, 'PortalTypeConfiguration') as portal_type_configuration,
+                json_extract_path_text(Properties, 'RoleArn') as role_arn,
+                json_extract_path_text(Properties, 'NotificationSenderEmail') as notification_sender_email,
+                json_extract_path_text(Properties, 'Alarms') as alarms,
                 json_extract_path_text(Properties, 'Tags') as tags
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTSiteWise::Dataset'
-                AND Identifier = '<DatasetId>'
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTSiteWise::Portal'
+                AND Identifier = '<PortalId>'
                 AND region = 'us-east-1'
-    datasets_list_only:
-      name: datasets_list_only
-      id: awscc.iotsitewise.datasets_list_only
-      x-cfn-schema-name: Dataset
-      x-cfn-type-name: AWS::IoTSiteWise::Dataset
-      x-identifiers:
-        - DatasetId
+    portals_list_only:
+      name: portals_list_only
+      id: awscc.iotsitewise.portals_list_only
+      x-cfn-schema-name: Portal
+      x-cfn-type-name: AWS::IoTSiteWise::Portal
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3416,24 +3484,24 @@ components:
             ddl: |-
               SELECT
               region,
-              JSON_EXTRACT(Properties, '$.DatasetId') as dataset_id
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTSiteWise::Dataset'
+              JSON_EXTRACT(Properties, '$.PortalId') as portal_id
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTSiteWise::Portal'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres"
               ddl: |-
                 SELECT
                 region,
-                json_extract_path_text(Properties, 'DatasetId') as dataset_id
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTSiteWise::Dataset'
+                json_extract_path_text(Properties, 'PortalId') as portal_id
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTSiteWise::Portal'
                 AND region = 'us-east-1'
-    gateways:
-      name: gateways
-      id: awscc.iotsitewise.gateways
-      x-cfn-schema-name: Gateway
-      x-cfn-type-name: AWS::IoTSiteWise::Gateway
-      x-identifiers:
-        - GatewayId
+    projects:
+      name: projects
+      id: awscc.iotsitewise.projects
+      x-cfn-schema-name: Project
+      x-cfn-type-name: AWS::IoTSiteWise::Project
+      x-identifiers: &ref_8
+        - ProjectId
       x-type: cloud_control
       methods:
         create_resource:
@@ -3441,12 +3509,12 @@ components:
             requestBodyTranslate:
               algorithm: naive_DesiredState
           operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Gateway&__detailTransformed=true/post'
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Project&__detailTransformed=true/post'
           request:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::IoTSiteWise::Gateway"
+                "TypeName": "AWS::IoTSiteWise::Project"
               }
           response:
             mediaType: application/json
@@ -3462,7 +3530,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::IoTSiteWise::Gateway"
+                "TypeName": "AWS::IoTSiteWise::Project"
               }
           response:
             mediaType: application/json
@@ -3478,7 +3546,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::IoTSiteWise::Gateway"
+                "TypeName": "AWS::IoTSiteWise::Project"
               }
           response:
             mediaType: application/json
@@ -3486,11 +3554,11 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/gateways/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/projects/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/gateways/methods/delete_resource'
+          - $ref: '#/components/x-stackQL-resources/projects/methods/delete_resource'
         update:
-          - $ref: '#/components/x-stackQL-resources/gateways/methods/update_resource'
+          - $ref: '#/components/x-stackQL-resources/projects/methods/update_resource'
       config:
         views:
           select:
@@ -3499,14 +3567,15 @@ components:
               SELECT
               region,
               Identifier,
-              JSON_EXTRACT(Properties, '$.GatewayName') as gateway_name,
-              JSON_EXTRACT(Properties, '$.GatewayPlatform') as gateway_platform,
-              JSON_EXTRACT(Properties, '$.GatewayVersion') as gateway_version,
-              JSON_EXTRACT(Properties, '$.Tags') as tags,
-              JSON_EXTRACT(Properties, '$.GatewayId') as gateway_id,
-              JSON_EXTRACT(Properties, '$.GatewayCapabilitySummaries') as gateway_capability_summaries
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTSiteWise::Gateway'
-              AND Identifier = '<GatewayId>'
+              JSON_EXTRACT(Properties, '$.PortalId') as portal_id,
+              JSON_EXTRACT(Properties, '$.ProjectId') as project_id,
+              JSON_EXTRACT(Properties, '$.ProjectName') as project_name,
+              JSON_EXTRACT(Properties, '$.ProjectDescription') as project_description,
+              JSON_EXTRACT(Properties, '$.ProjectArn') as project_arn,
+              JSON_EXTRACT(Properties, '$.AssetIds') as asset_ids,
+              JSON_EXTRACT(Properties, '$.Tags') as tags
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTSiteWise::Project'
+              AND Identifier = '<ProjectId>'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
@@ -3514,22 +3583,22 @@ components:
                 SELECT
                 region,
                 Identifier,
-                json_extract_path_text(Properties, 'GatewayName') as gateway_name,
-                json_extract_path_text(Properties, 'GatewayPlatform') as gateway_platform,
-                json_extract_path_text(Properties, 'GatewayVersion') as gateway_version,
-                json_extract_path_text(Properties, 'Tags') as tags,
-                json_extract_path_text(Properties, 'GatewayId') as gateway_id,
-                json_extract_path_text(Properties, 'GatewayCapabilitySummaries') as gateway_capability_summaries
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTSiteWise::Gateway'
-                AND Identifier = '<GatewayId>'
+                json_extract_path_text(Properties, 'PortalId') as portal_id,
+                json_extract_path_text(Properties, 'ProjectId') as project_id,
+                json_extract_path_text(Properties, 'ProjectName') as project_name,
+                json_extract_path_text(Properties, 'ProjectDescription') as project_description,
+                json_extract_path_text(Properties, 'ProjectArn') as project_arn,
+                json_extract_path_text(Properties, 'AssetIds') as asset_ids,
+                json_extract_path_text(Properties, 'Tags') as tags
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::IoTSiteWise::Project'
+                AND Identifier = '<ProjectId>'
                 AND region = 'us-east-1'
-    gateways_list_only:
-      name: gateways_list_only
-      id: awscc.iotsitewise.gateways_list_only
-      x-cfn-schema-name: Gateway
-      x-cfn-type-name: AWS::IoTSiteWise::Gateway
-      x-identifiers:
-        - GatewayId
+    projects_list_only:
+      name: projects_list_only
+      id: awscc.iotsitewise.projects_list_only
+      x-cfn-schema-name: Project
+      x-cfn-type-name: AWS::IoTSiteWise::Project
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3543,16 +3612,16 @@ components:
             ddl: |-
               SELECT
               region,
-              JSON_EXTRACT(Properties, '$.GatewayId') as gateway_id
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTSiteWise::Gateway'
+              JSON_EXTRACT(Properties, '$.ProjectId') as project_id
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTSiteWise::Project'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres"
               ddl: |-
                 SELECT
                 region,
-                json_extract_path_text(Properties, 'GatewayId') as gateway_id
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTSiteWise::Gateway'
+                json_extract_path_text(Properties, 'ProjectId') as project_id
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::IoTSiteWise::Project'
                 AND region = 'us-east-1'
 paths:
   /?Action=CreateResource&Version=2021-09-30:
@@ -3698,7 +3767,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__Portal&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__AccessPolicy&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3708,7 +3777,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreatePortal
+      operationId: CreateAccessPolicy
       parameters:
         - description: Action Header
           in: header
@@ -3731,7 +3800,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreatePortalRequest'
+              $ref: '#/components/schemas/CreateAccessPolicyRequest'
         required: true
       responses:
         '200':
@@ -3740,7 +3809,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__Project&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__Asset&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3750,7 +3819,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateProject
+      operationId: CreateAsset
       parameters:
         - description: Action Header
           in: header
@@ -3773,7 +3842,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateProjectRequest'
+              $ref: '#/components/schemas/CreateAssetRequest'
         required: true
       responses:
         '200':
@@ -3782,7 +3851,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__AccessPolicy&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__AssetModel&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3792,7 +3861,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateAccessPolicy
+      operationId: CreateAssetModel
       parameters:
         - description: Action Header
           in: header
@@ -3815,7 +3884,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateAccessPolicyRequest'
+              $ref: '#/components/schemas/CreateAssetModelRequest'
         required: true
       responses:
         '200':
@@ -3824,7 +3893,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__Asset&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__ComputationModel&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3834,7 +3903,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateAsset
+      operationId: CreateComputationModel
       parameters:
         - description: Action Header
           in: header
@@ -3857,7 +3926,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateAssetRequest'
+              $ref: '#/components/schemas/CreateComputationModelRequest'
         required: true
       responses:
         '200':
@@ -3866,7 +3935,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__AssetModel&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__Dashboard&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3876,7 +3945,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateAssetModel
+      operationId: CreateDashboard
       parameters:
         - description: Action Header
           in: header
@@ -3899,7 +3968,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateAssetModelRequest'
+              $ref: '#/components/schemas/CreateDashboardRequest'
         required: true
       responses:
         '200':
@@ -3908,7 +3977,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__ComputationModel&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__Dataset&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3918,7 +3987,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateComputationModel
+      operationId: CreateDataset
       parameters:
         - description: Action Header
           in: header
@@ -3941,7 +4010,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateComputationModelRequest'
+              $ref: '#/components/schemas/CreateDatasetRequest'
         required: true
       responses:
         '200':
@@ -3950,7 +4019,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__Dashboard&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__Gateway&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3960,7 +4029,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateDashboard
+      operationId: CreateGateway
       parameters:
         - description: Action Header
           in: header
@@ -3983,7 +4052,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateDashboardRequest'
+              $ref: '#/components/schemas/CreateGatewayRequest'
         required: true
       responses:
         '200':
@@ -3992,7 +4061,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__Dataset&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__Portal&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -4002,7 +4071,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateDataset
+      operationId: CreatePortal
       parameters:
         - description: Action Header
           in: header
@@ -4025,7 +4094,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateDatasetRequest'
+              $ref: '#/components/schemas/CreatePortalRequest'
         required: true
       responses:
         '200':
@@ -4034,7 +4103,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__Gateway&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__Project&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -4044,7 +4113,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateGateway
+      operationId: CreateProject
       parameters:
         - description: Action Header
           in: header
@@ -4067,7 +4136,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateGatewayRequest'
+              $ref: '#/components/schemas/CreateProjectRequest'
         required: true
       responses:
         '200':
diff --git a/openapi/src/awscc/v00.00.00000/services/iottwinmaker.yaml b/openapi/src/awscc/v00.00.00000/services/iottwinmaker.yaml
index ff6a4d3a8..67e5d4f47 100644
--- a/openapi/src/awscc/v00.00.00000/services/iottwinmaker.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/iottwinmaker.yaml
@@ -485,7 +485,9 @@ components:
           minLength: 1
           maxLength: 256
         MapValue:
-          description: An object that maps strings to multiple DataValue objects.
+          description: |+
+            An object that maps strings to multiple DataValue objects. 
+
           type: object
           x-patternProperties:
             '[a-zA-Z_\-0-9]+':
@@ -562,6 +564,8 @@ components:
           minLength: 1
           maxLength: 256
       additionalProperties: false
+      required:
+        - Type
     PropertyDefinition:
       description: An object that sets information about a property.
       type: object
@@ -596,7 +600,7 @@ components:
           type: boolean
       additionalProperties: false
     PropertyGroup:
-      description: An object that specifies information about a property group.
+      description: An object that sets information about a property group.
       type: object
       properties:
         GroupType:
@@ -816,6 +820,104 @@ components:
           minLength: 1
           maxLength: 256
       additionalProperties: false
+    Entity_DataType:
+      description: An object that specifies the data type of a property.
+      type: object
+      properties:
+        AllowedValues:
+          description: The allowed values for this data type.
+          type: array
+          minItems: 0
+          maxItems: 50
+          uniqueItems: false
+          x-insertionOrder: false
+          items:
+            $ref: '#/components/schemas/Entity_DataValue'
+        NestedType:
+          description: The nested type in the data type.
+          $ref: '#/components/schemas/Entity_DataType'
+        Relationship:
+          description: A relationship that associates a component with another component.
+          $ref: '#/components/schemas/Relationship'
+        Type:
+          description: The underlying type of the data type.
+          type: string
+          enum:
+            - RELATIONSHIP
+            - STRING
+            - LONG
+            - BOOLEAN
+            - INTEGER
+            - DOUBLE
+            - LIST
+            - MAP
+        UnitOfMeasure:
+          description: The unit of measure used in this data type.
+          type: string
+          pattern: .*
+          minLength: 1
+          maxLength: 256
+      additionalProperties: false
+    Entity_DataValue:
+      description: An object that specifies a value for a property.
+      type: object
+      properties:
+        BooleanValue:
+          description: A Boolean value.
+          type: boolean
+        DoubleValue:
+          description: A double value.
+          type: number
+        Expression:
+          description: An expression that produces the value.
+          type: string
+          pattern: (^\$\{Parameters\.[a-zA-z]+([a-zA-z_0-9]*)}$)
+          minLength: 1
+          maxLength: 316
+        IntegerValue:
+          description: An integer value.
+          type: integer
+        ListValue:
+          description: A list of multiple values.
+          type: array
+          minItems: 0
+          maxItems: 50
+          uniqueItems: false
+          x-insertionOrder: false
+          items:
+            $ref: '#/components/schemas/Entity_DataValue'
+        LongValue:
+          description: A long value.
+          type: number
+        StringValue:
+          description: A string value.
+          type: string
+          pattern: .*
+          minLength: 1
+          maxLength: 256
+        MapValue:
+          description: An object that maps strings to multiple DataValue objects.
+          type: object
+          x-patternProperties:
+            '[a-zA-Z_\-0-9]+':
+              $ref: '#/components/schemas/Entity_DataValue'
+          additionalProperties: false
+        RelationshipValue:
+          description: A value that relates a component to another component.
+          type: object
+          properties:
+            TargetComponentName:
+              type: string
+              pattern: '[a-zA-Z_\-0-9]+'
+              minLength: 1
+              maxLength: 256
+            TargetEntityId:
+              type: string
+              pattern: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}|^[a-zA-Z0-9][a-zA-Z_\-0-9.:]*[a-zA-Z0-9]+'
+              minLength: 1
+              maxLength: 128
+          additionalProperties: false
+      additionalProperties: false
     Definition:
       description: An object that specifies information about a property definition.
       type: object
@@ -825,10 +927,10 @@ components:
           $ref: '#/components/schemas/PropertyDefinitionConfiguration'
         DataType:
           description: An object that contains information about the data type.
-          $ref: '#/components/schemas/DataType'
+          $ref: '#/components/schemas/Entity_DataType'
         DefaultValue:
           description: An object that contains the default value.
-          $ref: '#/components/schemas/DataValue'
+          $ref: '#/components/schemas/Entity_DataValue'
         IsExternalId:
           description: A Boolean value that specifies whether the property ID comes from an external data store.
           type: boolean
@@ -860,7 +962,26 @@ components:
           $ref: '#/components/schemas/Definition'
         Value:
           description: The value of the property.
-          $ref: '#/components/schemas/DataValue'
+          $ref: '#/components/schemas/Entity_DataValue'
+      additionalProperties: false
+    Entity_PropertyGroup:
+      description: An object that specifies information about a property group.
+      type: object
+      properties:
+        GroupType:
+          description: The type of property group.
+          type: string
+          enum:
+            - TABULAR
+        PropertyNames:
+          description: The list of property names in the property group.
+          type: array
+          minItems: 1
+          maxItems: 256
+          uniqueItems: true
+          x-insertionOrder: false
+          items:
+            $ref: '#/components/schemas/PropertyName'
       additionalProperties: false
     Component:
       type: object
@@ -899,7 +1020,7 @@ components:
           type: object
           x-patternProperties:
             '[a-zA-Z_\-0-9]+':
-              $ref: '#/components/schemas/PropertyGroup'
+              $ref: '#/components/schemas/Entity_PropertyGroup'
           additionalProperties: false
         Status:
           description: The current status of the entity.
@@ -943,7 +1064,7 @@ components:
           type: object
           x-patternProperties:
             '[a-zA-Z_\-0-9]+':
-              $ref: '#/components/schemas/PropertyGroup'
+              $ref: '#/components/schemas/Entity_PropertyGroup'
           additionalProperties: false
         Status:
           description: The current status of the component.
@@ -1848,7 +1969,7 @@ components:
       id: awscc.iottwinmaker.component_types
       x-cfn-schema-name: ComponentType
       x-cfn-type-name: AWS::IoTTwinMaker::ComponentType
-      x-identifiers:
+      x-identifiers: &ref_0
         - WorkspaceId
         - ComponentTypeId
       x-type: cloud_control
@@ -1965,9 +2086,7 @@ components:
       id: awscc.iottwinmaker.component_types_list_only
       x-cfn-schema-name: ComponentType
       x-cfn-type-name: AWS::IoTTwinMaker::ComponentType
-      x-identifiers:
-        - WorkspaceId
-        - ComponentTypeId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1999,7 +2118,7 @@ components:
       id: awscc.iottwinmaker.entities
       x-cfn-schema-name: Entity
       x-cfn-type-name: AWS::IoTTwinMaker::Entity
-      x-identifiers:
+      x-identifiers: &ref_1
         - WorkspaceId
         - EntityId
       x-type: cloud_control
@@ -2110,9 +2229,7 @@ components:
       id: awscc.iottwinmaker.entities_list_only
       x-cfn-schema-name: Entity
       x-cfn-type-name: AWS::IoTTwinMaker::Entity
-      x-identifiers:
-        - WorkspaceId
-        - EntityId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2144,7 +2261,7 @@ components:
       id: awscc.iottwinmaker.scenes
       x-cfn-schema-name: Scene
       x-cfn-type-name: AWS::IoTTwinMaker::Scene
-      x-identifiers:
+      x-identifiers: &ref_2
         - WorkspaceId
         - SceneId
       x-type: cloud_control
@@ -2251,9 +2368,7 @@ components:
       id: awscc.iottwinmaker.scenes_list_only
       x-cfn-schema-name: Scene
       x-cfn-type-name: AWS::IoTTwinMaker::Scene
-      x-identifiers:
-        - WorkspaceId
-        - SceneId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2285,7 +2400,7 @@ components:
       id: awscc.iottwinmaker.sync_jobs
       x-cfn-schema-name: SyncJob
       x-cfn-type-name: AWS::IoTTwinMaker::SyncJob
-      x-identifiers:
+      x-identifiers: &ref_3
         - WorkspaceId
         - SyncSource
       x-type: cloud_control
@@ -2369,9 +2484,7 @@ components:
       id: awscc.iottwinmaker.sync_jobs_list_only
       x-cfn-schema-name: SyncJob
       x-cfn-type-name: AWS::IoTTwinMaker::SyncJob
-      x-identifiers:
-        - WorkspaceId
-        - SyncSource
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2403,7 +2516,7 @@ components:
       id: awscc.iottwinmaker.workspaces
       x-cfn-schema-name: Workspace
       x-cfn-type-name: AWS::IoTTwinMaker::Workspace
-      x-identifiers:
+      x-identifiers: &ref_4
         - WorkspaceId
       x-type: cloud_control
       methods:
@@ -2503,8 +2616,7 @@ components:
       id: awscc.iottwinmaker.workspaces_list_only
       x-cfn-schema-name: Workspace
       x-cfn-type-name: AWS::IoTTwinMaker::Workspace
-      x-identifiers:
-        - WorkspaceId
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/iotwireless.yaml b/openapi/src/awscc/v00.00.00000/services/iotwireless.yaml
index bea95be78..49da67dd6 100644
--- a/openapi/src/awscc/v00.00.00000/services/iotwireless.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/iotwireless.yaml
@@ -396,11 +396,11 @@ components:
         Key:
           type: string
           minLength: 1
-          maxLength: 128
+          maxLength: 127
         Value:
           type: string
-          minLength: 0
-          maxLength: 256
+          minLength: 1
+          maxLength: 255
       additionalProperties: false
     Destination:
       type: object
@@ -556,6 +556,18 @@ components:
           maxLength: 64
         Supports32BitFCnt:
           type: boolean
+    DeviceProfile_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          minLength: 1
+          maxLength: 256
+      additionalProperties: false
     FactoryPresetFreq:
       type: integer
       minimum: 1000000
@@ -577,7 +589,7 @@ components:
           maxItems: 200
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/DeviceProfile_Tag'
         Arn:
           description: Service profile Arn. Returned after successful create.
           type: string
@@ -624,29 +636,33 @@ components:
         list:
           - iotwireless:ListDeviceProfiles
           - iotwireless:ListTagsForResource
-    LoRaWAN:
+    FuotaTask_Tag:
       type: object
       properties:
-        RfRegion:
-          description: Multicast group LoRaWAN RF region
+        Key:
           type: string
           minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          minLength: 0
+          maxLength: 256
+      additionalProperties: false
+    LoRaWAN:
+      type: object
+      properties:
+        StartTime:
+          description: FUOTA task LoRaWAN start time
+          type: string
           maxLength: 64
-        DlClass:
-          description: Multicast group LoRaWAN DL Class
+        RfRegion:
+          description: FUOTA task LoRaWAN RF region
           type: string
           minLength: 1
           maxLength: 64
-        NumberOfDevicesRequested:
-          description: Multicast group number of devices requested. Returned after successful read.
-          type: integer
-        NumberOfDevicesInGroup:
-          description: Multicast group number of devices in group. Returned after successful read.
-          type: integer
       additionalProperties: false
       required:
         - RfRegion
-        - DlClass
     FuotaTask:
       type: object
       properties:
@@ -685,7 +701,7 @@ components:
           maxItems: 200
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/FuotaTask_Tag'
         FuotaTaskStatus:
           description: FUOTA task status. Returned after successful read.
           type: string
@@ -757,6 +773,41 @@ components:
         list:
           - iotwireless:ListFuotaTasks
           - iotwireless:ListTagsForResource
+    MulticastGroup_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          minLength: 0
+          maxLength: 256
+      additionalProperties: false
+    MulticastGroup_LoRaWAN:
+      type: object
+      properties:
+        RfRegion:
+          description: Multicast group LoRaWAN RF region
+          type: string
+          minLength: 1
+          maxLength: 64
+        DlClass:
+          description: Multicast group LoRaWAN DL Class
+          type: string
+          minLength: 1
+          maxLength: 64
+        NumberOfDevicesRequested:
+          description: Multicast group number of devices requested. Returned after successful read.
+          type: integer
+        NumberOfDevicesInGroup:
+          description: Multicast group number of devices in group. Returned after successful read.
+          type: integer
+      additionalProperties: false
+      required:
+        - RfRegion
+        - DlClass
     MulticastGroup:
       type: object
       properties:
@@ -770,7 +821,7 @@ components:
           maxLength: 2048
         LoRaWAN:
           description: Multicast group LoRaWAN
-          $ref: '#/components/schemas/LoRaWAN'
+          $ref: '#/components/schemas/MulticastGroup_LoRaWAN'
         Arn:
           description: Multicast group arn. Returned after successful create.
           type: string
@@ -785,7 +836,7 @@ components:
           maxItems: 200
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/MulticastGroup_Tag'
         Status:
           description: Multicast group status. Returned after successful read.
           type: string
@@ -852,6 +903,24 @@ components:
         - INFO
         - ERROR
         - DISABLED
+    NetworkAnalyzerConfiguration_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     NetworkAnalyzerConfiguration:
       type: object
       properties:
@@ -897,7 +966,7 @@ components:
           x-insertionOrder: false
           maxItems: 200
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/NetworkAnalyzerConfiguration_Tag'
       required:
         - Name
       x-stackql-resource-name: network_analyzer_configuration
@@ -1095,6 +1164,18 @@ components:
           type: integer
         MinGwDiversity:
           type: integer
+    ServiceProfile_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          minLength: 1
+          maxLength: 256
+      additionalProperties: false
     ServiceProfile:
       type: object
       properties:
@@ -1112,7 +1193,7 @@ components:
           maxItems: 200
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ServiceProfile_Tag'
         Arn:
           description: Service profile Arn. Returned after successful create.
           type: string
@@ -1436,6 +1517,18 @@ components:
             - AbpV11
         - required:
             - AbpV10x
+    WirelessDevice_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          minLength: 0
+          maxLength: 256
+      additionalProperties: false
     Application:
       description: LoRaWAN application configuration, which can be used to perform geolocation.
       type: object
@@ -1490,7 +1583,7 @@ components:
           maxItems: 200
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/WirelessDevice_Tag'
         Arn:
           description: Wireless device arn. Returned after successful create.
           type: string
@@ -1567,6 +1660,24 @@ components:
       description: sidewalk role
       type: string
       maxLength: 2048
+    WirelessDeviceImportTask_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     WirelessDeviceImportTask:
       type: object
       properties:
@@ -1632,7 +1743,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/WirelessDeviceImportTask_Tag'
       required:
         - DestinationName
         - Sidewalk
@@ -1701,6 +1812,18 @@ components:
       required:
         - GatewayEui
         - RfRegion
+    WirelessGateway_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          minLength: 0
+          maxLength: 256
+      additionalProperties: false
     WirelessGateway:
       type: object
       properties:
@@ -1719,7 +1842,7 @@ components:
           maxItems: 200
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/WirelessGateway_Tag'
         LoRaWAN:
           description: The combination of Package, Station and Model which represents the version of the LoRaWAN Wireless Gateway.
           $ref: '#/components/schemas/LoRaWANGateway'
@@ -1859,7 +1982,7 @@ components:
               maxItems: 200
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/DeviceProfile_Tag'
             Arn:
               description: Service profile Arn. Returned after successful create.
               type: string
@@ -1919,7 +2042,7 @@ components:
               maxItems: 200
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/FuotaTask_Tag'
             FuotaTaskStatus:
               description: FUOTA task status. Returned after successful read.
               type: string
@@ -1966,7 +2089,7 @@ components:
               maxLength: 2048
             LoRaWAN:
               description: Multicast group LoRaWAN
-              $ref: '#/components/schemas/LoRaWAN'
+              $ref: '#/components/schemas/MulticastGroup_LoRaWAN'
             Arn:
               description: Multicast group arn. Returned after successful create.
               type: string
@@ -1981,7 +2104,7 @@ components:
               maxItems: 200
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/MulticastGroup_Tag'
             Status:
               description: Multicast group status. Returned after successful read.
               type: string
@@ -2052,7 +2175,7 @@ components:
               x-insertionOrder: false
               maxItems: 200
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/NetworkAnalyzerConfiguration_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateNetworkAnalyzerConfigurationRequest
       type: object
@@ -2136,7 +2259,7 @@ components:
               maxItems: 200
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ServiceProfile_Tag'
             Arn:
               description: Service profile Arn. Returned after successful create.
               type: string
@@ -2240,7 +2363,7 @@ components:
               maxItems: 200
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/WirelessDevice_Tag'
             Arn:
               description: Wireless device arn. Returned after successful create.
               type: string
@@ -2342,7 +2465,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/WirelessDeviceImportTask_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateWirelessDeviceImportTaskRequest
       type: object
@@ -2375,7 +2498,7 @@ components:
               maxItems: 200
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/WirelessGateway_Tag'
             LoRaWAN:
               description: The combination of Package, Station and Model which represents the version of the LoRaWAN Wireless Gateway.
               $ref: '#/components/schemas/LoRaWANGateway'
@@ -2412,7 +2535,7 @@ components:
       id: awscc.iotwireless.destinations
       x-cfn-schema-name: Destination
       x-cfn-type-name: AWS::IoTWireless::Destination
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -2510,8 +2633,7 @@ components:
       id: awscc.iotwireless.destinations_list_only
       x-cfn-schema-name: Destination
       x-cfn-type-name: AWS::IoTWireless::Destination
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2541,7 +2663,7 @@ components:
       id: awscc.iotwireless.device_profiles
       x-cfn-schema-name: DeviceProfile
       x-cfn-type-name: AWS::IoTWireless::DeviceProfile
-      x-identifiers:
+      x-identifiers: &ref_1
         - Id
       x-type: cloud_control
       methods:
@@ -2635,8 +2757,7 @@ components:
       id: awscc.iotwireless.device_profiles_list_only
       x-cfn-schema-name: DeviceProfile
       x-cfn-type-name: AWS::IoTWireless::DeviceProfile
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2666,7 +2787,7 @@ components:
       id: awscc.iotwireless.fuota_tasks
       x-cfn-schema-name: FuotaTask
       x-cfn-type-name: AWS::IoTWireless::FuotaTask
-      x-identifiers:
+      x-identifiers: &ref_2
         - Id
       x-type: cloud_control
       methods:
@@ -2776,8 +2897,7 @@ components:
       id: awscc.iotwireless.fuota_tasks_list_only
       x-cfn-schema-name: FuotaTask
       x-cfn-type-name: AWS::IoTWireless::FuotaTask
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2807,7 +2927,7 @@ components:
       id: awscc.iotwireless.multicast_groups
       x-cfn-schema-name: MulticastGroup
       x-cfn-type-name: AWS::IoTWireless::MulticastGroup
-      x-identifiers:
+      x-identifiers: &ref_3
         - Id
       x-type: cloud_control
       methods:
@@ -2909,8 +3029,7 @@ components:
       id: awscc.iotwireless.multicast_groups_list_only
       x-cfn-schema-name: MulticastGroup
       x-cfn-type-name: AWS::IoTWireless::MulticastGroup
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2940,7 +3059,7 @@ components:
       id: awscc.iotwireless.network_analyzer_configurations
       x-cfn-schema-name: NetworkAnalyzerConfiguration
       x-cfn-type-name: AWS::IoTWireless::NetworkAnalyzerConfiguration
-      x-identifiers:
+      x-identifiers: &ref_4
         - Name
       x-type: cloud_control
       methods:
@@ -3038,8 +3157,7 @@ components:
       id: awscc.iotwireless.network_analyzer_configurations_list_only
       x-cfn-schema-name: NetworkAnalyzerConfiguration
       x-cfn-type-name: AWS::IoTWireless::NetworkAnalyzerConfiguration
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3069,7 +3187,7 @@ components:
       id: awscc.iotwireless.partner_accounts
       x-cfn-schema-name: PartnerAccount
       x-cfn-type-name: AWS::IoTWireless::PartnerAccount
-      x-identifiers:
+      x-identifiers: &ref_5
         - PartnerAccountId
       x-type: cloud_control
       methods:
@@ -3171,8 +3289,7 @@ components:
       id: awscc.iotwireless.partner_accounts_list_only
       x-cfn-schema-name: PartnerAccount
       x-cfn-type-name: AWS::IoTWireless::PartnerAccount
-      x-identifiers:
-        - PartnerAccountId
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3202,7 +3319,7 @@ components:
       id: awscc.iotwireless.service_profiles
       x-cfn-schema-name: ServiceProfile
       x-cfn-type-name: AWS::IoTWireless::ServiceProfile
-      x-identifiers:
+      x-identifiers: &ref_6
         - Id
       x-type: cloud_control
       methods:
@@ -3296,8 +3413,7 @@ components:
       id: awscc.iotwireless.service_profiles_list_only
       x-cfn-schema-name: ServiceProfile
       x-cfn-type-name: AWS::IoTWireless::ServiceProfile
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3327,7 +3443,7 @@ components:
       id: awscc.iotwireless.task_definitions
       x-cfn-schema-name: TaskDefinition
       x-cfn-type-name: AWS::IoTWireless::TaskDefinition
-      x-identifiers:
+      x-identifiers: &ref_7
         - Id
       x-type: cloud_control
       methods:
@@ -3427,8 +3543,7 @@ components:
       id: awscc.iotwireless.task_definitions_list_only
       x-cfn-schema-name: TaskDefinition
       x-cfn-type-name: AWS::IoTWireless::TaskDefinition
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3458,7 +3573,7 @@ components:
       id: awscc.iotwireless.wireless_devices
       x-cfn-schema-name: WirelessDevice
       x-cfn-type-name: AWS::IoTWireless::WirelessDevice
-      x-identifiers:
+      x-identifiers: &ref_8
         - Id
       x-type: cloud_control
       methods:
@@ -3566,8 +3681,7 @@ components:
       id: awscc.iotwireless.wireless_devices_list_only
       x-cfn-schema-name: WirelessDevice
       x-cfn-type-name: AWS::IoTWireless::WirelessDevice
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3597,7 +3711,7 @@ components:
       id: awscc.iotwireless.wireless_device_import_tasks
       x-cfn-schema-name: WirelessDeviceImportTask
       x-cfn-type-name: AWS::IoTWireless::WirelessDeviceImportTask
-      x-identifiers:
+      x-identifiers: &ref_9
         - Id
       x-type: cloud_control
       methods:
@@ -3705,8 +3819,7 @@ components:
       id: awscc.iotwireless.wireless_device_import_tasks_list_only
       x-cfn-schema-name: WirelessDeviceImportTask
       x-cfn-type-name: AWS::IoTWireless::WirelessDeviceImportTask
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3736,7 +3849,7 @@ components:
       id: awscc.iotwireless.wireless_gateways
       x-cfn-schema-name: WirelessGateway
       x-cfn-type-name: AWS::IoTWireless::WirelessGateway
-      x-identifiers:
+      x-identifiers: &ref_10
         - Id
       x-type: cloud_control
       methods:
@@ -3838,8 +3951,7 @@ components:
       id: awscc.iotwireless.wireless_gateways_list_only
       x-cfn-schema-name: WirelessGateway
       x-cfn-type-name: AWS::IoTWireless::WirelessGateway
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/ivs.yaml b/openapi/src/awscc/v00.00.00000/services/ivs.yaml
index 3213ba569..685e6e966 100644
--- a/openapi/src/awscc/v00.00.00000/services/ivs.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/ivs.yaml
@@ -545,6 +545,24 @@ components:
         list:
           - ivs:ListChannels
           - ivs:ListTagsForResource
+    EncoderConfiguration_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     EncoderConfiguration:
       type: object
       properties:
@@ -596,7 +614,7 @@ components:
           x-insertionOrder: false
           maxItems: 50
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/EncoderConfiguration_Tag'
       required: []
       x-stackql-resource-name: encoder_configuration
       description: Resource Type definition for AWS::IVS::EncoderConfiguration.
@@ -750,6 +768,21 @@ components:
         list:
           - ivs:ListIngestConfigurations
           - ivs:ListTagsForResource
+    PlaybackKeyPair_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          minLength: 0
+          maxLength: 256
+      required:
+        - Value
+        - Key
     PlaybackKeyPair:
       type: object
       properties:
@@ -778,7 +811,7 @@ components:
           x-insertionOrder: false
           maxItems: 50
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/PlaybackKeyPair_Tag'
       x-stackql-resource-name: playback_key_pair
       description: Resource Type definition for AWS::IVS::PlaybackKeyPair
       x-type-name: AWS::IVS::PlaybackKeyPair
@@ -819,6 +852,24 @@ components:
         list:
           - ivs:ListPlaybackKeyPairs
           - ivs:ListTagsForResource
+    PlaybackRestrictionPolicy_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     PlaybackRestrictionPolicy:
       type: object
       properties:
@@ -860,7 +911,7 @@ components:
           x-insertionOrder: false
           maxItems: 50
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/PlaybackRestrictionPolicy_Tag'
       x-stackql-resource-name: playback_restriction_policy
       description: Resource Type definition for AWS::IVS::PlaybackRestrictionPolicy.
       x-type-name: AWS::IVS::PlaybackRestrictionPolicy
@@ -897,6 +948,21 @@ components:
         list:
           - ivs:ListPlaybackRestrictionPolicies
           - ivs:ListTagsForResource
+    PublicKey_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     PublicKey:
       type: object
       properties:
@@ -926,7 +992,7 @@ components:
           x-insertionOrder: false
           maxItems: 50
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/PublicKey_Tag'
       x-stackql-resource-name: public_key
       description: Resource Type definition for AWS::IVS::PublicKey
       x-type-name: AWS::IVS::PublicKey
@@ -986,42 +1052,43 @@ components:
       required:
         - BucketName
     ThumbnailConfiguration:
-      description: A complex type that allows you to enable/disable the recording of thumbnails for individual participant recording and modify the interval at which thumbnails are generated for the live session.
+      description: Recording Thumbnail Configuration.
       type: object
       additionalProperties: false
       properties:
-        ParticipantThumbnailConfiguration:
-          description: An object representing a configuration of thumbnails for recorded video from an individual participant.
-          type: object
-          additionalProperties: false
-          properties:
-            RecordingMode:
-              description: 'Thumbnail recording mode. Default: DISABLED.'
-              type: string
-              enum:
-                - INTERVAL
-                - DISABLED
-              default: DISABLED
-            Storage:
-              description: 'Indicates the format in which thumbnails are recorded. SEQUENTIAL records all generated thumbnails in a serial manner, to the media/thumbnails/high directory. LATEST saves the latest thumbnail in media/latest_thumbnail/high/thumb.jpg and overwrites it at the interval specified by targetIntervalSeconds. You can enable both SEQUENTIAL and LATEST. Default: SEQUENTIAL.'
-              type: array
-              minItems: 0
-              maxItems: 2
-              uniqueItems: true
-              x-insertionOrder: false
-              items:
-                type: string
-                enum:
-                  - SEQUENTIAL
-                  - LATEST
-              default:
-                - SEQUENTIAL
-            TargetIntervalSeconds:
-              description: 'The targeted thumbnail-generation interval in seconds. This is configurable only if recordingMode is INTERVAL. Default: 60.'
-              type: integer
-              minimum: 1
-              maximum: 86400
-              default: 60
+        RecordingMode:
+          description: Thumbnail Recording Mode, which determines whether thumbnails are recorded at an interval or are disabled.
+          type: string
+          enum:
+            - INTERVAL
+            - DISABLED
+          default: INTERVAL
+        TargetIntervalSeconds:
+          description: Target Interval Seconds defines the interval at which thumbnails are recorded. This field is required if RecordingMode is INTERVAL.
+          type: integer
+          minimum: 1
+          maximum: 60
+          default: 60
+        Resolution:
+          description: Resolution indicates the desired resolution of recorded thumbnails.
+          type: string
+          enum:
+            - FULL_HD
+            - HD
+            - SD
+            - LOWEST_RESOLUTION
+        Storage:
+          description: Storage indicates the format in which thumbnails are recorded.
+          type: array
+          uniqueItems: true
+          x-insertionOrder: false
+          minItems: 0
+          maxItems: 2
+          items:
+            type: string
+            enum:
+              - SEQUENTIAL
+              - LATEST
       required: []
     RenditionConfiguration:
       description: Rendition Configuration describes which renditions should be recorded for a stream.
@@ -1181,6 +1248,44 @@ components:
         ParticipantRecordingHlsConfiguration:
           $ref: '#/components/schemas/ParticipantRecordingHlsConfiguration'
       required: []
+    Stage_ThumbnailConfiguration:
+      description: A complex type that allows you to enable/disable the recording of thumbnails for individual participant recording and modify the interval at which thumbnails are generated for the live session.
+      type: object
+      additionalProperties: false
+      properties:
+        ParticipantThumbnailConfiguration:
+          description: An object representing a configuration of thumbnails for recorded video from an individual participant.
+          type: object
+          additionalProperties: false
+          properties:
+            RecordingMode:
+              description: 'Thumbnail recording mode. Default: DISABLED.'
+              type: string
+              enum:
+                - INTERVAL
+                - DISABLED
+              default: DISABLED
+            Storage:
+              description: 'Indicates the format in which thumbnails are recorded. SEQUENTIAL records all generated thumbnails in a serial manner, to the media/thumbnails/high directory. LATEST saves the latest thumbnail in media/latest_thumbnail/high/thumb.jpg and overwrites it at the interval specified by targetIntervalSeconds. You can enable both SEQUENTIAL and LATEST. Default: SEQUENTIAL.'
+              type: array
+              minItems: 0
+              maxItems: 2
+              uniqueItems: true
+              x-insertionOrder: false
+              items:
+                type: string
+                enum:
+                  - SEQUENTIAL
+                  - LATEST
+              default:
+                - SEQUENTIAL
+            TargetIntervalSeconds:
+              description: 'The targeted thumbnail-generation interval in seconds. This is configurable only if recordingMode is INTERVAL. Default: 60.'
+              type: integer
+              minimum: 1
+              maximum: 86400
+              default: 60
+      required: []
     AutoParticipantRecordingConfiguration:
       description: Configuration object for individual participant recording, to attach to the new stage.
       type: object
@@ -1215,7 +1320,7 @@ components:
           maximum: 300
           default: 0
         ThumbnailConfiguration:
-          $ref: '#/components/schemas/ThumbnailConfiguration'
+          $ref: '#/components/schemas/Stage_ThumbnailConfiguration'
       required:
         - StorageConfigurationArn
     Stage:
@@ -1597,7 +1702,7 @@ components:
               x-insertionOrder: false
               maxItems: 50
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/EncoderConfiguration_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateEncoderConfigurationRequest
       type: object
@@ -1715,7 +1820,7 @@ components:
               x-insertionOrder: false
               maxItems: 50
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/PlaybackKeyPair_Tag'
           x-stackQL-stringOnly: true
       x-title: CreatePlaybackKeyPairRequest
       type: object
@@ -1771,7 +1876,7 @@ components:
               x-insertionOrder: false
               maxItems: 50
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/PlaybackRestrictionPolicy_Tag'
           x-stackQL-stringOnly: true
       x-title: CreatePlaybackRestrictionPolicyRequest
       type: object
@@ -1815,7 +1920,7 @@ components:
               x-insertionOrder: false
               maxItems: 50
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/PublicKey_Tag'
           x-stackQL-stringOnly: true
       x-title: CreatePublicKeyRequest
       type: object
@@ -2010,7 +2115,7 @@ components:
       id: awscc.ivs.channels
       x-cfn-schema-name: Channel
       x-cfn-type-name: AWS::IVS::Channel
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -2120,8 +2225,7 @@ components:
       id: awscc.ivs.channels_list_only
       x-cfn-schema-name: Channel
       x-cfn-type-name: AWS::IVS::Channel
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2151,7 +2255,7 @@ components:
       id: awscc.ivs.encoder_configurations
       x-cfn-schema-name: EncoderConfiguration
       x-cfn-type-name: AWS::IVS::EncoderConfiguration
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -2243,8 +2347,7 @@ components:
       id: awscc.ivs.encoder_configurations_list_only
       x-cfn-schema-name: EncoderConfiguration
       x-cfn-type-name: AWS::IVS::EncoderConfiguration
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2274,7 +2377,7 @@ components:
       id: awscc.ivs.ingest_configurations
       x-cfn-schema-name: IngestConfiguration
       x-cfn-type-name: AWS::IVS::IngestConfiguration
-      x-identifiers:
+      x-identifiers: &ref_2
         - Arn
       x-type: cloud_control
       methods:
@@ -2378,8 +2481,7 @@ components:
       id: awscc.ivs.ingest_configurations_list_only
       x-cfn-schema-name: IngestConfiguration
       x-cfn-type-name: AWS::IVS::IngestConfiguration
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2409,7 +2511,7 @@ components:
       id: awscc.ivs.playback_key_pairs
       x-cfn-schema-name: PlaybackKeyPair
       x-cfn-type-name: AWS::IVS::PlaybackKeyPair
-      x-identifiers:
+      x-identifiers: &ref_3
         - Arn
       x-type: cloud_control
       methods:
@@ -2503,8 +2605,7 @@ components:
       id: awscc.ivs.playback_key_pairs_list_only
       x-cfn-schema-name: PlaybackKeyPair
       x-cfn-type-name: AWS::IVS::PlaybackKeyPair
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2534,7 +2635,7 @@ components:
       id: awscc.ivs.playback_restriction_policies
       x-cfn-schema-name: PlaybackRestrictionPolicy
       x-cfn-type-name: AWS::IVS::PlaybackRestrictionPolicy
-      x-identifiers:
+      x-identifiers: &ref_4
         - Arn
       x-type: cloud_control
       methods:
@@ -2630,8 +2731,7 @@ components:
       id: awscc.ivs.playback_restriction_policies_list_only
       x-cfn-schema-name: PlaybackRestrictionPolicy
       x-cfn-type-name: AWS::IVS::PlaybackRestrictionPolicy
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2661,7 +2761,7 @@ components:
       id: awscc.ivs.public_keys
       x-cfn-schema-name: PublicKey
       x-cfn-type-name: AWS::IVS::PublicKey
-      x-identifiers:
+      x-identifiers: &ref_5
         - Arn
       x-type: cloud_control
       methods:
@@ -2755,8 +2855,7 @@ components:
       id: awscc.ivs.public_keys_list_only
       x-cfn-schema-name: PublicKey
       x-cfn-type-name: AWS::IVS::PublicKey
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2786,7 +2885,7 @@ components:
       id: awscc.ivs.recording_configurations
       x-cfn-schema-name: RecordingConfiguration
       x-cfn-type-name: AWS::IVS::RecordingConfiguration
-      x-identifiers:
+      x-identifiers: &ref_6
         - Arn
       x-type: cloud_control
       methods:
@@ -2886,8 +2985,7 @@ components:
       id: awscc.ivs.recording_configurations_list_only
       x-cfn-schema-name: RecordingConfiguration
       x-cfn-type-name: AWS::IVS::RecordingConfiguration
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2917,7 +3015,7 @@ components:
       id: awscc.ivs.stages
       x-cfn-schema-name: Stage
       x-cfn-type-name: AWS::IVS::Stage
-      x-identifiers:
+      x-identifiers: &ref_7
         - Arn
       x-type: cloud_control
       methods:
@@ -3011,8 +3109,7 @@ components:
       id: awscc.ivs.stages_list_only
       x-cfn-schema-name: Stage
       x-cfn-type-name: AWS::IVS::Stage
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3042,7 +3139,7 @@ components:
       id: awscc.ivs.storage_configurations
       x-cfn-schema-name: StorageConfiguration
       x-cfn-type-name: AWS::IVS::StorageConfiguration
-      x-identifiers:
+      x-identifiers: &ref_8
         - Arn
       x-type: cloud_control
       methods:
@@ -3134,8 +3231,7 @@ components:
       id: awscc.ivs.storage_configurations_list_only
       x-cfn-schema-name: StorageConfiguration
       x-cfn-type-name: AWS::IVS::StorageConfiguration
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3165,7 +3261,7 @@ components:
       id: awscc.ivs.stream_keys
       x-cfn-schema-name: StreamKey
       x-cfn-type-name: AWS::IVS::StreamKey
-      x-identifiers:
+      x-identifiers: &ref_9
         - Arn
       x-type: cloud_control
       methods:
@@ -3257,8 +3353,7 @@ components:
       id: awscc.ivs.stream_keys_list_only
       x-cfn-schema-name: StreamKey
       x-cfn-type-name: AWS::IVS::StreamKey
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/ivschat.yaml b/openapi/src/awscc/v00.00.00000/services/ivschat.yaml
index 4471d8bf3..c47d5fdb6 100644
--- a/openapi/src/awscc/v00.00.00000/services/ivschat.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/ivschat.yaml
@@ -454,11 +454,11 @@ components:
         Value:
           type: string
           description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
-          minLength: 1
+          minLength: 0
           maxLength: 256
       required:
-        - Value
         - Key
+        - Value
     LoggingConfiguration:
       type: object
       properties:
@@ -567,6 +567,24 @@ components:
         list:
           - ivschat:ListLoggingConfigurations
           - ivschat:ListTagsForResource
+    Room_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 256
+      required:
+        - Value
+        - Key
     MessageReviewHandler:
       description: Configuration information for optional review of messages.
       type: object
@@ -639,7 +657,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Room_Tag'
       required: []
       x-stackql-resource-name: room
       description: Resource type definition for AWS::IVSChat::Room.
@@ -796,7 +814,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Room_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateRoomRequest
       type: object
@@ -814,7 +832,7 @@ components:
       id: awscc.ivschat.logging_configurations
       x-cfn-schema-name: LoggingConfiguration
       x-cfn-type-name: AWS::IVSChat::LoggingConfiguration
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -910,8 +928,7 @@ components:
       id: awscc.ivschat.logging_configurations_list_only
       x-cfn-schema-name: LoggingConfiguration
       x-cfn-type-name: AWS::IVSChat::LoggingConfiguration
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -941,7 +958,7 @@ components:
       id: awscc.ivschat.rooms
       x-cfn-schema-name: Room
       x-cfn-type-name: AWS::IVSChat::Room
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -1041,8 +1058,7 @@ components:
       id: awscc.ivschat.rooms_list_only
       x-cfn-schema-name: Room
       x-cfn-type-name: AWS::IVSChat::Room
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/kafkaconnect.yaml b/openapi/src/awscc/v00.00.00000/services/kafkaconnect.yaml
index 0b7e89a3a..827ddc22e 100644
--- a/openapi/src/awscc/v00.00.00000/services/kafkaconnect.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/kafkaconnect.yaml
@@ -459,100 +459,23 @@ components:
           type: string
       required:
         - Enabled
-    CustomPlugin:
+    Connector_CustomPlugin:
+      description: Details about a custom plugin.
       type: object
+      additionalProperties: false
       properties:
-        Name:
-          description: The name of the custom plugin.
-          type: string
-          minLength: 1
-          maxLength: 128
-        Description:
-          description: A summary description of the custom plugin.
-          type: string
-          maxLength: 1024
         CustomPluginArn:
           description: The Amazon Resource Name (ARN) of the custom plugin to use.
           type: string
           pattern: arn:(aws|aws-us-gov|aws-cn):kafkaconnect:.*
-        ContentType:
-          description: The type of the plugin file.
-          type: string
-          enum:
-            - JAR
-            - ZIP
-        FileDescription:
-          $ref: '#/components/schemas/CustomPluginFileDescription'
-        Location:
-          $ref: '#/components/schemas/CustomPluginLocation'
         Revision:
-          description: The revision of the custom plugin.
+          description: The revision of the custom plugin to use.
           type: integer
           format: int64
-        Tags:
-          description: An array of key-value pairs to apply to this resource.
-          type: array
-          uniqueItems: false
-          x-insertionOrder: false
-          items:
-            $ref: '#/components/schemas/Tag'
+          minimum: 1
       required:
-        - Name
-        - ContentType
-        - Location
-      x-stackql-resource-name: custom_plugin
-      description: An example resource schema demonstrating some basic constructs and validation rules.
-      x-type-name: AWS::KafkaConnect::CustomPlugin
-      x-stackql-primary-identifier:
-        - CustomPluginArn
-      x-stackql-additional-identifiers:
-        - - Name
-      x-create-only-properties:
-        - Name
-        - Description
-        - ContentType
-        - Location
-      x-read-only-properties:
         - CustomPluginArn
         - Revision
-        - FileDescription
-      x-required-properties:
-        - Name
-        - ContentType
-        - Location
-      x-tagging:
-        taggable: true
-        tagOnCreate: true
-        tagUpdatable: true
-        cloudFormationSystemTags: true
-        tagProperty: /properties/Tags
-        permissions:
-          - kafkaconnect:ListTagsForResource
-          - kafkaconnect:UntagResource
-          - kafkaconnect:TagResource
-      x-required-permissions:
-        create:
-          - kafkaconnect:DescribeCustomPlugin
-          - kafkaconnect:ListTagsForResource
-          - kafkaconnect:CreateCustomPlugin
-          - kafkaconnect:TagResource
-          - s3:GetObject
-          - s3:GetObjectVersion
-          - s3:GetObjectAttributes
-          - s3:GetObjectVersionAttributes
-        read:
-          - kafkaconnect:DescribeCustomPlugin
-          - kafkaconnect:ListTagsForResource
-        update:
-          - kafkaconnect:DescribeCustomPlugin
-          - kafkaconnect:ListTagsForResource
-          - kafkaconnect:TagResource
-          - kafkaconnect:UntagResource
-        delete:
-          - kafkaconnect:DeleteCustomPlugin
-          - kafkaconnect:DescribeCustomPlugin
-        list:
-          - kafkaconnect:ListCustomPlugins
     FirehoseLogDelivery:
       description: Details about delivering logs to Amazon Kinesis Data Firehose.
       type: object
@@ -620,7 +543,7 @@ components:
       additionalProperties: false
       properties:
         CustomPlugin:
-          $ref: '#/components/schemas/CustomPlugin'
+          $ref: '#/components/schemas/Connector_CustomPlugin'
       required:
         - CustomPlugin
     ProvisionedCapacity:
@@ -718,85 +641,23 @@ components:
       required:
         - SecurityGroups
         - Subnets
-    WorkerConfiguration:
+    Connector_WorkerConfiguration:
+      description: Specifies the worker configuration to use with the connector.
       type: object
+      additionalProperties: false
       properties:
-        Name:
-          description: The name of the worker configuration.
-          type: string
-          minLength: 1
-          maxLength: 128
-        Description:
-          description: A summary description of the worker configuration.
-          type: string
-          maxLength: 1024
-        WorkerConfigurationArn:
-          description: The Amazon Resource Name (ARN) of the custom configuration.
-          type: string
-          pattern: arn:(aws|aws-us-gov|aws-cn):kafkaconnect:.*
-        PropertiesFileContent:
-          description: Base64 encoded contents of connect-distributed.properties file.
-          type: string
         Revision:
-          description: The description of a revision of the worker configuration.
+          description: The revision of the worker configuration to use.
           type: integer
+          minimum: 1
           format: int64
-        Tags:
-          description: A collection of tags associated with a resource
-          type: array
-          uniqueItems: true
-          x-insertionOrder: false
-          items:
-            $ref: '#/components/schemas/Tag'
+        WorkerConfigurationArn:
+          description: The Amazon Resource Name (ARN) of the worker configuration to use.
+          type: string
+          pattern: arn:(aws|aws-us-gov|aws-cn):kafkaconnect:.*
       required:
-        - Name
-        - PropertiesFileContent
-      x-stackql-resource-name: worker_configuration
-      description: The configuration of the workers, which are the processes that run the connector logic.
-      x-type-name: AWS::KafkaConnect::WorkerConfiguration
-      x-stackql-primary-identifier:
-        - WorkerConfigurationArn
-      x-stackql-additional-identifiers:
-        - - Name
-      x-create-only-properties:
-        - Name
-        - Description
-        - PropertiesFileContent
-      x-read-only-properties:
-        - WorkerConfigurationArn
         - Revision
-      x-required-properties:
-        - Name
-        - PropertiesFileContent
-      x-tagging:
-        taggable: true
-        tagOnCreate: true
-        tagUpdatable: true
-        cloudFormationSystemTags: true
-        tagProperty: /properties/Tags
-        permissions:
-          - kafkaconnect:ListTagsForResource
-          - kafkaconnect:UntagResource
-          - kafkaconnect:TagResource
-      x-required-permissions:
-        create:
-          - kafkaconnect:DescribeWorkerConfiguration
-          - kafkaconnect:CreateWorkerConfiguration
-          - kafkaconnect:TagResource
-          - kafkaconnect:ListTagsForResource
-        read:
-          - kafkaconnect:DescribeWorkerConfiguration
-          - kafkaconnect:ListTagsForResource
-        update:
-          - kafkaconnect:DescribeWorkerConfiguration
-          - kafkaconnect:ListTagsForResource
-          - kafkaconnect:TagResource
-          - kafkaconnect:UntagResource
-        delete:
-          - kafkaconnect:DescribeWorkerConfiguration
-          - kafkaconnect:DeleteWorkerConfiguration
-        list:
-          - kafkaconnect:ListWorkerConfigurations
+        - WorkerConfigurationArn
     WorkerLogDelivery:
       description: Specifies where worker logs are delivered.
       type: object
@@ -864,7 +725,7 @@ components:
           items:
             $ref: '#/components/schemas/Tag'
         WorkerConfiguration:
-          $ref: '#/components/schemas/WorkerConfiguration'
+          $ref: '#/components/schemas/Connector_WorkerConfiguration'
       required:
         - Capacity
         - ConnectorConfiguration
@@ -966,6 +827,24 @@ components:
           - firehose:TagDeliveryStream
         list:
           - kafkaconnect:ListConnectors
+    CustomPlugin_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     CustomPluginFileDescription:
       description: Details about the custom plugin file.
       type: object
@@ -1004,101 +883,179 @@ components:
       required:
         - BucketArn
         - FileKey
-    CreateCustomPluginRequest:
-      properties:
-        ClientToken:
-          type: string
-        RoleArn:
-          type: string
-        TypeName:
-          type: string
-        TypeVersionId:
-          type: string
-        DesiredState:
-          type: object
-          properties:
-            Name:
-              description: The name of the custom plugin.
-              type: string
-              minLength: 1
-              maxLength: 128
-            Description:
-              description: A summary description of the custom plugin.
-              type: string
-              maxLength: 1024
-            CustomPluginArn:
-              description: The Amazon Resource Name (ARN) of the custom plugin to use.
-              type: string
-              pattern: arn:(aws|aws-us-gov|aws-cn):kafkaconnect:.*
-            ContentType:
-              description: The type of the plugin file.
-              type: string
-              enum:
-                - JAR
-                - ZIP
-            FileDescription:
-              $ref: '#/components/schemas/CustomPluginFileDescription'
-            Location:
-              $ref: '#/components/schemas/CustomPluginLocation'
-            Revision:
-              description: The revision of the custom plugin.
-              type: integer
-              format: int64
-            Tags:
-              description: An array of key-value pairs to apply to this resource.
-              type: array
-              uniqueItems: false
-              x-insertionOrder: false
-              items:
-                $ref: '#/components/schemas/Tag'
-          x-stackQL-stringOnly: true
-      x-title: CreateCustomPluginRequest
+    CustomPlugin:
       type: object
-      required: []
-    CreateWorkerConfigurationRequest:
       properties:
-        ClientToken:
+        Name:
+          description: The name of the custom plugin.
           type: string
-        RoleArn:
+          minLength: 1
+          maxLength: 128
+        Description:
+          description: A summary description of the custom plugin.
           type: string
-        TypeName:
+          maxLength: 1024
+        CustomPluginArn:
+          description: The Amazon Resource Name (ARN) of the custom plugin to use.
           type: string
-        TypeVersionId:
+          pattern: arn:(aws|aws-us-gov|aws-cn):kafkaconnect:.*
+        ContentType:
+          description: The type of the plugin file.
           type: string
-        DesiredState:
-          type: object
-          properties:
-            Name:
-              description: The name of the worker configuration.
-              type: string
-              minLength: 1
-              maxLength: 128
-            Description:
-              description: A summary description of the worker configuration.
-              type: string
-              maxLength: 1024
-            WorkerConfigurationArn:
-              description: The Amazon Resource Name (ARN) of the custom configuration.
-              type: string
-              pattern: arn:(aws|aws-us-gov|aws-cn):kafkaconnect:.*
-            PropertiesFileContent:
-              description: Base64 encoded contents of connect-distributed.properties file.
-              type: string
-            Revision:
-              description: The description of a revision of the worker configuration.
-              type: integer
-              format: int64
-            Tags:
-              description: A collection of tags associated with a resource
-              type: array
-              uniqueItems: true
-              x-insertionOrder: false
-              items:
-                $ref: '#/components/schemas/Tag'
-          x-stackQL-stringOnly: true
-      x-title: CreateWorkerConfigurationRequest
+          enum:
+            - JAR
+            - ZIP
+        FileDescription:
+          $ref: '#/components/schemas/CustomPluginFileDescription'
+        Location:
+          $ref: '#/components/schemas/CustomPluginLocation'
+        Revision:
+          description: The revision of the custom plugin.
+          type: integer
+          format: int64
+        Tags:
+          description: An array of key-value pairs to apply to this resource.
+          type: array
+          uniqueItems: false
+          x-insertionOrder: false
+          items:
+            $ref: '#/components/schemas/CustomPlugin_Tag'
+      required:
+        - Name
+        - ContentType
+        - Location
+      x-stackql-resource-name: custom_plugin
+      description: An example resource schema demonstrating some basic constructs and validation rules.
+      x-type-name: AWS::KafkaConnect::CustomPlugin
+      x-stackql-primary-identifier:
+        - CustomPluginArn
+      x-stackql-additional-identifiers:
+        - - Name
+      x-create-only-properties:
+        - Name
+        - Description
+        - ContentType
+        - Location
+      x-read-only-properties:
+        - CustomPluginArn
+        - Revision
+        - FileDescription
+      x-required-properties:
+        - Name
+        - ContentType
+        - Location
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: true
+        tagProperty: /properties/Tags
+        permissions:
+          - kafkaconnect:ListTagsForResource
+          - kafkaconnect:UntagResource
+          - kafkaconnect:TagResource
+      x-required-permissions:
+        create:
+          - kafkaconnect:DescribeCustomPlugin
+          - kafkaconnect:ListTagsForResource
+          - kafkaconnect:CreateCustomPlugin
+          - kafkaconnect:TagResource
+          - s3:GetObject
+          - s3:GetObjectVersion
+          - s3:GetObjectAttributes
+          - s3:GetObjectVersionAttributes
+        read:
+          - kafkaconnect:DescribeCustomPlugin
+          - kafkaconnect:ListTagsForResource
+        update:
+          - kafkaconnect:DescribeCustomPlugin
+          - kafkaconnect:ListTagsForResource
+          - kafkaconnect:TagResource
+          - kafkaconnect:UntagResource
+        delete:
+          - kafkaconnect:DeleteCustomPlugin
+          - kafkaconnect:DescribeCustomPlugin
+        list:
+          - kafkaconnect:ListCustomPlugins
+    WorkerConfiguration:
       type: object
-      required: []
+      properties:
+        Name:
+          description: The name of the worker configuration.
+          type: string
+          minLength: 1
+          maxLength: 128
+        Description:
+          description: A summary description of the worker configuration.
+          type: string
+          maxLength: 1024
+        WorkerConfigurationArn:
+          description: The Amazon Resource Name (ARN) of the custom configuration.
+          type: string
+          pattern: arn:(aws|aws-us-gov|aws-cn):kafkaconnect:.*
+        PropertiesFileContent:
+          description: Base64 encoded contents of connect-distributed.properties file.
+          type: string
+        Revision:
+          description: The description of a revision of the worker configuration.
+          type: integer
+          format: int64
+        Tags:
+          description: A collection of tags associated with a resource
+          type: array
+          uniqueItems: true
+          x-insertionOrder: false
+          items:
+            $ref: '#/components/schemas/Tag'
+      required:
+        - Name
+        - PropertiesFileContent
+      x-stackql-resource-name: worker_configuration
+      description: The configuration of the workers, which are the processes that run the connector logic.
+      x-type-name: AWS::KafkaConnect::WorkerConfiguration
+      x-stackql-primary-identifier:
+        - WorkerConfigurationArn
+      x-stackql-additional-identifiers:
+        - - Name
+      x-create-only-properties:
+        - Name
+        - Description
+        - PropertiesFileContent
+      x-read-only-properties:
+        - WorkerConfigurationArn
+        - Revision
+      x-required-properties:
+        - Name
+        - PropertiesFileContent
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: true
+        tagProperty: /properties/Tags
+        permissions:
+          - kafkaconnect:ListTagsForResource
+          - kafkaconnect:UntagResource
+          - kafkaconnect:TagResource
+      x-required-permissions:
+        create:
+          - kafkaconnect:DescribeWorkerConfiguration
+          - kafkaconnect:CreateWorkerConfiguration
+          - kafkaconnect:TagResource
+          - kafkaconnect:ListTagsForResource
+        read:
+          - kafkaconnect:DescribeWorkerConfiguration
+          - kafkaconnect:ListTagsForResource
+        update:
+          - kafkaconnect:DescribeWorkerConfiguration
+          - kafkaconnect:ListTagsForResource
+          - kafkaconnect:TagResource
+          - kafkaconnect:UntagResource
+        delete:
+          - kafkaconnect:DescribeWorkerConfiguration
+          - kafkaconnect:DeleteWorkerConfiguration
+        list:
+          - kafkaconnect:ListWorkerConfigurations
     CreateConnectorRequest:
       properties:
         ClientToken:
@@ -1165,11 +1122,106 @@ components:
               items:
                 $ref: '#/components/schemas/Tag'
             WorkerConfiguration:
-              $ref: '#/components/schemas/WorkerConfiguration'
+              $ref: '#/components/schemas/Connector_WorkerConfiguration'
           x-stackQL-stringOnly: true
       x-title: CreateConnectorRequest
       type: object
       required: []
+    CreateCustomPluginRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            Name:
+              description: The name of the custom plugin.
+              type: string
+              minLength: 1
+              maxLength: 128
+            Description:
+              description: A summary description of the custom plugin.
+              type: string
+              maxLength: 1024
+            CustomPluginArn:
+              description: The Amazon Resource Name (ARN) of the custom plugin to use.
+              type: string
+              pattern: arn:(aws|aws-us-gov|aws-cn):kafkaconnect:.*
+            ContentType:
+              description: The type of the plugin file.
+              type: string
+              enum:
+                - JAR
+                - ZIP
+            FileDescription:
+              $ref: '#/components/schemas/CustomPluginFileDescription'
+            Location:
+              $ref: '#/components/schemas/CustomPluginLocation'
+            Revision:
+              description: The revision of the custom plugin.
+              type: integer
+              format: int64
+            Tags:
+              description: An array of key-value pairs to apply to this resource.
+              type: array
+              uniqueItems: false
+              x-insertionOrder: false
+              items:
+                $ref: '#/components/schemas/CustomPlugin_Tag'
+          x-stackQL-stringOnly: true
+      x-title: CreateCustomPluginRequest
+      type: object
+      required: []
+    CreateWorkerConfigurationRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            Name:
+              description: The name of the worker configuration.
+              type: string
+              minLength: 1
+              maxLength: 128
+            Description:
+              description: A summary description of the worker configuration.
+              type: string
+              maxLength: 1024
+            WorkerConfigurationArn:
+              description: The Amazon Resource Name (ARN) of the custom configuration.
+              type: string
+              pattern: arn:(aws|aws-us-gov|aws-cn):kafkaconnect:.*
+            PropertiesFileContent:
+              description: Base64 encoded contents of connect-distributed.properties file.
+              type: string
+            Revision:
+              description: The description of a revision of the worker configuration.
+              type: integer
+              format: int64
+            Tags:
+              description: A collection of tags associated with a resource
+              type: array
+              uniqueItems: true
+              x-insertionOrder: false
+              items:
+                $ref: '#/components/schemas/Tag'
+          x-stackQL-stringOnly: true
+      x-title: CreateWorkerConfigurationRequest
+      type: object
+      required: []
   securitySchemes:
     hmac:
       type: apiKey
@@ -1178,12 +1230,154 @@ components:
       description: Amazon Signature authorization v4
       x-amazon-apigateway-authtype: awsSigv4
   x-stackQL-resources:
+    connectors:
+      name: connectors
+      id: awscc.kafkaconnect.connectors
+      x-cfn-schema-name: Connector
+      x-cfn-type-name: AWS::KafkaConnect::Connector
+      x-identifiers: &ref_0
+        - ConnectorArn
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Connector&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::KafkaConnect::Connector"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::KafkaConnect::Connector"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::KafkaConnect::Connector"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/connectors/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/connectors/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/connectors/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.Capacity') as capacity,
+              JSON_EXTRACT(Properties, '$.ConnectorArn') as connector_arn,
+              JSON_EXTRACT(Properties, '$.ConnectorConfiguration') as connector_configuration,
+              JSON_EXTRACT(Properties, '$.ConnectorDescription') as connector_description,
+              JSON_EXTRACT(Properties, '$.ConnectorName') as connector_name,
+              JSON_EXTRACT(Properties, '$.KafkaCluster') as kafka_cluster,
+              JSON_EXTRACT(Properties, '$.KafkaClusterClientAuthentication') as kafka_cluster_client_authentication,
+              JSON_EXTRACT(Properties, '$.KafkaClusterEncryptionInTransit') as kafka_cluster_encryption_in_transit,
+              JSON_EXTRACT(Properties, '$.KafkaConnectVersion') as kafka_connect_version,
+              JSON_EXTRACT(Properties, '$.LogDelivery') as log_delivery,
+              JSON_EXTRACT(Properties, '$.Plugins') as plugins,
+              JSON_EXTRACT(Properties, '$.ServiceExecutionRoleArn') as service_execution_role_arn,
+              JSON_EXTRACT(Properties, '$.Tags') as tags,
+              JSON_EXTRACT(Properties, '$.WorkerConfiguration') as worker_configuration
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::KafkaConnect::Connector'
+              AND Identifier = '<ConnectorArn>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'Capacity') as capacity,
+                json_extract_path_text(Properties, 'ConnectorArn') as connector_arn,
+                json_extract_path_text(Properties, 'ConnectorConfiguration') as connector_configuration,
+                json_extract_path_text(Properties, 'ConnectorDescription') as connector_description,
+                json_extract_path_text(Properties, 'ConnectorName') as connector_name,
+                json_extract_path_text(Properties, 'KafkaCluster') as kafka_cluster,
+                json_extract_path_text(Properties, 'KafkaClusterClientAuthentication') as kafka_cluster_client_authentication,
+                json_extract_path_text(Properties, 'KafkaClusterEncryptionInTransit') as kafka_cluster_encryption_in_transit,
+                json_extract_path_text(Properties, 'KafkaConnectVersion') as kafka_connect_version,
+                json_extract_path_text(Properties, 'LogDelivery') as log_delivery,
+                json_extract_path_text(Properties, 'Plugins') as plugins,
+                json_extract_path_text(Properties, 'ServiceExecutionRoleArn') as service_execution_role_arn,
+                json_extract_path_text(Properties, 'Tags') as tags,
+                json_extract_path_text(Properties, 'WorkerConfiguration') as worker_configuration
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::KafkaConnect::Connector'
+                AND Identifier = '<ConnectorArn>'
+                AND region = 'us-east-1'
+    connectors_list_only:
+      name: connectors_list_only
+      id: awscc.kafkaconnect.connectors_list_only
+      x-cfn-schema-name: Connector
+      x-cfn-type-name: AWS::KafkaConnect::Connector
+      x-identifiers: *ref_0
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.ConnectorArn') as connector_arn
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::KafkaConnect::Connector'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'ConnectorArn') as connector_arn
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::KafkaConnect::Connector'
+                AND region = 'us-east-1'
     custom_plugins:
       name: custom_plugins
       id: awscc.kafkaconnect.custom_plugins
       x-cfn-schema-name: CustomPlugin
       x-cfn-type-name: AWS::KafkaConnect::CustomPlugin
-      x-identifiers:
+      x-identifiers: &ref_1
         - CustomPluginArn
       x-type: cloud_control
       methods:
@@ -1283,8 +1477,7 @@ components:
       id: awscc.kafkaconnect.custom_plugins_list_only
       x-cfn-schema-name: CustomPlugin
       x-cfn-type-name: AWS::KafkaConnect::CustomPlugin
-      x-identifiers:
-        - CustomPluginArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1314,7 +1507,7 @@ components:
       id: awscc.kafkaconnect.worker_configurations
       x-cfn-schema-name: WorkerConfiguration
       x-cfn-type-name: AWS::KafkaConnect::WorkerConfiguration
-      x-identifiers:
+      x-identifiers: &ref_2
         - WorkerConfigurationArn
       x-type: cloud_control
       methods:
@@ -1410,8 +1603,7 @@ components:
       id: awscc.kafkaconnect.worker_configurations_list_only
       x-cfn-schema-name: WorkerConfiguration
       x-cfn-type-name: AWS::KafkaConnect::WorkerConfiguration
-      x-identifiers:
-        - WorkerConfigurationArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1436,149 +1628,6 @@ components:
                 json_extract_path_text(Properties, 'WorkerConfigurationArn') as worker_configuration_arn
                 FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::KafkaConnect::WorkerConfiguration'
                 AND region = 'us-east-1'
-    connectors:
-      name: connectors
-      id: awscc.kafkaconnect.connectors
-      x-cfn-schema-name: Connector
-      x-cfn-type-name: AWS::KafkaConnect::Connector
-      x-identifiers:
-        - ConnectorArn
-      x-type: cloud_control
-      methods:
-        create_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive_DesiredState
-          operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Connector&__detailTransformed=true/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::KafkaConnect::Connector"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-        update_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive
-          operation:
-            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::KafkaConnect::Connector"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-        delete_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive
-          operation:
-            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::KafkaConnect::Connector"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-      sqlVerbs:
-        insert:
-          - $ref: '#/components/x-stackQL-resources/connectors/methods/create_resource'
-        delete:
-          - $ref: '#/components/x-stackQL-resources/connectors/methods/delete_resource'
-        update:
-          - $ref: '#/components/x-stackQL-resources/connectors/methods/update_resource'
-      config:
-        views:
-          select:
-            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
-            ddl: |-
-              SELECT
-              region,
-              Identifier,
-              JSON_EXTRACT(Properties, '$.Capacity') as capacity,
-              JSON_EXTRACT(Properties, '$.ConnectorArn') as connector_arn,
-              JSON_EXTRACT(Properties, '$.ConnectorConfiguration') as connector_configuration,
-              JSON_EXTRACT(Properties, '$.ConnectorDescription') as connector_description,
-              JSON_EXTRACT(Properties, '$.ConnectorName') as connector_name,
-              JSON_EXTRACT(Properties, '$.KafkaCluster') as kafka_cluster,
-              JSON_EXTRACT(Properties, '$.KafkaClusterClientAuthentication') as kafka_cluster_client_authentication,
-              JSON_EXTRACT(Properties, '$.KafkaClusterEncryptionInTransit') as kafka_cluster_encryption_in_transit,
-              JSON_EXTRACT(Properties, '$.KafkaConnectVersion') as kafka_connect_version,
-              JSON_EXTRACT(Properties, '$.LogDelivery') as log_delivery,
-              JSON_EXTRACT(Properties, '$.Plugins') as plugins,
-              JSON_EXTRACT(Properties, '$.ServiceExecutionRoleArn') as service_execution_role_arn,
-              JSON_EXTRACT(Properties, '$.Tags') as tags,
-              JSON_EXTRACT(Properties, '$.WorkerConfiguration') as worker_configuration
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::KafkaConnect::Connector'
-              AND Identifier = '<ConnectorArn>'
-              AND region = 'us-east-1'
-            fallback:
-              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
-              ddl: |-
-                SELECT
-                region,
-                Identifier,
-                json_extract_path_text(Properties, 'Capacity') as capacity,
-                json_extract_path_text(Properties, 'ConnectorArn') as connector_arn,
-                json_extract_path_text(Properties, 'ConnectorConfiguration') as connector_configuration,
-                json_extract_path_text(Properties, 'ConnectorDescription') as connector_description,
-                json_extract_path_text(Properties, 'ConnectorName') as connector_name,
-                json_extract_path_text(Properties, 'KafkaCluster') as kafka_cluster,
-                json_extract_path_text(Properties, 'KafkaClusterClientAuthentication') as kafka_cluster_client_authentication,
-                json_extract_path_text(Properties, 'KafkaClusterEncryptionInTransit') as kafka_cluster_encryption_in_transit,
-                json_extract_path_text(Properties, 'KafkaConnectVersion') as kafka_connect_version,
-                json_extract_path_text(Properties, 'LogDelivery') as log_delivery,
-                json_extract_path_text(Properties, 'Plugins') as plugins,
-                json_extract_path_text(Properties, 'ServiceExecutionRoleArn') as service_execution_role_arn,
-                json_extract_path_text(Properties, 'Tags') as tags,
-                json_extract_path_text(Properties, 'WorkerConfiguration') as worker_configuration
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::KafkaConnect::Connector'
-                AND Identifier = '<ConnectorArn>'
-                AND region = 'us-east-1'
-    connectors_list_only:
-      name: connectors_list_only
-      id: awscc.kafkaconnect.connectors_list_only
-      x-cfn-schema-name: Connector
-      x-cfn-type-name: AWS::KafkaConnect::Connector
-      x-identifiers:
-        - ConnectorArn
-      x-type: cloud_control_view
-      methods: {}
-      sqlVerbs:
-        insert: []
-        delete: []
-        update: []
-      config:
-        views:
-          select:
-            predicate: sqlDialect == "sqlite3"
-            ddl: |-
-              SELECT
-              region,
-              JSON_EXTRACT(Properties, '$.ConnectorArn') as connector_arn
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::KafkaConnect::Connector'
-              AND region = 'us-east-1'
-            fallback:
-              predicate: sqlDialect == "postgres"
-              ddl: |-
-                SELECT
-                region,
-                json_extract_path_text(Properties, 'ConnectorArn') as connector_arn
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::KafkaConnect::Connector'
-                AND region = 'us-east-1'
 paths:
   /?Action=CreateResource&Version=2021-09-30:
     parameters:
@@ -1723,7 +1772,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__CustomPlugin&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__Connector&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -1733,7 +1782,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateCustomPlugin
+      operationId: CreateConnector
       parameters:
         - description: Action Header
           in: header
@@ -1756,7 +1805,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateCustomPluginRequest'
+              $ref: '#/components/schemas/CreateConnectorRequest'
         required: true
       responses:
         '200':
@@ -1765,7 +1814,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__WorkerConfiguration&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__CustomPlugin&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -1775,7 +1824,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateWorkerConfiguration
+      operationId: CreateCustomPlugin
       parameters:
         - description: Action Header
           in: header
@@ -1798,7 +1847,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateWorkerConfigurationRequest'
+              $ref: '#/components/schemas/CreateCustomPluginRequest'
         required: true
       responses:
         '200':
@@ -1807,7 +1856,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__Connector&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__WorkerConfiguration&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -1817,7 +1866,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateConnector
+      operationId: CreateWorkerConfiguration
       parameters:
         - description: Action Header
           in: header
@@ -1840,7 +1889,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateConnectorRequest'
+              $ref: '#/components/schemas/CreateWorkerConfigurationRequest'
         required: true
       responses:
         '200':
diff --git a/openapi/src/awscc/v00.00.00000/services/kendra.yaml b/openapi/src/awscc/v00.00.00000/services/kendra.yaml
index c464b27d1..aa3c0b967 100644
--- a/openapi/src/awscc/v00.00.00000/services/kendra.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/kendra.yaml
@@ -391,7 +391,7 @@ components:
       type: object
   schemas:
     IndexId:
-      description: Unique ID of Index
+      description: ID of Index
       type: string
       minLength: 36
       maxLength: 36
@@ -416,7 +416,6 @@ components:
     TagList:
       description: List of tags
       type: array
-      x-insertionOrder: false
       maxItems: 200
       items:
         $ref: '#/components/schemas/Tag'
@@ -482,7 +481,7 @@ components:
       type: string
       minLength: 1
       maxLength: 2048
-      pattern: ^(https?|ftp|file):\/\/([^\s]*)
+      pattern: ^(https?|ftp|file)://([^\s]*)
     SecretArn:
       type: string
       minLength: 1
@@ -1442,7 +1441,7 @@ components:
         - required:
             - TemplateConfiguration
     Name:
-      description: Name of index
+      description: Name of data source
       type: string
       minLength: 1
       maxLength: 1000
@@ -1463,7 +1462,9 @@ components:
         - WORKDOCS
         - TEMPLATE
     Description:
+      description: Description of data source
       type: string
+      minLength: 1
       maxLength: 1000
     LanguageCode:
       description: The code for a language.
@@ -1472,7 +1473,7 @@ components:
       maxLength: 10
       pattern: '[a-zA-Z-]*'
     RoleArn:
-      description: Role Arn
+      description: Role ARN
       type: string
       minLength: 1
       maxLength: 1284
@@ -1482,10 +1483,10 @@ components:
       type: string
       maxLength: 1000
     Id:
-      description: Unique ID of index
+      description: ID of data source
       type: string
-      minLength: 36
-      maxLength: 36
+      minLength: 1
+      maxLength: 100
     Arn:
       type: string
       maxLength: 1000
@@ -1679,6 +1680,16 @@ components:
           - kendra:TagResource
           - kendra:UntagResource
           - iam:PassRole
+    Faq_IndexId:
+      description: Unique ID of Index
+      type: string
+      minLength: 36
+      maxLength: 36
+    Faq_Description:
+      description: Description of the FAQ
+      type: string
+      minLength: 1
+      maxLength: 1000
     FileFormat:
       description: Format of the input file
       enum:
@@ -1690,20 +1701,30 @@ components:
       type: string
       minLength: 1
       maxLength: 100
+    Faq_RoleArn:
+      type: string
+      minLength: 1
+      maxLength: 1284
+      pattern: arn:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{0,63}:[a-z0-9-\.]{0,63}:[a-z0-9-\.]{0,63}:[^/].{0,1023}
+    Faq_Id:
+      description: Unique ID of the FAQ
+      type: string
+      minLength: 1
+      maxLength: 100
     Faq:
       type: object
       properties:
         Id:
-          $ref: '#/components/schemas/Id'
+          $ref: '#/components/schemas/Faq_Id'
         IndexId:
           description: Index ID
-          $ref: '#/components/schemas/IndexId'
+          $ref: '#/components/schemas/Faq_IndexId'
         Name:
           description: FAQ name
           $ref: '#/components/schemas/FaqName'
         Description:
           description: FAQ description
-          $ref: '#/components/schemas/Description'
+          $ref: '#/components/schemas/Faq_Description'
         FileFormat:
           description: FAQ file format
           $ref: '#/components/schemas/FileFormat'
@@ -1712,7 +1733,7 @@ components:
           $ref: '#/components/schemas/S3Path'
         RoleArn:
           description: FAQ role ARN
-          $ref: '#/components/schemas/RoleArn'
+          $ref: '#/components/schemas/Faq_RoleArn'
         Tags:
           description: Tags for labeling the FAQ
           $ref: '#/components/schemas/TagList'
@@ -1782,10 +1803,20 @@ components:
         KmsKeyId:
           $ref: '#/components/schemas/KmsKeyId'
       additionalProperties: false
+    Index_Description:
+      type: string
+      maxLength: 1000
     KmsKeyId:
       type: string
       minLength: 1
       maxLength: 2048
+    Index_TagList:
+      description: List of tags
+      type: array
+      x-insertionOrder: false
+      maxItems: 200
+      items:
+        $ref: '#/components/schemas/Tag'
     Importance:
       type: integer
       minimum: 1
@@ -1901,6 +1932,22 @@ components:
         - DEVELOPER_EDITION
         - ENTERPRISE_EDITION
         - GEN_AI_ENTERPRISE_EDITION
+    Index_Name:
+      description: Name of index
+      type: string
+      minLength: 1
+      maxLength: 1000
+    Index_RoleArn:
+      description: Role Arn
+      type: string
+      minLength: 1
+      maxLength: 1284
+      pattern: arn:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{0,63}:[a-z0-9-\.]{0,63}:[a-z0-9-\.]{0,63}:[^/].{0,1023}
+    Index_Id:
+      description: Unique ID of index
+      type: string
+      minLength: 36
+      maxLength: 36
     UserContextPolicy:
       type: string
       enum:
@@ -1927,6 +1974,11 @@ components:
       type: string
       minLength: 1
       maxLength: 100
+    Index_Url:
+      type: string
+      minLength: 1
+      maxLength: 2048
+      pattern: ^(https?|ftp|file):\/\/([^\s]*)
     JsonTokenTypeConfiguration:
       type: object
       properties:
@@ -1944,9 +1996,9 @@ components:
         KeyLocation:
           $ref: '#/components/schemas/KeyLocation'
         URL:
-          $ref: '#/components/schemas/Url'
+          $ref: '#/components/schemas/Index_Url'
         SecretManagerArn:
-          $ref: '#/components/schemas/RoleArn'
+          $ref: '#/components/schemas/Index_RoleArn'
         UserNameAttributeField:
           $ref: '#/components/schemas/UserNameAttributeField'
         GroupAttributeField:
@@ -1976,22 +2028,22 @@ components:
       type: object
       properties:
         Id:
-          $ref: '#/components/schemas/Id'
+          $ref: '#/components/schemas/Index_Id'
         Arn:
           $ref: '#/components/schemas/Arn'
         Description:
           description: A description for the index
-          $ref: '#/components/schemas/Description'
+          $ref: '#/components/schemas/Index_Description'
         ServerSideEncryptionConfiguration:
           description: Server side encryption configuration
           $ref: '#/components/schemas/ServerSideEncryptionConfiguration'
         Tags:
           description: Tags for labeling the index
-          $ref: '#/components/schemas/TagList'
+          $ref: '#/components/schemas/Index_TagList'
         Name:
-          $ref: '#/components/schemas/Name'
+          $ref: '#/components/schemas/Index_Name'
         RoleArn:
-          $ref: '#/components/schemas/RoleArn'
+          $ref: '#/components/schemas/Index_RoleArn'
         Edition:
           $ref: '#/components/schemas/Edition'
         DocumentMetadataConfigurations:
@@ -2115,16 +2167,16 @@ components:
           type: object
           properties:
             Id:
-              $ref: '#/components/schemas/Id'
+              $ref: '#/components/schemas/Faq_Id'
             IndexId:
               description: Index ID
-              $ref: '#/components/schemas/IndexId'
+              $ref: '#/components/schemas/Faq_IndexId'
             Name:
               description: FAQ name
               $ref: '#/components/schemas/FaqName'
             Description:
               description: FAQ description
-              $ref: '#/components/schemas/Description'
+              $ref: '#/components/schemas/Faq_Description'
             FileFormat:
               description: FAQ file format
               $ref: '#/components/schemas/FileFormat'
@@ -2133,7 +2185,7 @@ components:
               $ref: '#/components/schemas/S3Path'
             RoleArn:
               description: FAQ role ARN
-              $ref: '#/components/schemas/RoleArn'
+              $ref: '#/components/schemas/Faq_RoleArn'
             Tags:
               description: Tags for labeling the FAQ
               $ref: '#/components/schemas/TagList'
@@ -2160,22 +2212,22 @@ components:
           type: object
           properties:
             Id:
-              $ref: '#/components/schemas/Id'
+              $ref: '#/components/schemas/Index_Id'
             Arn:
               $ref: '#/components/schemas/Arn'
             Description:
               description: A description for the index
-              $ref: '#/components/schemas/Description'
+              $ref: '#/components/schemas/Index_Description'
             ServerSideEncryptionConfiguration:
               description: Server side encryption configuration
               $ref: '#/components/schemas/ServerSideEncryptionConfiguration'
             Tags:
               description: Tags for labeling the index
-              $ref: '#/components/schemas/TagList'
+              $ref: '#/components/schemas/Index_TagList'
             Name:
-              $ref: '#/components/schemas/Name'
+              $ref: '#/components/schemas/Index_Name'
             RoleArn:
-              $ref: '#/components/schemas/RoleArn'
+              $ref: '#/components/schemas/Index_RoleArn'
             Edition:
               $ref: '#/components/schemas/Edition'
             DocumentMetadataConfigurations:
@@ -2205,7 +2257,7 @@ components:
       id: awscc.kendra.data_sources
       x-cfn-schema-name: DataSource
       x-cfn-type-name: AWS::Kendra::DataSource
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
         - IndexId
       x-type: cloud_control
@@ -2314,9 +2366,7 @@ components:
       id: awscc.kendra.data_sources_list_only
       x-cfn-schema-name: DataSource
       x-cfn-type-name: AWS::Kendra::DataSource
-      x-identifiers:
-        - Id
-        - IndexId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2348,7 +2398,7 @@ components:
       id: awscc.kendra.faqs
       x-cfn-schema-name: Faq
       x-cfn-type-name: AWS::Kendra::Faq
-      x-identifiers:
+      x-identifiers: &ref_1
         - Id
         - IndexId
       x-type: cloud_control
@@ -2453,9 +2503,7 @@ components:
       id: awscc.kendra.faqs_list_only
       x-cfn-schema-name: Faq
       x-cfn-type-name: AWS::Kendra::Faq
-      x-identifiers:
-        - Id
-        - IndexId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2487,7 +2535,7 @@ components:
       id: awscc.kendra.indices
       x-cfn-schema-name: Index
       x-cfn-type-name: AWS::Kendra::Index
-      x-identifiers:
+      x-identifiers: &ref_2
         - Id
       x-type: cloud_control
       methods:
@@ -2595,8 +2643,7 @@ components:
       id: awscc.kendra.indices_list_only
       x-cfn-schema-name: Index
       x-cfn-type-name: AWS::Kendra::Index
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/kendraranking.yaml b/openapi/src/awscc/v00.00.00000/services/kendraranking.yaml
index 67d78cb2d..d61991be2 100644
--- a/openapi/src/awscc/v00.00.00000/services/kendraranking.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/kendraranking.yaml
@@ -544,7 +544,7 @@ components:
       id: awscc.kendraranking.execution_plans
       x-cfn-schema-name: ExecutionPlan
       x-cfn-type-name: AWS::KendraRanking::ExecutionPlan
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
       x-type: cloud_control
       methods:
@@ -640,8 +640,7 @@ components:
       id: awscc.kendraranking.execution_plans_list_only
       x-cfn-schema-name: ExecutionPlan
       x-cfn-type-name: AWS::KendraRanking::ExecutionPlan
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/kinesis.yaml b/openapi/src/awscc/v00.00.00000/services/kinesis.yaml
index d7ddb54ed..9a85a5778 100644
--- a/openapi/src/awscc/v00.00.00000/services/kinesis.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/kinesis.yaml
@@ -488,20 +488,20 @@ components:
         - EncryptionType
         - KeyId
     Tag:
-      description: An arbitrary set of tags (key-value pairs) to associate with the Kinesis consumer.
-      additionalProperties: false
+      description: An arbitrary set of tags (key-value pairs) to associate with the Kinesis stream.
       type: object
+      additionalProperties: false
       properties:
-        Value:
-          minLength: 0
-          description: 'The value for the tag. You can specify a value that is 0 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
-          type: string
-          maxLength: 255
         Key:
-          minLength: 1
           description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
           type: string
+          minLength: 1
           maxLength: 128
+        Value:
+          description: 'The value for the tag. You can specify a value that is 0 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+          minLength: 0
+          maxLength: 255
       required:
         - Key
         - Value
@@ -608,6 +608,24 @@ components:
           - kinesis:UntagResource
         list:
           - kinesis:ListStreams
+    StreamConsumer_Tag:
+      description: An arbitrary set of tags (key-value pairs) to associate with the Kinesis consumer.
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          minLength: 0
+          description: 'The value for the tag. You can specify a value that is 0 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+          maxLength: 255
+        Key:
+          minLength: 1
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+          maxLength: 128
+      required:
+        - Key
+        - Value
     StreamConsumer:
       type: object
       properties:
@@ -639,7 +657,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/StreamConsumer_Tag'
       required:
         - ConsumerName
         - StreamARN
@@ -815,7 +833,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/StreamConsumer_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateStreamConsumerRequest
       type: object
@@ -921,7 +939,7 @@ components:
       id: awscc.kinesis.streams
       x-cfn-schema-name: Stream
       x-cfn-type-name: AWS::Kinesis::Stream
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -1021,8 +1039,7 @@ components:
       id: awscc.kinesis.streams_list_only
       x-cfn-schema-name: Stream
       x-cfn-type-name: AWS::Kinesis::Stream
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1052,7 +1069,7 @@ components:
       id: awscc.kinesis.stream_consumers
       x-cfn-schema-name: StreamConsumer
       x-cfn-type-name: AWS::Kinesis::StreamConsumer
-      x-identifiers:
+      x-identifiers: &ref_1
         - ConsumerARN
       x-type: cloud_control
       methods:
@@ -1131,8 +1148,7 @@ components:
       id: awscc.kinesis.stream_consumers_list_only
       x-cfn-schema-name: StreamConsumer
       x-cfn-type-name: AWS::Kinesis::StreamConsumer
-      x-identifiers:
-        - ConsumerARN
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/kinesisanalyticsv2.yaml b/openapi/src/awscc/v00.00.00000/services/kinesisanalyticsv2.yaml
index f146ee993..7938fa54c 100644
--- a/openapi/src/awscc/v00.00.00000/services/kinesisanalyticsv2.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/kinesisanalyticsv2.yaml
@@ -1256,7 +1256,7 @@ components:
       id: awscc.kinesisanalyticsv2.applications
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::KinesisAnalyticsV2::Application
-      x-identifiers:
+      x-identifiers: &ref_0
         - ApplicationName
       x-type: cloud_control
       methods:
@@ -1358,8 +1358,7 @@ components:
       id: awscc.kinesisanalyticsv2.applications_list_only
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::KinesisAnalyticsV2::Application
-      x-identifiers:
-        - ApplicationName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/kinesisfirehose.yaml b/openapi/src/awscc/v00.00.00000/services/kinesisfirehose.yaml
index 214b0e4ea..fe3d62ad1 100644
--- a/openapi/src/awscc/v00.00.00000/services/kinesisfirehose.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/kinesisfirehose.yaml
@@ -1874,7 +1874,7 @@ components:
       id: awscc.kinesisfirehose.delivery_streams
       x-cfn-schema-name: DeliveryStream
       x-cfn-type-name: AWS::KinesisFirehose::DeliveryStream
-      x-identifiers:
+      x-identifiers: &ref_0
         - DeliveryStreamName
       x-type: cloud_control
       methods:
@@ -1996,8 +1996,7 @@ components:
       id: awscc.kinesisfirehose.delivery_streams_list_only
       x-cfn-schema-name: DeliveryStream
       x-cfn-type-name: AWS::KinesisFirehose::DeliveryStream
-      x-identifiers:
-        - DeliveryStreamName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/kinesisvideo.yaml b/openapi/src/awscc/v00.00.00000/services/kinesisvideo.yaml
index 06f8aafbd..f2c64a454 100644
--- a/openapi/src/awscc/v00.00.00000/services/kinesisvideo.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/kinesisvideo.yaml
@@ -391,7 +391,7 @@ components:
       type: object
   schemas:
     Tag:
-      description: A key-value pair to associated with the Kinesis Video Stream.
+      description: A key-value pair to associate with a resource.
       type: object
       properties:
         Key:
@@ -401,7 +401,7 @@ components:
           maxLength: 128
         Value:
           type: string
-          description: 'The value for the tag. Specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. The following characters can be used: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          description: 'The value for the tag. Specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:.  The following characters can be used: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
           minLength: 0
           maxLength: 256
       required:
@@ -478,6 +478,24 @@ components:
           - kinesisvideo:DescribeSignalingChannel
         list:
           - kinesisvideo:ListSignalingChannels
+    Stream_Tag:
+      description: A key-value pair to associated with the Kinesis Video Stream.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. Specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. The following characters can be used: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. Specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. The following characters can be used: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     Stream:
       type: object
       properties:
@@ -519,7 +537,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Stream_Tag'
           minItems: 1
           maxItems: 50
       required: []
@@ -658,7 +676,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Stream_Tag'
               minItems: 1
               maxItems: 50
           x-stackQL-stringOnly: true
@@ -678,7 +696,7 @@ components:
       id: awscc.kinesisvideo.signaling_channels
       x-cfn-schema-name: SignalingChannel
       x-cfn-type-name: AWS::KinesisVideo::SignalingChannel
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -772,8 +790,7 @@ components:
       id: awscc.kinesisvideo.signaling_channels_list_only
       x-cfn-schema-name: SignalingChannel
       x-cfn-type-name: AWS::KinesisVideo::SignalingChannel
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -803,7 +820,7 @@ components:
       id: awscc.kinesisvideo.streams
       x-cfn-schema-name: Stream
       x-cfn-type-name: AWS::KinesisVideo::Stream
-      x-identifiers:
+      x-identifiers: &ref_1
         - Name
       x-type: cloud_control
       methods:
@@ -901,8 +918,7 @@ components:
       id: awscc.kinesisvideo.streams_list_only
       x-cfn-schema-name: Stream
       x-cfn-type-name: AWS::KinesisVideo::Stream
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/kms.yaml b/openapi/src/awscc/v00.00.00000/services/kms.yaml
index 9aa3e04db..63a01d68f 100644
--- a/openapi/src/awscc/v00.00.00000/services/kms.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/kms.yaml
@@ -455,20 +455,27 @@ components:
         delete:
           - kms:DeleteAlias
     Tag:
-      description: A key-value pair to associate with a resource.
-      additionalProperties: false
+      description: |-
+        A key-value pair. A tag consists of a tag key and a tag value. Tag keys and tag values are both required, but tag values can be empty (null) strings.
+          Do not include confidential or sensitive information in this field. This field may be displayed in plaintext in CloudTrail logs and other output.
+          For information about the rules that apply to tag keys and tag values, see [User-Defined Tag Restrictions](https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/allocation-tag-restrictions.html) in the *Billing and Cost Management User Guide*.
       type: object
       properties:
-        Value:
-          minLength: 0
-          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
-          type: string
-          maxLength: 256
         Key:
-          minLength: 1
-          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
           type: string
+          description: |-
+            The key name of the tag. You can specify a value that's 1 to 128 Unicode characters in length and can't be prefixed with ``aws:``. digits, whitespace, ``_``, ``.``, ``:``, ``/``, ``=``, ``+``, ``@``, ``-``, and ``"``.
+             For more information, see [Tag](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html).
+          minLength: 1
           maxLength: 128
+        Value:
+          type: string
+          description: |-
+            The value for the tag. You can specify a value that's 1 to 256 characters in length. You can use any of the following characters: the set of Unicode letters, digits, whitespace, ``_``, ``.``, ``/``, ``=``, ``+``, and ``-``.
+             For more information, see [Tag](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html).
+          minLength: 0
+          maxLength: 256
+      additionalProperties: false
       required:
         - Key
         - Value
@@ -730,6 +737,24 @@ components:
         list:
           - kms:ListKeys
           - kms:DescribeKey
+    ReplicaKey_Tag:
+      description: A key-value pair to associate with a resource.
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          minLength: 0
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+          maxLength: 256
+        Key:
+          minLength: 1
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+          maxLength: 128
+      required:
+        - Key
+        - Value
     ReplicaKey:
       type: object
       properties:
@@ -764,7 +789,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ReplicaKey_Tag'
       required:
         - PrimaryKeyArn
         - KeyPolicy
@@ -1112,7 +1137,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ReplicaKey_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateReplicaKeyRequest
       type: object
@@ -1130,7 +1155,7 @@ components:
       id: awscc.kms.aliases
       x-cfn-schema-name: Alias
       x-cfn-type-name: AWS::KMS::Alias
-      x-identifiers:
+      x-identifiers: &ref_0
         - AliasName
       x-type: cloud_control
       methods:
@@ -1218,8 +1243,7 @@ components:
       id: awscc.kms.aliases_list_only
       x-cfn-schema-name: Alias
       x-cfn-type-name: AWS::KMS::Alias
-      x-identifiers:
-        - AliasName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1249,7 +1273,7 @@ components:
       id: awscc.kms.keys
       x-cfn-schema-name: Key
       x-cfn-type-name: AWS::KMS::Key
-      x-identifiers:
+      x-identifiers: &ref_1
         - KeyId
       x-type: cloud_control
       methods:
@@ -1361,8 +1385,7 @@ components:
       id: awscc.kms.keys_list_only
       x-cfn-schema-name: Key
       x-cfn-type-name: AWS::KMS::Key
-      x-identifiers:
-        - KeyId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1392,7 +1415,7 @@ components:
       id: awscc.kms.replica_keys
       x-cfn-schema-name: ReplicaKey
       x-cfn-type-name: AWS::KMS::ReplicaKey
-      x-identifiers:
+      x-identifiers: &ref_2
         - KeyId
       x-type: cloud_control
       methods:
@@ -1492,8 +1515,7 @@ components:
       id: awscc.kms.replica_keys_list_only
       x-cfn-schema-name: ReplicaKey
       x-cfn-type-name: AWS::KMS::ReplicaKey
-      x-identifiers:
-        - KeyId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/lakeformation.yaml b/openapi/src/awscc/v00.00.00000/services/lakeformation.yaml
index 0137a0b54..7874579a4 100644
--- a/openapi/src/awscc/v00.00.00000/services/lakeformation.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/lakeformation.yaml
@@ -391,10 +391,12 @@ components:
       type: object
   schemas:
     CatalogIdString:
+      description: A string representing the Catalog Id.
       type: string
       minLength: 12
       maxLength: 12
     NameString:
+      description: A string representing a resource's name.
       type: string
       minLength: 1
       maxLength: 255
@@ -411,18 +413,19 @@ components:
           additionalProperties: false
       additionalProperties: false
     ColumnNames:
+      description: A list of column names.
       type: array
+      x-insertionOrder: false
       items:
         $ref: '#/components/schemas/NameString'
-      x-insertionOrder: false
     ColumnWildcard:
+      description: An object representing the Data Cells Filter's Columns. Either Column Names or a Wildcard is required.
       type: object
       properties:
         ExcludedColumnNames:
+          description: A list of column names to be excluded from the Data Cells Filter.
           $ref: '#/components/schemas/ColumnNames'
-          description: Excludes column names. Any column with this name will be excluded.
       additionalProperties: false
-      description: A wildcard object, consisting of an optional list of excluded column names or indexes.
     DataCellsFilter:
       type: object
       properties:
@@ -486,10 +489,18 @@ components:
           - lakeformation:ListDataCellsFilter
         list:
           - lakeformation:ListDataCellsFilter
+    PrincipalPermissions_CatalogIdString:
+      type: string
+      minLength: 12
+      maxLength: 12
     PathString:
       type: string
     ResourceArnString:
       type: string
+    PrincipalPermissions_NameString:
+      type: string
+      minLength: 1
+      maxLength: 255
     IAMRoleArn:
       type: string
       pattern: arn:*:iam::[0-9]*:role/.*
@@ -508,21 +519,21 @@ components:
       type: object
       properties:
         CatalogId:
-          $ref: '#/components/schemas/CatalogIdString'
+          $ref: '#/components/schemas/PrincipalPermissions_CatalogIdString'
         TagKey:
           $ref: '#/components/schemas/LFTagKey'
         TagValues:
           $ref: '#/components/schemas/TagValueList'
+      additionalProperties: false
       required:
-        - CatalogId
         - TagKey
         - TagValues
-      additionalProperties: false
+      description: ''
     LFTagsList:
       type: array
+      x-insertionOrder: false
       items:
         $ref: '#/components/schemas/LFTagPair'
-      x-insertionOrder: false
     Expression:
       type: array
       x-insertionOrder: false
@@ -539,7 +550,9 @@ components:
       properties:
         DataLakePrincipalIdentifier:
           $ref: '#/components/schemas/DataLakePrincipalString'
+          description: An identifier for the LFlong principal.
       additionalProperties: false
+      description: The LFlong principal.
     ResourceType:
       type: string
       enum:
@@ -552,13 +565,16 @@ components:
       type: object
       properties:
         CatalogId:
-          $ref: '#/components/schemas/CatalogIdString'
+          $ref: '#/components/schemas/PrincipalPermissions_CatalogIdString'
+          description: The identifier for the Data Catalog. By default, it is the account ID of the caller.
         Name:
-          $ref: '#/components/schemas/NameString'
+          $ref: '#/components/schemas/PrincipalPermissions_NameString'
+          description: The name of the database resource. Unique to the Data Catalog.
+      additionalProperties: false
       required:
         - CatalogId
         - Name
-      additionalProperties: false
+      description: A structure for the database object.
     TableWildcard:
       type: object
       additionalProperties: false
@@ -566,39 +582,68 @@ components:
       type: object
       properties:
         CatalogId:
-          $ref: '#/components/schemas/CatalogIdString'
+          $ref: '#/components/schemas/PrincipalPermissions_CatalogIdString'
+          description: The identifier for the Data Catalog. By default, it is the account ID of the caller.
         DatabaseName:
-          $ref: '#/components/schemas/NameString'
+          $ref: '#/components/schemas/PrincipalPermissions_NameString'
+          description: The name of the database for the table. Unique to a Data Catalog. A database is a set of associated table definitions organized into a logical group. You can Grant and Revoke database privileges to a principal.
         Name:
-          $ref: '#/components/schemas/NameString'
+          $ref: '#/components/schemas/PrincipalPermissions_NameString'
+          description: The name of the table.
         TableWildcard:
           $ref: '#/components/schemas/TableWildcard'
+          description: |-
+            A wildcard object representing every table under a database.
+             At least one of ``TableResource$Name`` or ``TableResource$TableWildcard`` is required.
+      additionalProperties: false
       required:
         - CatalogId
         - DatabaseName
+      description: A structure for the table object. A table is a metadata definition that represents your data. You can Grant and Revoke table privileges to a principal.
+    PrincipalPermissions_ColumnNames:
+      type: array
+      x-insertionOrder: false
+      items:
+        $ref: '#/components/schemas/PrincipalPermissions_NameString'
+    PrincipalPermissions_ColumnWildcard:
+      type: object
+      properties:
+        ExcludedColumnNames:
+          $ref: '#/components/schemas/PrincipalPermissions_ColumnNames'
+          description: Excludes column names. Any column with this name will be excluded.
       additionalProperties: false
+      description: A wildcard object, consisting of an optional list of excluded column names or indexes.
     TableWithColumnsResource:
       type: object
       properties:
         CatalogId:
-          $ref: '#/components/schemas/CatalogIdString'
+          $ref: '#/components/schemas/PrincipalPermissions_CatalogIdString'
+          description: The identifier for the GLUDC where the location is registered with LFlong.
         DatabaseName:
-          $ref: '#/components/schemas/NameString'
+          $ref: '#/components/schemas/PrincipalPermissions_NameString'
+          description: The name of the database for the table with columns resource. Unique to the Data Catalog. A database is a set of associated table definitions organized into a logical group. You can Grant and Revoke database privileges to a principal.
         Name:
-          $ref: '#/components/schemas/NameString'
+          $ref: '#/components/schemas/PrincipalPermissions_NameString'
+          description: The name of the table resource. A table is a metadata definition that represents your data. You can Grant and Revoke table privileges to a principal.
         ColumnNames:
-          $ref: '#/components/schemas/ColumnNames'
+          $ref: '#/components/schemas/PrincipalPermissions_ColumnNames'
+          description: The list of column names for the table. At least one of ``ColumnNames`` or ``ColumnWildcard`` is required.
+        ColumnWildcard:
+          $ref: '#/components/schemas/PrincipalPermissions_ColumnWildcard'
+          description: A wildcard specified by a ``ColumnWildcard`` object. At least one of ``ColumnNames`` or ``ColumnWildcard`` is required.
+      additionalProperties: false
       required:
         - CatalogId
         - DatabaseName
         - Name
-        - ColumnNames
-      additionalProperties: false
+      description: |-
+        A structure for a table with columns object. This object is only used when granting a SELECT permission.
+         This object must take a value for at least one of ``ColumnsNames``, ``ColumnsIndexes``, or ``ColumnsWildcard``.
     DataLocationResource:
       type: object
       properties:
         CatalogId:
-          $ref: '#/components/schemas/CatalogIdString'
+          $ref: '#/components/schemas/PrincipalPermissions_CatalogIdString'
           description: The identifier for the GLUDC where the location is registered with LFlong.
         ResourceArn:
           $ref: '#/components/schemas/ResourceArnString'
@@ -612,16 +657,16 @@ components:
       type: object
       properties:
         TableCatalogId:
-          $ref: '#/components/schemas/CatalogIdString'
+          $ref: '#/components/schemas/PrincipalPermissions_CatalogIdString'
           description: The ID of the catalog to which the table belongs.
         DatabaseName:
-          $ref: '#/components/schemas/NameString'
+          $ref: '#/components/schemas/PrincipalPermissions_NameString'
           description: A database in the GLUDC.
         TableName:
-          $ref: '#/components/schemas/NameString'
+          $ref: '#/components/schemas/PrincipalPermissions_NameString'
           description: The name of the table.
         Name:
-          $ref: '#/components/schemas/NameString'
+          $ref: '#/components/schemas/PrincipalPermissions_NameString'
           description: The name given by the user to the data filter cell.
       additionalProperties: false
       required:
@@ -634,10 +679,10 @@ components:
       type: object
       properties:
         CatalogId:
-          $ref: '#/components/schemas/CatalogIdString'
+          $ref: '#/components/schemas/PrincipalPermissions_CatalogIdString'
           description: The identifier for the GLUDC where the location is registered with GLUDC.
         TagKey:
-          $ref: '#/components/schemas/NameString'
+          $ref: '#/components/schemas/PrincipalPermissions_NameString'
           description: The key-name for the LF-tag.
         TagValues:
           $ref: '#/components/schemas/TagValueList'
@@ -652,7 +697,7 @@ components:
       type: object
       properties:
         CatalogId:
-          $ref: '#/components/schemas/CatalogIdString'
+          $ref: '#/components/schemas/PrincipalPermissions_CatalogIdString'
           description: The identifier for the GLUDC. The GLUDC is the persistent metadata store. It contains database definitions, table definitions, and other control information to manage your LFlong environment.
         ResourceType:
           $ref: '#/components/schemas/ResourceType'
@@ -673,13 +718,30 @@ components:
       properties:
         Catalog:
           $ref: '#/components/schemas/CatalogResource'
+          description: The identifier for the Data Catalog. By default, the account ID. The Data Catalog is the persistent metadata store. It contains database definitions, table definitions, and other control information to manage your LFlong environment.
         Database:
           $ref: '#/components/schemas/DatabaseResource'
+          description: The database for the resource. Unique to the Data Catalog. A database is a set of associated table definitions organized into a logical group. You can Grant and Revoke database permissions to a principal.
         Table:
           $ref: '#/components/schemas/TableResource'
+          description: The table for the resource. A table is a metadata definition that represents your data. You can Grant and Revoke table privileges to a principal.
         TableWithColumns:
           $ref: '#/components/schemas/TableWithColumnsResource'
+          description: The table with columns for the resource. A principal with permissions to this resource can select metadata from the columns of a table in the Data Catalog and the underlying data in Amazon S3.
+        DataLocation:
+          $ref: '#/components/schemas/DataLocationResource'
+          description: The location of an Amazon S3 path where permissions are granted or revoked.
+        DataCellsFilter:
+          $ref: '#/components/schemas/DataCellsFilterResource'
+          description: A data cell filter.
+        LFTag:
+          $ref: '#/components/schemas/LFTagKeyResource'
+          description: The LF-tag key and values attached to a resource.
+        LFTagPolicy:
+          $ref: '#/components/schemas/LFTagPolicyResource'
+          description: A list of LF-tag conditions that define a resource's LF-tag policy.
       additionalProperties: false
+      description: A structure for the resource.
     NullableBoolean:
       type: boolean
     Permission:
@@ -735,11 +797,25 @@ components:
         - Principal
         - Resource
       description: ''
+    PrincipalPermissions_PrincipalPermissions:
+      type: object
+      properties:
+        DataLakePrincipal:
+          $ref: '#/components/schemas/DataLakePrincipal'
+        PermissionList:
+          $ref: '#/components/schemas/PermissionList'
+      additionalProperties: false
+      description: ''
+    PrincipalPermissionsList:
+      type: array
+      x-insertionOrder: false
+      items:
+        $ref: '#/components/schemas/PrincipalPermissions_PrincipalPermissions'
     PrincipalPermissions:
       type: object
       properties:
         Catalog:
-          $ref: '#/components/schemas/CatalogIdString'
+          $ref: '#/components/schemas/PrincipalPermissions_CatalogIdString'
           description: The identifier for the GLUDC. By default, the account ID. The GLUDC is the persistent metadata store. It contains database definitions, table definitions, and other control information to manage your Lake Formation environment.
         Principal:
           $ref: '#/components/schemas/DataLakePrincipal'
@@ -802,23 +878,39 @@ components:
           - lakeformation:ListPermissions
           - glue:GetTable
           - glue:GetDatabase
-    PrincipalPermissionsList:
+    Tag_CatalogIdString:
+      type: string
+      minLength: 12
+      maxLength: 12
+    Tag_LFTagKey:
+      type: string
+      minLength: 1
+      maxLength: 128
+      pattern: ^([{a-zA-Z}{\s}{0-9}_.:\/=+\-@%]*)$
+    Tag_LFTagValue:
+      type: string
+      minLength: 0
+      maxLength: 256
+      pattern: ^([{a-zA-Z}{\s}{0-9}_.:\*\/=+\-@%]*)$
+    Tag_TagValueList:
       type: array
-      x-insertionOrder: false
       items:
-        $ref: '#/components/schemas/PrincipalPermissions'
+        $ref: '#/components/schemas/Tag_LFTagValue'
+      x-insertionOrder: false
+      minItems: 1
+      maxItems: 1000
     Tag:
       type: object
       properties:
         CatalogId:
           description: The identifier for the Data Catalog. By default, the account ID. The Data Catalog is the persistent metadata store. It contains database definitions, table definitions, and other control information to manage your Lake Formation environment.
-          $ref: '#/components/schemas/CatalogIdString'
+          $ref: '#/components/schemas/Tag_CatalogIdString'
         TagKey:
           description: The key-name for the LF-tag.
-          $ref: '#/components/schemas/LFTagKey'
+          $ref: '#/components/schemas/Tag_LFTagKey'
         TagValues:
           description: A list of possible values an attribute can take.
-          $ref: '#/components/schemas/TagValueList'
+          $ref: '#/components/schemas/Tag_TagValueList'
       required:
         - TagKey
         - TagValues
@@ -849,15 +941,108 @@ components:
           - lakeformation:DeleteLFTag
         list:
           - lakeformation:ListLFTags
+    TagAssociation_CatalogIdString:
+      type: string
+      minLength: 12
+      maxLength: 12
+    TagAssociation_NameString:
+      type: string
+      minLength: 1
+      maxLength: 255
+    TagAssociation_LFTagPair:
+      type: object
+      properties:
+        CatalogId:
+          $ref: '#/components/schemas/TagAssociation_CatalogIdString'
+        TagKey:
+          $ref: '#/components/schemas/LFTagKey'
+        TagValues:
+          $ref: '#/components/schemas/TagValueList'
+      required:
+        - CatalogId
+        - TagKey
+        - TagValues
+      additionalProperties: false
+    TagAssociation_LFTagsList:
+      type: array
+      items:
+        $ref: '#/components/schemas/TagAssociation_LFTagPair'
+      x-insertionOrder: false
+    TagAssociation_DataLakePrincipal:
+      type: object
+      properties:
+        DataLakePrincipalIdentifier:
+          $ref: '#/components/schemas/DataLakePrincipalString'
+      additionalProperties: false
+    TagAssociation_DatabaseResource:
+      type: object
+      properties:
+        CatalogId:
+          $ref: '#/components/schemas/TagAssociation_CatalogIdString'
+        Name:
+          $ref: '#/components/schemas/TagAssociation_NameString'
+      required:
+        - CatalogId
+        - Name
+      additionalProperties: false
+    TagAssociation_TableResource:
+      type: object
+      properties:
+        CatalogId:
+          $ref: '#/components/schemas/TagAssociation_CatalogIdString'
+        DatabaseName:
+          $ref: '#/components/schemas/TagAssociation_NameString'
+        Name:
+          $ref: '#/components/schemas/TagAssociation_NameString'
+        TableWildcard:
+          $ref: '#/components/schemas/TableWildcard'
+      required:
+        - CatalogId
+        - DatabaseName
+      additionalProperties: false
+    TagAssociation_ColumnNames:
+      type: array
+      items:
+        $ref: '#/components/schemas/TagAssociation_NameString'
+      x-insertionOrder: false
+    TagAssociation_TableWithColumnsResource:
+      type: object
+      properties:
+        CatalogId:
+          $ref: '#/components/schemas/TagAssociation_CatalogIdString'
+        DatabaseName:
+          $ref: '#/components/schemas/TagAssociation_NameString'
+        Name:
+          $ref: '#/components/schemas/TagAssociation_NameString'
+        ColumnNames:
+          $ref: '#/components/schemas/TagAssociation_ColumnNames'
+      required:
+        - CatalogId
+        - DatabaseName
+        - Name
+        - ColumnNames
+      additionalProperties: false
+    TagAssociation_Resource:
+      type: object
+      properties:
+        Catalog:
+          $ref: '#/components/schemas/CatalogResource'
+        Database:
+          $ref: '#/components/schemas/TagAssociation_DatabaseResource'
+        Table:
+          $ref: '#/components/schemas/TagAssociation_TableResource'
+        TableWithColumns:
+          $ref: '#/components/schemas/TagAssociation_TableWithColumnsResource'
+      additionalProperties: false
     TagAssociation:
       type: object
       properties:
         Resource:
           description: Resource to tag with the Lake Formation Tags
-          $ref: '#/components/schemas/Resource'
+          $ref: '#/components/schemas/TagAssociation_Resource'
         LFTags:
           description: List of Lake Formation Tags to associate with the Lake Formation Resource
-          $ref: '#/components/schemas/LFTagsList'
+          $ref: '#/components/schemas/TagAssociation_LFTagsList'
         ResourceIdentifier:
           description: Unique string identifying the resource. Used as primary identifier, which ideally should be a string
           type: string
@@ -950,7 +1135,7 @@ components:
           type: object
           properties:
             Catalog:
-              $ref: '#/components/schemas/CatalogIdString'
+              $ref: '#/components/schemas/PrincipalPermissions_CatalogIdString'
               description: The identifier for the GLUDC. By default, the account ID. The GLUDC is the persistent metadata store. It contains database definitions, table definitions, and other control information to manage your Lake Formation environment.
             Principal:
               $ref: '#/components/schemas/DataLakePrincipal'
@@ -989,13 +1174,13 @@ components:
           properties:
             CatalogId:
               description: The identifier for the Data Catalog. By default, the account ID. The Data Catalog is the persistent metadata store. It contains database definitions, table definitions, and other control information to manage your Lake Formation environment.
-              $ref: '#/components/schemas/CatalogIdString'
+              $ref: '#/components/schemas/Tag_CatalogIdString'
             TagKey:
               description: The key-name for the LF-tag.
-              $ref: '#/components/schemas/LFTagKey'
+              $ref: '#/components/schemas/Tag_LFTagKey'
             TagValues:
               description: A list of possible values an attribute can take.
-              $ref: '#/components/schemas/TagValueList'
+              $ref: '#/components/schemas/Tag_TagValueList'
           x-stackQL-stringOnly: true
       x-title: CreateTagRequest
       type: object
@@ -1015,10 +1200,10 @@ components:
           properties:
             Resource:
               description: Resource to tag with the Lake Formation Tags
-              $ref: '#/components/schemas/Resource'
+              $ref: '#/components/schemas/TagAssociation_Resource'
             LFTags:
               description: List of Lake Formation Tags to associate with the Lake Formation Resource
-              $ref: '#/components/schemas/LFTagsList'
+              $ref: '#/components/schemas/TagAssociation_LFTagsList'
             ResourceIdentifier:
               description: Unique string identifying the resource. Used as primary identifier, which ideally should be a string
               type: string
@@ -1042,7 +1227,7 @@ components:
       id: awscc.lakeformation.data_cells_filters
       x-cfn-schema-name: DataCellsFilter
       x-cfn-type-name: AWS::LakeFormation::DataCellsFilter
-      x-identifiers:
+      x-identifiers: &ref_0
         - TableCatalogId
         - DatabaseName
         - TableName
@@ -1126,11 +1311,7 @@ components:
       id: awscc.lakeformation.data_cells_filters_list_only
       x-cfn-schema-name: DataCellsFilter
       x-cfn-type-name: AWS::LakeFormation::DataCellsFilter
-      x-identifiers:
-        - TableCatalogId
-        - DatabaseName
-        - TableName
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1248,7 +1429,7 @@ components:
       id: awscc.lakeformation.tags
       x-cfn-schema-name: Tag
       x-cfn-type-name: AWS::LakeFormation::Tag
-      x-identifiers:
+      x-identifiers: &ref_1
         - TagKey
       x-type: cloud_control
       methods:
@@ -1338,8 +1519,7 @@ components:
       id: awscc.lakeformation.tags_list_only
       x-cfn-schema-name: Tag
       x-cfn-type-name: AWS::LakeFormation::Tag
-      x-identifiers:
-        - TagKey
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/lambda.yaml b/openapi/src/awscc/v00.00.00000/services/lambda.yaml
index bf3433195..c20ebc98b 100644
--- a/openapi/src/awscc/v00.00.00000/services/lambda.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/lambda.yaml
@@ -392,12 +392,12 @@ components:
   schemas:
     ProvisionedConcurrencyConfiguration:
       type: object
-      description: A provisioned concurrency configuration for a function's version.
+      description: A provisioned concurrency configuration for a function's alias.
       additionalProperties: false
       properties:
         ProvisionedConcurrentExecutions:
           type: integer
-          description: The amount of provisioned concurrency to allocate for the version.
+          description: The amount of provisioned concurrency to allocate for the alias.
       required:
         - ProvisionedConcurrentExecutions
     VersionWeight:
@@ -526,20 +526,19 @@ components:
       required:
         - UntrustedArtifactOnDeployment
     Tag:
-      description: A [tag](https://docs.aws.amazon.com/lambda/latest/dg/tagging.html) to apply to the function.
-      additionalProperties: false
       type: object
+      additionalProperties: false
       properties:
-        Value:
-          minLength: 0
-          description: The value for this tag.
-          type: string
-          maxLength: 256
         Key:
-          minLength: 1
-          description: The key for this tag.
           type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
           maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
       required:
         - Key
     CodeSigningConfig:
@@ -609,27 +608,27 @@ components:
         list:
           - lambda:ListCodeSigningConfigs
     DestinationConfig:
+      description: A destination for events after they have been sent to a function for processing.
       type: object
-      additionalProperties: false
-      description: A configuration object that specifies the destination of an event after Lambda processes it. For more information, see [Adding a destination](https://docs.aws.amazon.com/lambda/latest/dg/invocation-async-retain-records.html#invocation-async-destinations).
       properties:
         OnFailure:
-          description: The destination configuration for failed invocations.
           $ref: '#/components/schemas/OnFailure'
+        OnSuccess:
+          $ref: '#/components/schemas/OnSuccess'
+      additionalProperties: false
     OnFailure:
+      description: The destination configuration for failed invocations.
       type: object
-      description: A destination for events that failed processing. For more information, see [Adding a destination](https://docs.aws.amazon.com/lambda/latest/dg/invocation-async-retain-records.html#invocation-async-destinations).
-      additionalProperties: false
       properties:
         Destination:
-          description: |-
-            The Amazon Resource Name (ARN) of the destination resource.
-             To retain records of unsuccessful [asynchronous invocations](https://docs.aws.amazon.com/lambda/latest/dg/invocation-async.html#invocation-async-destinations), you can configure an Amazon SNS topic, Amazon SQS queue, Amazon S3 bucket, Lambda function, or Amazon EventBridge event bus as the destination.
-             To retain records of failed invocations from [Kinesis](https://docs.aws.amazon.com/lambda/latest/dg/with-kinesis.html), [DynamoDB](https://docs.aws.amazon.com/lambda/latest/dg/with-ddb.html), [self-managed Kafka](https://docs.aws.amazon.com/lambda/latest/dg/with-kafka.html#services-smaa-onfailure-destination) or [Amazon MSK](https://docs.aws.amazon.com/lambda/latest/dg/with-msk.html#services-msk-onfailure-destination), you can configure an Amazon SNS topic, Amazon SQS queue, or Amazon S3 bucket as the destination.
+          description: The Amazon Resource Name (ARN) of the destination resource.
           type: string
-          pattern: arn:(aws[a-zA-Z0-9-]*):([a-zA-Z0-9\-])+:((eusc-)?[a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\d{1})?:(\d{12})?:(.*)
-          minLength: 12
-          maxLength: 1024
+          pattern: ^$|arn:(aws[a-zA-Z0-9-]*):([a-zA-Z0-9\-])+:([a-z]+(-[a-z]+)+-\d{1})?:(\d{12})?:(.*)
+          minLength: 0
+          maxLength: 350
+      required:
+        - Destination
+      additionalProperties: false
     OnSuccess:
       description: The destination configuration for successful invocations.
       type: object
@@ -697,6 +696,14 @@ components:
           - lambda:DeleteFunctionEventInvokeConfig
         list:
           - lambda:ListFunctionEventInvokeConfigs
+    EventSourceMapping_DestinationConfig:
+      type: object
+      additionalProperties: false
+      description: A configuration object that specifies the destination of an event after Lambda processes it. For more information, see [Adding a destination](https://docs.aws.amazon.com/lambda/latest/dg/invocation-async-retain-records.html#invocation-async-destinations).
+      properties:
+        OnFailure:
+          description: The destination configuration for failed invocations.
+          $ref: '#/components/schemas/EventSourceMapping_OnFailure'
     FilterCriteria:
       type: object
       description: An object that contains the filters for an event source.
@@ -721,6 +728,20 @@ components:
           pattern: .*
           minLength: 0
           maxLength: 4096
+    EventSourceMapping_OnFailure:
+      type: object
+      description: A destination for events that failed processing. For more information, see [Adding a destination](https://docs.aws.amazon.com/lambda/latest/dg/invocation-async-retain-records.html#invocation-async-destinations).
+      additionalProperties: false
+      properties:
+        Destination:
+          description: |-
+            The Amazon Resource Name (ARN) of the destination resource.
+             To retain records of unsuccessful [asynchronous invocations](https://docs.aws.amazon.com/lambda/latest/dg/invocation-async.html#invocation-async-destinations), you can configure an Amazon SNS topic, Amazon SQS queue, Amazon S3 bucket, Lambda function, or Amazon EventBridge event bus as the destination.
+             To retain records of failed invocations from [Kinesis](https://docs.aws.amazon.com/lambda/latest/dg/with-kinesis.html), [DynamoDB](https://docs.aws.amazon.com/lambda/latest/dg/with-ddb.html), [self-managed Kafka](https://docs.aws.amazon.com/lambda/latest/dg/with-kafka.html#services-smaa-onfailure-destination) or [Amazon MSK](https://docs.aws.amazon.com/lambda/latest/dg/with-msk.html#services-msk-onfailure-destination), you can configure an Amazon SNS topic, Amazon SQS queue, or Amazon S3 bucket as the destination.
+          type: string
+          pattern: arn:(aws[a-zA-Z0-9-]*):([a-zA-Z0-9\-])+:((eusc-)?[a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\d{1})?:(\d{12})?:(.*)
+          minLength: 12
+          maxLength: 1024
     SourceAccessConfiguration:
       type: object
       additionalProperties: false
@@ -820,6 +841,23 @@ components:
         MaximumConcurrency:
           description: Limits the number of concurrent instances that the SQS event source can invoke.
           $ref: '#/components/schemas/MaximumConcurrency'
+    EventSourceMapping_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: The key for this tag.
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: The value for this tag.
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+      description: A [tag](https://docs.aws.amazon.com/lambda/latest/dg/tagging.html) to apply to the event source mapping.
     DocumentDBEventSourceConfig:
       description: Specific configuration settings for a DocumentDB event source.
       type: object
@@ -970,7 +1008,7 @@ components:
           type: boolean
         DestinationConfig:
           description: (Kinesis, DynamoDB Streams, Amazon MSK, and self-managed Apache Kafka event sources only) A configuration object that specifies the destination of an event after Lambda processes it.
-          $ref: '#/components/schemas/DestinationConfig'
+          $ref: '#/components/schemas/EventSourceMapping_DestinationConfig'
         Enabled:
           description: |-
             When true, the event source mapping is active. When false, Lambda pauses polling and invocation.
@@ -1065,7 +1103,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/EventSourceMapping_Tag'
         Topics:
           description: The name of the Kafka topic.
           type: array
@@ -1428,6 +1466,23 @@ components:
       required:
         - Arn
         - LocalMountPath
+    Function_Tag:
+      description: A [tag](https://docs.aws.amazon.com/lambda/latest/dg/tagging.html) to apply to the function.
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          minLength: 0
+          description: The value for this tag.
+          type: string
+          maxLength: 256
+        Key:
+          minLength: 1
+          description: The key for this tag.
+          type: string
+          maxLength: 128
+      required:
+        - Key
     EphemeralStorage:
       description: The size of the function's ``/tmp`` directory in MB. The default value is 512, but it can be any whole number between 512 and 10,240 MB.
       additionalProperties: false
@@ -1518,7 +1573,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Function_Tag'
         ImageConfig:
           description: Configuration values that override the container image Dockerfile settings. For more information, see [Container image settings](https://docs.aws.amazon.com/lambda/latest/dg/images-create.html#images-parms).
           $ref: '#/components/schemas/ImageConfig'
@@ -2060,6 +2115,16 @@ components:
           - lambda:ListFunctionUrlConfigs
         delete:
           - lambda:DeleteFunctionUrlConfig
+    Version_ProvisionedConcurrencyConfiguration:
+      type: object
+      description: A provisioned concurrency configuration for a function's version.
+      additionalProperties: false
+      properties:
+        ProvisionedConcurrentExecutions:
+          type: integer
+          description: The amount of provisioned concurrency to allocate for the version.
+      required:
+        - ProvisionedConcurrentExecutions
     RuntimePolicy:
       type: object
       description: Runtime Management Config of a function.
@@ -2102,7 +2167,7 @@ components:
           pattern: ^(arn:(aws[a-zA-Z-]*)?:lambda:)?((eusc-)?[a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\d{1}:)?(\d{12}:)?(function:)?([a-zA-Z0-9-_]+)(:(\$LATEST|[a-zA-Z0-9-_]+))?$
         ProvisionedConcurrencyConfig:
           description: Specifies a provisioned concurrency configuration for a function's version. Updates are not supported for this property.
-          $ref: '#/components/schemas/ProvisionedConcurrencyConfiguration'
+          $ref: '#/components/schemas/Version_ProvisionedConcurrencyConfiguration'
         RuntimePolicy:
           description: Specifies the runtime management configuration of a function. Displays runtimeVersionArn only for Manual.
           $ref: '#/components/schemas/RuntimePolicy'
@@ -2303,7 +2368,7 @@ components:
               type: boolean
             DestinationConfig:
               description: (Kinesis, DynamoDB Streams, Amazon MSK, and self-managed Apache Kafka event sources only) A configuration object that specifies the destination of an event after Lambda processes it.
-              $ref: '#/components/schemas/DestinationConfig'
+              $ref: '#/components/schemas/EventSourceMapping_DestinationConfig'
             Enabled:
               description: |-
                 When true, the event source mapping is active. When false, Lambda pauses polling and invocation.
@@ -2398,7 +2463,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/EventSourceMapping_Tag'
             Topics:
               description: The name of the Kafka topic.
               type: array
@@ -2559,7 +2624,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Function_Tag'
             ImageConfig:
               description: Configuration values that override the container image Dockerfile settings. For more information, see [Container image settings](https://docs.aws.amazon.com/lambda/latest/dg/images-create.html#images-parms).
               $ref: '#/components/schemas/ImageConfig'
@@ -2866,7 +2931,7 @@ components:
               pattern: ^(arn:(aws[a-zA-Z-]*)?:lambda:)?((eusc-)?[a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\d{1}:)?(\d{12}:)?(function:)?([a-zA-Z0-9-_]+)(:(\$LATEST|[a-zA-Z0-9-_]+))?$
             ProvisionedConcurrencyConfig:
               description: Specifies a provisioned concurrency configuration for a function's version. Updates are not supported for this property.
-              $ref: '#/components/schemas/ProvisionedConcurrencyConfiguration'
+              $ref: '#/components/schemas/Version_ProvisionedConcurrencyConfiguration'
             RuntimePolicy:
               description: Specifies the runtime management configuration of a function. Displays runtimeVersionArn only for Manual.
               $ref: '#/components/schemas/RuntimePolicy'
@@ -2887,7 +2952,7 @@ components:
       id: awscc.lambda.aliases
       x-cfn-schema-name: Alias
       x-cfn-type-name: AWS::Lambda::Alias
-      x-identifiers:
+      x-identifiers: &ref_0
         - AliasArn
       x-type: cloud_control
       methods:
@@ -2985,8 +3050,7 @@ components:
       id: awscc.lambda.aliases_list_only
       x-cfn-schema-name: Alias
       x-cfn-type-name: AWS::Lambda::Alias
-      x-identifiers:
-        - AliasArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3016,7 +3080,7 @@ components:
       id: awscc.lambda.code_signing_configs
       x-cfn-schema-name: CodeSigningConfig
       x-cfn-type-name: AWS::Lambda::CodeSigningConfig
-      x-identifiers:
+      x-identifiers: &ref_1
         - CodeSigningConfigArn
       x-type: cloud_control
       methods:
@@ -3112,8 +3176,7 @@ components:
       id: awscc.lambda.code_signing_configs_list_only
       x-cfn-schema-name: CodeSigningConfig
       x-cfn-type-name: AWS::Lambda::CodeSigningConfig
-      x-identifiers:
-        - CodeSigningConfigArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3143,7 +3206,7 @@ components:
       id: awscc.lambda.event_invoke_configs
       x-cfn-schema-name: EventInvokeConfig
       x-cfn-type-name: AWS::Lambda::EventInvokeConfig
-      x-identifiers:
+      x-identifiers: &ref_2
         - FunctionName
         - Qualifier
       x-type: cloud_control
@@ -3238,9 +3301,7 @@ components:
       id: awscc.lambda.event_invoke_configs_list_only
       x-cfn-schema-name: EventInvokeConfig
       x-cfn-type-name: AWS::Lambda::EventInvokeConfig
-      x-identifiers:
-        - FunctionName
-        - Qualifier
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3272,7 +3333,7 @@ components:
       id: awscc.lambda.event_source_mappings
       x-cfn-schema-name: EventSourceMapping
       x-cfn-type-name: AWS::Lambda::EventSourceMapping
-      x-identifiers:
+      x-identifiers: &ref_3
         - Id
       x-type: cloud_control
       methods:
@@ -3414,8 +3475,7 @@ components:
       id: awscc.lambda.event_source_mappings_list_only
       x-cfn-schema-name: EventSourceMapping
       x-cfn-type-name: AWS::Lambda::EventSourceMapping
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3445,7 +3505,7 @@ components:
       id: awscc.lambda.functions
       x-cfn-schema-name: Function
       x-cfn-type-name: AWS::Lambda::Function
-      x-identifiers:
+      x-identifiers: &ref_4
         - FunctionName
       x-type: cloud_control
       methods:
@@ -3585,8 +3645,7 @@ components:
       id: awscc.lambda.functions_list_only
       x-cfn-schema-name: Function
       x-cfn-type-name: AWS::Lambda::Function
-      x-identifiers:
-        - FunctionName
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3616,7 +3675,7 @@ components:
       id: awscc.lambda.layer_versions
       x-cfn-schema-name: LayerVersion
       x-cfn-type-name: AWS::Lambda::LayerVersion
-      x-identifiers:
+      x-identifiers: &ref_5
         - LayerVersionArn
       x-type: cloud_control
       methods:
@@ -3697,8 +3756,7 @@ components:
       id: awscc.lambda.layer_versions_list_only
       x-cfn-schema-name: LayerVersion
       x-cfn-type-name: AWS::Lambda::LayerVersion
-      x-identifiers:
-        - LayerVersionArn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3728,7 +3786,7 @@ components:
       id: awscc.lambda.layer_version_permissions
       x-cfn-schema-name: LayerVersionPermission
       x-cfn-type-name: AWS::Lambda::LayerVersionPermission
-      x-identifiers:
+      x-identifiers: &ref_6
         - Id
       x-type: cloud_control
       methods:
@@ -3805,8 +3863,7 @@ components:
       id: awscc.lambda.layer_version_permissions_list_only
       x-cfn-schema-name: LayerVersionPermission
       x-cfn-type-name: AWS::Lambda::LayerVersionPermission
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3836,7 +3893,7 @@ components:
       id: awscc.lambda.permissions
       x-cfn-schema-name: Permission
       x-cfn-type-name: AWS::Lambda::Permission
-      x-identifiers:
+      x-identifiers: &ref_7
         - FunctionName
         - Id
       x-type: cloud_control
@@ -3922,9 +3979,7 @@ components:
       id: awscc.lambda.permissions_list_only
       x-cfn-schema-name: Permission
       x-cfn-type-name: AWS::Lambda::Permission
-      x-identifiers:
-        - FunctionName
-        - Id
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3956,7 +4011,7 @@ components:
       id: awscc.lambda.urls
       x-cfn-schema-name: Url
       x-cfn-type-name: AWS::Lambda::Url
-      x-identifiers:
+      x-identifiers: &ref_8
         - FunctionArn
       x-type: cloud_control
       methods:
@@ -4054,8 +4109,7 @@ components:
       id: awscc.lambda.urls_list_only
       x-cfn-schema-name: Url
       x-cfn-type-name: AWS::Lambda::Url
-      x-identifiers:
-        - FunctionArn
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4085,7 +4139,7 @@ components:
       id: awscc.lambda.versions
       x-cfn-schema-name: Version
       x-cfn-type-name: AWS::Lambda::Version
-      x-identifiers:
+      x-identifiers: &ref_9
         - FunctionArn
       x-type: cloud_control
       methods:
@@ -4166,8 +4220,7 @@ components:
       id: awscc.lambda.versions_list_only
       x-cfn-schema-name: Version
       x-cfn-type-name: AWS::Lambda::Version
-      x-identifiers:
-        - FunctionArn
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/launchwizard.yaml b/openapi/src/awscc/v00.00.00000/services/launchwizard.yaml
index 710c0b912..0855dd61d 100644
--- a/openapi/src/awscc/v00.00.00000/services/launchwizard.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/launchwizard.yaml
@@ -679,7 +679,7 @@ components:
       id: awscc.launchwizard.deployments
       x-cfn-schema-name: Deployment
       x-cfn-type-name: AWS::LaunchWizard::Deployment
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -785,8 +785,7 @@ components:
       id: awscc.launchwizard.deployments_list_only
       x-cfn-schema-name: Deployment
       x-cfn-type-name: AWS::LaunchWizard::Deployment
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/lex.yaml b/openapi/src/awscc/v00.00.00000/services/lex.yaml
index 2b3e7f37d..e3245c769 100644
--- a/openapi/src/awscc/v00.00.00000/services/lex.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/lex.yaml
@@ -410,7 +410,6 @@ components:
         - ReplicaRegions
       additionalProperties: false
     BotAliasLocaleSettingsList:
-      description: A list of bot alias locale settings to add to the bot alias.
       type: array
       uniqueItems: true
       maxItems: 50
@@ -418,11 +417,9 @@ components:
       items:
         $ref: '#/components/schemas/BotAliasLocaleSettingsItem'
     BotAliasLocaleSettingsItem:
-      description: A locale setting in alias
       type: object
       properties:
         LocaleId:
-          description: A string used to identify the locale
           type: string
           minLength: 1
           maxLength: 128
@@ -433,19 +430,16 @@ components:
         - BotAliasLocaleSetting
       additionalProperties: false
     BotAliasLocaleSettings:
-      description: You can use this parameter to specify a specific Lambda function to run different functions in different locales.
       type: object
       properties:
         CodeHookSpecification:
           $ref: '#/components/schemas/CodeHookSpecification'
         Enabled:
           type: boolean
-          description: Whether the Lambda code hook is enabled
       required:
         - Enabled
       additionalProperties: false
     CodeHookSpecification:
-      description: Contains information about code hooks that Amazon Lex calls during a conversation.
       type: object
       properties:
         LambdaCodeHook:
@@ -454,16 +448,13 @@ components:
         - LambdaCodeHook
       additionalProperties: false
     LambdaCodeHook:
-      description: Contains information about code hooks that Amazon Lex calls during a conversation.
       type: object
       properties:
         CodeHookInterfaceVersion:
-          description: The version of the request-response that you want Amazon Lex to use to invoke your Lambda function.
           type: string
           minLength: 1
           maxLength: 5
         LambdaArn:
-          description: The Amazon Resource Name (ARN) of the Lambda function.
           type: string
           minLength: 20
           maxLength: 2048
@@ -472,7 +463,6 @@ components:
         - LambdaArn
       additionalProperties: false
     ConversationLogSettings:
-      description: Contains information about code hooks that Amazon Lex calls during a conversation.
       type: object
       properties:
         AudioLogSettings:
@@ -481,7 +471,6 @@ components:
           $ref: '#/components/schemas/TextLogSettings'
       additionalProperties: false
     AudioLogSettings:
-      description: List of audio log settings
       type: array
       maxItems: 1
       uniqueItems: true
@@ -489,7 +478,6 @@ components:
       items:
         $ref: '#/components/schemas/AudioLogSetting'
     TextLogSettings:
-      description: List of text log settings
       type: array
       maxItems: 1
       uniqueItems: true
@@ -497,33 +485,28 @@ components:
       items:
         $ref: '#/components/schemas/TextLogSetting'
     AudioLogSetting:
-      description: Settings for logging audio of conversations between Amazon Lex and a user. You specify whether to log audio and the Amazon S3 bucket where the audio file is stored.
       type: object
       properties:
         Destination:
           $ref: '#/components/schemas/AudioLogDestination'
         Enabled:
           type: boolean
-          description: ''
       required:
         - Destination
         - Enabled
       additionalProperties: false
     TextLogSetting:
-      description: Contains information about code hooks that Amazon Lex calls during a conversation.
       type: object
       properties:
         Destination:
           $ref: '#/components/schemas/TextLogDestination'
         Enabled:
           type: boolean
-          description: ''
       required:
         - Destination
         - Enabled
       additionalProperties: false
     AudioLogDestination:
-      description: The location of audio log files collected when conversation logging is enabled for a bot.
       type: object
       properties:
         S3Bucket:
@@ -532,7 +515,6 @@ components:
         - S3Bucket
       additionalProperties: false
     TextLogDestination:
-      description: Defines the Amazon CloudWatch Logs destination log group for conversation text logs.
       type: object
       properties:
         CloudWatch:
@@ -544,12 +526,10 @@ components:
       type: object
       properties:
         CloudWatchLogGroupArn:
-          description: A string used to identify the groupArn for the Cloudwatch Log Group
           type: string
           minLength: 1
           maxLength: 2048
         LogPrefix:
-          description: A string containing the value for the Log Prefix
           type: string
           minLength: 0
           maxLength: 1024
@@ -558,23 +538,19 @@ components:
         - LogPrefix
       additionalProperties: false
     S3BucketLogDestination:
-      description: Specifies an Amazon S3 bucket for logging audio conversations
       type: object
       properties:
         S3BucketArn:
           type: string
-          description: The Amazon Resource Name (ARN) of an Amazon S3 bucket where audio log files are stored.
           minLength: 1
           maxLength: 2048
           pattern: ^arn:[\w\-]+:s3:::[a-z0-9][\.\-a-z0-9]{1,61}[a-z0-9]$
         LogPrefix:
           type: string
-          description: The Amazon S3 key of the deployment package.
           minLength: 0
           maxLength: 1024
         KmsKeyArn:
           type: string
-          description: The Amazon Resource Name (ARN) of an AWS Key Management Service (KMS) key for encrypting audio log files stored in an S3 bucket.
           minLength: 20
           maxLength: 2048
           pattern: ^arn:[\w\-]+:kms:[\w\-]+:[\d]{12}:(?:key\/[\w\-]+|alias\/[a-zA-Z0-9:\/_\-]{1,256})$
@@ -606,7 +582,6 @@ components:
       maxLength: 2048
       pattern: ^arn:aws[a-zA-Z-]*:iam::[0-9]{12}:role/.*$
     Id:
-      description: Unique ID of resource
       type: string
       minLength: 10
       maxLength: 10
@@ -617,15 +592,14 @@ components:
       maxLength: 1011
       pattern: ^arn:aws[a-zA-Z-]*:lex:[a-z]+-(?:[a-z]+-)*[0-9]:[0-9]{12}:bot/[0-9a-zA-Z]+$
     Name:
-      description: A unique identifier for a resource.
       type: string
       minLength: 1
       maxLength: 100
       pattern: ^([0-9a-zA-Z][_-]?)+$
     Description:
-      description: A description of the version. Use the description to help identify the version in lists.
+      description: A description of the resource
       type: string
-      maxLength: 200
+      maxLength: 2000
     DataPrivacy:
       type: object
       properties:
@@ -664,16 +638,13 @@ components:
       items:
         $ref: '#/components/schemas/SampleUtterance'
     Tag:
-      description: A label for tagging Lex resources
       type: object
       properties:
         Key:
-          description: A string used to identify this tag
           type: string
           minLength: 1
           maxLength: 128
         Value:
-          description: A string containing the value for the tag
           type: string
           minLength: 0
           maxLength: 256
@@ -682,7 +653,6 @@ components:
         - Value
       additionalProperties: false
     LocaleId:
-      description: The identifier of the language and locale that the bot will be used in.
       type: string
     VoiceSettings:
       type: object
@@ -2239,6 +2209,17 @@ components:
         list:
           - lex:ListBots
           - lex:ListBotReplicas
+    BotAlias_LocaleId:
+      description: The identifier of the language and locale that the bot alias will be configured in.
+      type: string
+    BotAlias_BotAliasLocaleSettingsList:
+      description: A list of bot alias locale settings to add to the bot alias.
+      type: array
+      uniqueItems: true
+      maxItems: 50
+      x-insertionOrder: false
+      items:
+        $ref: '#/components/schemas/BotAlias_BotAliasLocaleSettingsItem'
     BotAliasStatus:
       type: string
       enum:
@@ -2246,73 +2227,235 @@ components:
         - Available
         - Deleting
         - Failed
-    BotVersion:
+    BotAlias_BotAliasLocaleSettingsItem:
+      description: A locale setting in alias
       type: object
       properties:
-        BotId:
-          $ref: '#/components/schemas/Id'
-        BotVersion:
-          $ref: '#/components/schemas/BotVersion'
-        Description:
-          $ref: '#/components/schemas/Description'
-        BotVersionLocaleSpecification:
-          $ref: '#/components/schemas/BotVersionLocaleSpecificationList'
+        LocaleId:
+          description: A string used to identify the locale
+          type: string
+          minLength: 1
+          maxLength: 128
+        BotAliasLocaleSetting:
+          $ref: '#/components/schemas/BotAlias_BotAliasLocaleSettings'
       required:
-        - BotId
-        - BotVersionLocaleSpecification
-      x-stackql-resource-name: bot_version
-      description: A version is a numbered snapshot of your work that you can publish for use in different parts of your workflow, such as development, beta deployment, and production.
-      x-type-name: AWS::Lex::BotVersion
-      x-stackql-primary-identifier:
-        - BotId
-        - BotVersion
-      x-create-only-properties:
-        - BotId
-      x-write-only-properties:
-        - BotVersionLocaleSpecification
-      x-read-only-properties:
-        - BotVersion
-      x-required-properties:
-        - BotId
-        - BotVersionLocaleSpecification
-      x-required-permissions:
-        create:
-          - lex:CreateBotVersion
-          - lex:DescribeBotVersion
-          - lex:DescribeBot
-          - lex:DescribeBotLocale
-          - lex:BuildBotLocale
-        read:
-          - lex:DescribeBotVersion
-        delete:
-          - lex:DeleteBotVersion
-          - lex:DescribeBotVersion
-        list:
-          - lex:ListBotVersions
+        - LocaleId
+        - BotAliasLocaleSetting
+      additionalProperties: false
+    BotAlias_BotAliasLocaleSettings:
+      description: You can use this parameter to specify a specific Lambda function to run different functions in different locales.
+      type: object
+      properties:
+        CodeHookSpecification:
+          $ref: '#/components/schemas/BotAlias_CodeHookSpecification'
+        Enabled:
+          type: boolean
+          description: Whether the Lambda code hook is enabled
+      required:
+        - Enabled
+      additionalProperties: false
+    BotAlias_CodeHookSpecification:
+      description: Contains information about code hooks that Amazon Lex calls during a conversation.
+      type: object
+      properties:
+        LambdaCodeHook:
+          $ref: '#/components/schemas/BotAlias_LambdaCodeHook'
+      required:
+        - LambdaCodeHook
+      additionalProperties: false
+    BotAlias_LambdaCodeHook:
+      description: Contains information about code hooks that Amazon Lex calls during a conversation.
+      type: object
+      properties:
+        CodeHookInterfaceVersion:
+          description: The version of the request-response that you want Amazon Lex to use to invoke your Lambda function.
+          type: string
+          minLength: 1
+          maxLength: 5
+        LambdaArn:
+          description: The Amazon Resource Name (ARN) of the Lambda function.
+          type: string
+          minLength: 20
+          maxLength: 2048
+      required:
+        - CodeHookInterfaceVersion
+        - LambdaArn
+      additionalProperties: false
+    BotAlias_ConversationLogSettings:
+      description: Contains information about code hooks that Amazon Lex calls during a conversation.
+      type: object
+      properties:
+        AudioLogSettings:
+          $ref: '#/components/schemas/BotAlias_AudioLogSettings'
+        TextLogSettings:
+          $ref: '#/components/schemas/BotAlias_TextLogSettings'
+      additionalProperties: false
+    BotAlias_AudioLogSettings:
+      description: List of audio log settings
+      type: array
+      maxItems: 1
+      uniqueItems: true
+      x-insertionOrder: false
+      items:
+        $ref: '#/components/schemas/BotAlias_AudioLogSetting'
+    BotAlias_TextLogSettings:
+      description: List of text log settings
+      type: array
+      maxItems: 1
+      uniqueItems: true
+      x-insertionOrder: false
+      items:
+        $ref: '#/components/schemas/BotAlias_TextLogSetting'
+    BotAlias_AudioLogSetting:
+      description: Settings for logging audio of conversations between Amazon Lex and a user. You specify whether to log audio and the Amazon S3 bucket where the audio file is stored.
+      type: object
+      properties:
+        Destination:
+          $ref: '#/components/schemas/BotAlias_AudioLogDestination'
+        Enabled:
+          type: boolean
+          description: ''
+      required:
+        - Destination
+        - Enabled
+      additionalProperties: false
+    BotAlias_TextLogSetting:
+      description: Contains information about code hooks that Amazon Lex calls during a conversation.
+      type: object
+      properties:
+        Destination:
+          $ref: '#/components/schemas/BotAlias_TextLogDestination'
+        Enabled:
+          type: boolean
+          description: ''
+      required:
+        - Destination
+        - Enabled
+      additionalProperties: false
+    BotAlias_AudioLogDestination:
+      description: The location of audio log files collected when conversation logging is enabled for a bot.
+      type: object
+      properties:
+        S3Bucket:
+          $ref: '#/components/schemas/BotAlias_S3BucketLogDestination'
+      required:
+        - S3Bucket
+      additionalProperties: false
+    BotAlias_TextLogDestination:
+      description: Defines the Amazon CloudWatch Logs destination log group for conversation text logs.
+      type: object
+      properties:
+        CloudWatch:
+          $ref: '#/components/schemas/BotAlias_CloudWatchLogGroupLogDestination'
+      required:
+        - CloudWatch
+      additionalProperties: false
+    BotAlias_CloudWatchLogGroupLogDestination:
+      type: object
+      properties:
+        CloudWatchLogGroupArn:
+          description: A string used to identify the groupArn for the Cloudwatch Log Group
+          type: string
+          minLength: 1
+          maxLength: 2048
+        LogPrefix:
+          description: A string containing the value for the Log Prefix
+          type: string
+          minLength: 0
+          maxLength: 1024
+      required:
+        - CloudWatchLogGroupArn
+        - LogPrefix
+      additionalProperties: false
+    BotAlias_S3BucketLogDestination:
+      description: Specifies an Amazon S3 bucket for logging audio conversations
+      type: object
+      properties:
+        S3BucketArn:
+          type: string
+          description: The Amazon Resource Name (ARN) of an Amazon S3 bucket where audio log files are stored.
+          minLength: 1
+          maxLength: 2048
+          pattern: ^arn:[\w\-]+:s3:::[a-z0-9][\.\-a-z0-9]{1,61}[a-z0-9]$
+        LogPrefix:
+          type: string
+          description: The Amazon S3 key of the deployment package.
+          minLength: 0
+          maxLength: 1024
+        KmsKeyArn:
+          type: string
+          description: The Amazon Resource Name (ARN) of an AWS Key Management Service (KMS) key for encrypting audio log files stored in an S3 bucket.
+          minLength: 20
+          maxLength: 2048
+          pattern: ^arn:[\w\-]+:kms:[\w\-]+:[\d]{12}:(?:key\/[\w\-]+|alias\/[a-zA-Z0-9:\/_\-]{1,256})$
+      required:
+        - LogPrefix
+        - S3BucketArn
+      additionalProperties: false
+    BotAlias_Id:
+      description: Unique ID of resource
+      type: string
+      minLength: 10
+      maxLength: 10
+      pattern: ^[0-9a-zA-Z]+$
+    BotAlias_Name:
+      description: A unique identifier for a resource.
+      type: string
+      minLength: 1
+      maxLength: 100
+      pattern: ^([0-9a-zA-Z][_-]?)+$
+    BotAlias_BotVersion:
+      description: The version of a bot.
+      type: string
+      minLength: 1
+      maxLength: 5
+      pattern: ^(DRAFT|[0-9]+)$
+    BotAlias_Description:
+      description: A description of the bot alias. Use the description to help identify the bot alias in lists.
+      type: string
+      maxLength: 200
     Arn:
       type: string
       maxLength: 1000
+    BotAlias_Tag:
+      description: A label for tagging Lex resources
+      type: object
+      properties:
+        Key:
+          description: A string used to identify this tag
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          description: A string containing the value for the tag
+          type: string
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     BotAlias:
       type: object
       properties:
         BotAliasId:
-          $ref: '#/components/schemas/Id'
+          $ref: '#/components/schemas/BotAlias_Id'
         BotId:
-          $ref: '#/components/schemas/Id'
+          $ref: '#/components/schemas/BotAlias_Id'
         Arn:
           $ref: '#/components/schemas/Arn'
         BotAliasStatus:
           $ref: '#/components/schemas/BotAliasStatus'
         BotAliasLocaleSettings:
-          $ref: '#/components/schemas/BotAliasLocaleSettingsList'
+          $ref: '#/components/schemas/BotAlias_BotAliasLocaleSettingsList'
         BotAliasName:
-          $ref: '#/components/schemas/Name'
+          $ref: '#/components/schemas/BotAlias_Name'
         BotVersion:
-          $ref: '#/components/schemas/BotVersion'
+          $ref: '#/components/schemas/BotAlias_BotVersion'
         ConversationLogSettings:
-          $ref: '#/components/schemas/ConversationLogSettings'
+          $ref: '#/components/schemas/BotAlias_ConversationLogSettings'
         Description:
-          $ref: '#/components/schemas/Description'
+          $ref: '#/components/schemas/BotAlias_Description'
         SentimentAnalysisSettings:
           description: Determines whether Amazon Lex will use Amazon Comprehend to detect the sentiment of user utterances.
           type: object
@@ -2330,7 +2473,7 @@ components:
           maxItems: 200
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/BotAlias_Tag'
       required:
         - BotId
         - BotAliasName
@@ -2367,12 +2510,31 @@ components:
           - lex:DeleteBotAlias
         list:
           - lex:ListBotAliases
-    BotVersionLocaleDetails:
+    BotVersion_Id:
+      description: Unique ID of resource
+      type: string
+      minLength: 10
+      maxLength: 10
+      pattern: ^[0-9a-zA-Z]+$
+    BotVersion_Description:
+      description: A description of the version. Use the description to help identify the version in lists.
+      type: string
+      maxLength: 200
+    BotVersion_LocaleId:
+      description: The identifier of the language and locale that the bot will be used in.
+      type: string
+    BotVersion_BotVersion:
+      description: The version of a bot.
+      type: string
+      minLength: 1
+      maxLength: 5
+      pattern: ^(DRAFT|[0-9]+)$
+    BotVersionLocaleDetails:
       description: The version of a bot used for a bot locale.
       type: object
       properties:
         SourceBotVersion:
-          $ref: '#/components/schemas/BotVersion'
+          $ref: '#/components/schemas/BotVersion_BotVersion'
       required:
         - SourceBotVersion
       additionalProperties: false
@@ -2380,7 +2542,7 @@ components:
       type: object
       properties:
         LocaleId:
-          $ref: '#/components/schemas/LocaleId'
+          $ref: '#/components/schemas/BotVersion_LocaleId'
         BotVersionLocaleDetails:
           $ref: '#/components/schemas/BotVersionLocaleDetails'
       required:
@@ -2394,6 +2556,49 @@ components:
       minItems: 1
       items:
         $ref: '#/components/schemas/BotVersionLocaleSpecification'
+    BotVersion:
+      type: object
+      properties:
+        BotId:
+          $ref: '#/components/schemas/BotVersion_Id'
+        BotVersion:
+          $ref: '#/components/schemas/BotVersion_BotVersion'
+        Description:
+          $ref: '#/components/schemas/BotVersion_Description'
+        BotVersionLocaleSpecification:
+          $ref: '#/components/schemas/BotVersionLocaleSpecificationList'
+      required:
+        - BotId
+        - BotVersionLocaleSpecification
+      x-stackql-resource-name: bot_version
+      description: A version is a numbered snapshot of your work that you can publish for use in different parts of your workflow, such as development, beta deployment, and production.
+      x-type-name: AWS::Lex::BotVersion
+      x-stackql-primary-identifier:
+        - BotId
+        - BotVersion
+      x-create-only-properties:
+        - BotId
+      x-write-only-properties:
+        - BotVersionLocaleSpecification
+      x-read-only-properties:
+        - BotVersion
+      x-required-properties:
+        - BotId
+        - BotVersionLocaleSpecification
+      x-required-permissions:
+        create:
+          - lex:CreateBotVersion
+          - lex:DescribeBotVersion
+          - lex:DescribeBot
+          - lex:DescribeBotLocale
+          - lex:BuildBotLocale
+        read:
+          - lex:DescribeBotVersion
+        delete:
+          - lex:DeleteBotVersion
+          - lex:DescribeBotVersion
+        list:
+          - lex:ListBotVersions
     ResourceArn:
       description: The Amazon Resource Name (ARN) of the bot or bot alias that the resource policy is attached to.
       type: string
@@ -2527,31 +2732,6 @@ components:
       x-title: CreateBotRequest
       type: object
       required: []
-    CreateBotVersionRequest:
-      properties:
-        ClientToken:
-          type: string
-        RoleArn:
-          type: string
-        TypeName:
-          type: string
-        TypeVersionId:
-          type: string
-        DesiredState:
-          type: object
-          properties:
-            BotId:
-              $ref: '#/components/schemas/Id'
-            BotVersion:
-              $ref: '#/components/schemas/BotVersion'
-            Description:
-              $ref: '#/components/schemas/Description'
-            BotVersionLocaleSpecification:
-              $ref: '#/components/schemas/BotVersionLocaleSpecificationList'
-          x-stackQL-stringOnly: true
-      x-title: CreateBotVersionRequest
-      type: object
-      required: []
     CreateBotAliasRequest:
       properties:
         ClientToken:
@@ -2566,23 +2746,23 @@ components:
           type: object
           properties:
             BotAliasId:
-              $ref: '#/components/schemas/Id'
+              $ref: '#/components/schemas/BotAlias_Id'
             BotId:
-              $ref: '#/components/schemas/Id'
+              $ref: '#/components/schemas/BotAlias_Id'
             Arn:
               $ref: '#/components/schemas/Arn'
             BotAliasStatus:
               $ref: '#/components/schemas/BotAliasStatus'
             BotAliasLocaleSettings:
-              $ref: '#/components/schemas/BotAliasLocaleSettingsList'
+              $ref: '#/components/schemas/BotAlias_BotAliasLocaleSettingsList'
             BotAliasName:
-              $ref: '#/components/schemas/Name'
+              $ref: '#/components/schemas/BotAlias_Name'
             BotVersion:
-              $ref: '#/components/schemas/BotVersion'
+              $ref: '#/components/schemas/BotAlias_BotVersion'
             ConversationLogSettings:
-              $ref: '#/components/schemas/ConversationLogSettings'
+              $ref: '#/components/schemas/BotAlias_ConversationLogSettings'
             Description:
-              $ref: '#/components/schemas/Description'
+              $ref: '#/components/schemas/BotAlias_Description'
             SentimentAnalysisSettings:
               description: Determines whether Amazon Lex will use Amazon Comprehend to detect the sentiment of user utterances.
               type: object
@@ -2600,11 +2780,36 @@ components:
               maxItems: 200
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/BotAlias_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateBotAliasRequest
       type: object
       required: []
+    CreateBotVersionRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            BotId:
+              $ref: '#/components/schemas/BotVersion_Id'
+            BotVersion:
+              $ref: '#/components/schemas/BotVersion_BotVersion'
+            Description:
+              $ref: '#/components/schemas/BotVersion_Description'
+            BotVersionLocaleSpecification:
+              $ref: '#/components/schemas/BotVersionLocaleSpecificationList'
+          x-stackQL-stringOnly: true
+      x-title: CreateBotVersionRequest
+      type: object
+      required: []
     CreateResourcePolicyRequest:
       properties:
         ClientToken:
@@ -2643,7 +2848,7 @@ components:
       id: awscc.lex.bots
       x-cfn-schema-name: Bot
       x-cfn-type-name: AWS::Lex::Bot
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
       x-type: cloud_control
       methods:
@@ -2757,8 +2962,7 @@ components:
       id: awscc.lex.bots_list_only
       x-cfn-schema-name: Bot
       x-cfn-type-name: AWS::Lex::Bot
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2783,14 +2987,14 @@ components:
                 json_extract_path_text(Properties, 'Id') as id
                 FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Lex::Bot'
                 AND region = 'us-east-1'
-    bot_versions:
-      name: bot_versions
-      id: awscc.lex.bot_versions
-      x-cfn-schema-name: BotVersion
-      x-cfn-type-name: AWS::Lex::BotVersion
-      x-identifiers:
+    bot_aliases:
+      name: bot_aliases
+      id: awscc.lex.bot_aliases
+      x-cfn-schema-name: BotAlias
+      x-cfn-type-name: AWS::Lex::BotAlias
+      x-identifiers: &ref_1
+        - BotAliasId
         - BotId
-        - BotVersion
       x-type: cloud_control
       methods:
         create_resource:
@@ -2798,12 +3002,28 @@ components:
             requestBodyTranslate:
               algorithm: naive_DesiredState
           operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__BotVersion&__detailTransformed=true/post'
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__BotAlias&__detailTransformed=true/post'
           request:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::Lex::BotVersion"
+                "TypeName": "AWS::Lex::BotAlias"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::Lex::BotAlias"
               }
           response:
             mediaType: application/json
@@ -2819,7 +3039,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::Lex::BotVersion"
+                "TypeName": "AWS::Lex::BotAlias"
               }
           response:
             mediaType: application/json
@@ -2827,10 +3047,11 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/bot_versions/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/bot_aliases/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/bot_versions/methods/delete_resource'
-        update: []
+          - $ref: '#/components/x-stackQL-resources/bot_aliases/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/bot_aliases/methods/update_resource'
       config:
         views:
           select:
@@ -2839,12 +3060,19 @@ components:
               SELECT
               region,
               Identifier,
+              JSON_EXTRACT(Properties, '$.BotAliasId') as bot_alias_id,
               JSON_EXTRACT(Properties, '$.BotId') as bot_id,
+              JSON_EXTRACT(Properties, '$.Arn') as arn,
+              JSON_EXTRACT(Properties, '$.BotAliasStatus') as bot_alias_status,
+              JSON_EXTRACT(Properties, '$.BotAliasLocaleSettings') as bot_alias_locale_settings,
+              JSON_EXTRACT(Properties, '$.BotAliasName') as bot_alias_name,
               JSON_EXTRACT(Properties, '$.BotVersion') as bot_version,
+              JSON_EXTRACT(Properties, '$.ConversationLogSettings') as conversation_log_settings,
               JSON_EXTRACT(Properties, '$.Description') as description,
-              JSON_EXTRACT(Properties, '$.BotVersionLocaleSpecification') as bot_version_locale_specification
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::Lex::BotVersion'
-              AND Identifier = '<BotId>|<BotVersion>'
+              JSON_EXTRACT(Properties, '$.SentimentAnalysisSettings') as sentiment_analysis_settings,
+              JSON_EXTRACT(Properties, '$.BotAliasTags') as bot_alias_tags
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::Lex::BotAlias'
+              AND Identifier = '<BotAliasId>|<BotId>'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
@@ -2852,21 +3080,26 @@ components:
                 SELECT
                 region,
                 Identifier,
+                json_extract_path_text(Properties, 'BotAliasId') as bot_alias_id,
                 json_extract_path_text(Properties, 'BotId') as bot_id,
+                json_extract_path_text(Properties, 'Arn') as arn,
+                json_extract_path_text(Properties, 'BotAliasStatus') as bot_alias_status,
+                json_extract_path_text(Properties, 'BotAliasLocaleSettings') as bot_alias_locale_settings,
+                json_extract_path_text(Properties, 'BotAliasName') as bot_alias_name,
                 json_extract_path_text(Properties, 'BotVersion') as bot_version,
+                json_extract_path_text(Properties, 'ConversationLogSettings') as conversation_log_settings,
                 json_extract_path_text(Properties, 'Description') as description,
-                json_extract_path_text(Properties, 'BotVersionLocaleSpecification') as bot_version_locale_specification
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::Lex::BotVersion'
-                AND Identifier = '<BotId>|<BotVersion>'
+                json_extract_path_text(Properties, 'SentimentAnalysisSettings') as sentiment_analysis_settings,
+                json_extract_path_text(Properties, 'BotAliasTags') as bot_alias_tags
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::Lex::BotAlias'
+                AND Identifier = '<BotAliasId>|<BotId>'
                 AND region = 'us-east-1'
-    bot_versions_list_only:
-      name: bot_versions_list_only
-      id: awscc.lex.bot_versions_list_only
-      x-cfn-schema-name: BotVersion
-      x-cfn-type-name: AWS::Lex::BotVersion
-      x-identifiers:
-        - BotId
-        - BotVersion
+    bot_aliases_list_only:
+      name: bot_aliases_list_only
+      id: awscc.lex.bot_aliases_list_only
+      x-cfn-schema-name: BotAlias
+      x-cfn-type-name: AWS::Lex::BotAlias
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2880,27 +3113,27 @@ components:
             ddl: |-
               SELECT
               region,
-              JSON_EXTRACT(Properties, '$.BotId') as bot_id,
-              JSON_EXTRACT(Properties, '$.BotVersion') as bot_version
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Lex::BotVersion'
+              JSON_EXTRACT(Properties, '$.BotAliasId') as bot_alias_id,
+              JSON_EXTRACT(Properties, '$.BotId') as bot_id
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Lex::BotAlias'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres"
               ddl: |-
                 SELECT
                 region,
-                json_extract_path_text(Properties, 'BotId') as bot_id,
-                json_extract_path_text(Properties, 'BotVersion') as bot_version
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Lex::BotVersion'
+                json_extract_path_text(Properties, 'BotAliasId') as bot_alias_id,
+                json_extract_path_text(Properties, 'BotId') as bot_id
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Lex::BotAlias'
                 AND region = 'us-east-1'
-    bot_aliases:
-      name: bot_aliases
-      id: awscc.lex.bot_aliases
-      x-cfn-schema-name: BotAlias
-      x-cfn-type-name: AWS::Lex::BotAlias
-      x-identifiers:
-        - BotAliasId
+    bot_versions:
+      name: bot_versions
+      id: awscc.lex.bot_versions
+      x-cfn-schema-name: BotVersion
+      x-cfn-type-name: AWS::Lex::BotVersion
+      x-identifiers: &ref_2
         - BotId
+        - BotVersion
       x-type: cloud_control
       methods:
         create_resource:
@@ -2908,28 +3141,12 @@ components:
             requestBodyTranslate:
               algorithm: naive_DesiredState
           operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__BotAlias&__detailTransformed=true/post'
-          request:
-            mediaType: application/x-amz-json-1.0
-            base: |-
-              {
-                "TypeName": "AWS::Lex::BotAlias"
-              }
-          response:
-            mediaType: application/json
-            openAPIDocKey: '200'
-            objectKey: $.ProgressEvent
-        update_resource:
-          config:
-            requestBodyTranslate:
-              algorithm: naive
-          operation:
-            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__BotVersion&__detailTransformed=true/post'
           request:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::Lex::BotAlias"
+                "TypeName": "AWS::Lex::BotVersion"
               }
           response:
             mediaType: application/json
@@ -2945,7 +3162,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::Lex::BotAlias"
+                "TypeName": "AWS::Lex::BotVersion"
               }
           response:
             mediaType: application/json
@@ -2953,11 +3170,10 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/bot_aliases/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/bot_versions/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/bot_aliases/methods/delete_resource'
-        update:
-          - $ref: '#/components/x-stackQL-resources/bot_aliases/methods/update_resource'
+          - $ref: '#/components/x-stackQL-resources/bot_versions/methods/delete_resource'
+        update: []
       config:
         views:
           select:
@@ -2966,19 +3182,12 @@ components:
               SELECT
               region,
               Identifier,
-              JSON_EXTRACT(Properties, '$.BotAliasId') as bot_alias_id,
               JSON_EXTRACT(Properties, '$.BotId') as bot_id,
-              JSON_EXTRACT(Properties, '$.Arn') as arn,
-              JSON_EXTRACT(Properties, '$.BotAliasStatus') as bot_alias_status,
-              JSON_EXTRACT(Properties, '$.BotAliasLocaleSettings') as bot_alias_locale_settings,
-              JSON_EXTRACT(Properties, '$.BotAliasName') as bot_alias_name,
               JSON_EXTRACT(Properties, '$.BotVersion') as bot_version,
-              JSON_EXTRACT(Properties, '$.ConversationLogSettings') as conversation_log_settings,
               JSON_EXTRACT(Properties, '$.Description') as description,
-              JSON_EXTRACT(Properties, '$.SentimentAnalysisSettings') as sentiment_analysis_settings,
-              JSON_EXTRACT(Properties, '$.BotAliasTags') as bot_alias_tags
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::Lex::BotAlias'
-              AND Identifier = '<BotAliasId>|<BotId>'
+              JSON_EXTRACT(Properties, '$.BotVersionLocaleSpecification') as bot_version_locale_specification
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::Lex::BotVersion'
+              AND Identifier = '<BotId>|<BotVersion>'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
@@ -2986,28 +3195,19 @@ components:
                 SELECT
                 region,
                 Identifier,
-                json_extract_path_text(Properties, 'BotAliasId') as bot_alias_id,
                 json_extract_path_text(Properties, 'BotId') as bot_id,
-                json_extract_path_text(Properties, 'Arn') as arn,
-                json_extract_path_text(Properties, 'BotAliasStatus') as bot_alias_status,
-                json_extract_path_text(Properties, 'BotAliasLocaleSettings') as bot_alias_locale_settings,
-                json_extract_path_text(Properties, 'BotAliasName') as bot_alias_name,
                 json_extract_path_text(Properties, 'BotVersion') as bot_version,
-                json_extract_path_text(Properties, 'ConversationLogSettings') as conversation_log_settings,
                 json_extract_path_text(Properties, 'Description') as description,
-                json_extract_path_text(Properties, 'SentimentAnalysisSettings') as sentiment_analysis_settings,
-                json_extract_path_text(Properties, 'BotAliasTags') as bot_alias_tags
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::Lex::BotAlias'
-                AND Identifier = '<BotAliasId>|<BotId>'
+                json_extract_path_text(Properties, 'BotVersionLocaleSpecification') as bot_version_locale_specification
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::Lex::BotVersion'
+                AND Identifier = '<BotId>|<BotVersion>'
                 AND region = 'us-east-1'
-    bot_aliases_list_only:
-      name: bot_aliases_list_only
-      id: awscc.lex.bot_aliases_list_only
-      x-cfn-schema-name: BotAlias
-      x-cfn-type-name: AWS::Lex::BotAlias
-      x-identifiers:
-        - BotAliasId
-        - BotId
+    bot_versions_list_only:
+      name: bot_versions_list_only
+      id: awscc.lex.bot_versions_list_only
+      x-cfn-schema-name: BotVersion
+      x-cfn-type-name: AWS::Lex::BotVersion
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3021,25 +3221,25 @@ components:
             ddl: |-
               SELECT
               region,
-              JSON_EXTRACT(Properties, '$.BotAliasId') as bot_alias_id,
-              JSON_EXTRACT(Properties, '$.BotId') as bot_id
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Lex::BotAlias'
+              JSON_EXTRACT(Properties, '$.BotId') as bot_id,
+              JSON_EXTRACT(Properties, '$.BotVersion') as bot_version
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Lex::BotVersion'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres"
               ddl: |-
                 SELECT
                 region,
-                json_extract_path_text(Properties, 'BotAliasId') as bot_alias_id,
-                json_extract_path_text(Properties, 'BotId') as bot_id
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Lex::BotAlias'
+                json_extract_path_text(Properties, 'BotId') as bot_id,
+                json_extract_path_text(Properties, 'BotVersion') as bot_version
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Lex::BotVersion'
                 AND region = 'us-east-1'
     resource_policies:
       name: resource_policies
       id: awscc.lex.resource_policies
       x-cfn-schema-name: ResourcePolicy
       x-cfn-type-name: AWS::Lex::ResourcePolicy
-      x-identifiers:
+      x-identifiers: &ref_3
         - Id
       x-type: cloud_control
       methods:
@@ -3131,8 +3331,7 @@ components:
       id: awscc.lex.resource_policies_list_only
       x-cfn-schema-name: ResourcePolicy
       x-cfn-type-name: AWS::Lex::ResourcePolicy
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3343,7 +3542,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__BotVersion&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__BotAlias&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3353,7 +3552,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateBotVersion
+      operationId: CreateBotAlias
       parameters:
         - description: Action Header
           in: header
@@ -3376,7 +3575,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateBotVersionRequest'
+              $ref: '#/components/schemas/CreateBotAliasRequest'
         required: true
       responses:
         '200':
@@ -3385,7 +3584,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__BotAlias&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__BotVersion&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3395,7 +3594,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateBotAlias
+      operationId: CreateBotVersion
       parameters:
         - description: Action Header
           in: header
@@ -3418,7 +3617,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateBotAliasRequest'
+              $ref: '#/components/schemas/CreateBotVersionRequest'
         required: true
       responses:
         '200':
diff --git a/openapi/src/awscc/v00.00.00000/services/licensemanager.yaml b/openapi/src/awscc/v00.00.00000/services/licensemanager.yaml
index 86d0a1a89..6d745ad61 100644
--- a/openapi/src/awscc/v00.00.00000/services/licensemanager.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/licensemanager.yaml
@@ -730,7 +730,7 @@ components:
       id: awscc.licensemanager.grants
       x-cfn-schema-name: Grant
       x-cfn-type-name: AWS::LicenseManager::Grant
-      x-identifiers:
+      x-identifiers: &ref_0
         - GrantArn
       x-type: cloud_control
       methods:
@@ -830,8 +830,7 @@ components:
       id: awscc.licensemanager.grants_list_only
       x-cfn-schema-name: Grant
       x-cfn-type-name: AWS::LicenseManager::Grant
-      x-identifiers:
-        - GrantArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -861,7 +860,7 @@ components:
       id: awscc.licensemanager.licenses
       x-cfn-schema-name: License
       x-cfn-type-name: AWS::LicenseManager::License
-      x-identifiers:
+      x-identifiers: &ref_1
         - LicenseArn
       x-type: cloud_control
       methods:
@@ -971,8 +970,7 @@ components:
       id: awscc.licensemanager.licenses_list_only
       x-cfn-schema-name: License
       x-cfn-type-name: AWS::LicenseManager::License
-      x-identifiers:
-        - LicenseArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/lightsail.yaml b/openapi/src/awscc/v00.00.00000/services/lightsail.yaml
index 9145e9d31..bb49233e2 100644
--- a/openapi/src/awscc/v00.00.00000/services/lightsail.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/lightsail.yaml
@@ -731,6 +731,83 @@ components:
         Protocol:
           type: string
       additionalProperties: false
+    Container_Container:
+      description: Describes the settings of a container that will be launched, or that is launched, to an Amazon Lightsail container service.
+      type: object
+      properties:
+        ContainerName:
+          type: string
+          description: The name of the container.
+        Command:
+          type: array
+          uniqueItems: true
+          x-insertionOrder: false
+          items:
+            type: string
+          description: The launch command for the container.
+        Environment:
+          type: array
+          uniqueItems: true
+          x-insertionOrder: false
+          items:
+            $ref: '#/components/schemas/EnvironmentVariable'
+          description: The environment variables of the container.
+        Image:
+          type: string
+          description: The name of the image used for the container.
+        Ports:
+          type: array
+          uniqueItems: true
+          x-insertionOrder: false
+          items:
+            $ref: '#/components/schemas/PortInfo'
+          description: The open firewall ports of the container.
+      additionalProperties: false
+    ContainerServiceDeployment:
+      description: Describes a container deployment configuration of an Amazon Lightsail container service.
+      type: object
+      properties:
+        Containers:
+          type: array
+          uniqueItems: true
+          x-insertionOrder: false
+          items:
+            $ref: '#/components/schemas/Container_Container'
+          description: An object that describes the configuration for the containers of the deployment.
+        PublicEndpoint:
+          $ref: '#/components/schemas/PublicEndpoint'
+          description: An object that describes the endpoint of the deployment.
+      additionalProperties: false
+    PublicDomainName:
+      description: The public domain name to use with the container service, such as example.com and www.example.com.
+      type: object
+      properties:
+        CertificateName:
+          type: string
+        DomainNames:
+          type: array
+          uniqueItems: true
+          x-insertionOrder: false
+          items:
+            type: string
+          description: An object that describes the configuration for the containers of the deployment.
+      additionalProperties: false
+    PrivateRegistryAccess:
+      description: An object to describe the configuration for the container service to access private container image repositories, such as Amazon Elastic Container Registry (Amazon ECR) private repositories.
+      type: object
+      properties:
+        EcrImagePullerRole:
+          description: An object to describe a request to activate or deactivate the role that you can use to grant an Amazon Lightsail container service access to Amazon Elastic Container Registry (Amazon ECR) private repositories.
+          type: object
+          properties:
+            IsActive:
+              type: boolean
+              description: A Boolean value that indicates whether to activate the role.
+            PrincipalArn:
+              type: string
+              description: The Amazon Resource Name (ARN) of the role, if it is activated.
+          additionalProperties: false
+      additionalProperties: false
     Container:
       type: object
       properties:
@@ -829,51 +906,6 @@ components:
           - lightsail:TagResource
           - lightsail:UntagResource
           - lightsail:UpdateContainerService
-    ContainerServiceDeployment:
-      description: Describes a container deployment configuration of an Amazon Lightsail container service.
-      type: object
-      properties:
-        Containers:
-          type: array
-          uniqueItems: true
-          x-insertionOrder: false
-          items:
-            $ref: '#/components/schemas/Container'
-          description: An object that describes the configuration for the containers of the deployment.
-        PublicEndpoint:
-          $ref: '#/components/schemas/PublicEndpoint'
-          description: An object that describes the endpoint of the deployment.
-      additionalProperties: false
-    PublicDomainName:
-      description: The public domain name to use with the container service, such as example.com and www.example.com.
-      type: object
-      properties:
-        CertificateName:
-          type: string
-        DomainNames:
-          type: array
-          uniqueItems: true
-          x-insertionOrder: false
-          items:
-            type: string
-          description: An object that describes the configuration for the containers of the deployment.
-      additionalProperties: false
-    PrivateRegistryAccess:
-      description: An object to describe the configuration for the container service to access private container image repositories, such as Amazon Elastic Container Registry (Amazon ECR) private repositories.
-      type: object
-      properties:
-        EcrImagePullerRole:
-          description: An object to describe a request to activate or deactivate the role that you can use to grant an Amazon Lightsail container service access to Amazon Elastic Container Registry (Amazon ECR) private repositories.
-          type: object
-          properties:
-            IsActive:
-              type: boolean
-              description: A Boolean value that indicates whether to activate the role.
-            PrincipalArn:
-              type: string
-              description: The Amazon Resource Name (ARN) of the role, if it is activated.
-          additionalProperties: false
-      additionalProperties: false
     RelationalDatabaseParameter:
       description: Describes the parameters of the database.
       type: object
@@ -1076,18 +1108,17 @@ components:
         - AddOnType
       additionalProperties: false
     Location:
-      description: The region name and Availability Zone where you created the snapshot.
+      description: Location of a resource.
       type: object
       properties:
         AvailabilityZone:
           type: string
-          description: The Availability Zone. Follows the format us-east-2a (case-sensitive).
+          description: 'The Availability Zone in which to create your disk. Use the following format: us-east-2a (case sensitive). Be sure to add the include Availability Zones parameter to your request.'
         RegionName:
           type: string
-          description: The AWS Region name.
+          description: The Region Name in which to create your disk.
       additionalProperties: false
     Disk:
-      description: Disk associated with the Instance.
       type: object
       properties:
         DiskName:
@@ -1096,28 +1127,117 @@ components:
           pattern: ^[a-zA-Z0-9][\w\-.]*[a-zA-Z0-9]$
           minLength: 1
           maxLength: 254
-        SizeInGb:
+        DiskArn:
           type: string
-          description: Size of the disk attached to the Instance.
-        IsSystemDisk:
-          type: boolean
-          description: Is the Attached disk is the system disk of the Instance.
-        IOPS:
+        SupportCode:
+          description: Support code to help identify any issues
+          type: string
+        AvailabilityZone:
+          description: 'The Availability Zone in which to create your instance. Use the following format: us-east-2a (case sensitive). Be sure to add the include Availability Zones parameter to your request.'
+          type: string
+          minLength: 1
+          maxLength: 255
+        Location:
+          $ref: '#/components/schemas/Location'
+        ResourceType:
+          description: Resource type of Lightsail instance.
+          type: string
+        Tags:
+          description: An array of key-value pairs to apply to this resource.
+          type: array
+          uniqueItems: true
+          x-insertionOrder: false
+          items:
+            $ref: '#/components/schemas/Tag'
+        AddOns:
+          description: An array of objects representing the add-ons to enable for the new instance.
+          type: array
+          x-insertionOrder: false
+          items:
+            $ref: '#/components/schemas/AddOn'
+        State:
+          description: State of the Lightsail disk
+          type: string
+        AttachmentState:
+          description: Attachment State of the Lightsail disk
+          type: string
+        SizeInGb:
+          description: Size of the Lightsail disk
           type: integer
-          description: IOPS of disk.
+        Iops:
+          description: Iops of the Lightsail disk
+          type: integer
+        IsAttached:
+          description: Check is Disk is attached state
+          type: boolean
         Path:
+          description: Path of the  attached Disk
           type: string
-          description: Path of the disk attached to the instance.
         AttachedTo:
+          description: Name of the attached Lightsail Instance
           type: string
-          description: Instance attached to the disk.
-        AttachmentState:
-          type: string
-          description: Attachment state of the disk.
       required:
         - DiskName
+        - SizeInGb
+      x-stackql-resource-name: disk
+      description: Resource Type definition for AWS::Lightsail::Disk
+      x-type-name: AWS::Lightsail::Disk
+      x-stackql-primary-identifier:
+        - DiskName
+      x-create-only-properties:
+        - DiskName
+        - AvailabilityZone
+        - SizeInGb
+      x-read-only-properties:
+        - AttachedTo
         - Path
-      additionalProperties: false
+        - IsAttached
+        - Iops
+        - AttachmentState
+        - State
+        - ResourceType
+        - Location/AvailabilityZone
+        - Location/RegionName
+        - SupportCode
+        - DiskArn
+      x-required-properties:
+        - DiskName
+        - SizeInGb
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: false
+        tagProperty: /properties/Tags
+        permissions:
+          - lightsail:TagResource
+          - lightsail:UntagResource
+      x-required-permissions:
+        create:
+          - lightsail:CreateDisk
+          - lightsail:EnableAddOn
+          - lightsail:DisableAddOn
+          - lightsail:GetDisk
+          - lightsail:GetDisks
+          - lightsail:GetRegions
+          - lightsail:TagResource
+          - lightsail:UntagResource
+        read:
+          - lightsail:GetDisk
+          - lightsail:GetDisks
+        delete:
+          - lightsail:GetDisk
+          - lightsail:GetDisks
+          - lightsail:DeleteDisk
+        list:
+          - lightsail:GetDisks
+        update:
+          - lightsail:GetDisk
+          - lightsail:GetDisks
+          - lightsail:EnableAddOn
+          - lightsail:DisableAddOn
+          - lightsail:TagResource
+          - lightsail:UntagResource
     CacheBehaviorPerPath:
       description: Describes the per-path cache behavior of an Amazon Lightsail content delivery network (CDN) distribution.
       type: object
@@ -1338,6 +1458,19 @@ components:
           - lightsail:GetDistributions
         list:
           - lightsail:GetDistributions
+    Domain_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: The key name of the tag.
+        Value:
+          type: string
+          description: The value for the tag.
+      required:
+        - Key
+      additionalProperties: false
     DomainEntry:
       type: object
       description: Describes the domain recordset entry (e.g., A record, CNAME record, TXT record, etc.)
@@ -1416,7 +1549,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Domain_Tag'
       required:
         - DomainName
       x-stackql-resource-name: domain
@@ -1481,6 +1614,49 @@ components:
       x-insertionOrder: false
       items:
         type: string
+    Instance_Location:
+      description: Location of a resource.
+      type: object
+      properties:
+        AvailabilityZone:
+          type: string
+          description: 'The Availability Zone in which to create your instance. Use the following format: us-east-2a (case sensitive). Be sure to add the include Availability Zones parameter to your request.'
+        RegionName:
+          type: string
+          description: The Region Name in which to create your instance.
+      additionalProperties: false
+    Instance_Disk:
+      description: Disk associated with the Instance.
+      type: object
+      properties:
+        DiskName:
+          description: The names to use for your new Lightsail disk.
+          type: string
+          pattern: ^[a-zA-Z0-9][\w\-.]*[a-zA-Z0-9]$
+          minLength: 1
+          maxLength: 254
+        SizeInGb:
+          type: string
+          description: Size of the disk attached to the Instance.
+        IsSystemDisk:
+          type: boolean
+          description: Is the Attached disk is the system disk of the Instance.
+        IOPS:
+          type: integer
+          description: IOPS of disk.
+        Path:
+          type: string
+          description: Path of the disk attached to the instance.
+        AttachedTo:
+          type: string
+          description: Instance attached to the disk.
+        AttachmentState:
+          type: string
+          description: Attachment state of the disk.
+      required:
+        - DiskName
+        - Path
+      additionalProperties: false
     Hardware:
       description: Hardware of the Instance.
       type: object
@@ -1497,7 +1673,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Disk'
+            $ref: '#/components/schemas/Instance_Disk'
       additionalProperties: false
     State:
       description: Current State of the Instance.
@@ -1591,7 +1767,7 @@ components:
           items:
             type: string
         Location:
-          $ref: '#/components/schemas/Location'
+          $ref: '#/components/schemas/Instance_Location'
         Hardware:
           $ref: '#/components/schemas/Hardware'
         State:
@@ -1731,6 +1907,17 @@ components:
           - lightsail:GetDisk
           - lightsail:TagResource
           - lightsail:UntagResource
+    InstanceSnapshot_Location:
+      description: The region name and Availability Zone where you created the snapshot.
+      type: object
+      properties:
+        AvailabilityZone:
+          type: string
+          description: The Availability Zone. Follows the format us-east-2a (case-sensitive).
+        RegionName:
+          type: string
+          description: The AWS Region name.
+      additionalProperties: false
     InstanceSnapshot:
       type: object
       properties:
@@ -1765,7 +1952,7 @@ components:
           description: Support code to help identify any issues
           type: string
         Location:
-          $ref: '#/components/schemas/Location'
+          $ref: '#/components/schemas/InstanceSnapshot_Location'
         Tags:
           description: An array of key-value pairs to apply to this resource.
           type: array
@@ -2365,6 +2552,78 @@ components:
       x-title: CreateDatabaseRequest
       type: object
       required: []
+    CreateDiskRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            DiskName:
+              description: The names to use for your new Lightsail disk.
+              type: string
+              pattern: ^[a-zA-Z0-9][\w\-.]*[a-zA-Z0-9]$
+              minLength: 1
+              maxLength: 254
+            DiskArn:
+              type: string
+            SupportCode:
+              description: Support code to help identify any issues
+              type: string
+            AvailabilityZone:
+              description: 'The Availability Zone in which to create your instance. Use the following format: us-east-2a (case sensitive). Be sure to add the include Availability Zones parameter to your request.'
+              type: string
+              minLength: 1
+              maxLength: 255
+            Location:
+              $ref: '#/components/schemas/Location'
+            ResourceType:
+              description: Resource type of Lightsail instance.
+              type: string
+            Tags:
+              description: An array of key-value pairs to apply to this resource.
+              type: array
+              uniqueItems: true
+              x-insertionOrder: false
+              items:
+                $ref: '#/components/schemas/Tag'
+            AddOns:
+              description: An array of objects representing the add-ons to enable for the new instance.
+              type: array
+              x-insertionOrder: false
+              items:
+                $ref: '#/components/schemas/AddOn'
+            State:
+              description: State of the Lightsail disk
+              type: string
+            AttachmentState:
+              description: Attachment State of the Lightsail disk
+              type: string
+            SizeInGb:
+              description: Size of the Lightsail disk
+              type: integer
+            Iops:
+              description: Iops of the Lightsail disk
+              type: integer
+            IsAttached:
+              description: Check is Disk is attached state
+              type: boolean
+            Path:
+              description: Path of the  attached Disk
+              type: string
+            AttachedTo:
+              description: Name of the attached Lightsail Instance
+              type: string
+          x-stackQL-stringOnly: true
+      x-title: CreateDiskRequest
+      type: object
+      required: []
     CreateDistributionRequest:
       properties:
         ClientToken:
@@ -2484,7 +2743,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Domain_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateDomainRequest
       type: object
@@ -2524,7 +2783,7 @@ components:
               items:
                 type: string
             Location:
-              $ref: '#/components/schemas/Location'
+              $ref: '#/components/schemas/Instance_Location'
             Hardware:
               $ref: '#/components/schemas/Hardware'
             State:
@@ -2627,7 +2886,7 @@ components:
               description: Support code to help identify any issues
               type: string
             Location:
-              $ref: '#/components/schemas/Location'
+              $ref: '#/components/schemas/InstanceSnapshot_Location'
             Tags:
               description: An array of key-value pairs to apply to this resource.
               type: array
@@ -2783,7 +3042,7 @@ components:
       id: awscc.lightsail.alarms
       x-cfn-schema-name: Alarm
       x-cfn-type-name: AWS::Lightsail::Alarm
-      x-identifiers:
+      x-identifiers: &ref_0
         - AlarmName
       x-type: cloud_control
       methods:
@@ -2893,8 +3152,7 @@ components:
       id: awscc.lightsail.alarms_list_only
       x-cfn-schema-name: Alarm
       x-cfn-type-name: AWS::Lightsail::Alarm
-      x-identifiers:
-        - AlarmName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2924,7 +3182,7 @@ components:
       id: awscc.lightsail.buckets
       x-cfn-schema-name: Bucket
       x-cfn-type-name: AWS::Lightsail::Bucket
-      x-identifiers:
+      x-identifiers: &ref_1
         - BucketName
       x-type: cloud_control
       methods:
@@ -3028,8 +3286,7 @@ components:
       id: awscc.lightsail.buckets_list_only
       x-cfn-schema-name: Bucket
       x-cfn-type-name: AWS::Lightsail::Bucket
-      x-identifiers:
-        - BucketName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3059,7 +3316,7 @@ components:
       id: awscc.lightsail.certificates
       x-cfn-schema-name: Certificate
       x-cfn-type-name: AWS::Lightsail::Certificate
-      x-identifiers:
+      x-identifiers: &ref_2
         - CertificateName
       x-type: cloud_control
       methods:
@@ -3155,8 +3412,7 @@ components:
       id: awscc.lightsail.certificates_list_only
       x-cfn-schema-name: Certificate
       x-cfn-type-name: AWS::Lightsail::Certificate
-      x-identifiers:
-        - CertificateName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3186,7 +3442,7 @@ components:
       id: awscc.lightsail.containers
       x-cfn-schema-name: Container
       x-cfn-type-name: AWS::Lightsail::Container
-      x-identifiers:
+      x-identifiers: &ref_3
         - ServiceName
       x-type: cloud_control
       methods:
@@ -3292,8 +3548,7 @@ components:
       id: awscc.lightsail.containers_list_only
       x-cfn-schema-name: Container
       x-cfn-type-name: AWS::Lightsail::Container
-      x-identifiers:
-        - ServiceName
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3323,7 +3578,7 @@ components:
       id: awscc.lightsail.databases
       x-cfn-schema-name: Database
       x-cfn-type-name: AWS::Lightsail::Database
-      x-identifiers:
+      x-identifiers: &ref_4
         - RelationalDatabaseName
       x-type: cloud_control
       methods:
@@ -3439,8 +3694,7 @@ components:
       id: awscc.lightsail.databases_list_only
       x-cfn-schema-name: Database
       x-cfn-type-name: AWS::Lightsail::Database
-      x-identifiers:
-        - RelationalDatabaseName
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3465,12 +3719,156 @@ components:
                 json_extract_path_text(Properties, 'RelationalDatabaseName') as relational_database_name
                 FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Lightsail::Database'
                 AND region = 'us-east-1'
+    disks:
+      name: disks
+      id: awscc.lightsail.disks
+      x-cfn-schema-name: Disk
+      x-cfn-type-name: AWS::Lightsail::Disk
+      x-identifiers: &ref_5
+        - DiskName
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Disk&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::Lightsail::Disk"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::Lightsail::Disk"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::Lightsail::Disk"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/disks/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/disks/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/disks/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.DiskName') as disk_name,
+              JSON_EXTRACT(Properties, '$.DiskArn') as disk_arn,
+              JSON_EXTRACT(Properties, '$.SupportCode') as support_code,
+              JSON_EXTRACT(Properties, '$.AvailabilityZone') as availability_zone,
+              JSON_EXTRACT(Properties, '$.Location') as location,
+              JSON_EXTRACT(Properties, '$.ResourceType') as resource_type,
+              JSON_EXTRACT(Properties, '$.Tags') as tags,
+              JSON_EXTRACT(Properties, '$.AddOns') as add_ons,
+              JSON_EXTRACT(Properties, '$.State') as state,
+              JSON_EXTRACT(Properties, '$.AttachmentState') as attachment_state,
+              JSON_EXTRACT(Properties, '$.SizeInGb') as size_in_gb,
+              JSON_EXTRACT(Properties, '$.Iops') as iops,
+              JSON_EXTRACT(Properties, '$.IsAttached') as is_attached,
+              JSON_EXTRACT(Properties, '$.Path') as path,
+              JSON_EXTRACT(Properties, '$.AttachedTo') as attached_to
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::Lightsail::Disk'
+              AND Identifier = '<DiskName>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'DiskName') as disk_name,
+                json_extract_path_text(Properties, 'DiskArn') as disk_arn,
+                json_extract_path_text(Properties, 'SupportCode') as support_code,
+                json_extract_path_text(Properties, 'AvailabilityZone') as availability_zone,
+                json_extract_path_text(Properties, 'Location') as location,
+                json_extract_path_text(Properties, 'ResourceType') as resource_type,
+                json_extract_path_text(Properties, 'Tags') as tags,
+                json_extract_path_text(Properties, 'AddOns') as add_ons,
+                json_extract_path_text(Properties, 'State') as state,
+                json_extract_path_text(Properties, 'AttachmentState') as attachment_state,
+                json_extract_path_text(Properties, 'SizeInGb') as size_in_gb,
+                json_extract_path_text(Properties, 'Iops') as iops,
+                json_extract_path_text(Properties, 'IsAttached') as is_attached,
+                json_extract_path_text(Properties, 'Path') as path,
+                json_extract_path_text(Properties, 'AttachedTo') as attached_to
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::Lightsail::Disk'
+                AND Identifier = '<DiskName>'
+                AND region = 'us-east-1'
+    disks_list_only:
+      name: disks_list_only
+      id: awscc.lightsail.disks_list_only
+      x-cfn-schema-name: Disk
+      x-cfn-type-name: AWS::Lightsail::Disk
+      x-identifiers: *ref_5
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.DiskName') as disk_name
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Lightsail::Disk'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'DiskName') as disk_name
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Lightsail::Disk'
+                AND region = 'us-east-1'
     distributions:
       name: distributions
       id: awscc.lightsail.distributions
       x-cfn-schema-name: Distribution
       x-cfn-type-name: AWS::Lightsail::Distribution
-      x-identifiers:
+      x-identifiers: &ref_6
         - DistributionName
       x-type: cloud_control
       methods:
@@ -3580,8 +3978,7 @@ components:
       id: awscc.lightsail.distributions_list_only
       x-cfn-schema-name: Distribution
       x-cfn-type-name: AWS::Lightsail::Distribution
-      x-identifiers:
-        - DistributionName
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3611,7 +4008,7 @@ components:
       id: awscc.lightsail.domains
       x-cfn-schema-name: Domain
       x-cfn-type-name: AWS::Lightsail::Domain
-      x-identifiers:
+      x-identifiers: &ref_7
         - DomainName
       x-type: cloud_control
       methods:
@@ -3711,8 +4108,7 @@ components:
       id: awscc.lightsail.domains_list_only
       x-cfn-schema-name: Domain
       x-cfn-type-name: AWS::Lightsail::Domain
-      x-identifiers:
-        - DomainName
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3742,7 +4138,7 @@ components:
       id: awscc.lightsail.instances
       x-cfn-schema-name: Instance
       x-cfn-type-name: AWS::Lightsail::Instance
-      x-identifiers:
+      x-identifiers: &ref_8
         - InstanceName
       x-type: cloud_control
       methods:
@@ -3868,8 +4264,7 @@ components:
       id: awscc.lightsail.instances_list_only
       x-cfn-schema-name: Instance
       x-cfn-type-name: AWS::Lightsail::Instance
-      x-identifiers:
-        - InstanceName
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3899,7 +4294,7 @@ components:
       id: awscc.lightsail.instance_snapshots
       x-cfn-schema-name: InstanceSnapshot
       x-cfn-type-name: AWS::Lightsail::InstanceSnapshot
-      x-identifiers:
+      x-identifiers: &ref_9
         - InstanceSnapshotName
       x-type: cloud_control
       methods:
@@ -4007,8 +4402,7 @@ components:
       id: awscc.lightsail.instance_snapshots_list_only
       x-cfn-schema-name: InstanceSnapshot
       x-cfn-type-name: AWS::Lightsail::InstanceSnapshot
-      x-identifiers:
-        - InstanceSnapshotName
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4038,7 +4432,7 @@ components:
       id: awscc.lightsail.load_balancers
       x-cfn-schema-name: LoadBalancer
       x-cfn-type-name: AWS::Lightsail::LoadBalancer
-      x-identifiers:
+      x-identifiers: &ref_10
         - LoadBalancerName
       x-type: cloud_control
       methods:
@@ -4142,8 +4536,7 @@ components:
       id: awscc.lightsail.load_balancers_list_only
       x-cfn-schema-name: LoadBalancer
       x-cfn-type-name: AWS::Lightsail::LoadBalancer
-      x-identifiers:
-        - LoadBalancerName
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4173,7 +4566,7 @@ components:
       id: awscc.lightsail.load_balancer_tls_certificates
       x-cfn-schema-name: LoadBalancerTlsCertificate
       x-cfn-type-name: AWS::Lightsail::LoadBalancerTlsCertificate
-      x-identifiers:
+      x-identifiers: &ref_11
         - CertificateName
         - LoadBalancerName
       x-type: cloud_control
@@ -4274,9 +4667,7 @@ components:
       id: awscc.lightsail.load_balancer_tls_certificates_list_only
       x-cfn-schema-name: LoadBalancerTlsCertificate
       x-cfn-type-name: AWS::Lightsail::LoadBalancerTlsCertificate
-      x-identifiers:
-        - CertificateName
-        - LoadBalancerName
+      x-identifiers: *ref_11
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4308,7 +4699,7 @@ components:
       id: awscc.lightsail.static_ips
       x-cfn-schema-name: StaticIp
       x-cfn-type-name: AWS::Lightsail::StaticIp
-      x-identifiers:
+      x-identifiers: &ref_12
         - StaticIpName
       x-type: cloud_control
       methods:
@@ -4402,8 +4793,7 @@ components:
       id: awscc.lightsail.static_ips_list_only
       x-cfn-schema-name: StaticIp
       x-cfn-type-name: AWS::Lightsail::StaticIp
-      x-identifiers:
-        - StaticIpName
+      x-identifiers: *ref_12
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4782,6 +5172,48 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
+  /?Action=CreateResource&Version=2021-09-30&__Disk&__detailTransformed=true:
+    parameters:
+      - $ref: '#/components/parameters/X-Amz-Content-Sha256'
+      - $ref: '#/components/parameters/X-Amz-Date'
+      - $ref: '#/components/parameters/X-Amz-Algorithm'
+      - $ref: '#/components/parameters/X-Amz-Credential'
+      - $ref: '#/components/parameters/X-Amz-Security-Token'
+      - $ref: '#/components/parameters/X-Amz-Signature'
+      - $ref: '#/components/parameters/X-Amz-SignedHeaders'
+    post:
+      operationId: CreateDisk
+      parameters:
+        - description: Action Header
+          in: header
+          name: X-Amz-Target
+          required: false
+          schema:
+            default: CloudApiService.CreateResource
+            enum:
+              - CloudApiService.CreateResource
+            type: string
+        - in: header
+          name: Content-Type
+          required: false
+          schema:
+            default: application/x-amz-json-1.0
+            enum:
+              - application/x-amz-json-1.0
+            type: string
+      requestBody:
+        content:
+          application/x-amz-json-1.0:
+            schema:
+              $ref: '#/components/schemas/CreateDiskRequest'
+        required: true
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
+          description: Success
   /?Action=CreateResource&Version=2021-09-30&__Distribution&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
diff --git a/openapi/src/awscc/v00.00.00000/services/location.yaml b/openapi/src/awscc/v00.00.00000/services/location.yaml
index 123997043..9ce16eeed 100644
--- a/openapi/src/awscc/v00.00.00000/services/location.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/location.yaml
@@ -1504,7 +1504,7 @@ components:
       id: awscc.location.api_keys
       x-cfn-schema-name: APIKey
       x-cfn-type-name: AWS::Location::APIKey
-      x-identifiers:
+      x-identifiers: &ref_0
         - KeyName
       x-type: cloud_control
       methods:
@@ -1612,8 +1612,7 @@ components:
       id: awscc.location.api_keys_list_only
       x-cfn-schema-name: APIKey
       x-cfn-type-name: AWS::Location::APIKey
-      x-identifiers:
-        - KeyName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1643,7 +1642,7 @@ components:
       id: awscc.location.geofence_collections
       x-cfn-schema-name: GeofenceCollection
       x-cfn-type-name: AWS::Location::GeofenceCollection
-      x-identifiers:
+      x-identifiers: &ref_1
         - CollectionName
       x-type: cloud_control
       methods:
@@ -1747,8 +1746,7 @@ components:
       id: awscc.location.geofence_collections_list_only
       x-cfn-schema-name: GeofenceCollection
       x-cfn-type-name: AWS::Location::GeofenceCollection
-      x-identifiers:
-        - CollectionName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1778,7 +1776,7 @@ components:
       id: awscc.location.maps
       x-cfn-schema-name: Map
       x-cfn-type-name: AWS::Location::Map
-      x-identifiers:
+      x-identifiers: &ref_2
         - MapName
       x-type: cloud_control
       methods:
@@ -1880,8 +1878,7 @@ components:
       id: awscc.location.maps_list_only
       x-cfn-schema-name: Map
       x-cfn-type-name: AWS::Location::Map
-      x-identifiers:
-        - MapName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1911,7 +1908,7 @@ components:
       id: awscc.location.place_indices
       x-cfn-schema-name: PlaceIndex
       x-cfn-type-name: AWS::Location::PlaceIndex
-      x-identifiers:
+      x-identifiers: &ref_3
         - IndexName
       x-type: cloud_control
       methods:
@@ -2015,8 +2012,7 @@ components:
       id: awscc.location.place_indices_list_only
       x-cfn-schema-name: PlaceIndex
       x-cfn-type-name: AWS::Location::PlaceIndex
-      x-identifiers:
-        - IndexName
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2046,7 +2042,7 @@ components:
       id: awscc.location.route_calculators
       x-cfn-schema-name: RouteCalculator
       x-cfn-type-name: AWS::Location::RouteCalculator
-      x-identifiers:
+      x-identifiers: &ref_4
         - CalculatorName
       x-type: cloud_control
       methods:
@@ -2148,8 +2144,7 @@ components:
       id: awscc.location.route_calculators_list_only
       x-cfn-schema-name: RouteCalculator
       x-cfn-type-name: AWS::Location::RouteCalculator
-      x-identifiers:
-        - CalculatorName
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2179,7 +2174,7 @@ components:
       id: awscc.location.trackers
       x-cfn-schema-name: Tracker
       x-cfn-type-name: AWS::Location::Tracker
-      x-identifiers:
+      x-identifiers: &ref_5
         - TrackerName
       x-type: cloud_control
       methods:
@@ -2289,8 +2284,7 @@ components:
       id: awscc.location.trackers_list_only
       x-cfn-schema-name: Tracker
       x-cfn-type-name: AWS::Location::Tracker
-      x-identifiers:
-        - TrackerName
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2320,7 +2314,7 @@ components:
       id: awscc.location.tracker_consumers
       x-cfn-schema-name: TrackerConsumer
       x-cfn-type-name: AWS::Location::TrackerConsumer
-      x-identifiers:
+      x-identifiers: &ref_6
         - TrackerName
         - ConsumerArn
       x-type: cloud_control
@@ -2392,9 +2386,7 @@ components:
       id: awscc.location.tracker_consumers_list_only
       x-cfn-schema-name: TrackerConsumer
       x-cfn-type-name: AWS::Location::TrackerConsumer
-      x-identifiers:
-        - TrackerName
-        - ConsumerArn
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/logs.yaml b/openapi/src/awscc/v00.00.00000/services/logs.yaml
index 8d6599d8a..c822e8696 100644
--- a/openapi/src/awscc/v00.00.00000/services/logs.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/logs.yaml
@@ -508,26 +508,27 @@ components:
           - logs:GetTransformer
           - logs:GetMetricExtractionPolicy
     Tag:
-      description: The value of this key-value pair.
+      description: A key-value pair to associate with a resource.
       type: object
-      additionalProperties: false
       properties:
         Key:
           type: string
-          description: ''
+          description: The key name of the tag. You can specify a value that is 1 to 128 Unicode
           minLength: 1
           maxLength: 128
         Value:
           type: string
-          description: The value of this key-value pair.
+          description: The value for the tag. You can specify a value that is 0 to 256 Unicode
           minLength: 0
           maxLength: 256
       required:
         - Key
         - Value
+      additionalProperties: false
     Arn:
+      description: Amazon Resource Name (ARN) that uniquely identify AWS resource.
       type: string
-      minLength: 20
+      minLength: 16
       maxLength: 2048
       pattern: '[\w#+=/:,.@-]*\*?'
     FieldHeader:
@@ -645,6 +646,30 @@ components:
         list:
           - logs:DescribeDeliveries
           - logs:ListTagsForResource
+    DeliveryDestination_Arn:
+      description: The Amazon Resource Name (ARN) that uniquely identifies a resource.
+      type: string
+      minLength: 16
+      maxLength: 2048
+      pattern: '[\w#+=/:,.@-]*\*?'
+    DeliveryDestination_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     DestinationPolicy:
       type: object
       properties:
@@ -668,17 +693,17 @@ components:
           maxLength: 60
         Arn:
           description: The Amazon Resource Name (ARN) that uniquely identifies this delivery destination.
-          $ref: '#/components/schemas/Arn'
+          $ref: '#/components/schemas/DeliveryDestination_Arn'
         DestinationResourceArn:
           description: The ARN of the Amazon Web Services destination that this delivery destination represents. That Amazon Web Services destination can be a log group in CloudWatch Logs, an Amazon S3 bucket, or a delivery stream in Firehose.
-          $ref: '#/components/schemas/Arn'
+          $ref: '#/components/schemas/DeliveryDestination_Arn'
         Tags:
           description: The tags that have been assigned to this delivery destination.
           type: array
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/DeliveryDestination_Tag'
         DeliveryDestinationType:
           description: Displays whether this delivery destination is CloudWatch Logs, Amazon S3, or Kinesis Data Firehose.
           type: string
@@ -757,6 +782,12 @@ components:
         list:
           - logs:DescribeDeliveryDestinations
           - logs:GetDeliveryDestinationPolicy
+    DeliverySource_Arn:
+      description: The Amazon Resource Name (ARN) that uniquely identifies this delivery source.
+      type: string
+      minLength: 16
+      maxLength: 2048
+      pattern: '[\w#+=/:,.@-]*\*?'
     DeliverySource:
       type: object
       properties:
@@ -768,17 +799,17 @@ components:
           maxLength: 60
         Arn:
           description: The Amazon Resource Name (ARN) that uniquely identifies this delivery source.
-          $ref: '#/components/schemas/Arn'
+          $ref: '#/components/schemas/DeliverySource_Arn'
         ResourceArns:
           description: This array contains the ARN of the AWS resource that sends logs and is represented by this delivery source. Currently, only one ARN can be in the array.
           type: array
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Arn'
+            $ref: '#/components/schemas/DeliverySource_Arn'
         ResourceArn:
           description: The ARN of the resource that will be sending the logs.
-          $ref: '#/components/schemas/Arn'
+          $ref: '#/components/schemas/DeliverySource_Arn'
         Service:
           description: The AWS service that is sending logs.
           type: string
@@ -851,6 +882,24 @@ components:
           - logs:DeleteDeliverySource
         list:
           - logs:DescribeDeliverySources
+    Destination_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., :, /, =, +, - and @.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., :, /, =, +, - and @.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
     Destination:
       type: object
       properties:
@@ -862,7 +911,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Destination_Tag'
         DestinationName:
           description: The name of the destination resource
           type: string
@@ -931,19 +980,24 @@ components:
         list:
           - logs:DescribeDestinations
           - logs:ListTagsForResource
+    Integration_Arn:
+      type: string
+      minLength: 20
+      maxLength: 2048
+      pattern: '[\w#+=/:,.@-]*\*?'
     OpenSearchResourceConfig:
       type: object
       properties:
         KmsKeyArn:
-          $ref: '#/components/schemas/Arn'
+          $ref: '#/components/schemas/Integration_Arn'
         DataSourceRoleArn:
-          $ref: '#/components/schemas/Arn'
+          $ref: '#/components/schemas/Integration_Arn'
         DashboardViewerPrincipals:
           type: array
           items:
-            $ref: '#/components/schemas/Arn'
+            $ref: '#/components/schemas/Integration_Arn'
         ApplicationARN:
-          $ref: '#/components/schemas/Arn'
+          $ref: '#/components/schemas/Integration_Arn'
         RetentionDays:
           type: integer
           minimum: 1
@@ -1132,11 +1186,185 @@ components:
           - logs:DeleteLogAnomalyDetector
         list:
           - logs:ListLogAnomalyDetectors
+    LogGroup_Tag:
+      description: The value of this key-value pair.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: ''
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: The value of this key-value pair.
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
     LogGroup:
-      type: string
-      pattern: '[\.\-_/#A-Za-z0-9]+'
-      minLength: 1
-      maxLength: 512
+      type: object
+      properties:
+        LogGroupName:
+          description: The name of the log group. If you don't specify a name, CFNlong generates a unique ID for the log group.
+          type: string
+          minLength: 1
+          maxLength: 512
+          pattern: ^[.\-_/#A-Za-z0-9]{1,512}\Z
+        KmsKeyId:
+          description: |-
+            The Amazon Resource Name (ARN) of the KMS key to use when encrypting log data.
+             To associate an KMS key with the log group, specify the ARN of that KMS key here. If you do so, ingested data is encrypted using this key. This association is stored as long as the data encrypted with the KMS key is still within CWL. This enables CWL to decrypt this data whenever it is requested.
+             If you attempt to associate a KMS key with the log group but the KMS key doesn't exist or is deactivated, you will receive an ``InvalidParameterException`` error.
+             Log group data is always encrypted in CWL. If you omit this key, the encryption does not use KMS. For more information, see [Encrypt log data in using](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/encrypt-log-data-kms.html)
+          type: string
+          maxLength: 256
+          pattern: ^arn:[a-z0-9-]+:kms:[a-z0-9-]+:\d{12}:(key|alias)/.+\Z
+        DataProtectionPolicy:
+          description: |-
+            Creates a data protection policy and assigns it to the log group. A data protection policy can help safeguard sensitive data that's ingested by the log group by auditing and masking the sensitive log data. When a user who does not have permission to view masked data views a log event that includes masked data, the sensitive data is replaced by asterisks.
+             For more information, including a list of types of data that can be audited and masked, see [Protect sensitive log data with masking](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/mask-sensitive-log-data.html).
+          type: object
+        FieldIndexPolicies:
+          description: |-
+            Creates or updates a *field index policy* for the specified log group. Only log groups in the Standard log class support field index policies. For more information about log classes, see [Log classes](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatch_Logs_Log_Classes.html).
+             You can use field index policies to create *field indexes* on fields found in log events in the log group. Creating field indexes lowers the costs for CWL Insights queries that reference those field indexes, because these queries attempt to skip the processing of log events that are known to not match the indexed field. Good fields to index are fields that you often need to query for and fields that have high cardinality of values Common examples of indexes include request ID, session ID, userID, and instance IDs. For more information, see [Create field indexes to improve query performance and reduce costs](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatchLogs-Field-Indexing.html).
+             Currently, this array supports only one field index policy object.
+          type: array
+          uniqueItems: true
+          x-insertionOrder: false
+          items:
+            description: Index policy for log group in JSON format
+            type: object
+        LogGroupClass:
+          description: |-
+            Specifies the log group class for this log group. There are two classes:
+              +  The ``Standard`` log class supports all CWL features.
+              +  The ``Infrequent Access`` log class supports a subset of CWL features and incurs lower costs.
+              
+             For details about the features supported by each class, see [Log classes](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatch_Logs_Log_Classes.html)
+          type: string
+          enum:
+            - STANDARD
+            - INFREQUENT_ACCESS
+            - DELIVERY
+          default: STANDARD
+        RetentionInDays:
+          description: |-
+            The number of days to retain the log events in the specified log group. Possible values are: 1, 3, 5, 7, 14, 30, 60, 90, 120, 150, 180, 365, 400, 545, 731, 1096, 1827, 2192, 2557, 2922, 3288, and 3653.
+             To set a log group so that its log events do not expire, use [DeleteRetentionPolicy](https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_DeleteRetentionPolicy.html).
+          type: integer
+          enum:
+            - 1
+            - 3
+            - 5
+            - 7
+            - 14
+            - 30
+            - 60
+            - 90
+            - 120
+            - 150
+            - 180
+            - 365
+            - 400
+            - 545
+            - 731
+            - 1096
+            - 1827
+            - 2192
+            - 2557
+            - 2922
+            - 3288
+            - 3653
+        Tags:
+          description: |-
+            An array of key-value pairs to apply to the log group.
+             For more information, see [Tag](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html).
+          type: array
+          uniqueItems: true
+          x-insertionOrder: false
+          items:
+            $ref: '#/components/schemas/LogGroup_Tag'
+        Arn:
+          description: ''
+          type: string
+        ResourcePolicyDocument:
+          description: ''
+          type: object
+      x-stackql-resource-name: log_group
+      description: |-
+        The ``AWS::Logs::LogGroup`` resource specifies a log group. A log group defines common properties for log streams, such as their retention and access control rules. Each log stream must belong to one log group.
+         You can create up to 1,000,000 log groups per Region per account. You must use the following guidelines when naming a log group:
+          +  Log group names must be unique within a Region for an AWS account.
+          +  Log group names can be between 1 and 512 characters long.
+          +  Log group names consist of the following characters: a-z, A-Z, 0-9, '_' (underscore), '-' (hyphen), '/' (forward slash), and '.' (period).
+      x-type-name: AWS::Logs::LogGroup
+      x-stackql-primary-identifier:
+        - LogGroupName
+      x-create-only-properties:
+        - LogGroupName
+      x-read-only-properties:
+        - Arn
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: true
+        tagProperty: /properties/Tags
+        permissions:
+          - logs:TagResource
+          - logs:UntagResource
+          - logs:ListTagsForResource
+      x-required-permissions:
+        create:
+          - logs:DescribeLogGroups
+          - logs:CreateLogGroup
+          - logs:PutRetentionPolicy
+          - logs:TagResource
+          - logs:GetDataProtectionPolicy
+          - logs:PutDataProtectionPolicy
+          - logs:CreateLogDelivery
+          - s3:REST.PUT.OBJECT
+          - firehose:TagDeliveryStream
+          - logs:PutResourcePolicy
+          - logs:DescribeResourcePolicies
+          - logs:PutIndexPolicy
+          - logs:DescribeIndexPolicies
+        read:
+          - logs:DescribeLogGroups
+          - logs:ListTagsForResource
+          - logs:GetDataProtectionPolicy
+          - logs:DescribeIndexPolicies
+          - logs:DescribeResourcePolicies
+        update:
+          - logs:DescribeLogGroups
+          - logs:AssociateKmsKey
+          - logs:DisassociateKmsKey
+          - logs:PutRetentionPolicy
+          - logs:DeleteRetentionPolicy
+          - logs:TagResource
+          - logs:UntagResource
+          - logs:ListTagsForResource
+          - logs:GetDataProtectionPolicy
+          - logs:PutDataProtectionPolicy
+          - logs:CreateLogDelivery
+          - s3:REST.PUT.OBJECT
+          - firehose:TagDeliveryStream
+          - logs:PutIndexPolicy
+          - logs:DeleteIndexPolicy
+          - logs:PutResourcePolicy
+          - logs:DescribeResourcePolicies
+          - logs:DeleteResourcePolicy
+        delete:
+          - logs:DescribeLogGroups
+          - logs:DeleteLogGroup
+          - logs:DeleteDataProtectionPolicy
+        list:
+          - logs:DescribeLogGroups
+          - logs:ListTagsForResource
     LogStream:
       type: object
       properties:
@@ -1339,6 +1567,11 @@ components:
           - logs:DescribeMetricFilters
         delete:
           - logs:DeleteMetricFilter
+    QueryDefinition_LogGroup:
+      type: string
+      pattern: '[\.\-_/#A-Za-z0-9]+'
+      minLength: 1
+      maxLength: 512
     QueryDefinition:
       type: object
       properties:
@@ -1358,7 +1591,7 @@ components:
           x-insertionOrder: false
           items:
             description: LogGroup name
-            $ref: '#/components/schemas/LogGroup'
+            $ref: '#/components/schemas/QueryDefinition_LogGroup'
         QueryDefinitionId:
           description: Unique identifier of a query definition
           type: string
@@ -2150,17 +2383,17 @@ components:
               maxLength: 60
             Arn:
               description: The Amazon Resource Name (ARN) that uniquely identifies this delivery destination.
-              $ref: '#/components/schemas/Arn'
+              $ref: '#/components/schemas/DeliveryDestination_Arn'
             DestinationResourceArn:
               description: The ARN of the Amazon Web Services destination that this delivery destination represents. That Amazon Web Services destination can be a log group in CloudWatch Logs, an Amazon S3 bucket, or a delivery stream in Firehose.
-              $ref: '#/components/schemas/Arn'
+              $ref: '#/components/schemas/DeliveryDestination_Arn'
             Tags:
               description: The tags that have been assigned to this delivery destination.
               type: array
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/DeliveryDestination_Tag'
             DeliveryDestinationType:
               description: Displays whether this delivery destination is CloudWatch Logs, Amazon S3, or Kinesis Data Firehose.
               type: string
@@ -2207,17 +2440,17 @@ components:
               maxLength: 60
             Arn:
               description: The Amazon Resource Name (ARN) that uniquely identifies this delivery source.
-              $ref: '#/components/schemas/Arn'
+              $ref: '#/components/schemas/DeliverySource_Arn'
             ResourceArns:
               description: This array contains the ARN of the AWS resource that sends logs and is represented by this delivery source. Currently, only one ARN can be in the array.
               type: array
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Arn'
+                $ref: '#/components/schemas/DeliverySource_Arn'
             ResourceArn:
               description: The ARN of the resource that will be sending the logs.
-              $ref: '#/components/schemas/Arn'
+              $ref: '#/components/schemas/DeliverySource_Arn'
             Service:
               description: The AWS service that is sending logs.
               type: string
@@ -2262,7 +2495,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Destination_Tag'
             DestinationName:
               description: The name of the destination resource
               type: string
@@ -2391,6 +2624,110 @@ components:
       x-title: CreateLogAnomalyDetectorRequest
       type: object
       required: []
+    CreateLogGroupRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            LogGroupName:
+              description: The name of the log group. If you don't specify a name, CFNlong generates a unique ID for the log group.
+              type: string
+              minLength: 1
+              maxLength: 512
+              pattern: ^[.\-_/#A-Za-z0-9]{1,512}\Z
+            KmsKeyId:
+              description: |-
+                The Amazon Resource Name (ARN) of the KMS key to use when encrypting log data.
+                 To associate an KMS key with the log group, specify the ARN of that KMS key here. If you do so, ingested data is encrypted using this key. This association is stored as long as the data encrypted with the KMS key is still within CWL. This enables CWL to decrypt this data whenever it is requested.
+                 If you attempt to associate a KMS key with the log group but the KMS key doesn't exist or is deactivated, you will receive an ``InvalidParameterException`` error.
+                 Log group data is always encrypted in CWL. If you omit this key, the encryption does not use KMS. For more information, see [Encrypt log data in using](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/encrypt-log-data-kms.html)
+              type: string
+              maxLength: 256
+              pattern: ^arn:[a-z0-9-]+:kms:[a-z0-9-]+:\d{12}:(key|alias)/.+\Z
+            DataProtectionPolicy:
+              description: |-
+                Creates a data protection policy and assigns it to the log group. A data protection policy can help safeguard sensitive data that's ingested by the log group by auditing and masking the sensitive log data. When a user who does not have permission to view masked data views a log event that includes masked data, the sensitive data is replaced by asterisks.
+                 For more information, including a list of types of data that can be audited and masked, see [Protect sensitive log data with masking](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/mask-sensitive-log-data.html).
+              type: object
+            FieldIndexPolicies:
+              description: |-
+                Creates or updates a *field index policy* for the specified log group. Only log groups in the Standard log class support field index policies. For more information about log classes, see [Log classes](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatch_Logs_Log_Classes.html).
+                 You can use field index policies to create *field indexes* on fields found in log events in the log group. Creating field indexes lowers the costs for CWL Insights queries that reference those field indexes, because these queries attempt to skip the processing of log events that are known to not match the indexed field. Good fields to index are fields that you often need to query for and fields that have high cardinality of values Common examples of indexes include request ID, session ID, userID, and instance IDs. For more information, see [Create field indexes to improve query performance and reduce costs](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatchLogs-Field-Indexing.html).
+                 Currently, this array supports only one field index policy object.
+              type: array
+              uniqueItems: true
+              x-insertionOrder: false
+              items:
+                description: Index policy for log group in JSON format
+                type: object
+            LogGroupClass:
+              description: |-
+                Specifies the log group class for this log group. There are two classes:
+                  +  The ``Standard`` log class supports all CWL features.
+                  +  The ``Infrequent Access`` log class supports a subset of CWL features and incurs lower costs.
+                  
+                 For details about the features supported by each class, see [Log classes](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatch_Logs_Log_Classes.html)
+              type: string
+              enum:
+                - STANDARD
+                - INFREQUENT_ACCESS
+                - DELIVERY
+              default: STANDARD
+            RetentionInDays:
+              description: |-
+                The number of days to retain the log events in the specified log group. Possible values are: 1, 3, 5, 7, 14, 30, 60, 90, 120, 150, 180, 365, 400, 545, 731, 1096, 1827, 2192, 2557, 2922, 3288, and 3653.
+                 To set a log group so that its log events do not expire, use [DeleteRetentionPolicy](https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_DeleteRetentionPolicy.html).
+              type: integer
+              enum:
+                - 1
+                - 3
+                - 5
+                - 7
+                - 14
+                - 30
+                - 60
+                - 90
+                - 120
+                - 150
+                - 180
+                - 365
+                - 400
+                - 545
+                - 731
+                - 1096
+                - 1827
+                - 2192
+                - 2557
+                - 2922
+                - 3288
+                - 3653
+            Tags:
+              description: |-
+                An array of key-value pairs to apply to the log group.
+                 For more information, see [Tag](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html).
+              type: array
+              uniqueItems: true
+              x-insertionOrder: false
+              items:
+                $ref: '#/components/schemas/LogGroup_Tag'
+            Arn:
+              description: ''
+              type: string
+            ResourcePolicyDocument:
+              description: ''
+              type: object
+          x-stackQL-stringOnly: true
+      x-title: CreateLogGroupRequest
+      type: object
+      required: []
     CreateLogStreamRequest:
       properties:
         ClientToken:
@@ -2489,7 +2826,7 @@ components:
               x-insertionOrder: false
               items:
                 description: LogGroup name
-                $ref: '#/components/schemas/LogGroup'
+                $ref: '#/components/schemas/QueryDefinition_LogGroup'
             QueryDefinitionId:
               description: Unique identifier of a query definition
               type: string
@@ -2623,7 +2960,7 @@ components:
       id: awscc.logs.account_policies
       x-cfn-schema-name: AccountPolicy
       x-cfn-type-name: AWS::Logs::AccountPolicy
-      x-identifiers:
+      x-identifiers: &ref_0
         - AccountId
         - PolicyType
         - PolicyName
@@ -2721,10 +3058,7 @@ components:
       id: awscc.logs.account_policies_list_only
       x-cfn-schema-name: AccountPolicy
       x-cfn-type-name: AWS::Logs::AccountPolicy
-      x-identifiers:
-        - AccountId
-        - PolicyType
-        - PolicyName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2758,7 +3092,7 @@ components:
       id: awscc.logs.deliveries
       x-cfn-schema-name: Delivery
       x-cfn-type-name: AWS::Logs::Delivery
-      x-identifiers:
+      x-identifiers: &ref_1
         - DeliveryId
       x-type: cloud_control
       methods:
@@ -2862,8 +3196,7 @@ components:
       id: awscc.logs.deliveries_list_only
       x-cfn-schema-name: Delivery
       x-cfn-type-name: AWS::Logs::Delivery
-      x-identifiers:
-        - DeliveryId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2893,7 +3226,7 @@ components:
       id: awscc.logs.delivery_destinations
       x-cfn-schema-name: DeliveryDestination
       x-cfn-type-name: AWS::Logs::DeliveryDestination
-      x-identifiers:
+      x-identifiers: &ref_2
         - Name
       x-type: cloud_control
       methods:
@@ -2991,8 +3324,7 @@ components:
       id: awscc.logs.delivery_destinations_list_only
       x-cfn-schema-name: DeliveryDestination
       x-cfn-type-name: AWS::Logs::DeliveryDestination
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3022,7 +3354,7 @@ components:
       id: awscc.logs.delivery_sources
       x-cfn-schema-name: DeliverySource
       x-cfn-type-name: AWS::Logs::DeliverySource
-      x-identifiers:
+      x-identifiers: &ref_3
         - Name
       x-type: cloud_control
       methods:
@@ -3120,8 +3452,7 @@ components:
       id: awscc.logs.delivery_sources_list_only
       x-cfn-schema-name: DeliverySource
       x-cfn-type-name: AWS::Logs::DeliverySource
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3151,7 +3482,7 @@ components:
       id: awscc.logs.destinations
       x-cfn-schema-name: Destination
       x-cfn-type-name: AWS::Logs::Destination
-      x-identifiers:
+      x-identifiers: &ref_4
         - DestinationName
       x-type: cloud_control
       methods:
@@ -3247,8 +3578,7 @@ components:
       id: awscc.logs.destinations_list_only
       x-cfn-schema-name: Destination
       x-cfn-type-name: AWS::Logs::Destination
-      x-identifiers:
-        - DestinationName
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3278,7 +3608,7 @@ components:
       id: awscc.logs.integrations
       x-cfn-schema-name: Integration
       x-cfn-type-name: AWS::Logs::Integration
-      x-identifiers:
+      x-identifiers: &ref_5
         - IntegrationName
       x-type: cloud_control
       methods:
@@ -3353,8 +3683,7 @@ components:
       id: awscc.logs.integrations_list_only
       x-cfn-schema-name: Integration
       x-cfn-type-name: AWS::Logs::Integration
-      x-identifiers:
-        - IntegrationName
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3384,7 +3713,7 @@ components:
       id: awscc.logs.log_anomaly_detectors
       x-cfn-schema-name: LogAnomalyDetector
       x-cfn-type-name: AWS::Logs::LogAnomalyDetector
-      x-identifiers:
+      x-identifiers: &ref_6
         - AnomalyDetectorArn
       x-type: cloud_control
       methods:
@@ -3490,8 +3819,7 @@ components:
       id: awscc.logs.log_anomaly_detectors_list_only
       x-cfn-schema-name: LogAnomalyDetector
       x-cfn-type-name: AWS::Logs::LogAnomalyDetector
-      x-identifiers:
-        - AnomalyDetectorArn
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3516,12 +3844,144 @@ components:
                 json_extract_path_text(Properties, 'AnomalyDetectorArn') as anomaly_detector_arn
                 FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Logs::LogAnomalyDetector'
                 AND region = 'us-east-1'
+    log_groups:
+      name: log_groups
+      id: awscc.logs.log_groups
+      x-cfn-schema-name: LogGroup
+      x-cfn-type-name: AWS::Logs::LogGroup
+      x-identifiers: &ref_7
+        - LogGroupName
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__LogGroup&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::Logs::LogGroup"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::Logs::LogGroup"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::Logs::LogGroup"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/log_groups/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/log_groups/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/log_groups/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.LogGroupName') as log_group_name,
+              JSON_EXTRACT(Properties, '$.KmsKeyId') as kms_key_id,
+              JSON_EXTRACT(Properties, '$.DataProtectionPolicy') as data_protection_policy,
+              JSON_EXTRACT(Properties, '$.FieldIndexPolicies') as field_index_policies,
+              JSON_EXTRACT(Properties, '$.LogGroupClass') as log_group_class,
+              JSON_EXTRACT(Properties, '$.RetentionInDays') as retention_in_days,
+              JSON_EXTRACT(Properties, '$.Tags') as tags,
+              JSON_EXTRACT(Properties, '$.Arn') as arn,
+              JSON_EXTRACT(Properties, '$.ResourcePolicyDocument') as resource_policy_document
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::Logs::LogGroup'
+              AND Identifier = '<LogGroupName>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'LogGroupName') as log_group_name,
+                json_extract_path_text(Properties, 'KmsKeyId') as kms_key_id,
+                json_extract_path_text(Properties, 'DataProtectionPolicy') as data_protection_policy,
+                json_extract_path_text(Properties, 'FieldIndexPolicies') as field_index_policies,
+                json_extract_path_text(Properties, 'LogGroupClass') as log_group_class,
+                json_extract_path_text(Properties, 'RetentionInDays') as retention_in_days,
+                json_extract_path_text(Properties, 'Tags') as tags,
+                json_extract_path_text(Properties, 'Arn') as arn,
+                json_extract_path_text(Properties, 'ResourcePolicyDocument') as resource_policy_document
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::Logs::LogGroup'
+                AND Identifier = '<LogGroupName>'
+                AND region = 'us-east-1'
+    log_groups_list_only:
+      name: log_groups_list_only
+      id: awscc.logs.log_groups_list_only
+      x-cfn-schema-name: LogGroup
+      x-cfn-type-name: AWS::Logs::LogGroup
+      x-identifiers: *ref_7
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.LogGroupName') as log_group_name
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Logs::LogGroup'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'LogGroupName') as log_group_name
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Logs::LogGroup'
+                AND region = 'us-east-1'
     log_streams:
       name: log_streams
       id: awscc.logs.log_streams
       x-cfn-schema-name: LogStream
       x-cfn-type-name: AWS::Logs::LogStream
-      x-identifiers:
+      x-identifiers: &ref_8
         - LogGroupName
         - LogStreamName
       x-type: cloud_control
@@ -3593,9 +4053,7 @@ components:
       id: awscc.logs.log_streams_list_only
       x-cfn-schema-name: LogStream
       x-cfn-type-name: AWS::Logs::LogStream
-      x-identifiers:
-        - LogGroupName
-        - LogStreamName
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3627,7 +4085,7 @@ components:
       id: awscc.logs.metric_filters
       x-cfn-schema-name: MetricFilter
       x-cfn-type-name: AWS::Logs::MetricFilter
-      x-identifiers:
+      x-identifiers: &ref_9
         - LogGroupName
         - FilterName
       x-type: cloud_control
@@ -3722,9 +4180,7 @@ components:
       id: awscc.logs.metric_filters_list_only
       x-cfn-schema-name: MetricFilter
       x-cfn-type-name: AWS::Logs::MetricFilter
-      x-identifiers:
-        - LogGroupName
-        - FilterName
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3756,7 +4212,7 @@ components:
       id: awscc.logs.query_definitions
       x-cfn-schema-name: QueryDefinition
       x-cfn-type-name: AWS::Logs::QueryDefinition
-      x-identifiers:
+      x-identifiers: &ref_10
         - QueryDefinitionId
       x-type: cloud_control
       methods:
@@ -3850,8 +4306,7 @@ components:
       id: awscc.logs.query_definitions_list_only
       x-cfn-schema-name: QueryDefinition
       x-cfn-type-name: AWS::Logs::QueryDefinition
-      x-identifiers:
-        - QueryDefinitionId
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3881,7 +4336,7 @@ components:
       id: awscc.logs.resource_policies
       x-cfn-schema-name: ResourcePolicy
       x-cfn-type-name: AWS::Logs::ResourcePolicy
-      x-identifiers:
+      x-identifiers: &ref_11
         - PolicyName
       x-type: cloud_control
       methods:
@@ -3969,8 +4424,7 @@ components:
       id: awscc.logs.resource_policies_list_only
       x-cfn-schema-name: ResourcePolicy
       x-cfn-type-name: AWS::Logs::ResourcePolicy
-      x-identifiers:
-        - PolicyName
+      x-identifiers: *ref_11
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4000,7 +4454,7 @@ components:
       id: awscc.logs.subscription_filters
       x-cfn-schema-name: SubscriptionFilter
       x-cfn-type-name: AWS::Logs::SubscriptionFilter
-      x-identifiers:
+      x-identifiers: &ref_12
         - FilterName
         - LogGroupName
       x-type: cloud_control
@@ -4099,9 +4553,7 @@ components:
       id: awscc.logs.subscription_filters_list_only
       x-cfn-schema-name: SubscriptionFilter
       x-cfn-type-name: AWS::Logs::SubscriptionFilter
-      x-identifiers:
-        - FilterName
-        - LogGroupName
+      x-identifiers: *ref_12
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4133,7 +4585,7 @@ components:
       id: awscc.logs.transformers
       x-cfn-schema-name: Transformer
       x-cfn-type-name: AWS::Logs::Transformer
-      x-identifiers:
+      x-identifiers: &ref_13
         - LogGroupIdentifier
       x-type: cloud_control
       methods:
@@ -4221,8 +4673,7 @@ components:
       id: awscc.logs.transformers_list_only
       x-cfn-schema-name: Transformer
       x-cfn-type-name: AWS::Logs::Transformer
-      x-identifiers:
-        - LogGroupIdentifier
+      x-identifiers: *ref_13
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4685,6 +5136,48 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
+  /?Action=CreateResource&Version=2021-09-30&__LogGroup&__detailTransformed=true:
+    parameters:
+      - $ref: '#/components/parameters/X-Amz-Content-Sha256'
+      - $ref: '#/components/parameters/X-Amz-Date'
+      - $ref: '#/components/parameters/X-Amz-Algorithm'
+      - $ref: '#/components/parameters/X-Amz-Credential'
+      - $ref: '#/components/parameters/X-Amz-Security-Token'
+      - $ref: '#/components/parameters/X-Amz-Signature'
+      - $ref: '#/components/parameters/X-Amz-SignedHeaders'
+    post:
+      operationId: CreateLogGroup
+      parameters:
+        - description: Action Header
+          in: header
+          name: X-Amz-Target
+          required: false
+          schema:
+            default: CloudApiService.CreateResource
+            enum:
+              - CloudApiService.CreateResource
+            type: string
+        - in: header
+          name: Content-Type
+          required: false
+          schema:
+            default: application/x-amz-json-1.0
+            enum:
+              - application/x-amz-json-1.0
+            type: string
+      requestBody:
+        content:
+          application/x-amz-json-1.0:
+            schema:
+              $ref: '#/components/schemas/CreateLogGroupRequest'
+        required: true
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
+          description: Success
   /?Action=CreateResource&Version=2021-09-30&__LogStream&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
diff --git a/openapi/src/awscc/v00.00.00000/services/lookoutequipment.yaml b/openapi/src/awscc/v00.00.00000/services/lookoutequipment.yaml
index 20d301b0b..c9a0e1cbe 100644
--- a/openapi/src/awscc/v00.00.00000/services/lookoutequipment.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/lookoutequipment.yaml
@@ -695,7 +695,7 @@ components:
       id: awscc.lookoutequipment.inference_schedulers
       x-cfn-schema-name: InferenceScheduler
       x-cfn-type-name: AWS::LookoutEquipment::InferenceScheduler
-      x-identifiers:
+      x-identifiers: &ref_0
         - InferenceSchedulerName
       x-type: cloud_control
       methods:
@@ -799,8 +799,7 @@ components:
       id: awscc.lookoutequipment.inference_schedulers_list_only
       x-cfn-schema-name: InferenceScheduler
       x-cfn-type-name: AWS::LookoutEquipment::InferenceScheduler
-      x-identifiers:
-        - InferenceSchedulerName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/lookoutvision.yaml b/openapi/src/awscc/v00.00.00000/services/lookoutvision.yaml
index 30908fbfd..374317c96 100644
--- a/openapi/src/awscc/v00.00.00000/services/lookoutvision.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/lookoutvision.yaml
@@ -465,7 +465,7 @@ components:
       id: awscc.lookoutvision.projects
       x-cfn-schema-name: Project
       x-cfn-type-name: AWS::LookoutVision::Project
-      x-identifiers:
+      x-identifiers: &ref_0
         - ProjectName
       x-type: cloud_control
       methods:
@@ -536,8 +536,7 @@ components:
       id: awscc.lookoutvision.projects_list_only
       x-cfn-schema-name: Project
       x-cfn-type-name: AWS::LookoutVision::Project
-      x-identifiers:
-        - ProjectName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/m2.yaml b/openapi/src/awscc/v00.00.00000/services/m2.yaml
index 1236e8589..85a0f2fbb 100644
--- a/openapi/src/awscc/v00.00.00000/services/m2.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/m2.yaml
@@ -413,13 +413,11 @@ components:
           additionalProperties: false
     EngineType:
       type: string
-      description: The target platform for the environment.
       enum:
         - microfocus
         - bluage
     TagMap:
       type: object
-      description: Defines tags associated to an environment.
       maxProperties: 200
       minProperties: 0
       x-patternProperties:
@@ -628,6 +626,12 @@ components:
         - FileSystemId
         - MountPoint
       additionalProperties: false
+    Environment_EngineType:
+      type: string
+      description: The target platform for the environment.
+      enum:
+        - microfocus
+        - bluage
     FsxStorageConfiguration:
       type: object
       description: Defines the storage configuration for an Amazon FSx file system.
@@ -676,6 +680,17 @@ components:
           required:
             - Fsx
           additionalProperties: false
+    Environment_TagMap:
+      type: object
+      description: Defines tags associated to an environment.
+      maxProperties: 200
+      minProperties: 0
+      x-patternProperties:
+        ^(?!aws:).+$:
+          type: string
+          maxLength: 256
+          minLength: 0
+      additionalProperties: false
     Environment:
       type: object
       properties:
@@ -685,7 +700,7 @@ components:
           maxLength: 500
           minLength: 0
         EngineType:
-          $ref: '#/components/schemas/EngineType'
+          $ref: '#/components/schemas/Environment_EngineType'
         EngineVersion:
           type: string
           description: The version of the runtime engine for the environment.
@@ -743,7 +758,7 @@ components:
             pattern: ^\S{1,50}$
         Tags:
           description: Tags associated to this environment.
-          $ref: '#/components/schemas/TagMap'
+          $ref: '#/components/schemas/Environment_TagMap'
       required:
         - EngineType
         - InstanceType
@@ -915,7 +930,7 @@ components:
               maxLength: 500
               minLength: 0
             EngineType:
-              $ref: '#/components/schemas/EngineType'
+              $ref: '#/components/schemas/Environment_EngineType'
             EngineVersion:
               type: string
               description: The version of the runtime engine for the environment.
@@ -973,7 +988,7 @@ components:
                 pattern: ^\S{1,50}$
             Tags:
               description: Tags associated to this environment.
-              $ref: '#/components/schemas/TagMap'
+              $ref: '#/components/schemas/Environment_TagMap'
           x-stackQL-stringOnly: true
       x-title: CreateEnvironmentRequest
       type: object
@@ -991,7 +1006,7 @@ components:
       id: awscc.m2.applications
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::M2::Application
-      x-identifiers:
+      x-identifiers: &ref_0
         - ApplicationArn
       x-type: cloud_control
       methods:
@@ -1093,8 +1108,7 @@ components:
       id: awscc.m2.applications_list_only
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::M2::Application
-      x-identifiers:
-        - ApplicationArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1124,7 +1138,7 @@ components:
       id: awscc.m2.deployments
       x-cfn-schema-name: Deployment
       x-cfn-type-name: AWS::M2::Deployment
-      x-identifiers:
+      x-identifiers: &ref_1
         - ApplicationId
       x-type: cloud_control
       methods:
@@ -1218,8 +1232,7 @@ components:
       id: awscc.m2.deployments_list_only
       x-cfn-schema-name: Deployment
       x-cfn-type-name: AWS::M2::Deployment
-      x-identifiers:
-        - ApplicationId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1249,7 +1262,7 @@ components:
       id: awscc.m2.environments
       x-cfn-schema-name: Environment
       x-cfn-type-name: AWS::M2::Environment
-      x-identifiers:
+      x-identifiers: &ref_2
         - EnvironmentArn
       x-type: cloud_control
       methods:
@@ -1365,8 +1378,7 @@ components:
       id: awscc.m2.environments_list_only
       x-cfn-schema-name: Environment
       x-cfn-type-name: AWS::M2::Environment
-      x-identifiers:
-        - EnvironmentArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/macie.yaml b/openapi/src/awscc/v00.00.00000/services/macie.yaml
index 2c6b18286..b39f9c914 100644
--- a/openapi/src/awscc/v00.00.00000/services/macie.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/macie.yaml
@@ -976,7 +976,7 @@ components:
       id: awscc.macie.allow_lists
       x-cfn-schema-name: AllowList
       x-cfn-type-name: AWS::Macie::AllowList
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
       x-type: cloud_control
       methods:
@@ -1074,8 +1074,7 @@ components:
       id: awscc.macie.allow_lists_list_only
       x-cfn-schema-name: AllowList
       x-cfn-type-name: AWS::Macie::AllowList
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1105,7 +1104,7 @@ components:
       id: awscc.macie.custom_data_identifiers
       x-cfn-schema-name: CustomDataIdentifier
       x-cfn-type-name: AWS::Macie::CustomDataIdentifier
-      x-identifiers:
+      x-identifiers: &ref_1
         - Id
       x-type: cloud_control
       methods:
@@ -1207,8 +1206,7 @@ components:
       id: awscc.macie.custom_data_identifiers_list_only
       x-cfn-schema-name: CustomDataIdentifier
       x-cfn-type-name: AWS::Macie::CustomDataIdentifier
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1238,7 +1236,7 @@ components:
       id: awscc.macie.findings_filters
       x-cfn-schema-name: FindingsFilter
       x-cfn-type-name: AWS::Macie::FindingsFilter
-      x-identifiers:
+      x-identifiers: &ref_2
         - Id
       x-type: cloud_control
       methods:
@@ -1338,8 +1336,7 @@ components:
       id: awscc.macie.findings_filters_list_only
       x-cfn-schema-name: FindingsFilter
       x-cfn-type-name: AWS::Macie::FindingsFilter
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1369,7 +1366,7 @@ components:
       id: awscc.macie.sessions
       x-cfn-schema-name: Session
       x-cfn-type-name: AWS::Macie::Session
-      x-identifiers:
+      x-identifiers: &ref_3
         - AwsAccountId
       x-type: cloud_control
       methods:
@@ -1463,8 +1460,7 @@ components:
       id: awscc.macie.sessions_list_only
       x-cfn-schema-name: Session
       x-cfn-type-name: AWS::Macie::Session
-      x-identifiers:
-        - AwsAccountId
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/managedblockchain.yaml b/openapi/src/awscc/v00.00.00000/services/managedblockchain.yaml
index 08662129c..082588a79 100644
--- a/openapi/src/awscc/v00.00.00000/services/managedblockchain.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/managedblockchain.yaml
@@ -560,7 +560,7 @@ components:
       id: awscc.managedblockchain.accessors
       x-cfn-schema-name: Accessor
       x-cfn-type-name: AWS::ManagedBlockchain::Accessor
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
       x-type: cloud_control
       methods:
@@ -660,8 +660,7 @@ components:
       id: awscc.managedblockchain.accessors_list_only
       x-cfn-schema-name: Accessor
       x-cfn-type-name: AWS::ManagedBlockchain::Accessor
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/mediaconnect.yaml b/openapi/src/awscc/v00.00.00000/services/mediaconnect.yaml
index 54731d65f..877fdb2ce 100644
--- a/openapi/src/awscc/v00.00.00000/services/mediaconnect.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/mediaconnect.yaml
@@ -391,33 +391,19 @@ components:
       type: object
   schemas:
     FailoverConfig:
+      description: The settings for source failover.
       type: object
-      description: The settings for source failover
       properties:
         State:
-          type: string
-          enum:
-            - ENABLED
-            - DISABLED
-        RecoveryWindow:
-          type: integer
-          description: Search window time to look for dash-7 packets
+          $ref: '#/components/schemas/FailoverConfigStateEnum'
         FailoverMode:
-          type: string
-          description: The type of failover you choose for this flow. MERGE combines the source streams into a single stream, allowing graceful recovery from any single-source loss. FAILOVER allows switching between different streams.
-          enum:
-            - MERGE
-            - FAILOVER
+          description: The type of failover you choose for this flow. FAILOVER allows switching between different streams.
+          $ref: '#/components/schemas/FailoverModeEnum'
         SourcePriority:
-          type: object
           description: The priority you want to assign to a source. You can have a primary stream and a backup stream or two equally prioritized streams.
-          properties:
-            PrimarySource:
-              type: string
-              description: The name of the source you choose as the primary source for this flow.
-          required:
-            - PrimarySource
-          additionalProperties: false
+          $ref: '#/components/schemas/SourcePriority'
+      required:
+        - FailoverMode
       additionalProperties: false
     BridgeStateEnum:
       type: string
@@ -450,123 +436,59 @@ components:
           description: The name of the source you choose as the primary source for this flow.
           type: string
       additionalProperties: false
-    BridgeOutput:
+    Bridge_BridgeOutput:
+      description: The output of the bridge.
       type: object
       properties:
-        BridgeArn:
-          description: The Amazon Resource Number (ARN) of the bridge.
-          type: string
         NetworkOutput:
-          description: The output of the bridge.
           $ref: '#/components/schemas/BridgeNetworkOutput'
-        Name:
-          type: string
-          description: The network output name.
-      required:
-        - BridgeArn
-        - Name
-        - NetworkOutput
-      x-stackql-resource-name: bridge_output
-      description: Resource schema for AWS::MediaConnect::BridgeOutput
-      x-type-name: AWS::MediaConnect::BridgeOutput
-      x-stackql-primary-identifier:
-        - BridgeArn
-        - Name
-      x-create-only-properties:
-        - BridgeArn
-        - Name
-      x-required-properties:
-        - BridgeArn
-        - Name
-        - NetworkOutput
-      x-tagging:
-        taggable: false
-      x-required-permissions:
-        create:
-          - mediaconnect:AddBridgeOutputs
-          - mediaconnect:DescribeBridge
-        read:
-          - mediaconnect:DescribeBridge
-        update:
-          - mediaconnect:DescribeBridge
-          - mediaconnect:UpdateBridgeOutput
-        delete:
-          - mediaconnect:RemoveBridgeOutput
+      additionalProperties: false
     BridgeNetworkOutput:
-      type: object
       description: The output of the bridge. A network output is delivered to your premises.
+      type: object
       properties:
-        Protocol:
+        Name:
+          description: The network output name.
           type: string
-          enum:
-            - rtp-fec
-            - rtp
-            - udp
+        Protocol:
           description: The network output protocol.
+          $ref: '#/components/schemas/ProtocolEnum'
         IpAddress:
-          type: string
           description: The network output IP Address.
+          type: string
         Port:
-          type: integer
           description: The network output port.
+          type: integer
         NetworkName:
-          type: string
           description: The network output's gateway network name.
+          type: string
         Ttl:
-          type: integer
           description: The network output TTL.
+          type: integer
+      additionalProperties: false
       required:
+        - Name
         - Protocol
         - IpAddress
         - Port
         - NetworkName
         - Ttl
-      additionalProperties: false
-    BridgeSource:
+    Bridge_BridgeSource:
+      description: The bridge's source.
       type: object
       properties:
-        Name:
-          type: string
-          description: The name of the source.
-        BridgeArn:
-          description: The Amazon Resource Number (ARN) of the bridge.
-          type: string
         FlowSource:
           $ref: '#/components/schemas/BridgeFlowSource'
         NetworkSource:
           $ref: '#/components/schemas/BridgeNetworkSource'
-      required:
-        - Name
-        - BridgeArn
-      x-stackql-resource-name: bridge_source
-      description: Resource schema for AWS::MediaConnect::BridgeSource
-      x-type-name: AWS::MediaConnect::BridgeSource
-      x-stackql-primary-identifier:
-        - BridgeArn
-        - Name
-      x-create-only-properties:
-        - BridgeArn
-        - Name
-      x-required-properties:
-        - Name
-        - BridgeArn
-      x-tagging:
-        taggable: false
-      x-required-permissions:
-        create:
-          - mediaconnect:AddBridgeSources
-          - mediaconnect:DescribeBridge
-        read:
-          - mediaconnect:DescribeBridge
-        update:
-          - mediaconnect:DescribeBridge
-          - mediaconnect:UpdateBridgeSource
-        delete:
-          - mediaconnect:RemoveBridgeSource
+      additionalProperties: false
     BridgeFlowSource:
       type: object
       description: The source of the bridge. A flow source originates in MediaConnect as an existing cloud flow.
       properties:
+        Name:
+          description: The name of the flow source.
+          type: string
         FlowArn:
           description: The ARN of the cloud flow used as a source of this bridge.
           type: string
@@ -575,6 +497,7 @@ components:
           $ref: '#/components/schemas/VpcInterfaceAttachment'
       additionalProperties: false
       required:
+        - Name
         - FlowArn
     VpcInterfaceAttachment:
       type: object
@@ -588,6 +511,9 @@ components:
       type: object
       description: The source of the bridge. A network source originates at your premises.
       properties:
+        Name:
+          description: The name of the network source.
+          type: string
         Protocol:
           description: The network source protocol.
           $ref: '#/components/schemas/ProtocolEnum'
@@ -604,6 +530,7 @@ components:
           description: The network source's gateway network name.
           type: string
       required:
+        - Name
         - Protocol
         - MulticastIp
         - Port
@@ -667,7 +594,7 @@ components:
           minItems: 0
           maxItems: 2
           items:
-            $ref: '#/components/schemas/BridgeOutput'
+            $ref: '#/components/schemas/Bridge_BridgeOutput'
           x-insertionOrder: true
         Sources:
           description: The sources on this bridge.
@@ -675,7 +602,7 @@ components:
           minItems: 0
           maxItems: 2
           items:
-            $ref: '#/components/schemas/BridgeSource'
+            $ref: '#/components/schemas/Bridge_BridgeSource'
           x-insertionOrder: true
         IngressGatewayBridge:
           type: object
@@ -719,6 +646,157 @@ components:
           - mediaconnect:RemoveBridgeSource
         list:
           - mediaconnect:ListBridges
+    BridgeOutput_BridgeNetworkOutput:
+      type: object
+      description: The output of the bridge. A network output is delivered to your premises.
+      properties:
+        Protocol:
+          type: string
+          enum:
+            - rtp-fec
+            - rtp
+            - udp
+          description: The network output protocol.
+        IpAddress:
+          type: string
+          description: The network output IP Address.
+        Port:
+          type: integer
+          description: The network output port.
+        NetworkName:
+          type: string
+          description: The network output's gateway network name.
+        Ttl:
+          type: integer
+          description: The network output TTL.
+      required:
+        - Protocol
+        - IpAddress
+        - Port
+        - NetworkName
+        - Ttl
+      additionalProperties: false
+    BridgeOutput:
+      type: object
+      properties:
+        BridgeArn:
+          description: The Amazon Resource Number (ARN) of the bridge.
+          type: string
+        NetworkOutput:
+          description: The output of the bridge.
+          $ref: '#/components/schemas/BridgeOutput_BridgeNetworkOutput'
+        Name:
+          type: string
+          description: The network output name.
+      required:
+        - BridgeArn
+        - Name
+        - NetworkOutput
+      x-stackql-resource-name: bridge_output
+      description: Resource schema for AWS::MediaConnect::BridgeOutput
+      x-type-name: AWS::MediaConnect::BridgeOutput
+      x-stackql-primary-identifier:
+        - BridgeArn
+        - Name
+      x-create-only-properties:
+        - BridgeArn
+        - Name
+      x-required-properties:
+        - BridgeArn
+        - Name
+        - NetworkOutput
+      x-tagging:
+        taggable: false
+      x-required-permissions:
+        create:
+          - mediaconnect:AddBridgeOutputs
+          - mediaconnect:DescribeBridge
+        read:
+          - mediaconnect:DescribeBridge
+        update:
+          - mediaconnect:DescribeBridge
+          - mediaconnect:UpdateBridgeOutput
+        delete:
+          - mediaconnect:RemoveBridgeOutput
+    BridgeSource_BridgeFlowSource:
+      type: object
+      description: The source of the bridge. A flow source originates in MediaConnect as an existing cloud flow.
+      properties:
+        FlowArn:
+          description: The ARN of the cloud flow used as a source of this bridge.
+          type: string
+        FlowVpcInterfaceAttachment:
+          description: The name of the VPC interface attachment to use for this source.
+          $ref: '#/components/schemas/VpcInterfaceAttachment'
+      additionalProperties: false
+      required:
+        - FlowArn
+    BridgeSource_BridgeNetworkSource:
+      type: object
+      description: The source of the bridge. A network source originates at your premises.
+      properties:
+        Protocol:
+          description: The network source protocol.
+          $ref: '#/components/schemas/ProtocolEnum'
+        MulticastIp:
+          description: The network source multicast IP.
+          type: string
+        MulticastSourceSettings:
+          description: The settings related to the multicast source.
+          $ref: '#/components/schemas/MulticastSourceSettings'
+        Port:
+          description: The network source port.
+          type: integer
+        NetworkName:
+          description: The network source's gateway network name.
+          type: string
+      required:
+        - Protocol
+        - MulticastIp
+        - Port
+        - NetworkName
+      additionalProperties: false
+    BridgeSource:
+      type: object
+      properties:
+        Name:
+          type: string
+          description: The name of the source.
+        BridgeArn:
+          description: The Amazon Resource Number (ARN) of the bridge.
+          type: string
+        FlowSource:
+          $ref: '#/components/schemas/BridgeSource_BridgeFlowSource'
+        NetworkSource:
+          $ref: '#/components/schemas/BridgeSource_BridgeNetworkSource'
+      required:
+        - Name
+        - BridgeArn
+      x-stackql-resource-name: bridge_source
+      description: Resource schema for AWS::MediaConnect::BridgeSource
+      x-type-name: AWS::MediaConnect::BridgeSource
+      x-stackql-primary-identifier:
+        - BridgeArn
+        - Name
+      x-create-only-properties:
+        - BridgeArn
+        - Name
+      x-required-properties:
+        - Name
+        - BridgeArn
+      x-tagging:
+        taggable: false
+      x-required-permissions:
+        create:
+          - mediaconnect:AddBridgeSources
+          - mediaconnect:DescribeBridge
+        read:
+          - mediaconnect:DescribeBridge
+        update:
+          - mediaconnect:DescribeBridge
+          - mediaconnect:UpdateBridgeSource
+        delete:
+          - mediaconnect:RemoveBridgeSource
     Source:
       description: The settings for the source of the flow.
       type: object
@@ -845,6 +923,35 @@ components:
       additionalProperties: false
       required:
         - RoleArn
+    Flow_FailoverConfig:
+      type: object
+      description: The settings for source failover
+      properties:
+        State:
+          type: string
+          enum:
+            - ENABLED
+            - DISABLED
+        RecoveryWindow:
+          type: integer
+          description: Search window time to look for dash-7 packets
+        FailoverMode:
+          type: string
+          description: The type of failover you choose for this flow. MERGE combines the source streams into a single stream, allowing graceful recovery from any single-source loss. FAILOVER allows switching between different streams.
+          enum:
+            - MERGE
+            - FAILOVER
+        SourcePriority:
+          type: object
+          description: The priority you want to assign to a source. You can have a primary stream and a backup stream or two equally prioritized streams.
+          properties:
+            PrimarySource:
+              type: string
+              description: The name of the source you choose as the primary source for this flow.
+          required:
+            - PrimarySource
+          additionalProperties: false
+      additionalProperties: false
     GatewayBridgeSource:
       type: object
       description: The source configuration for cloud flows receiving a stream from a bridge.
@@ -1214,7 +1321,7 @@ components:
           $ref: '#/components/schemas/Source'
         SourceFailoverConfig:
           description: The source failover config of the flow.
-          $ref: '#/components/schemas/FailoverConfig'
+          $ref: '#/components/schemas/Flow_FailoverConfig'
         VpcInterfaces:
           type: array
           description: The VPC interfaces that you added to this flow.
@@ -1296,6 +1403,49 @@ components:
           - mediaconnect:RevokeFlowEntitlement
         list:
           - mediaconnect:ListFlows
+    FlowEntitlement_Encryption:
+      type: object
+      description: Information about the encryption of the flow.
+      properties:
+        Algorithm:
+          type: string
+          enum:
+            - aes128
+            - aes192
+            - aes256
+          description: The type of algorithm that is used for the encryption (such as aes128, aes192, or aes256).
+        ConstantInitializationVector:
+          type: string
+          description: A 128-bit, 16-byte hex value represented by a 32-character string, to be used with the key for encrypting content. This parameter is not valid for static key encryption.
+        DeviceId:
+          type: string
+          description: The value of one of the devices that you configured with your digital rights management (DRM) platform key provider. This parameter is required for SPEKE encryption and is not valid for static key encryption.
+        KeyType:
+          type: string
+          enum:
+            - speke
+            - static-key
+          description: The type of key that is used for the encryption. If no keyType is provided, the service will use the default setting (static-key).
+          default: static-key
+        Region:
+          type: string
+          description: The AWS Region that the API Gateway proxy endpoint was created in. This parameter is required for SPEKE encryption and is not valid for static key encryption.
+        ResourceId:
+          type: string
+          description: An identifier for the content. The service sends this value to the key server to identify the current endpoint. The resource ID is also known as the content ID. This parameter is required for SPEKE encryption and is not valid for static key encryption.
+        RoleArn:
+          type: string
+          description: The ARN of the role that you created during setup (when you set up AWS Elemental MediaConnect as a trusted entity).
+        SecretArn:
+          type: string
+          description: ' The ARN of the secret that you created in AWS Secrets Manager to store the encryption key. This parameter is required for static key encryption and is not valid for SPEKE encryption.'
+        Url:
+          type: string
+          description: The URL from the API Gateway proxy that you set up to talk to your key server. This parameter is required for SPEKE encryption and is not valid for static key encryption.
+      additionalProperties: false
+      required:
+        - Algorithm
+        - RoleArn
     FlowEntitlement:
       type: object
       properties:
@@ -1313,7 +1463,7 @@ components:
           type: string
           description: A description of the entitlement.
         Encryption:
-          $ref: '#/components/schemas/Encryption'
+          $ref: '#/components/schemas/FlowEntitlement_Encryption'
           description: The type of encryption that will be used on the output that is associated with this entitlement.
         EntitlementStatus:
           type: string
@@ -1364,6 +1514,42 @@ components:
         list:
           - mediaconnect:DescribeFlow
           - mediaconnect:ListFlows
+    FlowOutput_Encryption:
+      type: object
+      description: Information about the encryption of the flow.
+      properties:
+        Algorithm:
+          type: string
+          enum:
+            - aes128
+            - aes192
+            - aes256
+          description: The type of algorithm that is used for the encryption (such as aes128, aes192, or aes256).
+        KeyType:
+          type: string
+          enum:
+            - static-key
+            - srt-password
+          description: The type of key that is used for the encryption. If no keyType is provided, the service will use the default setting (static-key).
+          default: static-key
+        RoleArn:
+          type: string
+          description: The ARN of the role that you created during setup (when you set up AWS Elemental MediaConnect as a trusted entity).
+        SecretArn:
+          type: string
+          description: ' The ARN of the secret that you created in AWS Secrets Manager to store the encryption key. This parameter is required for static key encryption and is not valid for SPEKE encryption.'
+      additionalProperties: false
+      required:
+        - RoleArn
+        - SecretArn
+    FlowOutput_VpcInterfaceAttachment:
+      type: object
+      description: The settings for attaching a VPC interface to an output.
+      properties:
+        VpcInterfaceName:
+          type: string
+          description: The name of the VPC interface to use for this output.
+      additionalProperties: false
     MediaStreamOutputConfiguration:
       type: object
       description: The media stream that is associated with the output, and the parameters for that association.
@@ -1440,7 +1626,7 @@ components:
           items:
             type: string
         Encryption:
-          $ref: '#/components/schemas/Encryption'
+          $ref: '#/components/schemas/FlowOutput_Encryption'
           description: The type of key used for the encryption. If no keyType is provided, the service will use the default setting (static-key).
         Description:
           type: string
@@ -1485,7 +1671,7 @@ components:
           type: string
           description: The stream ID that you want to use for this transport. This parameter applies only to Zixi-based streams.
         VpcInterfaceAttachment:
-          $ref: '#/components/schemas/VpcInterfaceAttachment'
+          $ref: '#/components/schemas/FlowOutput_VpcInterfaceAttachment'
           description: The name of the VPC interface attachment to use for this output.
         MediaStreamOutputConfigurations:
           type: array
@@ -1787,59 +1973,6 @@ components:
           - mediaconnect:DeleteGateway
         list:
           - mediaconnect:ListGateways
-    CreateBridgeOutputRequest:
-      properties:
-        ClientToken:
-          type: string
-        RoleArn:
-          type: string
-        TypeName:
-          type: string
-        TypeVersionId:
-          type: string
-        DesiredState:
-          type: object
-          properties:
-            BridgeArn:
-              description: The Amazon Resource Number (ARN) of the bridge.
-              type: string
-            NetworkOutput:
-              description: The output of the bridge.
-              $ref: '#/components/schemas/BridgeNetworkOutput'
-            Name:
-              type: string
-              description: The network output name.
-          x-stackQL-stringOnly: true
-      x-title: CreateBridgeOutputRequest
-      type: object
-      required: []
-    CreateBridgeSourceRequest:
-      properties:
-        ClientToken:
-          type: string
-        RoleArn:
-          type: string
-        TypeName:
-          type: string
-        TypeVersionId:
-          type: string
-        DesiredState:
-          type: object
-          properties:
-            Name:
-              type: string
-              description: The name of the source.
-            BridgeArn:
-              description: The Amazon Resource Number (ARN) of the bridge.
-              type: string
-            FlowSource:
-              $ref: '#/components/schemas/BridgeFlowSource'
-            NetworkSource:
-              $ref: '#/components/schemas/BridgeNetworkSource'
-          x-stackQL-stringOnly: true
-      x-title: CreateBridgeSourceRequest
-      type: object
-      required: []
     CreateBridgeRequest:
       properties:
         ClientToken:
@@ -1872,7 +2005,7 @@ components:
               minItems: 0
               maxItems: 2
               items:
-                $ref: '#/components/schemas/BridgeOutput'
+                $ref: '#/components/schemas/Bridge_BridgeOutput'
               x-insertionOrder: true
             Sources:
               description: The sources on this bridge.
@@ -1880,7 +2013,7 @@ components:
               minItems: 0
               maxItems: 2
               items:
-                $ref: '#/components/schemas/BridgeSource'
+                $ref: '#/components/schemas/Bridge_BridgeSource'
               x-insertionOrder: true
             IngressGatewayBridge:
               type: object
@@ -1889,7 +2022,60 @@ components:
               type: object
               $ref: '#/components/schemas/EgressGatewayBridge'
           x-stackQL-stringOnly: true
-      x-title: CreateBridgeRequest
+      x-title: CreateBridgeRequest
+      type: object
+      required: []
+    CreateBridgeOutputRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            BridgeArn:
+              description: The Amazon Resource Number (ARN) of the bridge.
+              type: string
+            NetworkOutput:
+              description: The output of the bridge.
+              $ref: '#/components/schemas/BridgeOutput_BridgeNetworkOutput'
+            Name:
+              type: string
+              description: The network output name.
+          x-stackQL-stringOnly: true
+      x-title: CreateBridgeOutputRequest
+      type: object
+      required: []
+    CreateBridgeSourceRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            Name:
+              type: string
+              description: The name of the source.
+            BridgeArn:
+              description: The Amazon Resource Number (ARN) of the bridge.
+              type: string
+            FlowSource:
+              $ref: '#/components/schemas/BridgeSource_BridgeFlowSource'
+            NetworkSource:
+              $ref: '#/components/schemas/BridgeSource_BridgeNetworkSource'
+          x-stackQL-stringOnly: true
+      x-title: CreateBridgeSourceRequest
       type: object
       required: []
     CreateFlowRequest:
@@ -1925,7 +2111,7 @@ components:
               $ref: '#/components/schemas/Source'
             SourceFailoverConfig:
               description: The source failover config of the flow.
-              $ref: '#/components/schemas/FailoverConfig'
+              $ref: '#/components/schemas/Flow_FailoverConfig'
             VpcInterfaces:
               type: array
               description: The VPC interfaces that you added to this flow.
@@ -1985,7 +2171,7 @@ components:
               type: string
               description: A description of the entitlement.
             Encryption:
-              $ref: '#/components/schemas/Encryption'
+              $ref: '#/components/schemas/FlowEntitlement_Encryption'
               description: The type of encryption that will be used on the output that is associated with this entitlement.
             EntitlementStatus:
               type: string
@@ -2030,7 +2216,7 @@ components:
               items:
                 type: string
             Encryption:
-              $ref: '#/components/schemas/Encryption'
+              $ref: '#/components/schemas/FlowOutput_Encryption'
               description: The type of key used for the encryption. If no keyType is provided, the service will use the default setting (static-key).
             Description:
               type: string
@@ -2075,7 +2261,7 @@ components:
               type: string
               description: The stream ID that you want to use for this transport. This parameter applies only to Zixi-based streams.
             VpcInterfaceAttachment:
-              $ref: '#/components/schemas/VpcInterfaceAttachment'
+              $ref: '#/components/schemas/FlowOutput_VpcInterfaceAttachment'
               description: The name of the VPC interface attachment to use for this output.
             MediaStreamOutputConfigurations:
               type: array
@@ -2279,14 +2465,13 @@ components:
       description: Amazon Signature authorization v4
       x-amazon-apigateway-authtype: awsSigv4
   x-stackQL-resources:
-    bridge_outputs:
-      name: bridge_outputs
-      id: awscc.mediaconnect.bridge_outputs
-      x-cfn-schema-name: BridgeOutput
-      x-cfn-type-name: AWS::MediaConnect::BridgeOutput
-      x-identifiers:
+    bridges:
+      name: bridges
+      id: awscc.mediaconnect.bridges
+      x-cfn-schema-name: Bridge
+      x-cfn-type-name: AWS::MediaConnect::Bridge
+      x-identifiers: &ref_0
         - BridgeArn
-        - Name
       x-type: cloud_control
       methods:
         create_resource:
@@ -2294,12 +2479,12 @@ components:
             requestBodyTranslate:
               algorithm: naive_DesiredState
           operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__BridgeOutput&__detailTransformed=true/post'
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Bridge&__detailTransformed=true/post'
           request:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::MediaConnect::BridgeOutput"
+                "TypeName": "AWS::MediaConnect::Bridge"
               }
           response:
             mediaType: application/json
@@ -2315,7 +2500,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::MediaConnect::BridgeOutput"
+                "TypeName": "AWS::MediaConnect::Bridge"
               }
           response:
             mediaType: application/json
@@ -2331,7 +2516,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::MediaConnect::BridgeOutput"
+                "TypeName": "AWS::MediaConnect::Bridge"
               }
           response:
             mediaType: application/json
@@ -2339,11 +2524,11 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/bridge_outputs/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/bridges/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/bridge_outputs/methods/delete_resource'
+          - $ref: '#/components/x-stackQL-resources/bridges/methods/delete_resource'
         update:
-          - $ref: '#/components/x-stackQL-resources/bridge_outputs/methods/update_resource'
+          - $ref: '#/components/x-stackQL-resources/bridges/methods/update_resource'
       config:
         views:
           select:
@@ -2352,11 +2537,17 @@ components:
               SELECT
               region,
               Identifier,
+              JSON_EXTRACT(Properties, '$.Name') as name,
               JSON_EXTRACT(Properties, '$.BridgeArn') as bridge_arn,
-              JSON_EXTRACT(Properties, '$.NetworkOutput') as network_output,
-              JSON_EXTRACT(Properties, '$.Name') as name
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::MediaConnect::BridgeOutput'
-              AND Identifier = '<BridgeArn>|<Name>'
+              JSON_EXTRACT(Properties, '$.PlacementArn') as placement_arn,
+              JSON_EXTRACT(Properties, '$.BridgeState') as bridge_state,
+              JSON_EXTRACT(Properties, '$.SourceFailoverConfig') as source_failover_config,
+              JSON_EXTRACT(Properties, '$.Outputs') as outputs,
+              JSON_EXTRACT(Properties, '$.Sources') as sources,
+              JSON_EXTRACT(Properties, '$.IngressGatewayBridge') as ingress_gateway_bridge,
+              JSON_EXTRACT(Properties, '$.EgressGatewayBridge') as egress_gateway_bridge
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::MediaConnect::Bridge'
+              AND Identifier = '<BridgeArn>'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
@@ -2364,17 +2555,53 @@ components:
                 SELECT
                 region,
                 Identifier,
+                json_extract_path_text(Properties, 'Name') as name,
                 json_extract_path_text(Properties, 'BridgeArn') as bridge_arn,
-                json_extract_path_text(Properties, 'NetworkOutput') as network_output,
-                json_extract_path_text(Properties, 'Name') as name
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::MediaConnect::BridgeOutput'
-                AND Identifier = '<BridgeArn>|<Name>'
+                json_extract_path_text(Properties, 'PlacementArn') as placement_arn,
+                json_extract_path_text(Properties, 'BridgeState') as bridge_state,
+                json_extract_path_text(Properties, 'SourceFailoverConfig') as source_failover_config,
+                json_extract_path_text(Properties, 'Outputs') as outputs,
+                json_extract_path_text(Properties, 'Sources') as sources,
+                json_extract_path_text(Properties, 'IngressGatewayBridge') as ingress_gateway_bridge,
+                json_extract_path_text(Properties, 'EgressGatewayBridge') as egress_gateway_bridge
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::MediaConnect::Bridge'
+                AND Identifier = '<BridgeArn>'
                 AND region = 'us-east-1'
-    bridge_sources:
-      name: bridge_sources
-      id: awscc.mediaconnect.bridge_sources
-      x-cfn-schema-name: BridgeSource
-      x-cfn-type-name: AWS::MediaConnect::BridgeSource
+    bridges_list_only:
+      name: bridges_list_only
+      id: awscc.mediaconnect.bridges_list_only
+      x-cfn-schema-name: Bridge
+      x-cfn-type-name: AWS::MediaConnect::Bridge
+      x-identifiers: *ref_0
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.BridgeArn') as bridge_arn
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::MediaConnect::Bridge'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'BridgeArn') as bridge_arn
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::MediaConnect::Bridge'
+                AND region = 'us-east-1'
+    bridge_outputs:
+      name: bridge_outputs
+      id: awscc.mediaconnect.bridge_outputs
+      x-cfn-schema-name: BridgeOutput
+      x-cfn-type-name: AWS::MediaConnect::BridgeOutput
       x-identifiers:
         - BridgeArn
         - Name
@@ -2385,12 +2612,12 @@ components:
             requestBodyTranslate:
               algorithm: naive_DesiredState
           operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__BridgeSource&__detailTransformed=true/post'
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__BridgeOutput&__detailTransformed=true/post'
           request:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::MediaConnect::BridgeSource"
+                "TypeName": "AWS::MediaConnect::BridgeOutput"
               }
           response:
             mediaType: application/json
@@ -2406,7 +2633,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::MediaConnect::BridgeSource"
+                "TypeName": "AWS::MediaConnect::BridgeOutput"
               }
           response:
             mediaType: application/json
@@ -2422,7 +2649,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::MediaConnect::BridgeSource"
+                "TypeName": "AWS::MediaConnect::BridgeOutput"
               }
           response:
             mediaType: application/json
@@ -2430,11 +2657,11 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/bridge_sources/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/bridge_outputs/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/bridge_sources/methods/delete_resource'
+          - $ref: '#/components/x-stackQL-resources/bridge_outputs/methods/delete_resource'
         update:
-          - $ref: '#/components/x-stackQL-resources/bridge_sources/methods/update_resource'
+          - $ref: '#/components/x-stackQL-resources/bridge_outputs/methods/update_resource'
       config:
         views:
           select:
@@ -2443,11 +2670,10 @@ components:
               SELECT
               region,
               Identifier,
-              JSON_EXTRACT(Properties, '$.Name') as name,
               JSON_EXTRACT(Properties, '$.BridgeArn') as bridge_arn,
-              JSON_EXTRACT(Properties, '$.FlowSource') as flow_source,
-              JSON_EXTRACT(Properties, '$.NetworkSource') as network_source
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::MediaConnect::BridgeSource'
+              JSON_EXTRACT(Properties, '$.NetworkOutput') as network_output,
+              JSON_EXTRACT(Properties, '$.Name') as name
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::MediaConnect::BridgeOutput'
               AND Identifier = '<BridgeArn>|<Name>'
               AND region = 'us-east-1'
             fallback:
@@ -2456,20 +2682,20 @@ components:
                 SELECT
                 region,
                 Identifier,
-                json_extract_path_text(Properties, 'Name') as name,
                 json_extract_path_text(Properties, 'BridgeArn') as bridge_arn,
-                json_extract_path_text(Properties, 'FlowSource') as flow_source,
-                json_extract_path_text(Properties, 'NetworkSource') as network_source
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::MediaConnect::BridgeSource'
+                json_extract_path_text(Properties, 'NetworkOutput') as network_output,
+                json_extract_path_text(Properties, 'Name') as name
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::MediaConnect::BridgeOutput'
                 AND Identifier = '<BridgeArn>|<Name>'
                 AND region = 'us-east-1'
-    bridges:
-      name: bridges
-      id: awscc.mediaconnect.bridges
-      x-cfn-schema-name: Bridge
-      x-cfn-type-name: AWS::MediaConnect::Bridge
+    bridge_sources:
+      name: bridge_sources
+      id: awscc.mediaconnect.bridge_sources
+      x-cfn-schema-name: BridgeSource
+      x-cfn-type-name: AWS::MediaConnect::BridgeSource
       x-identifiers:
         - BridgeArn
+        - Name
       x-type: cloud_control
       methods:
         create_resource:
@@ -2477,12 +2703,12 @@ components:
             requestBodyTranslate:
               algorithm: naive_DesiredState
           operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Bridge&__detailTransformed=true/post'
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__BridgeSource&__detailTransformed=true/post'
           request:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::MediaConnect::Bridge"
+                "TypeName": "AWS::MediaConnect::BridgeSource"
               }
           response:
             mediaType: application/json
@@ -2498,7 +2724,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::MediaConnect::Bridge"
+                "TypeName": "AWS::MediaConnect::BridgeSource"
               }
           response:
             mediaType: application/json
@@ -2514,7 +2740,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::MediaConnect::Bridge"
+                "TypeName": "AWS::MediaConnect::BridgeSource"
               }
           response:
             mediaType: application/json
@@ -2522,11 +2748,11 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/bridges/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/bridge_sources/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/bridges/methods/delete_resource'
+          - $ref: '#/components/x-stackQL-resources/bridge_sources/methods/delete_resource'
         update:
-          - $ref: '#/components/x-stackQL-resources/bridges/methods/update_resource'
+          - $ref: '#/components/x-stackQL-resources/bridge_sources/methods/update_resource'
       config:
         views:
           select:
@@ -2537,15 +2763,10 @@ components:
               Identifier,
               JSON_EXTRACT(Properties, '$.Name') as name,
               JSON_EXTRACT(Properties, '$.BridgeArn') as bridge_arn,
-              JSON_EXTRACT(Properties, '$.PlacementArn') as placement_arn,
-              JSON_EXTRACT(Properties, '$.BridgeState') as bridge_state,
-              JSON_EXTRACT(Properties, '$.SourceFailoverConfig') as source_failover_config,
-              JSON_EXTRACT(Properties, '$.Outputs') as outputs,
-              JSON_EXTRACT(Properties, '$.Sources') as sources,
-              JSON_EXTRACT(Properties, '$.IngressGatewayBridge') as ingress_gateway_bridge,
-              JSON_EXTRACT(Properties, '$.EgressGatewayBridge') as egress_gateway_bridge
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::MediaConnect::Bridge'
-              AND Identifier = '<BridgeArn>'
+              JSON_EXTRACT(Properties, '$.FlowSource') as flow_source,
+              JSON_EXTRACT(Properties, '$.NetworkSource') as network_source
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::MediaConnect::BridgeSource'
+              AND Identifier = '<BridgeArn>|<Name>'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
@@ -2555,53 +2776,17 @@ components:
                 Identifier,
                 json_extract_path_text(Properties, 'Name') as name,
                 json_extract_path_text(Properties, 'BridgeArn') as bridge_arn,
-                json_extract_path_text(Properties, 'PlacementArn') as placement_arn,
-                json_extract_path_text(Properties, 'BridgeState') as bridge_state,
-                json_extract_path_text(Properties, 'SourceFailoverConfig') as source_failover_config,
-                json_extract_path_text(Properties, 'Outputs') as outputs,
-                json_extract_path_text(Properties, 'Sources') as sources,
-                json_extract_path_text(Properties, 'IngressGatewayBridge') as ingress_gateway_bridge,
-                json_extract_path_text(Properties, 'EgressGatewayBridge') as egress_gateway_bridge
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::MediaConnect::Bridge'
-                AND Identifier = '<BridgeArn>'
-                AND region = 'us-east-1'
-    bridges_list_only:
-      name: bridges_list_only
-      id: awscc.mediaconnect.bridges_list_only
-      x-cfn-schema-name: Bridge
-      x-cfn-type-name: AWS::MediaConnect::Bridge
-      x-identifiers:
-        - BridgeArn
-      x-type: cloud_control_view
-      methods: {}
-      sqlVerbs:
-        insert: []
-        delete: []
-        update: []
-      config:
-        views:
-          select:
-            predicate: sqlDialect == "sqlite3"
-            ddl: |-
-              SELECT
-              region,
-              JSON_EXTRACT(Properties, '$.BridgeArn') as bridge_arn
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::MediaConnect::Bridge'
-              AND region = 'us-east-1'
-            fallback:
-              predicate: sqlDialect == "postgres"
-              ddl: |-
-                SELECT
-                region,
-                json_extract_path_text(Properties, 'BridgeArn') as bridge_arn
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::MediaConnect::Bridge'
+                json_extract_path_text(Properties, 'FlowSource') as flow_source,
+                json_extract_path_text(Properties, 'NetworkSource') as network_source
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::MediaConnect::BridgeSource'
+                AND Identifier = '<BridgeArn>|<Name>'
                 AND region = 'us-east-1'
     flows:
       name: flows
       id: awscc.mediaconnect.flows
       x-cfn-schema-name: Flow
       x-cfn-type-name: AWS::MediaConnect::Flow
-      x-identifiers:
+      x-identifiers: &ref_1
         - FlowArn
       x-type: cloud_control
       methods:
@@ -2713,8 +2898,7 @@ components:
       id: awscc.mediaconnect.flows_list_only
       x-cfn-schema-name: Flow
       x-cfn-type-name: AWS::MediaConnect::Flow
-      x-identifiers:
-        - FlowArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2744,7 +2928,7 @@ components:
       id: awscc.mediaconnect.flow_entitlements
       x-cfn-schema-name: FlowEntitlement
       x-cfn-type-name: AWS::MediaConnect::FlowEntitlement
-      x-identifiers:
+      x-identifiers: &ref_2
         - EntitlementArn
       x-type: cloud_control
       methods:
@@ -2844,8 +3028,7 @@ components:
       id: awscc.mediaconnect.flow_entitlements_list_only
       x-cfn-schema-name: FlowEntitlement
       x-cfn-type-name: AWS::MediaConnect::FlowEntitlement
-      x-identifiers:
-        - EntitlementArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2875,7 +3058,7 @@ components:
       id: awscc.mediaconnect.flow_outputs
       x-cfn-schema-name: FlowOutput
       x-cfn-type-name: AWS::MediaConnect::FlowOutput
-      x-identifiers:
+      x-identifiers: &ref_3
         - OutputArn
       x-type: cloud_control
       methods:
@@ -2997,8 +3180,7 @@ components:
       id: awscc.mediaconnect.flow_outputs_list_only
       x-cfn-schema-name: FlowOutput
       x-cfn-type-name: AWS::MediaConnect::FlowOutput
-      x-identifiers:
-        - OutputArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3028,7 +3210,7 @@ components:
       id: awscc.mediaconnect.flow_sources
       x-cfn-schema-name: FlowSource
       x-cfn-type-name: AWS::MediaConnect::FlowSource
-      x-identifiers:
+      x-identifiers: &ref_4
         - SourceArn
       x-type: cloud_control
       methods:
@@ -3154,8 +3336,7 @@ components:
       id: awscc.mediaconnect.flow_sources_list_only
       x-cfn-schema-name: FlowSource
       x-cfn-type-name: AWS::MediaConnect::FlowSource
-      x-identifiers:
-        - SourceArn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3185,7 +3366,7 @@ components:
       id: awscc.mediaconnect.flow_vpc_interfaces
       x-cfn-schema-name: FlowVpcInterface
       x-cfn-type-name: AWS::MediaConnect::FlowVpcInterface
-      x-identifiers:
+      x-identifiers: &ref_5
         - FlowArn
         - Name
       x-type: cloud_control
@@ -3282,9 +3463,7 @@ components:
       id: awscc.mediaconnect.flow_vpc_interfaces_list_only
       x-cfn-schema-name: FlowVpcInterface
       x-cfn-type-name: AWS::MediaConnect::FlowVpcInterface
-      x-identifiers:
-        - FlowArn
-        - Name
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3316,7 +3495,7 @@ components:
       id: awscc.mediaconnect.gateways
       x-cfn-schema-name: Gateway
       x-cfn-type-name: AWS::MediaConnect::Gateway
-      x-identifiers:
+      x-identifiers: &ref_6
         - GatewayArn
       x-type: cloud_control
       methods:
@@ -3393,8 +3572,7 @@ components:
       id: awscc.mediaconnect.gateways_list_only
       x-cfn-schema-name: Gateway
       x-cfn-type-name: AWS::MediaConnect::Gateway
-      x-identifiers:
-        - GatewayArn
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3563,7 +3741,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__BridgeOutput&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__Bridge&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3573,7 +3751,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateBridgeOutput
+      operationId: CreateBridge
       parameters:
         - description: Action Header
           in: header
@@ -3596,7 +3774,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateBridgeOutputRequest'
+              $ref: '#/components/schemas/CreateBridgeRequest'
         required: true
       responses:
         '200':
@@ -3605,7 +3783,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__BridgeSource&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__BridgeOutput&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3615,7 +3793,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateBridgeSource
+      operationId: CreateBridgeOutput
       parameters:
         - description: Action Header
           in: header
@@ -3638,7 +3816,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateBridgeSourceRequest'
+              $ref: '#/components/schemas/CreateBridgeOutputRequest'
         required: true
       responses:
         '200':
@@ -3647,7 +3825,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__Bridge&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__BridgeSource&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -3657,7 +3835,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateBridge
+      operationId: CreateBridgeSource
       parameters:
         - description: Action Header
           in: header
@@ -3680,7 +3858,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateBridgeRequest'
+              $ref: '#/components/schemas/CreateBridgeSourceRequest'
         required: true
       responses:
         '200':
diff --git a/openapi/src/awscc/v00.00.00000/services/medialive.yaml b/openapi/src/awscc/v00.00.00000/services/medialive.yaml
index 926e5d4b1..9582561b6 100644
--- a/openapi/src/awscc/v00.00.00000/services/medialive.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/medialive.yaml
@@ -913,6 +913,14 @@ components:
       required:
         - Arn
       additionalProperties: false
+    EventBridgeRuleTemplate_TagMap:
+      type: object
+      description: Represents the tags associated with a resource.
+      x-patternProperties:
+        .+:
+          type: string
+          description: Placeholder documentation for __string
+      additionalProperties: false
     EventBridgeRuleTemplate:
       type: object
       properties:
@@ -966,7 +974,7 @@ components:
           pattern: ^[^\s]+$
           description: A resource's name. Names must be unique within the scope of a resource type in a specific region.
         Tags:
-          $ref: '#/components/schemas/TagMap'
+          $ref: '#/components/schemas/EventBridgeRuleTemplate_TagMap'
       required:
         - EventType
         - Name
@@ -2277,7 +2285,7 @@ components:
               pattern: ^[^\s]+$
               description: A resource's name. Names must be unique within the scope of a resource type in a specific region.
             Tags:
-              $ref: '#/components/schemas/TagMap'
+              $ref: '#/components/schemas/EventBridgeRuleTemplate_TagMap'
           x-stackQL-stringOnly: true
       x-title: CreateEventBridgeRuleTemplateRequest
       type: object
@@ -2649,7 +2657,7 @@ components:
       id: awscc.medialive.channel_placement_groups
       x-cfn-schema-name: ChannelPlacementGroup
       x-cfn-type-name: AWS::MediaLive::ChannelPlacementGroup
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
         - ClusterId
       x-type: cloud_control
@@ -2750,9 +2758,7 @@ components:
       id: awscc.medialive.channel_placement_groups_list_only
       x-cfn-schema-name: ChannelPlacementGroup
       x-cfn-type-name: AWS::MediaLive::ChannelPlacementGroup
-      x-identifiers:
-        - Id
-        - ClusterId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2784,7 +2790,7 @@ components:
       id: awscc.medialive.cloud_watch_alarm_templates
       x-cfn-schema-name: CloudWatchAlarmTemplate
       x-cfn-type-name: AWS::MediaLive::CloudWatchAlarmTemplate
-      x-identifiers:
+      x-identifiers: &ref_1
         - Identifier
       x-type: cloud_control
       methods:
@@ -2906,8 +2912,7 @@ components:
       id: awscc.medialive.cloud_watch_alarm_templates_list_only
       x-cfn-schema-name: CloudWatchAlarmTemplate
       x-cfn-type-name: AWS::MediaLive::CloudWatchAlarmTemplate
-      x-identifiers:
-        - Identifier
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2937,7 +2942,7 @@ components:
       id: awscc.medialive.cloud_watch_alarm_template_groups
       x-cfn-schema-name: CloudWatchAlarmTemplateGroup
       x-cfn-type-name: AWS::MediaLive::CloudWatchAlarmTemplateGroup
-      x-identifiers:
+      x-identifiers: &ref_2
         - Identifier
       x-type: cloud_control
       methods:
@@ -3037,8 +3042,7 @@ components:
       id: awscc.medialive.cloud_watch_alarm_template_groups_list_only
       x-cfn-schema-name: CloudWatchAlarmTemplateGroup
       x-cfn-type-name: AWS::MediaLive::CloudWatchAlarmTemplateGroup
-      x-identifiers:
-        - Identifier
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3068,7 +3072,7 @@ components:
       id: awscc.medialive.clusters
       x-cfn-schema-name: Cluster
       x-cfn-type-name: AWS::MediaLive::Cluster
-      x-identifiers:
+      x-identifiers: &ref_3
         - Id
       x-type: cloud_control
       methods:
@@ -3170,8 +3174,7 @@ components:
       id: awscc.medialive.clusters_list_only
       x-cfn-schema-name: Cluster
       x-cfn-type-name: AWS::MediaLive::Cluster
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3201,7 +3204,7 @@ components:
       id: awscc.medialive.event_bridge_rule_templates
       x-cfn-schema-name: EventBridgeRuleTemplate
       x-cfn-type-name: AWS::MediaLive::EventBridgeRuleTemplate
-      x-identifiers:
+      x-identifiers: &ref_4
         - Identifier
       x-type: cloud_control
       methods:
@@ -3309,8 +3312,7 @@ components:
       id: awscc.medialive.event_bridge_rule_templates_list_only
       x-cfn-schema-name: EventBridgeRuleTemplate
       x-cfn-type-name: AWS::MediaLive::EventBridgeRuleTemplate
-      x-identifiers:
-        - Identifier
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3340,7 +3342,7 @@ components:
       id: awscc.medialive.event_bridge_rule_template_groups
       x-cfn-schema-name: EventBridgeRuleTemplateGroup
       x-cfn-type-name: AWS::MediaLive::EventBridgeRuleTemplateGroup
-      x-identifiers:
+      x-identifiers: &ref_5
         - Identifier
       x-type: cloud_control
       methods:
@@ -3440,8 +3442,7 @@ components:
       id: awscc.medialive.event_bridge_rule_template_groups_list_only
       x-cfn-schema-name: EventBridgeRuleTemplateGroup
       x-cfn-type-name: AWS::MediaLive::EventBridgeRuleTemplateGroup
-      x-identifiers:
-        - Identifier
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3471,7 +3472,7 @@ components:
       id: awscc.medialive.multiplexes
       x-cfn-schema-name: Multiplex
       x-cfn-type-name: AWS::MediaLive::Multiplex
-      x-identifiers:
+      x-identifiers: &ref_6
         - Id
       x-type: cloud_control
       methods:
@@ -3575,8 +3576,7 @@ components:
       id: awscc.medialive.multiplexes_list_only
       x-cfn-schema-name: Multiplex
       x-cfn-type-name: AWS::MediaLive::Multiplex
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3606,7 +3606,7 @@ components:
       id: awscc.medialive.multiplexprograms
       x-cfn-schema-name: Multiplexprogram
       x-cfn-type-name: AWS::MediaLive::Multiplexprogram
-      x-identifiers:
+      x-identifiers: &ref_7
         - ProgramName
         - MultiplexId
       x-type: cloud_control
@@ -3705,9 +3705,7 @@ components:
       id: awscc.medialive.multiplexprograms_list_only
       x-cfn-schema-name: Multiplexprogram
       x-cfn-type-name: AWS::MediaLive::Multiplexprogram
-      x-identifiers:
-        - ProgramName
-        - MultiplexId
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3739,7 +3737,7 @@ components:
       id: awscc.medialive.networks
       x-cfn-schema-name: Network
       x-cfn-type-name: AWS::MediaLive::Network
-      x-identifiers:
+      x-identifiers: &ref_8
         - Id
       x-type: cloud_control
       methods:
@@ -3839,8 +3837,7 @@ components:
       id: awscc.medialive.networks_list_only
       x-cfn-schema-name: Network
       x-cfn-type-name: AWS::MediaLive::Network
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3870,7 +3867,7 @@ components:
       id: awscc.medialive.sdi_sources
       x-cfn-schema-name: SdiSource
       x-cfn-type-name: AWS::MediaLive::SdiSource
-      x-identifiers:
+      x-identifiers: &ref_9
         - Id
       x-type: cloud_control
       methods:
@@ -3970,8 +3967,7 @@ components:
       id: awscc.medialive.sdi_sources_list_only
       x-cfn-schema-name: SdiSource
       x-cfn-type-name: AWS::MediaLive::SdiSource
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4001,7 +3997,7 @@ components:
       id: awscc.medialive.signal_maps
       x-cfn-schema-name: SignalMap
       x-cfn-type-name: AWS::MediaLive::SignalMap
-      x-identifiers:
+      x-identifiers: &ref_10
         - Identifier
       x-type: cloud_control
       methods:
@@ -4129,8 +4125,7 @@ components:
       id: awscc.medialive.signal_maps_list_only
       x-cfn-schema-name: SignalMap
       x-cfn-type-name: AWS::MediaLive::SignalMap
-      x-identifiers:
-        - Identifier
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/mediapackage.yaml b/openapi/src/awscc/v00.00.00000/services/mediapackage.yaml
index 562087fde..15fdea966 100644
--- a/openapi/src/awscc/v00.00.00000/services/mediapackage.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/mediapackage.yaml
@@ -534,11 +534,11 @@ components:
       additionalProperties: false
       properties:
         LogGroupName:
-          description: 'Sets a custom AWS CloudWatch log group name for egress logs. If a log group name isn''t specified, the default name is used: /aws/MediaPackage/VodEgressAccessLogs.'
+          description: 'Sets a custom AWS CloudWatch log group name for access logs. If a log group name isn''t specified, the defaults are used: /aws/MediaPackage/EgressAccessLogs for egress access logs and /aws/MediaPackage/IngressAccessLogs for ingress access logs.'
           type: string
-          pattern: \A\/aws\/MediaPackage\/[0-9a-zA-Z-_\/\.#]+\Z
+          pattern: \A^(\/aws\/MediaPackage\/)[a-zA-Z0-9_-]+\Z
           minLength: 1
-          maxLength: 512
+          maxLength: 256
     Channel:
       type: object
       properties:
@@ -616,183 +616,328 @@ components:
         list:
           - mediapackage:ListChannels
     MssPackage:
+      description: A Microsoft Smooth Streaming (MSS) packaging configuration.
       type: object
-      description: A Microsoft Smooth Streaming (MSS) PackagingConfiguration.
       additionalProperties: false
       properties:
+        ManifestWindowSeconds:
+          description: The time window (in seconds) contained in each manifest.
+          type: integer
+        SegmentDurationSeconds:
+          description: The duration (in seconds) of each segment.
+          type: integer
         Encryption:
           $ref: '#/components/schemas/MssEncryption'
-        MssManifests:
-          description: A list of MSS manifest configurations.
-          type: array
-          items:
-            $ref: '#/components/schemas/MssManifest'
-        SegmentDurationSeconds:
-          $ref: '#/components/schemas/SegmentDurationSeconds'
-      required:
-        - MssManifests
+        StreamSelection:
+          $ref: '#/components/schemas/StreamSelection'
     MssEncryption:
-      description: A CMAF encryption configuration.
+      description: A Microsoft Smooth Streaming (MSS) encryption configuration.
       type: object
       additionalProperties: false
+      required:
+        - SpekeKeyProvider
       properties:
         SpekeKeyProvider:
           $ref: '#/components/schemas/SpekeKeyProvider'
-      required:
-        - SpekeKeyProvider
     DashPackage:
-      type: object
       description: A Dynamic Adaptive Streaming over HTTP (DASH) packaging configuration.
+      type: object
       additionalProperties: false
       properties:
-        DashManifests:
-          description: A list of DASH manifest configurations.
-          type: array
-          items:
-            $ref: '#/components/schemas/DashManifest'
-        Encryption:
-          $ref: '#/components/schemas/DashEncryption'
+        SegmentDurationSeconds:
+          description: Duration (in seconds) of each segment. Actual segments will be rounded to the nearest multiple of the source segment duration.
+          type: integer
+        ManifestWindowSeconds:
+          description: Time window (in seconds) contained in each manifest.
+          type: integer
+        Profile:
+          description: The Dynamic Adaptive Streaming over HTTP (DASH) profile type.  When set to "HBBTV_1_5", HbbTV 1.5 compliant output is enabled.
+          type: string
+          enum:
+            - NONE
+            - HBBTV_1_5
+            - HYBRIDCAST
+            - DVB_DASH_2014
+        MinUpdatePeriodSeconds:
+          description: Minimum duration (in seconds) between potential changes to the Dynamic Adaptive Streaming over HTTP (DASH) Media Presentation Description (MPD).
+          type: integer
+        MinBufferTimeSeconds:
+          description: Minimum duration (in seconds) that a player will buffer media before starting the presentation.
+          type: integer
+        SuggestedPresentationDelaySeconds:
+          description: Duration (in seconds) to delay live content before presentation.
+          type: integer
         PeriodTriggers:
-          description: A list of triggers that controls when the outgoing Dynamic Adaptive Streaming over HTTP (DASH) Media Presentation Description (MPD) will be partitioned into multiple periods. If empty, the content will not be partitioned into more than one period. If the list contains "ADS", new periods will be created where the Asset contains SCTE-35 ad markers.
+          description: A list of triggers that controls when the outgoing Dynamic Adaptive Streaming over HTTP (DASH) Media Presentation Description (MPD) will be partitioned into multiple periods. If empty, the content will not be partitioned into more than one period. If the list contains "ADS", new periods will be created where the Channel source contains SCTE-35 ad markers.
           type: array
           items:
             type: string
             enum:
               - ADS
-        SegmentDurationSeconds:
-          $ref: '#/components/schemas/SegmentDurationSeconds'
+        IncludeIframeOnlyStream:
+          description: When enabled, an I-Frame only stream will be included in the output.
+          type: boolean
+        ManifestLayout:
+          description: Determines the position of some tags in the Media Presentation Description (MPD).  When set to FULL, elements like SegmentTemplate and ContentProtection are included in each Representation.  When set to COMPACT, duplicate elements are combined and presented at the AdaptationSet level.
+          type: string
+          enum:
+            - FULL
+            - COMPACT
+            - DRM_TOP_LEVEL_COMPACT
         SegmentTemplateFormat:
-          description: Determines the type of SegmentTemplate included in the Media Presentation Description (MPD). When set to NUMBER_WITH_TIMELINE, a full timeline is presented in each SegmentTemplate, with $Number$ media URLs. When set to TIME_WITH_TIMELINE, a full timeline is presented in each SegmentTemplate, with $Time$ media URLs. When set to NUMBER_WITH_DURATION, only a duration is included in each SegmentTemplate, with $Number$ media URLs.
+          description: Determines the type of SegmentTemplate included in the Media Presentation Description (MPD).  When set to NUMBER_WITH_TIMELINE, a full timeline is presented in each SegmentTemplate, with $Number$ media URLs.  When set to TIME_WITH_TIMELINE, a full timeline is presented in each SegmentTemplate, with $Time$ media URLs. When set to NUMBER_WITH_DURATION, only a duration is included in each SegmentTemplate, with $Number$ media URLs.
           type: string
           enum:
             - NUMBER_WITH_TIMELINE
             - TIME_WITH_TIMELINE
             - NUMBER_WITH_DURATION
-        IncludeEncoderConfigurationInSegments:
-          description: When includeEncoderConfigurationInSegments is set to true, MediaPackage places your encoder's Sequence Parameter Set (SPS), Picture Parameter Set (PPS), and Video Parameter Set (VPS) metadata in every video segment instead of in the init fragment. This lets you use different SPS/PPS/VPS settings for your assets during content playback.
-          type: boolean
-        IncludeIframeOnlyStream:
-          description: When enabled, an I-Frame only stream will be included in the output.
-          type: boolean
-      required:
-        - DashManifests
+        AdTriggers:
+          description: A list of SCTE-35 message types that are treated as ad markers in the output.  If empty, no ad markers are output.  Specify multiple items to create ad markers for all of the included message types.
+          type: array
+          items:
+            type: string
+            enum:
+              - SPLICE_INSERT
+              - BREAK
+              - PROVIDER_ADVERTISEMENT
+              - DISTRIBUTOR_ADVERTISEMENT
+              - PROVIDER_PLACEMENT_OPPORTUNITY
+              - DISTRIBUTOR_PLACEMENT_OPPORTUNITY
+              - PROVIDER_OVERLAY_PLACEMENT_OPPORTUNITY
+              - DISTRIBUTOR_OVERLAY_PLACEMENT_OPPORTUNITY
+        AdsOnDeliveryRestrictions:
+          $ref: '#/components/schemas/AdsOnDeliveryRestrictions'
+        Encryption:
+          $ref: '#/components/schemas/DashEncryption'
+        StreamSelection:
+          $ref: '#/components/schemas/StreamSelection'
+        UtcTiming:
+          description: Determines the type of UTCTiming included in the Media Presentation Description (MPD)
+          type: string
+          enum:
+            - HTTP-XSDATE
+            - HTTP-ISO
+            - HTTP-HEAD
+            - NONE
+        UtcTimingUri:
+          description: Specifies the value attribute of the UTCTiming field when utcTiming is set to HTTP-ISO, HTTP-HEAD or HTTP-XSDATE
+          type: string
     DashEncryption:
-      type: object
       description: A Dynamic Adaptive Streaming over HTTP (DASH) encryption configuration.
+      type: object
       additionalProperties: false
+      required:
+        - SpekeKeyProvider
       properties:
+        KeyRotationIntervalSeconds:
+          description: Time (in seconds) between each encryption key rotation.
+          type: integer
         SpekeKeyProvider:
           $ref: '#/components/schemas/SpekeKeyProvider'
-      required:
-        - SpekeKeyProvider
     Authorization:
+      description: CDN Authorization credentials
       type: object
       additionalProperties: false
+      required:
+        - SecretsRoleArn
+        - CdnIdentifierSecret
       properties:
-        CdnIdentifierSecret:
-          description: The Amazon Resource Name (ARN) for the secret in AWS Secrets Manager that is used for CDN authorization.
-          type: string
         SecretsRoleArn:
           description: The Amazon Resource Name (ARN) for the IAM role that allows MediaPackage to communicate with AWS Secrets Manager.
           type: string
-      required:
-        - CdnIdentifierSecret
-        - SecretsRoleArn
+        CdnIdentifierSecret:
+          description: The Amazon Resource Name (ARN) for the secret in Secrets Manager that your Content Distribution Network (CDN) uses for authorization to access your endpoint.
+          type: string
     HlsPackage:
       description: An HTTP Live Streaming (HLS) packaging configuration.
       type: object
       additionalProperties: false
       properties:
-        Encryption:
-          $ref: '#/components/schemas/HlsEncryption'
-        HlsManifests:
-          description: A list of HLS manifest configurations.
+        SegmentDurationSeconds:
+          description: Duration (in seconds) of each fragment. Actual fragments will be rounded to the nearest multiple of the source fragment duration.
+          type: integer
+        PlaylistWindowSeconds:
+          description: Time window (in seconds) contained in each parent manifest.
+          type: integer
+        PlaylistType:
+          description: The HTTP Live Streaming (HLS) playlist type. When either "EVENT" or "VOD" is specified, a corresponding EXT-X-PLAYLIST-TYPE entry will be included in the media playlist.
+          type: string
+          enum:
+            - NONE
+            - EVENT
+            - VOD
+        AdMarkers:
+          description: >-
+            This setting controls how ad markers are included in the packaged OriginEndpoint. "NONE" will omit all SCTE-35 ad markers from the output. "PASSTHROUGH" causes the manifest to contain a copy of the SCTE-35 ad markers (comments) taken directly from the input HTTP Live Streaming (HLS) manifest. "SCTE35_ENHANCED" generates ad markers and blackout tags based on SCTE-35 messages in the input source. "DATERANGE" inserts EXT-X-DATERANGE tags to signal ad and program transition events in HLS
+            and CMAF manifests. For this option, you must set a programDateTimeIntervalSeconds value that is greater than 0.
+          type: string
+          enum:
+            - NONE
+            - SCTE35_ENHANCED
+            - PASSTHROUGH
+            - DATERANGE
+        AdTriggers:
+          description: A list of SCTE-35 message types that are treated as ad markers in the output.  If empty, no ad markers are output.  Specify multiple items to create ad markers for all of the included message types.
           type: array
           items:
-            $ref: '#/components/schemas/HlsManifest'
-        IncludeDvbSubtitles:
-          description: When enabled, MediaPackage passes through digital video broadcasting (DVB) subtitles into the output.
+            type: string
+            enum:
+              - SPLICE_INSERT
+              - BREAK
+              - PROVIDER_ADVERTISEMENT
+              - DISTRIBUTOR_ADVERTISEMENT
+              - PROVIDER_PLACEMENT_OPPORTUNITY
+              - DISTRIBUTOR_PLACEMENT_OPPORTUNITY
+              - PROVIDER_OVERLAY_PLACEMENT_OPPORTUNITY
+              - DISTRIBUTOR_OVERLAY_PLACEMENT_OPPORTUNITY
+        AdsOnDeliveryRestrictions:
+          $ref: '#/components/schemas/AdsOnDeliveryRestrictions'
+        ProgramDateTimeIntervalSeconds:
+          description: >-
+            The interval (in seconds) between each EXT-X-PROGRAM-DATE-TIME tag inserted into manifests. Additionally, when an interval is specified ID3Timed Metadata messages will be generated every 5 seconds using the ingest time of the content. If the interval is not specified, or set to 0, then no EXT-X-PROGRAM-DATE-TIME tags will be inserted into manifests and no ID3Timed Metadata messages will be generated. Note that irrespective of this parameter, if any ID3 Timed Metadata is found in HTTP
+            Live Streaming (HLS) input, it will be passed through to HLS output.
+          type: integer
+        IncludeIframeOnlyStream:
+          description: When enabled, an I-Frame only stream will be included in the output.
           type: boolean
-        SegmentDurationSeconds:
-          $ref: '#/components/schemas/SegmentDurationSeconds'
         UseAudioRenditionGroup:
           description: When enabled, audio streams will be placed in rendition groups in the output.
           type: boolean
-      required:
-        - HlsManifests
+        IncludeDvbSubtitles:
+          description: When enabled, MediaPackage passes through digital video broadcasting (DVB) subtitles into the output.
+          type: boolean
+        Encryption:
+          $ref: '#/components/schemas/HlsEncryption'
+        StreamSelection:
+          $ref: '#/components/schemas/StreamSelection'
     HlsEncryption:
       description: An HTTP Live Streaming (HLS) encryption configuration.
       type: object
       additionalProperties: false
+      required:
+        - SpekeKeyProvider
       properties:
-        ConstantInitializationVector:
-          description: An HTTP Live Streaming (HLS) encryption configuration.
-          type: string
         EncryptionMethod:
           description: The encryption method to use.
           type: string
           enum:
             - AES_128
             - SAMPLE_AES
+        ConstantInitializationVector:
+          description: A constant initialization vector for encryption (optional). When not specified the initialization vector will be periodically rotated.
+          type: string
+        KeyRotationIntervalSeconds:
+          description: Interval (in seconds) between each encryption key rotation.
+          type: integer
+        RepeatExtXKey:
+          description: When enabled, the EXT-X-KEY tag will be repeated in output manifests.
+          type: boolean
         SpekeKeyProvider:
           $ref: '#/components/schemas/SpekeKeyProvider'
-      required:
-        - SpekeKeyProvider
     CmafPackage:
-      description: A CMAF packaging configuration.
+      description: A Common Media Application Format (CMAF) packaging configuration.
       type: object
       additionalProperties: false
       properties:
+        SegmentDurationSeconds:
+          description: Duration (in seconds) of each segment. Actual segments will be rounded to the nearest multiple of the source segment duration.
+          type: integer
+        SegmentPrefix:
+          description: An optional custom string that is prepended to the name of each segment. If not specified, it defaults to the ChannelId.
+          type: string
         Encryption:
           $ref: '#/components/schemas/CmafEncryption'
+        StreamSelection:
+          $ref: '#/components/schemas/StreamSelection'
         HlsManifests:
-          description: A list of HLS manifest configurations.
+          description: A list of HLS manifest configurations
           type: array
           items:
             $ref: '#/components/schemas/HlsManifest'
-        SegmentDurationSeconds:
-          $ref: '#/components/schemas/SegmentDurationSeconds'
-        IncludeEncoderConfigurationInSegments:
-          description: When includeEncoderConfigurationInSegments is set to true, MediaPackage places your encoder's Sequence Parameter Set (SPS), Picture Parameter Set (PPS), and Video Parameter Set (VPS) metadata in every video segment instead of in the init fragment. This lets you use different SPS/PPS/VPS settings for your assets during content playback.
-          type: boolean
-      required:
-        - HlsManifests
     CmafEncryption:
+      description: A Common Media Application Format (CMAF) encryption configuration.
       type: object
-      description: A CMAF encryption configuration.
       additionalProperties: false
+      required:
+        - SpekeKeyProvider
       properties:
+        KeyRotationIntervalSeconds:
+          description: Time (in seconds) between each encryption key rotation.
+          type: integer
         SpekeKeyProvider:
           $ref: '#/components/schemas/SpekeKeyProvider'
-      required:
-        - SpekeKeyProvider
+        ConstantInitializationVector:
+          description: An optional 128-bit, 16-byte hex value represented by a 32-character string, used in conjunction with the key for encrypting blocks. If you don't specify a value, then MediaPackage creates the constant initialization vector (IV).
+          type: string
+          pattern: \A[0-9a-fA-F]+\Z
+          minLength: 32
+          maxLength: 32
+        EncryptionMethod:
+          description: The encryption method used
+          type: string
+          enum:
+            - SAMPLE_AES
+            - AES_CTR
     HlsManifest:
-      description: An HTTP Live Streaming (HLS) manifest configuration.
+      description: A HTTP Live Streaming (HLS) manifest configuration.
       type: object
       additionalProperties: false
+      required:
+        - Id
       properties:
+        Id:
+          description: The ID of the manifest. The ID must be unique within the OriginEndpoint and it cannot be changed after it is created.
+          type: string
+        ManifestName:
+          description: An optional short string appended to the end of the OriginEndpoint URL. If not specified, defaults to the manifestName for the OriginEndpoint.
+          type: string
+        Url:
+          description: The URL of the packaged OriginEndpoint for consumption.
+          type: string
+        PlaylistWindowSeconds:
+          description: Time window (in seconds) contained in each parent manifest.
+          type: integer
+        PlaylistType:
+          description: The HTTP Live Streaming (HLS) playlist type. When either "EVENT" or "VOD" is specified, a corresponding EXT-X-PLAYLIST-TYPE entry will be included in the media playlist.
+          type: string
+          enum:
+            - NONE
+            - EVENT
+            - VOD
         AdMarkers:
-          description: This setting controls how ad markers are included in the packaged OriginEndpoint. "NONE" will omit all SCTE-35 ad markers from the output. "PASSTHROUGH" causes the manifest to contain a copy of the SCTE-35 ad markers (comments) taken directly from the input HTTP Live Streaming (HLS) manifest. "SCTE35_ENHANCED" generates ad markers and blackout tags based on SCTE-35 messages in the input source.
+          description: >-
+            This setting controls how ad markers are included in the packaged OriginEndpoint. "NONE" will omit all SCTE-35 ad markers from the output. "PASSTHROUGH" causes the manifest to contain a copy of the SCTE-35 ad markers (comments) taken directly from the input HTTP Live Streaming (HLS) manifest. "SCTE35_ENHANCED" generates ad markers and blackout tags based on SCTE-35 messages in the input source. "DATERANGE" inserts EXT-X-DATERANGE tags to signal ad and program transition events in HLS
+            and CMAF manifests. For this option, you must set a programDateTimeIntervalSeconds value that is greater than 0.
           type: string
           enum:
             - NONE
             - SCTE35_ENHANCED
             - PASSTHROUGH
-        IncludeIframeOnlyStream:
-          description: When enabled, an I-Frame only stream will be included in the output.
-          type: boolean
-        ManifestName:
-          $ref: '#/components/schemas/ManifestName'
+            - DATERANGE
         ProgramDateTimeIntervalSeconds:
           description: >-
             The interval (in seconds) between each EXT-X-PROGRAM-DATE-TIME tag inserted into manifests. Additionally, when an interval is specified ID3Timed Metadata messages will be generated every 5 seconds using the ingest time of the content. If the interval is not specified, or set to 0, then no EXT-X-PROGRAM-DATE-TIME tags will be inserted into manifests and no ID3Timed Metadata messages will be generated. Note that irrespective of this parameter, if any ID3 Timed Metadata is found in HTTP
             Live Streaming (HLS) input, it will be passed through to HLS output.
           type: integer
-        RepeatExtXKey:
-          description: When enabled, the EXT-X-KEY tag will be repeated in output manifests.
+        IncludeIframeOnlyStream:
+          description: When enabled, an I-Frame only stream will be included in the output.
           type: boolean
-        StreamSelection:
-          $ref: '#/components/schemas/StreamSelection'
+        AdTriggers:
+          description: A list of SCTE-35 message types that are treated as ad markers in the output.  If empty, no ad markers are output.  Specify multiple items to create ad markers for all of the included message types.
+          type: array
+          items:
+            type: string
+            enum:
+              - SPLICE_INSERT
+              - BREAK
+              - PROVIDER_ADVERTISEMENT
+              - DISTRIBUTOR_ADVERTISEMENT
+              - PROVIDER_PLACEMENT_OPPORTUNITY
+              - DISTRIBUTOR_PLACEMENT_OPPORTUNITY
+              - PROVIDER_OVERLAY_PLACEMENT_OPPORTUNITY
+              - DISTRIBUTOR_OVERLAY_PLACEMENT_OPPORTUNITY
+        AdsOnDeliveryRestrictions:
+          $ref: '#/components/schemas/AdsOnDeliveryRestrictions'
     StreamSelection:
       description: A StreamSelection configuration.
       type: object
@@ -815,11 +960,15 @@ components:
       description: A configuration for accessing an external Secure Packager and Encoder Key Exchange (SPEKE) service that will provide encryption keys.
       type: object
       additionalProperties: false
+      required:
+        - ResourceId
+        - SystemIds
+        - Url
+        - RoleArn
       properties:
-        EncryptionContractConfiguration:
-          $ref: '#/components/schemas/EncryptionContractConfiguration'
-        RoleArn:
-          $ref: '#/components/schemas/RoleArn'
+        ResourceId:
+          description: The resource ID to include in key requests.
+          type: string
         SystemIds:
           description: The system IDs to include in key requests.
           type: array
@@ -828,10 +977,14 @@ components:
         Url:
           description: The URL of the external key provider service.
           type: string
-      required:
-        - RoleArn
-        - SystemIds
-        - Url
+        RoleArn:
+          description: An Amazon Resource Name (ARN) of an IAM role that AWS Elemental MediaPackage will assume when accessing the key provider service.
+          type: string
+        CertificateArn:
+          description: An Amazon Resource Name (ARN) of a Certificate Manager certificate that MediaPackage will use for enforcing secure end-to-end data transfer with the key provider service.
+          type: string
+        EncryptionContractConfiguration:
+          $ref: '#/components/schemas/EncryptionContractConfiguration'
     EncryptionContractConfiguration:
       description: The configuration to use for encrypting one or more content tracks separately for endpoints that use SPEKE 2.0.
       type: object
@@ -979,12 +1132,60 @@ components:
     RoleArn:
       description: An Amazon Resource Name (ARN) of an IAM role that AWS Elemental MediaPackage will assume when accessing the key provider service.
       type: string
+    PackagingConfiguration_SpekeKeyProvider:
+      description: A configuration for accessing an external Secure Packager and Encoder Key Exchange (SPEKE) service that will provide encryption keys.
+      type: object
+      additionalProperties: false
+      properties:
+        EncryptionContractConfiguration:
+          $ref: '#/components/schemas/EncryptionContractConfiguration'
+        RoleArn:
+          $ref: '#/components/schemas/RoleArn'
+        SystemIds:
+          description: The system IDs to include in key requests.
+          type: array
+          items:
+            type: string
+        Url:
+          description: The URL of the external key provider service.
+          type: string
+      required:
+        - RoleArn
+        - SystemIds
+        - Url
     SegmentDurationSeconds:
       description: Duration (in seconds) of each fragment. Actual fragments will be rounded to the nearest multiple of the source fragment duration.
       type: integer
     ManifestName:
       description: An optional string to include in the name of the manifest.
       type: string
+    PackagingConfiguration_HlsManifest:
+      description: An HTTP Live Streaming (HLS) manifest configuration.
+      type: object
+      additionalProperties: false
+      properties:
+        AdMarkers:
+          description: This setting controls how ad markers are included in the packaged OriginEndpoint. "NONE" will omit all SCTE-35 ad markers from the output. "PASSTHROUGH" causes the manifest to contain a copy of the SCTE-35 ad markers (comments) taken directly from the input HTTP Live Streaming (HLS) manifest. "SCTE35_ENHANCED" generates ad markers and blackout tags based on SCTE-35 messages in the input source.
+          type: string
+          enum:
+            - NONE
+            - SCTE35_ENHANCED
+            - PASSTHROUGH
+        IncludeIframeOnlyStream:
+          description: When enabled, an I-Frame only stream will be included in the output.
+          type: boolean
+        ManifestName:
+          $ref: '#/components/schemas/ManifestName'
+        ProgramDateTimeIntervalSeconds:
+          description: >-
+            The interval (in seconds) between each EXT-X-PROGRAM-DATE-TIME tag inserted into manifests. Additionally, when an interval is specified ID3Timed Metadata messages will be generated every 5 seconds using the ingest time of the content. If the interval is not specified, or set to 0, then no EXT-X-PROGRAM-DATE-TIME tags will be inserted into manifests and no ID3Timed Metadata messages will be generated. Note that irrespective of this parameter, if any ID3 Timed Metadata is found in HTTP
+            Live Streaming (HLS) input, it will be passed through to HLS output.
+          type: integer
+        RepeatExtXKey:
+          description: When enabled, the EXT-X-KEY tag will be repeated in output manifests.
+          type: boolean
+        StreamSelection:
+          $ref: '#/components/schemas/StreamSelection'
     DashManifest:
       description: A DASH manifest configuration.
       type: object
@@ -1024,6 +1225,144 @@ components:
           $ref: '#/components/schemas/ManifestName'
         StreamSelection:
           $ref: '#/components/schemas/StreamSelection'
+    PackagingConfiguration_CmafEncryption:
+      type: object
+      description: A CMAF encryption configuration.
+      additionalProperties: false
+      properties:
+        SpekeKeyProvider:
+          $ref: '#/components/schemas/PackagingConfiguration_SpekeKeyProvider'
+      required:
+        - SpekeKeyProvider
+    PackagingConfiguration_CmafPackage:
+      description: A CMAF packaging configuration.
+      type: object
+      additionalProperties: false
+      properties:
+        Encryption:
+          $ref: '#/components/schemas/PackagingConfiguration_CmafEncryption'
+        HlsManifests:
+          description: A list of HLS manifest configurations.
+          type: array
+          items:
+            $ref: '#/components/schemas/PackagingConfiguration_HlsManifest'
+        SegmentDurationSeconds:
+          $ref: '#/components/schemas/SegmentDurationSeconds'
+        IncludeEncoderConfigurationInSegments:
+          description: When includeEncoderConfigurationInSegments is set to true, MediaPackage places your encoder's Sequence Parameter Set (SPS), Picture Parameter Set (PPS), and Video Parameter Set (VPS) metadata in every video segment instead of in the init fragment. This lets you use different SPS/PPS/VPS settings for your assets during content playback.
+          type: boolean
+      required:
+        - HlsManifests
+    PackagingConfiguration_DashEncryption:
+      type: object
+      description: A Dynamic Adaptive Streaming over HTTP (DASH) encryption configuration.
+      additionalProperties: false
+      properties:
+        SpekeKeyProvider:
+          $ref: '#/components/schemas/PackagingConfiguration_SpekeKeyProvider'
+      required:
+        - SpekeKeyProvider
+    PackagingConfiguration_DashPackage:
+      type: object
+      description: A Dynamic Adaptive Streaming over HTTP (DASH) packaging configuration.
+      additionalProperties: false
+      properties:
+        DashManifests:
+          description: A list of DASH manifest configurations.
+          type: array
+          items:
+            $ref: '#/components/schemas/DashManifest'
+        Encryption:
+          $ref: '#/components/schemas/PackagingConfiguration_DashEncryption'
+        PeriodTriggers:
+          description: A list of triggers that controls when the outgoing Dynamic Adaptive Streaming over HTTP (DASH) Media Presentation Description (MPD) will be partitioned into multiple periods. If empty, the content will not be partitioned into more than one period. If the list contains "ADS", new periods will be created where the Asset contains SCTE-35 ad markers.
+          type: array
+          items:
+            type: string
+            enum:
+              - ADS
+        SegmentDurationSeconds:
+          $ref: '#/components/schemas/SegmentDurationSeconds'
+        SegmentTemplateFormat:
+          description: Determines the type of SegmentTemplate included in the Media Presentation Description (MPD). When set to NUMBER_WITH_TIMELINE, a full timeline is presented in each SegmentTemplate, with $Number$ media URLs. When set to TIME_WITH_TIMELINE, a full timeline is presented in each SegmentTemplate, with $Time$ media URLs. When set to NUMBER_WITH_DURATION, only a duration is included in each SegmentTemplate, with $Number$ media URLs.
+          type: string
+          enum:
+            - NUMBER_WITH_TIMELINE
+            - TIME_WITH_TIMELINE
+            - NUMBER_WITH_DURATION
+        IncludeEncoderConfigurationInSegments:
+          description: When includeEncoderConfigurationInSegments is set to true, MediaPackage places your encoder's Sequence Parameter Set (SPS), Picture Parameter Set (PPS), and Video Parameter Set (VPS) metadata in every video segment instead of in the init fragment. This lets you use different SPS/PPS/VPS settings for your assets during content playback.
+          type: boolean
+        IncludeIframeOnlyStream:
+          description: When enabled, an I-Frame only stream will be included in the output.
+          type: boolean
+      required:
+        - DashManifests
+    PackagingConfiguration_HlsEncryption:
+      description: An HTTP Live Streaming (HLS) encryption configuration.
+      type: object
+      additionalProperties: false
+      properties:
+        ConstantInitializationVector:
+          description: An HTTP Live Streaming (HLS) encryption configuration.
+          type: string
+        EncryptionMethod:
+          description: The encryption method to use.
+          type: string
+          enum:
+            - AES_128
+            - SAMPLE_AES
+        SpekeKeyProvider:
+          $ref: '#/components/schemas/PackagingConfiguration_SpekeKeyProvider'
+      required:
+        - SpekeKeyProvider
+    PackagingConfiguration_HlsPackage:
+      description: An HTTP Live Streaming (HLS) packaging configuration.
+      type: object
+      additionalProperties: false
+      properties:
+        Encryption:
+          $ref: '#/components/schemas/PackagingConfiguration_HlsEncryption'
+        HlsManifests:
+          description: A list of HLS manifest configurations.
+          type: array
+          items:
+            $ref: '#/components/schemas/PackagingConfiguration_HlsManifest'
+        IncludeDvbSubtitles:
+          description: When enabled, MediaPackage passes through digital video broadcasting (DVB) subtitles into the output.
+          type: boolean
+        SegmentDurationSeconds:
+          $ref: '#/components/schemas/SegmentDurationSeconds'
+        UseAudioRenditionGroup:
+          description: When enabled, audio streams will be placed in rendition groups in the output.
+          type: boolean
+      required:
+        - HlsManifests
+    PackagingConfiguration_MssEncryption:
+      description: A CMAF encryption configuration.
+      type: object
+      additionalProperties: false
+      properties:
+        SpekeKeyProvider:
+          $ref: '#/components/schemas/PackagingConfiguration_SpekeKeyProvider'
+      required:
+        - SpekeKeyProvider
+    PackagingConfiguration_MssPackage:
+      type: object
+      description: A Microsoft Smooth Streaming (MSS) PackagingConfiguration.
+      additionalProperties: false
+      properties:
+        Encryption:
+          $ref: '#/components/schemas/PackagingConfiguration_MssEncryption'
+        MssManifests:
+          description: A list of MSS manifest configurations.
+          type: array
+          items:
+            $ref: '#/components/schemas/MssManifest'
+        SegmentDurationSeconds:
+          $ref: '#/components/schemas/SegmentDurationSeconds'
+      required:
+        - MssManifests
     PackagingConfiguration:
       type: object
       properties:
@@ -1038,16 +1377,16 @@ components:
           type: string
         CmafPackage:
           description: A CMAF packaging configuration.
-          $ref: '#/components/schemas/CmafPackage'
+          $ref: '#/components/schemas/PackagingConfiguration_CmafPackage'
         DashPackage:
           description: A Dynamic Adaptive Streaming over HTTP (DASH) packaging configuration.
-          $ref: '#/components/schemas/DashPackage'
+          $ref: '#/components/schemas/PackagingConfiguration_DashPackage'
         HlsPackage:
           description: An HTTP Live Streaming (HLS) packaging configuration.
-          $ref: '#/components/schemas/HlsPackage'
+          $ref: '#/components/schemas/PackagingConfiguration_HlsPackage'
         MssPackage:
           description: A Microsoft Smooth Streaming (MSS) PackagingConfiguration.
-          $ref: '#/components/schemas/MssPackage'
+          $ref: '#/components/schemas/PackagingConfiguration_MssPackage'
         Tags:
           description: A collection of tags associated with a resource
           type: array
@@ -1093,6 +1432,29 @@ components:
         list:
           - mediapackage-vod:ListPackagingConfigurations
           - mediapackage-vod:DescribePackagingGroup
+    PackagingGroup_Authorization:
+      type: object
+      additionalProperties: false
+      properties:
+        CdnIdentifierSecret:
+          description: The Amazon Resource Name (ARN) for the secret in AWS Secrets Manager that is used for CDN authorization.
+          type: string
+        SecretsRoleArn:
+          description: The Amazon Resource Name (ARN) for the IAM role that allows MediaPackage to communicate with AWS Secrets Manager.
+          type: string
+      required:
+        - CdnIdentifierSecret
+        - SecretsRoleArn
+    PackagingGroup_LogConfiguration:
+      type: object
+      additionalProperties: false
+      properties:
+        LogGroupName:
+          description: 'Sets a custom AWS CloudWatch log group name for egress logs. If a log group name isn''t specified, the default name is used: /aws/MediaPackage/VodEgressAccessLogs.'
+          type: string
+          pattern: \A\/aws\/MediaPackage\/[0-9a-zA-Z-_\/\.#]+\Z
+          minLength: 1
+          maxLength: 512
     PackagingGroup:
       type: object
       properties:
@@ -1110,7 +1472,7 @@ components:
           type: string
         Authorization:
           description: CDN Authorization
-          $ref: '#/components/schemas/Authorization'
+          $ref: '#/components/schemas/PackagingGroup_Authorization'
         Tags:
           description: A collection of tags associated with a resource
           type: array
@@ -1119,7 +1481,7 @@ components:
             $ref: '#/components/schemas/Tag'
         EgressAccessLogs:
           description: The configuration parameters for egress access logging.
-          $ref: '#/components/schemas/LogConfiguration'
+          $ref: '#/components/schemas/PackagingGroup_LogConfiguration'
       required:
         - Id
       x-stackql-resource-name: packaging_group
@@ -1355,16 +1717,16 @@ components:
               type: string
             CmafPackage:
               description: A CMAF packaging configuration.
-              $ref: '#/components/schemas/CmafPackage'
+              $ref: '#/components/schemas/PackagingConfiguration_CmafPackage'
             DashPackage:
               description: A Dynamic Adaptive Streaming over HTTP (DASH) packaging configuration.
-              $ref: '#/components/schemas/DashPackage'
+              $ref: '#/components/schemas/PackagingConfiguration_DashPackage'
             HlsPackage:
               description: An HTTP Live Streaming (HLS) packaging configuration.
-              $ref: '#/components/schemas/HlsPackage'
+              $ref: '#/components/schemas/PackagingConfiguration_HlsPackage'
             MssPackage:
               description: A Microsoft Smooth Streaming (MSS) PackagingConfiguration.
-              $ref: '#/components/schemas/MssPackage'
+              $ref: '#/components/schemas/PackagingConfiguration_MssPackage'
             Tags:
               description: A collection of tags associated with a resource
               type: array
@@ -1402,7 +1764,7 @@ components:
               type: string
             Authorization:
               description: CDN Authorization
-              $ref: '#/components/schemas/Authorization'
+              $ref: '#/components/schemas/PackagingGroup_Authorization'
             Tags:
               description: A collection of tags associated with a resource
               type: array
@@ -1411,7 +1773,7 @@ components:
                 $ref: '#/components/schemas/Tag'
             EgressAccessLogs:
               description: The configuration parameters for egress access logging.
-              $ref: '#/components/schemas/LogConfiguration'
+              $ref: '#/components/schemas/PackagingGroup_LogConfiguration'
           x-stackQL-stringOnly: true
       x-title: CreatePackagingGroupRequest
       type: object
@@ -1429,7 +1791,7 @@ components:
       id: awscc.mediapackage.assets
       x-cfn-schema-name: Asset
       x-cfn-type-name: AWS::MediaPackage::Asset
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
       x-type: cloud_control
       methods:
@@ -1514,8 +1876,7 @@ components:
       id: awscc.mediapackage.assets_list_only
       x-cfn-schema-name: Asset
       x-cfn-type-name: AWS::MediaPackage::Asset
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1545,7 +1906,7 @@ components:
       id: awscc.mediapackage.channels
       x-cfn-schema-name: Channel
       x-cfn-type-name: AWS::MediaPackage::Channel
-      x-identifiers:
+      x-identifiers: &ref_1
         - Id
       x-type: cloud_control
       methods:
@@ -1643,8 +2004,7 @@ components:
       id: awscc.mediapackage.channels_list_only
       x-cfn-schema-name: Channel
       x-cfn-type-name: AWS::MediaPackage::Channel
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1674,7 +2034,7 @@ components:
       id: awscc.mediapackage.origin_endpoints
       x-cfn-schema-name: OriginEndpoint
       x-cfn-type-name: AWS::MediaPackage::OriginEndpoint
-      x-identifiers:
+      x-identifiers: &ref_2
         - Id
       x-type: cloud_control
       methods:
@@ -1790,8 +2150,7 @@ components:
       id: awscc.mediapackage.origin_endpoints_list_only
       x-cfn-schema-name: OriginEndpoint
       x-cfn-type-name: AWS::MediaPackage::OriginEndpoint
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1821,7 +2180,7 @@ components:
       id: awscc.mediapackage.packaging_configurations
       x-cfn-schema-name: PackagingConfiguration
       x-cfn-type-name: AWS::MediaPackage::PackagingConfiguration
-      x-identifiers:
+      x-identifiers: &ref_3
         - Id
       x-type: cloud_control
       methods:
@@ -1904,8 +2263,7 @@ components:
       id: awscc.mediapackage.packaging_configurations_list_only
       x-cfn-schema-name: PackagingConfiguration
       x-cfn-type-name: AWS::MediaPackage::PackagingConfiguration
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1935,7 +2293,7 @@ components:
       id: awscc.mediapackage.packaging_groups
       x-cfn-schema-name: PackagingGroup
       x-cfn-type-name: AWS::MediaPackage::PackagingGroup
-      x-identifiers:
+      x-identifiers: &ref_4
         - Id
       x-type: cloud_control
       methods:
@@ -2031,8 +2389,7 @@ components:
       id: awscc.mediapackage.packaging_groups_list_only
       x-cfn-schema-name: PackagingGroup
       x-cfn-type-name: AWS::MediaPackage::PackagingGroup
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/mediapackagev2.yaml b/openapi/src/awscc/v00.00.00000/services/mediapackagev2.yaml
index d203d2cec..dab7d2c95 100644
--- a/openapi/src/awscc/v00.00.00000/services/mediapackagev2.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/mediapackagev2.yaml
@@ -1736,7 +1736,7 @@ components:
       id: awscc.mediapackagev2.channels
       x-cfn-schema-name: Channel
       x-cfn-type-name: AWS::MediaPackageV2::Channel
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -1844,8 +1844,7 @@ components:
       id: awscc.mediapackagev2.channels_list_only
       x-cfn-schema-name: Channel
       x-cfn-type-name: AWS::MediaPackageV2::Channel
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1875,7 +1874,7 @@ components:
       id: awscc.mediapackagev2.channel_groups
       x-cfn-schema-name: ChannelGroup
       x-cfn-type-name: AWS::MediaPackageV2::ChannelGroup
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -1973,8 +1972,7 @@ components:
       id: awscc.mediapackagev2.channel_groups_list_only
       x-cfn-schema-name: ChannelGroup
       x-cfn-type-name: AWS::MediaPackageV2::ChannelGroup
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2095,7 +2093,7 @@ components:
       id: awscc.mediapackagev2.origin_endpoints
       x-cfn-schema-name: OriginEndpoint
       x-cfn-type-name: AWS::MediaPackageV2::OriginEndpoint
-      x-identifiers:
+      x-identifiers: &ref_2
         - Arn
       x-type: cloud_control
       methods:
@@ -2215,8 +2213,7 @@ components:
       id: awscc.mediapackagev2.origin_endpoints_list_only
       x-cfn-schema-name: OriginEndpoint
       x-cfn-type-name: AWS::MediaPackageV2::OriginEndpoint
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/mediatailor.yaml b/openapi/src/awscc/v00.00.00000/services/mediatailor.yaml
index e950d68f8..cfeebef32 100644
--- a/openapi/src/awscc/v00.00.00000/services/mediatailor.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/mediatailor.yaml
@@ -1481,7 +1481,7 @@ components:
       id: awscc.mediatailor.channels
       x-cfn-schema-name: Channel
       x-cfn-type-name: AWS::MediaTailor::Channel
-      x-identifiers:
+      x-identifiers: &ref_0
         - ChannelName
       x-type: cloud_control
       methods:
@@ -1585,8 +1585,7 @@ components:
       id: awscc.mediatailor.channels_list_only
       x-cfn-schema-name: Channel
       x-cfn-type-name: AWS::MediaTailor::Channel
-      x-identifiers:
-        - ChannelName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1704,7 +1703,7 @@ components:
       id: awscc.mediatailor.live_sources
       x-cfn-schema-name: LiveSource
       x-cfn-type-name: AWS::MediaTailor::LiveSource
-      x-identifiers:
+      x-identifiers: &ref_1
         - LiveSourceName
         - SourceLocationName
       x-type: cloud_control
@@ -1799,9 +1798,7 @@ components:
       id: awscc.mediatailor.live_sources_list_only
       x-cfn-schema-name: LiveSource
       x-cfn-type-name: AWS::MediaTailor::LiveSource
-      x-identifiers:
-        - LiveSourceName
-        - SourceLocationName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1833,7 +1830,7 @@ components:
       id: awscc.mediatailor.playback_configurations
       x-cfn-schema-name: PlaybackConfiguration
       x-cfn-type-name: AWS::MediaTailor::PlaybackConfiguration
-      x-identifiers:
+      x-identifiers: &ref_2
         - Name
       x-type: cloud_control
       methods:
@@ -1959,8 +1956,7 @@ components:
       id: awscc.mediatailor.playback_configurations_list_only
       x-cfn-schema-name: PlaybackConfiguration
       x-cfn-type-name: AWS::MediaTailor::PlaybackConfiguration
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1990,7 +1986,7 @@ components:
       id: awscc.mediatailor.source_locations
       x-cfn-schema-name: SourceLocation
       x-cfn-type-name: AWS::MediaTailor::SourceLocation
-      x-identifiers:
+      x-identifiers: &ref_3
         - SourceLocationName
       x-type: cloud_control
       methods:
@@ -2088,8 +2084,7 @@ components:
       id: awscc.mediatailor.source_locations_list_only
       x-cfn-schema-name: SourceLocation
       x-cfn-type-name: AWS::MediaTailor::SourceLocation
-      x-identifiers:
-        - SourceLocationName
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2119,7 +2114,7 @@ components:
       id: awscc.mediatailor.vod_sources
       x-cfn-schema-name: VodSource
       x-cfn-type-name: AWS::MediaTailor::VodSource
-      x-identifiers:
+      x-identifiers: &ref_4
         - SourceLocationName
         - VodSourceName
       x-type: cloud_control
@@ -2214,9 +2209,7 @@ components:
       id: awscc.mediatailor.vod_sources_list_only
       x-cfn-schema-name: VodSource
       x-cfn-type-name: AWS::MediaTailor::VodSource
-      x-identifiers:
-        - SourceLocationName
-        - VodSourceName
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/memorydb.yaml b/openapi/src/awscc/v00.00.00000/services/memorydb.yaml
index 431ec88ea..6caa2ddd8 100644
--- a/openapi/src/awscc/v00.00.00000/services/memorydb.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/memorydb.yaml
@@ -495,6 +495,26 @@ components:
         Port:
           description: 'The port number that the engine is listening on. '
           type: integer
+    Cluster_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          description: The key for the tag. May not be null.
+          pattern: ^(?!aws:)(?!memorydb:)[a-zA-Z0-9 _\.\/=+:\-@]{1,128}$
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          description: The tag's value. May be null.
+          type: string
+          pattern: ^(?!aws:)(?!memorydb:)[a-zA-Z0-9 _\.\/=+:\-@]{1,256}$
+          minLength: 1
+          maxLength: 256
+      required:
+        - Key
+        - Value
     DataTieringStatus:
       type: string
       enum:
@@ -633,7 +653,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Cluster_Tag'
       required:
         - ClusterName
         - NodeType
@@ -702,6 +722,26 @@ components:
           - memorydb:DescribeClusters
         list:
           - memorydb:DescribeClusters
+    MultiRegionCluster_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          description: The key for the tag. May not be null.
+          pattern: ^(?!aws:)(?!memorydb:)[a-zA-Z0-9 _\.\/=+:\-@]{1,128}$
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          description: The tag's value. May be null.
+          type: string
+          pattern: ^(?!aws:)(?!memorydb:)[a-zA-Z0-9 _\.\/=+:\-@]{1,256}$
+          minLength: 1
+          maxLength: 256
+      required:
+        - Key
+        - Value
     MultiRegionCluster:
       type: object
       properties:
@@ -749,7 +789,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/MultiRegionCluster_Tag'
         UpdateStrategy:
           description: An enum string value that determines the update strategy for scaling. Possible values are 'COORDINATED' and 'UNCOORDINATED'. Default is 'COORDINATED'.
           type: string
@@ -808,6 +848,26 @@ components:
           - memorydb:DescribeMultiRegionClusters
         list:
           - memorydb:DescribeMultiRegionClusters
+    ParameterGroup_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          description: The key for the tag. May not be null.
+          pattern: ^(?!aws:)(?!memorydb:)[a-zA-Z0-9 _\.\/=+:\-@]{1,128}$
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          description: The tag's value. May be null.
+          type: string
+          pattern: ^(?!aws:)(?!memorydb:)[a-zA-Z0-9 _\.\/=+:\-@]{1,256}$
+          minLength: 1
+          maxLength: 256
+      required:
+        - Key
+        - Value
     ParameterGroup:
       type: object
       properties:
@@ -827,7 +887,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ParameterGroup_Tag'
         Parameters:
           description: An map of parameter names and values for the parameter update. You must supply at least one parameter name and value; subsequent arguments are optional.
           type: object
@@ -885,6 +945,26 @@ components:
           - memorydb:DeleteParameterGroup
         list:
           - memorydb:DescribeParameterGroups
+    SubnetGroup_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          description: The key for the tag. May not be null.
+          pattern: ^(?!aws:)(?!memorydb:)[a-zA-Z0-9 _\.\/=+:\-@]{1,128}$
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          description: The tag's value. May be null.
+          type: string
+          pattern: ^(?!aws:)(?!memorydb:)[a-zA-Z0-9 _\.\/=+:\-@]{1,256}$
+          minLength: 1
+          maxLength: 256
+      required:
+        - Key
+        - Value
     SubnetGroup:
       type: object
       properties:
@@ -909,7 +989,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/SubnetGroup_Tag'
         ARN:
           description: The Amazon Resource Name (ARN) of the subnet group.
           type: string
@@ -1235,7 +1315,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Cluster_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateClusterRequest
       type: object
@@ -1297,7 +1377,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/MultiRegionCluster_Tag'
             UpdateStrategy:
               description: An enum string value that determines the update strategy for scaling. Possible values are 'COORDINATED' and 'UNCOORDINATED'. Default is 'COORDINATED'.
               type: string
@@ -1337,7 +1417,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ParameterGroup_Tag'
             Parameters:
               description: An map of parameter names and values for the parameter update. You must supply at least one parameter name and value; subsequent arguments are optional.
               type: object
@@ -1382,7 +1462,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/SubnetGroup_Tag'
             ARN:
               description: The Amazon Resource Name (ARN) of the subnet group.
               type: string
@@ -1468,7 +1548,7 @@ components:
       id: awscc.memorydb.acls
       x-cfn-schema-name: ACL
       x-cfn-type-name: AWS::MemoryDB::ACL
-      x-identifiers:
+      x-identifiers: &ref_0
         - ACLName
       x-type: cloud_control
       methods:
@@ -1562,8 +1642,7 @@ components:
       id: awscc.memorydb.acls_list_only
       x-cfn-schema-name: ACL
       x-cfn-type-name: AWS::MemoryDB::ACL
-      x-identifiers:
-        - ACLName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1593,7 +1672,7 @@ components:
       id: awscc.memorydb.clusters
       x-cfn-schema-name: Cluster
       x-cfn-type-name: AWS::MemoryDB::Cluster
-      x-identifiers:
+      x-identifiers: &ref_1
         - ClusterName
       x-type: cloud_control
       methods:
@@ -1741,8 +1820,7 @@ components:
       id: awscc.memorydb.clusters_list_only
       x-cfn-schema-name: Cluster
       x-cfn-type-name: AWS::MemoryDB::Cluster
-      x-identifiers:
-        - ClusterName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1772,7 +1850,7 @@ components:
       id: awscc.memorydb.multi_region_clusters
       x-cfn-schema-name: MultiRegionCluster
       x-cfn-type-name: AWS::MemoryDB::MultiRegionCluster
-      x-identifiers:
+      x-identifiers: &ref_2
         - MultiRegionClusterName
       x-type: cloud_control
       methods:
@@ -1882,8 +1960,7 @@ components:
       id: awscc.memorydb.multi_region_clusters_list_only
       x-cfn-schema-name: MultiRegionCluster
       x-cfn-type-name: AWS::MemoryDB::MultiRegionCluster
-      x-identifiers:
-        - MultiRegionClusterName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1913,7 +1990,7 @@ components:
       id: awscc.memorydb.parameter_groups
       x-cfn-schema-name: ParameterGroup
       x-cfn-type-name: AWS::MemoryDB::ParameterGroup
-      x-identifiers:
+      x-identifiers: &ref_3
         - ParameterGroupName
       x-type: cloud_control
       methods:
@@ -2009,8 +2086,7 @@ components:
       id: awscc.memorydb.parameter_groups_list_only
       x-cfn-schema-name: ParameterGroup
       x-cfn-type-name: AWS::MemoryDB::ParameterGroup
-      x-identifiers:
-        - ParameterGroupName
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2040,7 +2116,7 @@ components:
       id: awscc.memorydb.subnet_groups
       x-cfn-schema-name: SubnetGroup
       x-cfn-type-name: AWS::MemoryDB::SubnetGroup
-      x-identifiers:
+      x-identifiers: &ref_4
         - SubnetGroupName
       x-type: cloud_control
       methods:
@@ -2136,8 +2212,7 @@ components:
       id: awscc.memorydb.subnet_groups_list_only
       x-cfn-schema-name: SubnetGroup
       x-cfn-type-name: AWS::MemoryDB::SubnetGroup
-      x-identifiers:
-        - SubnetGroupName
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2167,7 +2242,7 @@ components:
       id: awscc.memorydb.users
       x-cfn-schema-name: User
       x-cfn-type-name: AWS::MemoryDB::User
-      x-identifiers:
+      x-identifiers: &ref_5
         - UserName
       x-type: cloud_control
       methods:
@@ -2263,8 +2338,7 @@ components:
       id: awscc.memorydb.users_list_only
       x-cfn-schema-name: User
       x-cfn-type-name: AWS::MemoryDB::User
-      x-identifiers:
-        - UserName
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/mpa.yaml b/openapi/src/awscc/v00.00.00000/services/mpa.yaml
index bfb6c5b44..24f102138 100644
--- a/openapi/src/awscc/v00.00.00000/services/mpa.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/mpa.yaml
@@ -774,7 +774,7 @@ components:
       id: awscc.mpa.approval_teams
       x-cfn-schema-name: ApprovalTeam
       x-cfn-type-name: AWS::MPA::ApprovalTeam
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -888,8 +888,7 @@ components:
       id: awscc.mpa.approval_teams_list_only
       x-cfn-schema-name: ApprovalTeam
       x-cfn-type-name: AWS::MPA::ApprovalTeam
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -919,7 +918,7 @@ components:
       id: awscc.mpa.identity_sources
       x-cfn-schema-name: IdentitySource
       x-cfn-type-name: AWS::MPA::IdentitySource
-      x-identifiers:
+      x-identifiers: &ref_1
         - IdentitySourceArn
       x-type: cloud_control
       methods:
@@ -1019,8 +1018,7 @@ components:
       id: awscc.mpa.identity_sources_list_only
       x-cfn-schema-name: IdentitySource
       x-cfn-type-name: AWS::MPA::IdentitySource
-      x-identifiers:
-        - IdentitySourceArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/msk.yaml b/openapi/src/awscc/v00.00.00000/services/msk.yaml
index dde28f084..b0d7cc085 100644
--- a/openapi/src/awscc/v00.00.00000/services/msk.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/msk.yaml
@@ -673,10 +673,10 @@ components:
       type: object
       additionalProperties: false
       properties:
+        Scram:
+          $ref: '#/components/schemas/Scram'
         Iam:
           $ref: '#/components/schemas/Iam'
-      required:
-        - Iam
     Scram:
       type: object
       additionalProperties: false
@@ -703,12 +703,14 @@ components:
         - Enabled
     ClientAuthentication:
       type: object
+      additionalProperties: false
       properties:
+        Tls:
+          $ref: '#/components/schemas/Tls'
         Sasl:
           $ref: '#/components/schemas/Sasl'
-      additionalProperties: false
-      required:
-        - Sasl
+        Unauthenticated:
+          $ref: '#/components/schemas/Unauthenticated'
     VpcConnectivityClientAuthentication:
       type: object
       additionalProperties: false
@@ -1342,6 +1344,22 @@ components:
             type: string
       required:
         - SubnetIds
+    ServerlessCluster_ClientAuthentication:
+      type: object
+      properties:
+        Sasl:
+          $ref: '#/components/schemas/ServerlessCluster_Sasl'
+      additionalProperties: false
+      required:
+        - Sasl
+    ServerlessCluster_Sasl:
+      type: object
+      additionalProperties: false
+      properties:
+        Iam:
+          $ref: '#/components/schemas/Iam'
+      required:
+        - Iam
     ServerlessCluster:
       type: object
       properties:
@@ -1358,7 +1376,7 @@ components:
           items:
             $ref: '#/components/schemas/VpcConfig'
         ClientAuthentication:
-          $ref: '#/components/schemas/ClientAuthentication'
+          $ref: '#/components/schemas/ServerlessCluster_ClientAuthentication'
         Tags:
           type: object
           description: A key-value pair to associate with a resource.
@@ -1780,7 +1798,7 @@ components:
               items:
                 $ref: '#/components/schemas/VpcConfig'
             ClientAuthentication:
-              $ref: '#/components/schemas/ClientAuthentication'
+              $ref: '#/components/schemas/ServerlessCluster_ClientAuthentication'
             Tags:
               type: object
               description: A key-value pair to associate with a resource.
@@ -1838,7 +1856,7 @@ components:
       id: awscc.msk.batch_scram_secrets
       x-cfn-schema-name: BatchScramSecret
       x-cfn-type-name: AWS::MSK::BatchScramSecret
-      x-identifiers:
+      x-identifiers: &ref_0
         - ClusterArn
       x-type: cloud_control
       methods:
@@ -1926,8 +1944,7 @@ components:
       id: awscc.msk.batch_scram_secrets_list_only
       x-cfn-schema-name: BatchScramSecret
       x-cfn-type-name: AWS::MSK::BatchScramSecret
-      x-identifiers:
-        - ClusterArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1957,7 +1974,7 @@ components:
       id: awscc.msk.clusters
       x-cfn-schema-name: Cluster
       x-cfn-type-name: AWS::MSK::Cluster
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -2069,8 +2086,7 @@ components:
       id: awscc.msk.clusters_list_only
       x-cfn-schema-name: Cluster
       x-cfn-type-name: AWS::MSK::Cluster
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2100,7 +2116,7 @@ components:
       id: awscc.msk.cluster_policies
       x-cfn-schema-name: ClusterPolicy
       x-cfn-type-name: AWS::MSK::ClusterPolicy
-      x-identifiers:
+      x-identifiers: &ref_2
         - ClusterArn
       x-type: cloud_control
       methods:
@@ -2190,8 +2206,7 @@ components:
       id: awscc.msk.cluster_policies_list_only
       x-cfn-schema-name: ClusterPolicy
       x-cfn-type-name: AWS::MSK::ClusterPolicy
-      x-identifiers:
-        - ClusterArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2221,7 +2236,7 @@ components:
       id: awscc.msk.configurations
       x-cfn-schema-name: Configuration
       x-cfn-type-name: AWS::MSK::Configuration
-      x-identifiers:
+      x-identifiers: &ref_3
         - Arn
       x-type: cloud_control
       methods:
@@ -2317,8 +2332,7 @@ components:
       id: awscc.msk.configurations_list_only
       x-cfn-schema-name: Configuration
       x-cfn-type-name: AWS::MSK::Configuration
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2348,7 +2362,7 @@ components:
       id: awscc.msk.replicators
       x-cfn-schema-name: Replicator
       x-cfn-type-name: AWS::MSK::Replicator
-      x-identifiers:
+      x-identifiers: &ref_4
         - ReplicatorArn
       x-type: cloud_control
       methods:
@@ -2448,8 +2462,7 @@ components:
       id: awscc.msk.replicators_list_only
       x-cfn-schema-name: Replicator
       x-cfn-type-name: AWS::MSK::Replicator
-      x-identifiers:
-        - ReplicatorArn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2479,7 +2492,7 @@ components:
       id: awscc.msk.serverless_clusters
       x-cfn-schema-name: ServerlessCluster
       x-cfn-type-name: AWS::MSK::ServerlessCluster
-      x-identifiers:
+      x-identifiers: &ref_5
         - Arn
       x-type: cloud_control
       methods:
@@ -2556,8 +2569,7 @@ components:
       id: awscc.msk.serverless_clusters_list_only
       x-cfn-schema-name: ServerlessCluster
       x-cfn-type-name: AWS::MSK::ServerlessCluster
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2587,7 +2599,7 @@ components:
       id: awscc.msk.vpc_connections
       x-cfn-schema-name: VpcConnection
       x-cfn-type-name: AWS::MSK::VpcConnection
-      x-identifiers:
+      x-identifiers: &ref_6
         - Arn
       x-type: cloud_control
       methods:
@@ -2685,8 +2697,7 @@ components:
       id: awscc.msk.vpc_connections_list_only
       x-cfn-schema-name: VpcConnection
       x-cfn-type-name: AWS::MSK::VpcConnection
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/mwaa.yaml b/openapi/src/awscc/v00.00.00000/services/mwaa.yaml
index 2e6072ac8..c1ff66a00 100644
--- a/openapi/src/awscc/v00.00.00000/services/mwaa.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/mwaa.yaml
@@ -958,7 +958,7 @@ components:
       id: awscc.mwaa.environments
       x-cfn-schema-name: Environment
       x-cfn-type-name: AWS::MWAA::Environment
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -1104,8 +1104,7 @@ components:
       id: awscc.mwaa.environments_list_only
       x-cfn-schema-name: Environment
       x-cfn-type-name: AWS::MWAA::Environment
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/neptune.yaml b/openapi/src/awscc/v00.00.00000/services/neptune.yaml
index f8b34b731..76b2eb74a 100644
--- a/openapi/src/awscc/v00.00.00000/services/neptune.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/neptune.yaml
@@ -422,19 +422,22 @@ components:
         - MinCapacity
         - MaxCapacity
     Tag:
-      description: An optional array of key-value pairs to apply to this DB subnet group.
+      description: A key-value pair to associate with a resource.
       type: object
       additionalProperties: false
       properties:
         Key:
           type: string
           description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
         Value:
           type: string
           description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 0
+          maxLength: 256
       required:
         - Key
-        - Value
     DBCluster:
       type: object
       properties:
@@ -681,6 +684,20 @@ components:
           - rds:ListTagsForResource
           - kms:CreateGrant
           - kms:DescribeKey
+    DBClusterParameterGroup_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     DBClusterParameterGroup:
       type: object
       properties:
@@ -700,7 +717,7 @@ components:
           description: The list of tags for the cluster parameter group.
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/DBClusterParameterGroup_Tag'
       required:
         - Description
         - Family
@@ -759,6 +776,20 @@ components:
         list:
           - rds:DescribeDBClusterParameterGroups
           - rds:ListTagsForResource
+    DBInstance_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+      required:
+        - Key
+        - Value
     DBInstance:
       type: object
       properties:
@@ -815,7 +846,7 @@ components:
           x-insertionOrder: false
           uniqueItems: true
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/DBInstance_Tag'
           description: An arbitrary set of tags (key-value pairs) for this DB instance.
       required:
         - DBInstanceClass
@@ -898,6 +929,20 @@ components:
         list:
           - rds:DescribeDBInstances
           - rds:ListTagsForResource
+    DBParameterGroup_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+      additionalProperties: false
+      required:
+        - Key
+        - Value
     DBParameterGroup:
       type: object
       properties:
@@ -923,7 +968,7 @@ components:
           type: array
           uniqueItems: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/DBParameterGroup_Tag'
       required:
         - Family
         - Description
@@ -982,6 +1027,20 @@ components:
         list:
           - rds:DescribeDBParameterGroups
           - rds:ListTagsForResource
+    DBSubnetGroup_Tag:
+      description: An optional array of key-value pairs to apply to this DB subnet group.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+      required:
+        - Key
+        - Value
     DBSubnetGroup:
       type: object
       properties:
@@ -1008,7 +1067,7 @@ components:
           uniqueItems: false
           description: An optional array of key-value pairs to apply to this DB subnet group.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/DBSubnetGroup_Tag'
       required:
         - DBSubnetGroupDescription
         - SubnetIds
@@ -1285,7 +1344,7 @@ components:
               description: The list of tags for the cluster parameter group.
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/DBClusterParameterGroup_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateDBClusterParameterGroupRequest
       type: object
@@ -1356,7 +1415,7 @@ components:
               x-insertionOrder: false
               uniqueItems: true
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/DBInstance_Tag'
               description: An arbitrary set of tags (key-value pairs) for this DB instance.
           x-stackQL-stringOnly: true
       x-title: CreateDBInstanceRequest
@@ -1397,7 +1456,7 @@ components:
               type: array
               uniqueItems: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/DBParameterGroup_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateDBParameterGroupRequest
       type: object
@@ -1438,7 +1497,7 @@ components:
               uniqueItems: false
               description: An optional array of key-value pairs to apply to this DB subnet group.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/DBSubnetGroup_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateDBSubnetGroupRequest
       type: object
@@ -1456,7 +1515,7 @@ components:
       id: awscc.neptune.db_clusters
       x-cfn-schema-name: DBCluster
       x-cfn-type-name: AWS::Neptune::DBCluster
-      x-identifiers:
+      x-identifiers: &ref_0
         - DBClusterIdentifier
       x-type: cloud_control
       methods:
@@ -1598,8 +1657,7 @@ components:
       id: awscc.neptune.db_clusters_list_only
       x-cfn-schema-name: DBCluster
       x-cfn-type-name: AWS::Neptune::DBCluster
-      x-identifiers:
-        - DBClusterIdentifier
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1629,7 +1687,7 @@ components:
       id: awscc.neptune.db_cluster_parameter_groups
       x-cfn-schema-name: DBClusterParameterGroup
       x-cfn-type-name: AWS::Neptune::DBClusterParameterGroup
-      x-identifiers:
+      x-identifiers: &ref_1
         - Name
       x-type: cloud_control
       methods:
@@ -1723,8 +1781,7 @@ components:
       id: awscc.neptune.db_cluster_parameter_groups_list_only
       x-cfn-schema-name: DBClusterParameterGroup
       x-cfn-type-name: AWS::Neptune::DBClusterParameterGroup
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1754,7 +1811,7 @@ components:
       id: awscc.neptune.db_instances
       x-cfn-schema-name: DBInstance
       x-cfn-type-name: AWS::Neptune::DBInstance
-      x-identifiers:
+      x-identifiers: &ref_2
         - DBInstanceIdentifier
       x-type: cloud_control
       methods:
@@ -1864,8 +1921,7 @@ components:
       id: awscc.neptune.db_instances_list_only
       x-cfn-schema-name: DBInstance
       x-cfn-type-name: AWS::Neptune::DBInstance
-      x-identifiers:
-        - DBInstanceIdentifier
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1895,7 +1951,7 @@ components:
       id: awscc.neptune.db_parameter_groups
       x-cfn-schema-name: DBParameterGroup
       x-cfn-type-name: AWS::Neptune::DBParameterGroup
-      x-identifiers:
+      x-identifiers: &ref_3
         - Name
       x-type: cloud_control
       methods:
@@ -1989,8 +2045,7 @@ components:
       id: awscc.neptune.db_parameter_groups_list_only
       x-cfn-schema-name: DBParameterGroup
       x-cfn-type-name: AWS::Neptune::DBParameterGroup
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2020,7 +2075,7 @@ components:
       id: awscc.neptune.db_subnet_groups
       x-cfn-schema-name: DBSubnetGroup
       x-cfn-type-name: AWS::Neptune::DBSubnetGroup
-      x-identifiers:
+      x-identifiers: &ref_4
         - DBSubnetGroupName
       x-type: cloud_control
       methods:
@@ -2112,8 +2167,7 @@ components:
       id: awscc.neptune.db_subnet_groups_list_only
       x-cfn-schema-name: DBSubnetGroup
       x-cfn-type-name: AWS::Neptune::DBSubnetGroup
-      x-identifiers:
-        - DBSubnetGroupName
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/neptunegraph.yaml b/openapi/src/awscc/v00.00.00000/services/neptunegraph.yaml
index 96f6ed252..f4d93405d 100644
--- a/openapi/src/awscc/v00.00.00000/services/neptunegraph.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/neptunegraph.yaml
@@ -772,7 +772,7 @@ components:
       id: awscc.neptunegraph.graphs
       x-cfn-schema-name: Graph
       x-cfn-type-name: AWS::NeptuneGraph::Graph
-      x-identifiers:
+      x-identifiers: &ref_0
         - GraphId
       x-type: cloud_control
       methods:
@@ -876,8 +876,7 @@ components:
       id: awscc.neptunegraph.graphs_list_only
       x-cfn-schema-name: Graph
       x-cfn-type-name: AWS::NeptuneGraph::Graph
-      x-identifiers:
-        - GraphId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -907,7 +906,7 @@ components:
       id: awscc.neptunegraph.private_graph_endpoints
       x-cfn-schema-name: PrivateGraphEndpoint
       x-cfn-type-name: AWS::NeptuneGraph::PrivateGraphEndpoint
-      x-identifiers:
+      x-identifiers: &ref_1
         - PrivateGraphEndpointIdentifier
       x-type: cloud_control
       methods:
@@ -1003,8 +1002,7 @@ components:
       id: awscc.neptunegraph.private_graph_endpoints_list_only
       x-cfn-schema-name: PrivateGraphEndpoint
       x-cfn-type-name: AWS::NeptuneGraph::PrivateGraphEndpoint
-      x-identifiers:
-        - PrivateGraphEndpointIdentifier
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/networkfirewall.yaml b/openapi/src/awscc/v00.00.00000/services/networkfirewall.yaml
index 6315fb20c..a9569e94e 100644
--- a/openapi/src/awscc/v00.00.00000/services/networkfirewall.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/networkfirewall.yaml
@@ -393,7 +393,7 @@ components:
     ResourceArn:
       description: A resource ARN.
       type: string
-      pattern: ^(arn:aws.*)$
+      pattern: ^arn:aws.*$
       minLength: 1
       maxLength: 256
     EndpointId:
@@ -433,15 +433,13 @@ components:
           type: string
           minLength: 1
           maxLength: 128
-          pattern: ^.*$
         Value:
           type: string
           minLength: 0
           maxLength: 255
-          pattern: ^.*$
       required:
-        - Key
         - Value
+        - Key
       additionalProperties: false
     Firewall:
       type: object
@@ -583,98 +581,87 @@ components:
           - network-firewall:DescribeFirewall
         list:
           - network-firewall:ListFirewalls
-    FirewallPolicy:
+    FirewallPolicy_ResourceArn:
+      description: A resource ARN.
+      type: string
+      pattern: ^(arn:aws.*)$
+      minLength: 1
+      maxLength: 256
+    FirewallPolicy_Tag:
       type: object
       properties:
-        FirewallPolicyName:
+        Key:
           type: string
           minLength: 1
           maxLength: 128
-          pattern: ^[a-zA-Z0-9-]+$
-        FirewallPolicyArn:
-          $ref: '#/components/schemas/ResourceArn'
-        FirewallPolicy:
-          $ref: '#/components/schemas/FirewallPolicy'
-        FirewallPolicyId:
-          type: string
-          minLength: 36
-          maxLength: 36
-          pattern: ^([0-9a-f]{8})-([0-9a-f]{4}-){3}([0-9a-f]{12})$
-        Description:
+          pattern: ^.*$
+        Value:
           type: string
-          minLength: 1
-          maxLength: 512
+          minLength: 0
+          maxLength: 255
           pattern: ^.*$
-        Tags:
-          type: array
-          x-insertionOrder: false
-          uniqueItems: true
-          items:
-            $ref: '#/components/schemas/Tag'
       required:
-        - FirewallPolicyName
-        - FirewallPolicy
-      x-stackql-resource-name: firewall_policy
-      description: Resource type definition for AWS::NetworkFirewall::FirewallPolicy
-      x-type-name: AWS::NetworkFirewall::FirewallPolicy
-      x-stackql-primary-identifier:
-        - FirewallPolicyArn
-      x-create-only-properties:
-        - FirewallPolicyName
-      x-read-only-properties:
-        - FirewallPolicyArn
-        - FirewallPolicyId
-      x-required-properties:
-        - FirewallPolicyName
-        - FirewallPolicy
-      x-tagging:
-        taggable: true
-        tagOnCreate: true
-        tagUpdatable: true
-        cloudFormationSystemTags: true
-        tagProperty: /properties/Tags
-        permissions:
-          - network-firewall:TagResource
-          - network-firewall:UntagResource
-          - network-firewall:ListTagsForResource
-      x-required-permissions:
-        create:
-          - network-firewall:CreateFirewallPolicy
-          - network-firewall:DescribeFirewallPolicy
-          - network-firewall:ListTLSInspectionConfigurations
-          - network-firewall:TagResource
-          - network-firewall:ListRuleGroups
-        read:
-          - network-firewall:DescribeFirewallPolicy
-          - network-firewall:ListTagsForResources
-        update:
-          - network-firewall:UpdateFirewallPolicy
-          - network-firewall:DescribeFirewallPolicy
-          - network-firewall:TagResource
-          - network-firewall:UntagResource
-          - network-firewall:ListRuleGroups
-          - network-firewall:ListTLSInspectionConfigurations
-        delete:
-          - network-firewall:DeleteFirewallPolicy
-          - network-firewall:DescribeFirewallPolicy
-          - network-firewall:UntagResource
-        list:
-          - network-firewall:ListFirewallPolicies
-    RuleVariables:
+        - Key
+        - Value
+      additionalProperties: false
+    FirewallPolicy_FirewallPolicy:
       type: object
       properties:
-        IPSets:
-          type: object
-          x-patternProperties:
-            ^[A-Za-z0-9_]{1,32}$:
-              $ref: '#/components/schemas/IPSet'
-          additionalProperties: false
-        PortSets:
+        StatelessDefaultActions:
+          type: array
+          x-insertionOrder: true
+          uniqueItems: false
+          items:
+            type: string
+        StatelessFragmentDefaultActions:
+          type: array
+          x-insertionOrder: true
+          uniqueItems: false
+          items:
+            type: string
+        StatelessCustomActions:
+          type: array
+          x-insertionOrder: true
+          uniqueItems: false
+          items:
+            $ref: '#/components/schemas/CustomAction'
+        StatelessRuleGroupReferences:
+          type: array
+          x-insertionOrder: true
+          uniqueItems: false
+          items:
+            $ref: '#/components/schemas/StatelessRuleGroupReference'
+        StatefulRuleGroupReferences:
+          type: array
+          x-insertionOrder: true
+          uniqueItems: false
+          items:
+            $ref: '#/components/schemas/StatefulRuleGroupReference'
+        StatefulDefaultActions:
+          type: array
+          x-insertionOrder: true
+          uniqueItems: false
+          items:
+            type: string
+        StatefulEngineOptions:
+          $ref: '#/components/schemas/StatefulEngineOptions'
+        PolicyVariables:
           type: object
-          x-patternProperties:
-            ^[A-Za-z0-9_]{1,32}$:
-              $ref: '#/components/schemas/PortSet'
+          properties:
+            RuleVariables:
+              $ref: '#/components/schemas/RuleVariables'
           additionalProperties: false
+        TLSInspectionConfigurationArn:
+          $ref: '#/components/schemas/FirewallPolicy_ResourceArn'
+      required:
+        - StatelessDefaultActions
+        - StatelessFragmentDefaultActions
+      additionalProperties: false
+    RuleVariables:
+      type: object
+      x-patternProperties:
+        ^[A-Za-z0-9_]{1,32}$:
+          $ref: '#/components/schemas/IPSet'
       additionalProperties: false
     CustomAction:
       type: object
@@ -723,7 +710,7 @@ components:
       type: object
       properties:
         ResourceArn:
-          $ref: '#/components/schemas/ResourceArn'
+          $ref: '#/components/schemas/FirewallPolicy_ResourceArn'
         Priority:
           $ref: '#/components/schemas/Priority'
         Override:
@@ -737,7 +724,7 @@ components:
       type: object
       properties:
         ResourceArn:
-          $ref: '#/components/schemas/ResourceArn'
+          $ref: '#/components/schemas/FirewallPolicy_ResourceArn'
         Priority:
           $ref: '#/components/schemas/Priority'
       required:
@@ -799,6 +786,125 @@ components:
         - DROP
         - CONTINUE
         - REJECT
+    FirewallPolicy:
+      type: object
+      properties:
+        FirewallPolicyName:
+          type: string
+          minLength: 1
+          maxLength: 128
+          pattern: ^[a-zA-Z0-9-]+$
+        FirewallPolicyArn:
+          $ref: '#/components/schemas/FirewallPolicy_ResourceArn'
+        FirewallPolicy:
+          $ref: '#/components/schemas/FirewallPolicy_FirewallPolicy'
+        FirewallPolicyId:
+          type: string
+          minLength: 36
+          maxLength: 36
+          pattern: ^([0-9a-f]{8})-([0-9a-f]{4}-){3}([0-9a-f]{12})$
+        Description:
+          type: string
+          minLength: 1
+          maxLength: 512
+          pattern: ^.*$
+        Tags:
+          type: array
+          x-insertionOrder: false
+          uniqueItems: true
+          items:
+            $ref: '#/components/schemas/FirewallPolicy_Tag'
+      required:
+        - FirewallPolicyName
+        - FirewallPolicy
+      x-stackql-resource-name: firewall_policy
+      description: Resource type definition for AWS::NetworkFirewall::FirewallPolicy
+      x-type-name: AWS::NetworkFirewall::FirewallPolicy
+      x-stackql-primary-identifier:
+        - FirewallPolicyArn
+      x-create-only-properties:
+        - FirewallPolicyName
+      x-read-only-properties:
+        - FirewallPolicyArn
+        - FirewallPolicyId
+      x-required-properties:
+        - FirewallPolicyName
+        - FirewallPolicy
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: true
+        tagProperty: /properties/Tags
+        permissions:
+          - network-firewall:TagResource
+          - network-firewall:UntagResource
+          - network-firewall:ListTagsForResource
+      x-required-permissions:
+        create:
+          - network-firewall:CreateFirewallPolicy
+          - network-firewall:DescribeFirewallPolicy
+          - network-firewall:ListTLSInspectionConfigurations
+          - network-firewall:TagResource
+          - network-firewall:ListRuleGroups
+        read:
+          - network-firewall:DescribeFirewallPolicy
+          - network-firewall:ListTagsForResources
+        update:
+          - network-firewall:UpdateFirewallPolicy
+          - network-firewall:DescribeFirewallPolicy
+          - network-firewall:TagResource
+          - network-firewall:UntagResource
+          - network-firewall:ListRuleGroups
+          - network-firewall:ListTLSInspectionConfigurations
+        delete:
+          - network-firewall:DeleteFirewallPolicy
+          - network-firewall:DescribeFirewallPolicy
+          - network-firewall:UntagResource
+        list:
+          - network-firewall:ListFirewallPolicies
+    LoggingConfiguration_LoggingConfiguration:
+      type: object
+      properties:
+        LogDestinationConfigs:
+          type: array
+          x-insertionOrder: false
+          items:
+            $ref: '#/components/schemas/LogDestinationConfig'
+          minItems: 1
+      required:
+        - LogDestinationConfigs
+      additionalProperties: false
+    LogDestinationConfig:
+      type: object
+      properties:
+        LogType:
+          type: string
+          enum:
+            - ALERT
+            - FLOW
+            - TLS
+        LogDestinationType:
+          type: string
+          enum:
+            - S3
+            - CloudWatchLogs
+            - KinesisDataFirehose
+        LogDestination:
+          type: object
+          description: A key-value pair to configure the logDestinations.
+          x-patternProperties:
+            ^[0-9A-Za-z.\-_@\/]+$:
+              type: string
+              minLength: 1
+              maxLength: 1024
+          minProperties: 1
+          additionalProperties: false
+      required:
+        - LogType
+        - LogDestinationType
+        - LogDestination
+      additionalProperties: false
     LoggingConfiguration:
       type: object
       properties:
@@ -810,7 +916,7 @@ components:
         FirewallArn:
           $ref: '#/components/schemas/ResourceArn'
         LoggingConfiguration:
-          $ref: '#/components/schemas/LoggingConfiguration'
+          $ref: '#/components/schemas/LoggingConfiguration_LoggingConfiguration'
         EnableMonitoringDashboard:
           type: boolean
       required:
@@ -868,141 +974,63 @@ components:
           - logs:GetLogDelivery
           - network-firewall:UpdateLoggingConfiguration
           - network-firewall:DescribeLoggingConfiguration
-    LogDestinationConfig:
-      type: object
-      properties:
-        LogType:
-          type: string
-          enum:
-            - ALERT
-            - FLOW
-            - TLS
-        LogDestinationType:
-          type: string
-          enum:
-            - S3
-            - CloudWatchLogs
-            - KinesisDataFirehose
-        LogDestination:
-          type: object
-          description: A key-value pair to configure the logDestinations.
-          x-patternProperties:
-            ^[0-9A-Za-z.\-_@\/]+$:
-              type: string
-              minLength: 1
-              maxLength: 1024
-          minProperties: 1
-          additionalProperties: false
-      required:
-        - LogType
-        - LogDestinationType
-        - LogDestination
-      additionalProperties: false
-    RulesString:
+    RuleGroup_ResourceArn:
+      description: A resource ARN.
       type: string
-      minLength: 0
-      maxLength: 1000000
-    RuleGroup:
+      pattern: ^(arn:aws.*)$
+      minLength: 1
+      maxLength: 256
+    RuleGroup_Tag:
       type: object
       properties:
-        RuleGroupName:
+        Key:
           type: string
           minLength: 1
           maxLength: 128
-          pattern: ^[a-zA-Z0-9-]+$
-        RuleGroupArn:
-          $ref: '#/components/schemas/ResourceArn'
-        RuleGroupId:
-          type: string
-          minLength: 36
-          maxLength: 36
-          pattern: ^([0-9a-f]{8})-([0-9a-f]{4}-){3}([0-9a-f]{12})$
-        RuleGroup:
-          $ref: '#/components/schemas/RuleGroup'
-        Type:
-          type: string
-          enum:
-            - STATELESS
-            - STATEFUL
-        Capacity:
-          type: integer
-        SummaryConfiguration:
-          type: object
-          properties:
-            RuleOptions:
-              type: array
-              x-insertionOrder: true
-              uniqueItems: false
-              items:
-                $ref: '#/components/schemas/SummaryRuleOption'
-          additionalProperties: false
-        Description:
+          pattern: ^.*$
+        Value:
           type: string
-          minLength: 1
-          maxLength: 512
+          minLength: 0
+          maxLength: 255
           pattern: ^.*$
-        Tags:
-          type: array
-          x-insertionOrder: false
-          uniqueItems: true
-          items:
-            $ref: '#/components/schemas/Tag'
-      required:
-        - Type
-        - Capacity
-        - RuleGroupName
-      x-stackql-resource-name: rule_group
-      description: Resource type definition for AWS::NetworkFirewall::RuleGroup
-      x-type-name: AWS::NetworkFirewall::RuleGroup
-      x-stackql-primary-identifier:
-        - RuleGroupArn
-      x-create-only-properties:
-        - RuleGroupName
-        - Capacity
-        - Type
-      x-read-only-properties:
-        - RuleGroupArn
-        - RuleGroupId
-      x-required-properties:
-        - Type
-        - Capacity
-        - RuleGroupName
-      x-tagging:
-        taggable: true
-        tagOnCreate: true
-        tagUpdatable: true
-        cloudFormationSystemTags: true
-        tagProperty: /properties/Tags
-        permissions:
-          - network-firewall:TagResource
-          - network-firewall:UntagResource
-          - network-firewall:ListTagsForResource
-      x-required-permissions:
-        create:
-          - network-firewall:CreateRuleGroup
-          - network-firewall:DescribeRuleGroup
-          - network-firewall:TagResource
-          - network-firewall:ListRuleGroups
-          - iam:CreateServiceLinkedRole
-          - ec2:GetManagedPrefixListEntries
-          - ec2:DescribeManagedPrefixLists
-        read:
-          - network-firewall:DescribeRuleGroup
-          - network-firewall:ListTagsForResources
-        update:
-          - network-firewall:UpdateRuleGroup
-          - network-firewall:DescribeRuleGroup
-          - network-firewall:TagResource
-          - network-firewall:UntagResource
-          - iam:CreateServiceLinkedRole
-          - ec2:GetManagedPrefixListEntries
-          - ec2:DescribeManagedPrefixLists
-        delete:
-          - network-firewall:DeleteRuleGroup
-          - network-firewall:DescribeRuleGroup
-          - network-firewall:UntagResource
-        list:
-          - network-firewall:ListRuleGroups
+      required:
+        - Key
+        - Value
+      additionalProperties: false
+    RulesString:
+      type: string
+      minLength: 0
+      maxLength: 1000000
+    RuleGroup_RuleGroup:
+      type: object
+      properties:
+        RuleVariables:
+          $ref: '#/components/schemas/RuleGroup_RuleVariables'
+        ReferenceSets:
+          $ref: '#/components/schemas/ReferenceSets'
+        RulesSource:
+          $ref: '#/components/schemas/RulesSource'
+        StatefulRuleOptions:
+          $ref: '#/components/schemas/StatefulRuleOptions'
+      required:
+        - RulesSource
+      additionalProperties: false
+    RuleGroup_RuleVariables:
+      type: object
+      properties:
+        IPSets:
+          type: object
+          x-patternProperties:
+            ^[A-Za-z0-9_]{1,32}$:
+              $ref: '#/components/schemas/IPSet'
+          additionalProperties: false
+        PortSets:
+          type: object
+          x-patternProperties:
+            ^[A-Za-z0-9_]{1,32}$:
+              $ref: '#/components/schemas/PortSet'
+          additionalProperties: false
+      additionalProperties: false
     PortSet:
       type: object
       properties:
@@ -1027,7 +1055,7 @@ components:
       type: object
       properties:
         ReferenceArn:
-          $ref: '#/components/schemas/ResourceArn'
+          $ref: '#/components/schemas/RuleGroup_ResourceArn'
       additionalProperties: false
     RulesSource:
       type: object
@@ -1336,23 +1364,40 @@ components:
         RuleOrder:
           $ref: '#/components/schemas/RuleOrder'
       additionalProperties: false
-    TLSInspectionConfiguration:
+    RuleGroup:
       type: object
       properties:
-        TLSInspectionConfigurationName:
+        RuleGroupName:
           type: string
           minLength: 1
           maxLength: 128
           pattern: ^[a-zA-Z0-9-]+$
-        TLSInspectionConfigurationArn:
-          $ref: '#/components/schemas/ResourceArn'
-        TLSInspectionConfiguration:
-          $ref: '#/components/schemas/TLSInspectionConfiguration'
-        TLSInspectionConfigurationId:
+        RuleGroupArn:
+          $ref: '#/components/schemas/RuleGroup_ResourceArn'
+        RuleGroupId:
           type: string
           minLength: 36
           maxLength: 36
           pattern: ^([0-9a-f]{8})-([0-9a-f]{4}-){3}([0-9a-f]{12})$
+        RuleGroup:
+          $ref: '#/components/schemas/RuleGroup_RuleGroup'
+        Type:
+          type: string
+          enum:
+            - STATELESS
+            - STATEFUL
+        Capacity:
+          type: integer
+        SummaryConfiguration:
+          type: object
+          properties:
+            RuleOptions:
+              type: array
+              x-insertionOrder: true
+              uniqueItems: false
+              items:
+                $ref: '#/components/schemas/SummaryRuleOption'
+          additionalProperties: false
         Description:
           type: string
           minLength: 1
@@ -1363,23 +1408,27 @@ components:
           x-insertionOrder: false
           uniqueItems: true
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/RuleGroup_Tag'
       required:
-        - TLSInspectionConfigurationName
-        - TLSInspectionConfiguration
-      x-stackql-resource-name: tls_inspection_configuration
-      description: Resource type definition for AWS::NetworkFirewall::TLSInspectionConfiguration
-      x-type-name: AWS::NetworkFirewall::TLSInspectionConfiguration
+        - Type
+        - Capacity
+        - RuleGroupName
+      x-stackql-resource-name: rule_group
+      description: Resource type definition for AWS::NetworkFirewall::RuleGroup
+      x-type-name: AWS::NetworkFirewall::RuleGroup
       x-stackql-primary-identifier:
-        - TLSInspectionConfigurationArn
+        - RuleGroupArn
       x-create-only-properties:
-        - TLSInspectionConfigurationName
+        - RuleGroupName
+        - Capacity
+        - Type
       x-read-only-properties:
-        - TLSInspectionConfigurationArn
-        - TLSInspectionConfigurationId
+        - RuleGroupArn
+        - RuleGroupId
       x-required-properties:
-        - TLSInspectionConfigurationName
-        - TLSInspectionConfiguration
+        - Type
+        - Capacity
+        - RuleGroupName
       x-tagging:
         taggable: true
         tagOnCreate: true
@@ -1392,24 +1441,63 @@ components:
           - network-firewall:ListTagsForResource
       x-required-permissions:
         create:
-          - iam:CreateServiceLinkedRole
-          - network-firewall:CreateTLSInspectionConfiguration
-          - network-firewall:DescribeTLSInspectionConfiguration
+          - network-firewall:CreateRuleGroup
+          - network-firewall:DescribeRuleGroup
           - network-firewall:TagResource
+          - network-firewall:ListRuleGroups
+          - iam:CreateServiceLinkedRole
+          - ec2:GetManagedPrefixListEntries
+          - ec2:DescribeManagedPrefixLists
         read:
-          - network-firewall:DescribeTLSInspectionConfiguration
+          - network-firewall:DescribeRuleGroup
           - network-firewall:ListTagsForResources
         update:
-          - network-firewall:UpdateTLSInspectionConfiguration
-          - network-firewall:DescribeTLSInspectionConfiguration
+          - network-firewall:UpdateRuleGroup
+          - network-firewall:DescribeRuleGroup
           - network-firewall:TagResource
           - network-firewall:UntagResource
+          - iam:CreateServiceLinkedRole
+          - ec2:GetManagedPrefixListEntries
+          - ec2:DescribeManagedPrefixLists
         delete:
-          - network-firewall:DeleteTLSInspectionConfiguration
-          - network-firewall:DescribeTLSInspectionConfiguration
+          - network-firewall:DeleteRuleGroup
+          - network-firewall:DescribeRuleGroup
           - network-firewall:UntagResource
         list:
-          - network-firewall:ListTLSInspectionConfigurations
+          - network-firewall:ListRuleGroups
+    TLSInspectionConfiguration_ResourceArn:
+      description: A resource ARN.
+      type: string
+      pattern: ^(arn:aws.*)$
+      minLength: 1
+      maxLength: 256
+    TLSInspectionConfiguration_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+          pattern: ^.*$
+        Value:
+          type: string
+          minLength: 0
+          maxLength: 255
+          pattern: ^.*$
+      required:
+        - Key
+        - Value
+      additionalProperties: false
+    TLSInspectionConfiguration_TLSInspectionConfiguration:
+      type: object
+      properties:
+        ServerCertificateConfigurations:
+          type: array
+          x-insertionOrder: true
+          uniqueItems: false
+          items:
+            $ref: '#/components/schemas/ServerCertificateConfiguration'
+      additionalProperties: false
     ServerCertificateConfiguration:
       type: object
       properties:
@@ -1426,7 +1514,7 @@ components:
           items:
             $ref: '#/components/schemas/ServerCertificateScope'
         CertificateAuthorityArn:
-          $ref: '#/components/schemas/ResourceArn'
+          $ref: '#/components/schemas/TLSInspectionConfiguration_ResourceArn'
         CheckCertificateRevocationStatus:
           type: object
           properties:
@@ -1452,7 +1540,7 @@ components:
       type: object
       properties:
         ResourceArn:
-          $ref: '#/components/schemas/ResourceArn'
+          $ref: '#/components/schemas/TLSInspectionConfiguration_ResourceArn'
       additionalProperties: false
     ServerCertificateScope:
       type: object
@@ -1488,6 +1576,86 @@ components:
           items:
             $ref: '#/components/schemas/ProtocolNumber'
       additionalProperties: false
+    TLSInspectionConfiguration:
+      type: object
+      properties:
+        TLSInspectionConfigurationName:
+          type: string
+          minLength: 1
+          maxLength: 128
+          pattern: ^[a-zA-Z0-9-]+$
+        TLSInspectionConfigurationArn:
+          $ref: '#/components/schemas/TLSInspectionConfiguration_ResourceArn'
+        TLSInspectionConfiguration:
+          $ref: '#/components/schemas/TLSInspectionConfiguration_TLSInspectionConfiguration'
+        TLSInspectionConfigurationId:
+          type: string
+          minLength: 36
+          maxLength: 36
+          pattern: ^([0-9a-f]{8})-([0-9a-f]{4}-){3}([0-9a-f]{12})$
+        Description:
+          type: string
+          minLength: 1
+          maxLength: 512
+          pattern: ^.*$
+        Tags:
+          type: array
+          x-insertionOrder: false
+          uniqueItems: true
+          items:
+            $ref: '#/components/schemas/TLSInspectionConfiguration_Tag'
+      required:
+        - TLSInspectionConfigurationName
+        - TLSInspectionConfiguration
+      x-stackql-resource-name: tls_inspection_configuration
+      description: Resource type definition for AWS::NetworkFirewall::TLSInspectionConfiguration
+      x-type-name: AWS::NetworkFirewall::TLSInspectionConfiguration
+      x-stackql-primary-identifier:
+        - TLSInspectionConfigurationArn
+      x-create-only-properties:
+        - TLSInspectionConfigurationName
+      x-read-only-properties:
+        - TLSInspectionConfigurationArn
+        - TLSInspectionConfigurationId
+      x-required-properties:
+        - TLSInspectionConfigurationName
+        - TLSInspectionConfiguration
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: true
+        tagProperty: /properties/Tags
+        permissions:
+          - network-firewall:TagResource
+          - network-firewall:UntagResource
+          - network-firewall:ListTagsForResource
+      x-required-permissions:
+        create:
+          - iam:CreateServiceLinkedRole
+          - network-firewall:CreateTLSInspectionConfiguration
+          - network-firewall:DescribeTLSInspectionConfiguration
+          - network-firewall:TagResource
+        read:
+          - network-firewall:DescribeTLSInspectionConfiguration
+          - network-firewall:ListTagsForResources
+        update:
+          - network-firewall:UpdateTLSInspectionConfiguration
+          - network-firewall:DescribeTLSInspectionConfiguration
+          - network-firewall:TagResource
+          - network-firewall:UntagResource
+        delete:
+          - network-firewall:DeleteTLSInspectionConfiguration
+          - network-firewall:DescribeTLSInspectionConfiguration
+          - network-firewall:UntagResource
+        list:
+          - network-firewall:ListTLSInspectionConfigurations
+    VpcEndpointAssociation_ResourceArn:
+      description: A resource ARN.
+      type: string
+      pattern: ^(arn:aws.*)$
+      minLength: 1
+      maxLength: 256
     ResourceId:
       type: string
       minLength: 36
@@ -1502,17 +1670,34 @@ components:
       minLength: 1
       maxLength: 128
       pattern: ^vpc-[0-9a-f]+$
+    VpcEndpointAssociation_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+          pattern: ^.*$
+        Value:
+          type: string
+          minLength: 0
+          maxLength: 255
+          pattern: ^.*$
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     VpcEndpointAssociation:
       type: object
       properties:
         VpcEndpointAssociationArn:
-          $ref: '#/components/schemas/ResourceArn'
+          $ref: '#/components/schemas/VpcEndpointAssociation_ResourceArn'
         VpcEndpointAssociationId:
           $ref: '#/components/schemas/ResourceId'
         Description:
           $ref: '#/components/schemas/Description'
         FirewallArn:
-          $ref: '#/components/schemas/ResourceArn'
+          $ref: '#/components/schemas/VpcEndpointAssociation_ResourceArn'
         VpcId:
           $ref: '#/components/schemas/VpcId'
         EndpointId:
@@ -1524,7 +1709,7 @@ components:
           x-insertionOrder: false
           uniqueItems: true
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/VpcEndpointAssociation_Tag'
       required:
         - FirewallArn
         - VpcId
@@ -1683,9 +1868,9 @@ components:
               maxLength: 128
               pattern: ^[a-zA-Z0-9-]+$
             FirewallPolicyArn:
-              $ref: '#/components/schemas/ResourceArn'
+              $ref: '#/components/schemas/FirewallPolicy_ResourceArn'
             FirewallPolicy:
-              $ref: '#/components/schemas/FirewallPolicy'
+              $ref: '#/components/schemas/FirewallPolicy_FirewallPolicy'
             FirewallPolicyId:
               type: string
               minLength: 36
@@ -1701,7 +1886,7 @@ components:
               x-insertionOrder: false
               uniqueItems: true
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/FirewallPolicy_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateFirewallPolicyRequest
       type: object
@@ -1727,7 +1912,7 @@ components:
             FirewallArn:
               $ref: '#/components/schemas/ResourceArn'
             LoggingConfiguration:
-              $ref: '#/components/schemas/LoggingConfiguration'
+              $ref: '#/components/schemas/LoggingConfiguration_LoggingConfiguration'
             EnableMonitoringDashboard:
               type: boolean
           x-stackQL-stringOnly: true
@@ -1753,14 +1938,14 @@ components:
               maxLength: 128
               pattern: ^[a-zA-Z0-9-]+$
             RuleGroupArn:
-              $ref: '#/components/schemas/ResourceArn'
+              $ref: '#/components/schemas/RuleGroup_ResourceArn'
             RuleGroupId:
               type: string
               minLength: 36
               maxLength: 36
               pattern: ^([0-9a-f]{8})-([0-9a-f]{4}-){3}([0-9a-f]{12})$
             RuleGroup:
-              $ref: '#/components/schemas/RuleGroup'
+              $ref: '#/components/schemas/RuleGroup_RuleGroup'
             Type:
               type: string
               enum:
@@ -1788,7 +1973,7 @@ components:
               x-insertionOrder: false
               uniqueItems: true
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/RuleGroup_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateRuleGroupRequest
       type: object
@@ -1812,9 +1997,9 @@ components:
               maxLength: 128
               pattern: ^[a-zA-Z0-9-]+$
             TLSInspectionConfigurationArn:
-              $ref: '#/components/schemas/ResourceArn'
+              $ref: '#/components/schemas/TLSInspectionConfiguration_ResourceArn'
             TLSInspectionConfiguration:
-              $ref: '#/components/schemas/TLSInspectionConfiguration'
+              $ref: '#/components/schemas/TLSInspectionConfiguration_TLSInspectionConfiguration'
             TLSInspectionConfigurationId:
               type: string
               minLength: 36
@@ -1830,7 +2015,7 @@ components:
               x-insertionOrder: false
               uniqueItems: true
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/TLSInspectionConfiguration_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateTLSInspectionConfigurationRequest
       type: object
@@ -1849,13 +2034,13 @@ components:
           type: object
           properties:
             VpcEndpointAssociationArn:
-              $ref: '#/components/schemas/ResourceArn'
+              $ref: '#/components/schemas/VpcEndpointAssociation_ResourceArn'
             VpcEndpointAssociationId:
               $ref: '#/components/schemas/ResourceId'
             Description:
               $ref: '#/components/schemas/Description'
             FirewallArn:
-              $ref: '#/components/schemas/ResourceArn'
+              $ref: '#/components/schemas/VpcEndpointAssociation_ResourceArn'
             VpcId:
               $ref: '#/components/schemas/VpcId'
             EndpointId:
@@ -1867,7 +2052,7 @@ components:
               x-insertionOrder: false
               uniqueItems: true
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/VpcEndpointAssociation_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateVpcEndpointAssociationRequest
       type: object
@@ -1885,7 +2070,7 @@ components:
       id: awscc.networkfirewall.firewalls
       x-cfn-schema-name: Firewall
       x-cfn-type-name: AWS::NetworkFirewall::Firewall
-      x-identifiers:
+      x-identifiers: &ref_0
         - FirewallArn
       x-type: cloud_control
       methods:
@@ -2001,8 +2186,7 @@ components:
       id: awscc.networkfirewall.firewalls_list_only
       x-cfn-schema-name: Firewall
       x-cfn-type-name: AWS::NetworkFirewall::Firewall
-      x-identifiers:
-        - FirewallArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2032,7 +2216,7 @@ components:
       id: awscc.networkfirewall.firewall_policies
       x-cfn-schema-name: FirewallPolicy
       x-cfn-type-name: AWS::NetworkFirewall::FirewallPolicy
-      x-identifiers:
+      x-identifiers: &ref_1
         - FirewallPolicyArn
       x-type: cloud_control
       methods:
@@ -2128,8 +2312,7 @@ components:
       id: awscc.networkfirewall.firewall_policies_list_only
       x-cfn-schema-name: FirewallPolicy
       x-cfn-type-name: AWS::NetworkFirewall::FirewallPolicy
-      x-identifiers:
-        - FirewallPolicyArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2251,7 +2434,7 @@ components:
       id: awscc.networkfirewall.rule_groups
       x-cfn-schema-name: RuleGroup
       x-cfn-type-name: AWS::NetworkFirewall::RuleGroup
-      x-identifiers:
+      x-identifiers: &ref_2
         - RuleGroupArn
       x-type: cloud_control
       methods:
@@ -2353,8 +2536,7 @@ components:
       id: awscc.networkfirewall.rule_groups_list_only
       x-cfn-schema-name: RuleGroup
       x-cfn-type-name: AWS::NetworkFirewall::RuleGroup
-      x-identifiers:
-        - RuleGroupArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2384,7 +2566,7 @@ components:
       id: awscc.networkfirewall.tls_inspection_configurations
       x-cfn-schema-name: TLSInspectionConfiguration
       x-cfn-type-name: AWS::NetworkFirewall::TLSInspectionConfiguration
-      x-identifiers:
+      x-identifiers: &ref_3
         - TLSInspectionConfigurationArn
       x-type: cloud_control
       methods:
@@ -2480,8 +2662,7 @@ components:
       id: awscc.networkfirewall.tls_inspection_configurations_list_only
       x-cfn-schema-name: TLSInspectionConfiguration
       x-cfn-type-name: AWS::NetworkFirewall::TLSInspectionConfiguration
-      x-identifiers:
-        - TLSInspectionConfigurationArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2511,7 +2692,7 @@ components:
       id: awscc.networkfirewall.vpc_endpoint_associations
       x-cfn-schema-name: VpcEndpointAssociation
       x-cfn-type-name: AWS::NetworkFirewall::VpcEndpointAssociation
-      x-identifiers:
+      x-identifiers: &ref_4
         - VpcEndpointAssociationArn
       x-type: cloud_control
       methods:
@@ -2611,8 +2792,7 @@ components:
       id: awscc.networkfirewall.vpc_endpoint_associations_list_only
       x-cfn-schema-name: VpcEndpointAssociation
       x-cfn-type-name: AWS::NetworkFirewall::VpcEndpointAssociation
-      x-identifiers:
-        - VpcEndpointAssociationArn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/networkmanager.yaml b/openapi/src/awscc/v00.00.00000/services/networkmanager.yaml
index 58728ed59..cb0dd3800 100644
--- a/openapi/src/awscc/v00.00.00000/services/networkmanager.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/networkmanager.yaml
@@ -395,7 +395,7 @@ components:
       type: object
       properties:
         Tags:
-          description: The key-value tags that changed for the segment.
+          description: The list of key-value tags that changed for the segment.
           type: array
           uniqueItems: true
           x-insertionOrder: false
@@ -958,8 +958,22 @@ components:
           - networkmanager:GetCustomerGatewayAssociations
         delete:
           - networkmanager:DisassociateCustomerGateway
+    Device_Tag:
+      description: A key-value pair to associate with a device resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     Location:
-      description: The location of the site
+      description: The site location.
       type: object
       properties:
         Address:
@@ -1001,7 +1015,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Device_Tag'
         GlobalNetworkId:
           description: The ID of the global network.
           type: string
@@ -1079,6 +1093,24 @@ components:
           - networkmanager:DeleteDevice
         list:
           - networkmanager:GetDevices
+    DirectConnectGatewayAttachment_ProposedSegmentChange:
+      description: The attachment to move from one segment to another.
+      type: object
+      properties:
+        Tags:
+          description: The key-value tags that changed for the segment.
+          type: array
+          uniqueItems: true
+          x-insertionOrder: false
+          items:
+            $ref: '#/components/schemas/Tag'
+        AttachmentPolicyRuleNumber:
+          description: The rule number in the policy document that applies to this change.
+          type: integer
+        SegmentName:
+          description: The name of the segment to change.
+          type: string
+      additionalProperties: false
     DirectConnectGatewayAttachment:
       type: object
       properties:
@@ -1120,7 +1152,7 @@ components:
           type: string
         ProposedSegmentChange:
           description: The attachment to move from one segment to another.
-          $ref: '#/components/schemas/ProposedSegmentChange'
+          $ref: '#/components/schemas/DirectConnectGatewayAttachment_ProposedSegmentChange'
         NetworkFunctionGroupName:
           description: The name of the network function group attachment.
           type: string
@@ -1204,6 +1236,20 @@ components:
           - ec2:DescribeRegions
         list:
           - networkmanager:ListAttachments
+    GlobalNetwork_Tag:
+      description: A key-value pair to associate with a global network resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     GlobalNetwork:
       type: object
       properties:
@@ -1222,7 +1268,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/GlobalNetwork_Tag'
         CreatedAt:
           description: The date and time that the global network was created.
           type: string
@@ -1268,6 +1314,20 @@ components:
           - networkmanager:DescribeGlobalNetworks
         list:
           - networkmanager:DescribeGlobalNetworks
+    Link_Tag:
+      description: A key-value pair to associate with a link resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     Bandwidth:
       description: The bandwidth for the link.
       type: object
@@ -1309,7 +1369,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Link_Tag'
         Type:
           description: The type of the link.
           type: string
@@ -1417,6 +1477,34 @@ components:
           - networkmanager:GetLinkAssociations
         delete:
           - networkmanager:DisassociateLink
+    Site_Tag:
+      description: A key-value pair to associate with a site resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+      required:
+        - Key
+        - Value
+      additionalProperties: false
+    Site_Location:
+      description: The location of the site
+      type: object
+      properties:
+        Address:
+          description: The physical address.
+          type: string
+        Latitude:
+          description: The latitude.
+          type: string
+        Longitude:
+          description: The longitude.
+          type: string
+      additionalProperties: false
     Site:
       type: object
       properties:
@@ -1435,13 +1523,13 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Site_Tag'
         GlobalNetworkId:
           description: The ID of the global network.
           type: string
         Location:
           description: The location of the site.
-          $ref: '#/components/schemas/Location'
+          $ref: '#/components/schemas/Site_Location'
         CreatedAt:
           description: The date and time that the device was created.
           type: string
@@ -1495,6 +1583,24 @@ components:
           - networkmanager:DeleteSite
         list:
           - networkmanager:GetSites
+    SiteToSiteVpnAttachment_ProposedSegmentChange:
+      description: The attachment to move from one segment to another.
+      type: object
+      properties:
+        Tags:
+          description: The key-value tags that changed for the segment.
+          type: array
+          x-insertionOrder: false
+          uniqueItems: true
+          items:
+            $ref: '#/components/schemas/Tag'
+        AttachmentPolicyRuleNumber:
+          description: The rule number in the policy document that applies to this change.
+          type: integer
+        SegmentName:
+          description: The name of the segment to change.
+          type: string
+      additionalProperties: false
     SiteToSiteVpnAttachment:
       type: object
       properties:
@@ -1530,7 +1636,7 @@ components:
           type: string
         ProposedSegmentChange:
           description: The attachment to move from one segment to another.
-          $ref: '#/components/schemas/ProposedSegmentChange'
+          $ref: '#/components/schemas/SiteToSiteVpnAttachment_ProposedSegmentChange'
         NetworkFunctionGroupName:
           description: The name of the network function group attachment.
           type: string
@@ -1612,6 +1718,24 @@ components:
           - ec2:DescribeRegions
         list:
           - networkmanager:ListAttachments
+    TransitGatewayPeering_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     TransitGatewayPeering:
       type: object
       properties:
@@ -1654,7 +1778,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/TransitGatewayPeering_Tag'
       required:
         - CoreNetworkId
         - TransitGatewayArn
@@ -1752,6 +1876,57 @@ components:
         delete:
           - networkmanager:DeregisterTransitGateway
           - networkmanager:GetTransitGatewayRegistrations
+    TransitGatewayRouteTableAttachment_ProposedSegmentChange:
+      description: The attachment to move from one segment to another.
+      type: object
+      properties:
+        Tags:
+          description: The key-value tags that changed for the segment.
+          type: array
+          x-insertionOrder: false
+          uniqueItems: true
+          items:
+            $ref: '#/components/schemas/TransitGatewayRouteTableAttachment_Tag'
+        AttachmentPolicyRuleNumber:
+          description: The rule number in the policy document that applies to this change.
+          type: integer
+        SegmentName:
+          description: The name of the segment to change.
+          type: string
+      additionalProperties: false
+    TransitGatewayRouteTableAttachment_ProposedNetworkFunctionGroupChange:
+      description: The attachment to move from one network function group to another.
+      type: object
+      properties:
+        Tags:
+          description: The key-value tags that changed for the network function group.
+          type: array
+          x-insertionOrder: false
+          uniqueItems: true
+          items:
+            $ref: '#/components/schemas/TransitGatewayRouteTableAttachment_Tag'
+        AttachmentPolicyRuleNumber:
+          description: The rule number in the policy document that applies to this change.
+          type: integer
+        NetworkFunctionGroupName:
+          description: The name of the network function group to change.
+          type: string
+      additionalProperties: false
+    TransitGatewayRouteTableAttachment_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      x-insertionOrder: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     TransitGatewayRouteTableAttachment:
       type: object
       properties:
@@ -1793,13 +1968,13 @@ components:
           type: string
         ProposedSegmentChange:
           description: The attachment to move from one segment to another.
-          $ref: '#/components/schemas/ProposedSegmentChange'
+          $ref: '#/components/schemas/TransitGatewayRouteTableAttachment_ProposedSegmentChange'
         NetworkFunctionGroupName:
           description: The name of the network function group attachment.
           type: string
         ProposedNetworkFunctionGroupChange:
           description: The attachment to move from one network function group to another.
-          $ref: '#/components/schemas/ProposedNetworkFunctionGroupChange'
+          $ref: '#/components/schemas/TransitGatewayRouteTableAttachment_ProposedNetworkFunctionGroupChange'
         CreatedAt:
           description: Creation time of the attachment.
           type: string
@@ -1812,7 +1987,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/TransitGatewayRouteTableAttachment_Tag'
       required:
         - PeeringId
         - TransitGatewayRouteTableArn
@@ -1892,6 +2067,24 @@ components:
           type: boolean
           default: true
       additionalProperties: false
+    VpcAttachment_ProposedSegmentChange:
+      description: The attachment to move from one segment to another.
+      type: object
+      properties:
+        Tags:
+          description: The key-value tags that changed for the segment.
+          type: array
+          uniqueItems: true
+          x-insertionOrder: false
+          items:
+            $ref: '#/components/schemas/Tag'
+        AttachmentPolicyRuleNumber:
+          description: The rule number in the policy document that applies to this change.
+          type: integer
+        SegmentName:
+          description: The name of the segment to change.
+          type: string
+      additionalProperties: false
     VpcAttachment:
       type: object
       properties:
@@ -1930,7 +2123,7 @@ components:
           type: string
         ProposedSegmentChange:
           description: The attachment to move from one segment to another.
-          $ref: '#/components/schemas/ProposedSegmentChange'
+          $ref: '#/components/schemas/VpcAttachment_ProposedSegmentChange'
         NetworkFunctionGroupName:
           description: The name of the network function group attachment.
           type: string
@@ -2285,7 +2478,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Device_Tag'
             GlobalNetworkId:
               description: The ID of the global network.
               type: string
@@ -2371,7 +2564,7 @@ components:
               type: string
             ProposedSegmentChange:
               description: The attachment to move from one segment to another.
-              $ref: '#/components/schemas/ProposedSegmentChange'
+              $ref: '#/components/schemas/DirectConnectGatewayAttachment_ProposedSegmentChange'
             NetworkFunctionGroupName:
               description: The name of the network function group attachment.
               type: string
@@ -2423,7 +2616,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/GlobalNetwork_Tag'
             CreatedAt:
               description: The date and time that the global network was created.
               type: string
@@ -2474,7 +2667,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Link_Tag'
             Type:
               description: The type of the link.
               type: string
@@ -2542,13 +2735,13 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Site_Tag'
             GlobalNetworkId:
               description: The ID of the global network.
               type: string
             Location:
               description: The location of the site.
-              $ref: '#/components/schemas/Location'
+              $ref: '#/components/schemas/Site_Location'
             CreatedAt:
               description: The date and time that the device was created.
               type: string
@@ -2604,7 +2797,7 @@ components:
               type: string
             ProposedSegmentChange:
               description: The attachment to move from one segment to another.
-              $ref: '#/components/schemas/ProposedSegmentChange'
+              $ref: '#/components/schemas/SiteToSiteVpnAttachment_ProposedSegmentChange'
             NetworkFunctionGroupName:
               description: The name of the network function group attachment.
               type: string
@@ -2683,7 +2876,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/TransitGatewayPeering_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateTransitGatewayPeeringRequest
       type: object
@@ -2762,13 +2955,13 @@ components:
               type: string
             ProposedSegmentChange:
               description: The attachment to move from one segment to another.
-              $ref: '#/components/schemas/ProposedSegmentChange'
+              $ref: '#/components/schemas/TransitGatewayRouteTableAttachment_ProposedSegmentChange'
             NetworkFunctionGroupName:
               description: The name of the network function group attachment.
               type: string
             ProposedNetworkFunctionGroupChange:
               description: The attachment to move from one network function group to another.
-              $ref: '#/components/schemas/ProposedNetworkFunctionGroupChange'
+              $ref: '#/components/schemas/TransitGatewayRouteTableAttachment_ProposedNetworkFunctionGroupChange'
             CreatedAt:
               description: Creation time of the attachment.
               type: string
@@ -2781,7 +2974,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/TransitGatewayRouteTableAttachment_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateTransitGatewayRouteTableAttachmentRequest
       type: object
@@ -2834,7 +3027,7 @@ components:
               type: string
             ProposedSegmentChange:
               description: The attachment to move from one segment to another.
-              $ref: '#/components/schemas/ProposedSegmentChange'
+              $ref: '#/components/schemas/VpcAttachment_ProposedSegmentChange'
             NetworkFunctionGroupName:
               description: The name of the network function group attachment.
               type: string
@@ -2880,7 +3073,7 @@ components:
       id: awscc.networkmanager.connect_attachments
       x-cfn-schema-name: ConnectAttachment
       x-cfn-type-name: AWS::NetworkManager::ConnectAttachment
-      x-identifiers:
+      x-identifiers: &ref_0
         - AttachmentId
       x-type: cloud_control
       methods:
@@ -3000,8 +3193,7 @@ components:
       id: awscc.networkmanager.connect_attachments_list_only
       x-cfn-schema-name: ConnectAttachment
       x-cfn-type-name: AWS::NetworkManager::ConnectAttachment
-      x-identifiers:
-        - AttachmentId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3031,7 +3223,7 @@ components:
       id: awscc.networkmanager.connect_peers
       x-cfn-schema-name: ConnectPeer
       x-cfn-type-name: AWS::NetworkManager::ConnectPeer
-      x-identifiers:
+      x-identifiers: &ref_1
         - ConnectPeerId
       x-type: cloud_control
       methods:
@@ -3141,8 +3333,7 @@ components:
       id: awscc.networkmanager.connect_peers_list_only
       x-cfn-schema-name: ConnectPeer
       x-cfn-type-name: AWS::NetworkManager::ConnectPeer
-      x-identifiers:
-        - ConnectPeerId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3172,7 +3363,7 @@ components:
       id: awscc.networkmanager.core_networks
       x-cfn-schema-name: CoreNetwork
       x-cfn-type-name: AWS::NetworkManager::CoreNetwork
-      x-identifiers:
+      x-identifiers: &ref_2
         - CoreNetworkId
       x-type: cloud_control
       methods:
@@ -3280,8 +3471,7 @@ components:
       id: awscc.networkmanager.core_networks_list_only
       x-cfn-schema-name: CoreNetwork
       x-cfn-type-name: AWS::NetworkManager::CoreNetwork
-      x-identifiers:
-        - CoreNetworkId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3311,7 +3501,7 @@ components:
       id: awscc.networkmanager.customer_gateway_associations
       x-cfn-schema-name: CustomerGatewayAssociation
       x-cfn-type-name: AWS::NetworkManager::CustomerGatewayAssociation
-      x-identifiers:
+      x-identifiers: &ref_3
         - GlobalNetworkId
         - CustomerGatewayArn
       x-type: cloud_control
@@ -3387,9 +3577,7 @@ components:
       id: awscc.networkmanager.customer_gateway_associations_list_only
       x-cfn-schema-name: CustomerGatewayAssociation
       x-cfn-type-name: AWS::NetworkManager::CustomerGatewayAssociation
-      x-identifiers:
-        - GlobalNetworkId
-        - CustomerGatewayArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3421,7 +3609,7 @@ components:
       id: awscc.networkmanager.devices
       x-cfn-schema-name: Device
       x-cfn-type-name: AWS::NetworkManager::Device
-      x-identifiers:
+      x-identifiers: &ref_4
         - GlobalNetworkId
         - DeviceId
       x-type: cloud_control
@@ -3534,9 +3722,7 @@ components:
       id: awscc.networkmanager.devices_list_only
       x-cfn-schema-name: Device
       x-cfn-type-name: AWS::NetworkManager::Device
-      x-identifiers:
-        - GlobalNetworkId
-        - DeviceId
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3568,7 +3754,7 @@ components:
       id: awscc.networkmanager.direct_connect_gateway_attachments
       x-cfn-schema-name: DirectConnectGatewayAttachment
       x-cfn-type-name: AWS::NetworkManager::DirectConnectGatewayAttachment
-      x-identifiers:
+      x-identifiers: &ref_5
         - AttachmentId
       x-type: cloud_control
       methods:
@@ -3686,8 +3872,7 @@ components:
       id: awscc.networkmanager.direct_connect_gateway_attachments_list_only
       x-cfn-schema-name: DirectConnectGatewayAttachment
       x-cfn-type-name: AWS::NetworkManager::DirectConnectGatewayAttachment
-      x-identifiers:
-        - AttachmentId
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3717,7 +3902,7 @@ components:
       id: awscc.networkmanager.global_networks
       x-cfn-schema-name: GlobalNetwork
       x-cfn-type-name: AWS::NetworkManager::GlobalNetwork
-      x-identifiers:
+      x-identifiers: &ref_6
         - Id
       x-type: cloud_control
       methods:
@@ -3813,8 +3998,7 @@ components:
       id: awscc.networkmanager.global_networks_list_only
       x-cfn-schema-name: GlobalNetwork
       x-cfn-type-name: AWS::NetworkManager::GlobalNetwork
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3844,7 +4028,7 @@ components:
       id: awscc.networkmanager.links
       x-cfn-schema-name: Link
       x-cfn-type-name: AWS::NetworkManager::Link
-      x-identifiers:
+      x-identifiers: &ref_7
         - GlobalNetworkId
         - LinkId
       x-type: cloud_control
@@ -3951,9 +4135,7 @@ components:
       id: awscc.networkmanager.links_list_only
       x-cfn-schema-name: Link
       x-cfn-type-name: AWS::NetworkManager::Link
-      x-identifiers:
-        - GlobalNetworkId
-        - LinkId
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3985,7 +4167,7 @@ components:
       id: awscc.networkmanager.link_associations
       x-cfn-schema-name: LinkAssociation
       x-cfn-type-name: AWS::NetworkManager::LinkAssociation
-      x-identifiers:
+      x-identifiers: &ref_8
         - GlobalNetworkId
         - DeviceId
         - LinkId
@@ -4060,10 +4242,7 @@ components:
       id: awscc.networkmanager.link_associations_list_only
       x-cfn-schema-name: LinkAssociation
       x-cfn-type-name: AWS::NetworkManager::LinkAssociation
-      x-identifiers:
-        - GlobalNetworkId
-        - DeviceId
-        - LinkId
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4097,7 +4276,7 @@ components:
       id: awscc.networkmanager.sites
       x-cfn-schema-name: Site
       x-cfn-type-name: AWS::NetworkManager::Site
-      x-identifiers:
+      x-identifiers: &ref_9
         - GlobalNetworkId
         - SiteId
       x-type: cloud_control
@@ -4198,9 +4377,7 @@ components:
       id: awscc.networkmanager.sites_list_only
       x-cfn-schema-name: Site
       x-cfn-type-name: AWS::NetworkManager::Site
-      x-identifiers:
-        - GlobalNetworkId
-        - SiteId
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4232,7 +4409,7 @@ components:
       id: awscc.networkmanager.site_to_site_vpn_attachments
       x-cfn-schema-name: SiteToSiteVpnAttachment
       x-cfn-type-name: AWS::NetworkManager::SiteToSiteVpnAttachment
-      x-identifiers:
+      x-identifiers: &ref_10
         - AttachmentId
       x-type: cloud_control
       methods:
@@ -4350,8 +4527,7 @@ components:
       id: awscc.networkmanager.site_to_site_vpn_attachments_list_only
       x-cfn-schema-name: SiteToSiteVpnAttachment
       x-cfn-type-name: AWS::NetworkManager::SiteToSiteVpnAttachment
-      x-identifiers:
-        - AttachmentId
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4381,7 +4557,7 @@ components:
       id: awscc.networkmanager.transit_gateway_peerings
       x-cfn-schema-name: TransitGatewayPeering
       x-cfn-type-name: AWS::NetworkManager::TransitGatewayPeering
-      x-identifiers:
+      x-identifiers: &ref_11
         - PeeringId
       x-type: cloud_control
       methods:
@@ -4489,8 +4665,7 @@ components:
       id: awscc.networkmanager.transit_gateway_peerings_list_only
       x-cfn-schema-name: TransitGatewayPeering
       x-cfn-type-name: AWS::NetworkManager::TransitGatewayPeering
-      x-identifiers:
-        - PeeringId
+      x-identifiers: *ref_11
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4520,7 +4695,7 @@ components:
       id: awscc.networkmanager.transit_gateway_registrations
       x-cfn-schema-name: TransitGatewayRegistration
       x-cfn-type-name: AWS::NetworkManager::TransitGatewayRegistration
-      x-identifiers:
+      x-identifiers: &ref_12
         - GlobalNetworkId
         - TransitGatewayArn
       x-type: cloud_control
@@ -4592,9 +4767,7 @@ components:
       id: awscc.networkmanager.transit_gateway_registrations_list_only
       x-cfn-schema-name: TransitGatewayRegistration
       x-cfn-type-name: AWS::NetworkManager::TransitGatewayRegistration
-      x-identifiers:
-        - GlobalNetworkId
-        - TransitGatewayArn
+      x-identifiers: *ref_12
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4626,7 +4799,7 @@ components:
       id: awscc.networkmanager.transit_gateway_route_table_attachments
       x-cfn-schema-name: TransitGatewayRouteTableAttachment
       x-cfn-type-name: AWS::NetworkManager::TransitGatewayRouteTableAttachment
-      x-identifiers:
+      x-identifiers: &ref_13
         - AttachmentId
       x-type: cloud_control
       methods:
@@ -4746,8 +4919,7 @@ components:
       id: awscc.networkmanager.transit_gateway_route_table_attachments_list_only
       x-cfn-schema-name: TransitGatewayRouteTableAttachment
       x-cfn-type-name: AWS::NetworkManager::TransitGatewayRouteTableAttachment
-      x-identifiers:
-        - AttachmentId
+      x-identifiers: *ref_13
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4777,7 +4949,7 @@ components:
       id: awscc.networkmanager.vpc_attachments
       x-cfn-schema-name: VpcAttachment
       x-cfn-type-name: AWS::NetworkManager::VpcAttachment
-      x-identifiers:
+      x-identifiers: &ref_14
         - AttachmentId
       x-type: cloud_control
       methods:
@@ -4899,8 +5071,7 @@ components:
       id: awscc.networkmanager.vpc_attachments_list_only
       x-cfn-schema-name: VpcAttachment
       x-cfn-type-name: AWS::NetworkManager::VpcAttachment
-      x-identifiers:
-        - AttachmentId
+      x-identifiers: *ref_14
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/notifications.yaml b/openapi/src/awscc/v00.00.00000/services/notifications.yaml
index 4cb7ddf4e..86f6c6711 100644
--- a/openapi/src/awscc/v00.00.00000/services/notifications.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/notifications.yaml
@@ -1089,7 +1089,7 @@ components:
       id: awscc.notifications.channel_associations
       x-cfn-schema-name: ChannelAssociation
       x-cfn-type-name: AWS::Notifications::ChannelAssociation
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
         - NotificationConfigurationArn
       x-type: cloud_control
@@ -1161,9 +1161,7 @@ components:
       id: awscc.notifications.channel_associations_list_only
       x-cfn-schema-name: ChannelAssociation
       x-cfn-type-name: AWS::Notifications::ChannelAssociation
-      x-identifiers:
-        - Arn
-        - NotificationConfigurationArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1195,7 +1193,7 @@ components:
       id: awscc.notifications.event_rules
       x-cfn-schema-name: EventRule
       x-cfn-type-name: AWS::Notifications::EventRule
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -1297,8 +1295,7 @@ components:
       id: awscc.notifications.event_rules_list_only
       x-cfn-schema-name: EventRule
       x-cfn-type-name: AWS::Notifications::EventRule
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1328,7 +1325,7 @@ components:
       id: awscc.notifications.managed_notification_account_contact_associations
       x-cfn-schema-name: ManagedNotificationAccountContactAssociation
       x-cfn-type-name: AWS::Notifications::ManagedNotificationAccountContactAssociation
-      x-identifiers:
+      x-identifiers: &ref_2
         - ManagedNotificationConfigurationArn
         - ContactIdentifier
       x-type: cloud_control
@@ -1417,9 +1414,7 @@ components:
       id: awscc.notifications.managed_notification_account_contact_associations_list_only
       x-cfn-schema-name: ManagedNotificationAccountContactAssociation
       x-cfn-type-name: AWS::Notifications::ManagedNotificationAccountContactAssociation
-      x-identifiers:
-        - ManagedNotificationConfigurationArn
-        - ContactIdentifier
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1451,7 +1446,7 @@ components:
       id: awscc.notifications.managed_notification_additional_channel_associations
       x-cfn-schema-name: ManagedNotificationAdditionalChannelAssociation
       x-cfn-type-name: AWS::Notifications::ManagedNotificationAdditionalChannelAssociation
-      x-identifiers:
+      x-identifiers: &ref_3
         - ChannelArn
         - ManagedNotificationConfigurationArn
       x-type: cloud_control
@@ -1523,9 +1518,7 @@ components:
       id: awscc.notifications.managed_notification_additional_channel_associations_list_only
       x-cfn-schema-name: ManagedNotificationAdditionalChannelAssociation
       x-cfn-type-name: AWS::Notifications::ManagedNotificationAdditionalChannelAssociation
-      x-identifiers:
-        - ChannelArn
-        - ManagedNotificationConfigurationArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1557,7 +1550,7 @@ components:
       id: awscc.notifications.notification_configurations
       x-cfn-schema-name: NotificationConfiguration
       x-cfn-type-name: AWS::Notifications::NotificationConfiguration
-      x-identifiers:
+      x-identifiers: &ref_4
         - Arn
       x-type: cloud_control
       methods:
@@ -1655,8 +1648,7 @@ components:
       id: awscc.notifications.notification_configurations_list_only
       x-cfn-schema-name: NotificationConfiguration
       x-cfn-type-name: AWS::Notifications::NotificationConfiguration
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1686,7 +1678,7 @@ components:
       id: awscc.notifications.notification_hubs
       x-cfn-schema-name: NotificationHub
       x-cfn-type-name: AWS::Notifications::NotificationHub
-      x-identifiers:
+      x-identifiers: &ref_5
         - Region
       x-type: cloud_control
       methods:
@@ -1759,8 +1751,7 @@ components:
       id: awscc.notifications.notification_hubs_list_only
       x-cfn-schema-name: NotificationHub
       x-cfn-type-name: AWS::Notifications::NotificationHub
-      x-identifiers:
-        - Region
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1790,7 +1781,7 @@ components:
       id: awscc.notifications.organizational_unit_associations
       x-cfn-schema-name: OrganizationalUnitAssociation
       x-cfn-type-name: AWS::Notifications::OrganizationalUnitAssociation
-      x-identifiers:
+      x-identifiers: &ref_6
         - NotificationConfigurationArn
         - OrganizationalUnitId
       x-type: cloud_control
@@ -1862,9 +1853,7 @@ components:
       id: awscc.notifications.organizational_unit_associations_list_only
       x-cfn-schema-name: OrganizationalUnitAssociation
       x-cfn-type-name: AWS::Notifications::OrganizationalUnitAssociation
-      x-identifiers:
-        - NotificationConfigurationArn
-        - OrganizationalUnitId
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/notificationscontacts.yaml b/openapi/src/awscc/v00.00.00000/services/notificationscontacts.yaml
index 090c9a862..d243e2315 100644
--- a/openapi/src/awscc/v00.00.00000/services/notificationscontacts.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/notificationscontacts.yaml
@@ -390,6 +390,65 @@ components:
           $ref: '#/components/x-cloud-control-schemas/ProgressEvent'
       type: object
   schemas:
+    EmailContact_EmailContact:
+      type: object
+      properties:
+        Arn:
+          type: string
+          pattern: ^arn:aws:notifications-contacts::[0-9]{12}:emailcontact/[a-z0-9]{27}$
+        Name:
+          type: string
+          maxLength: 64
+          minLength: 1
+          pattern: '[\w-.~]+'
+        Address:
+          type: string
+          maxLength: 254
+          minLength: 6
+          pattern: ^(.+)@(.+)$
+        Status:
+          $ref: '#/components/schemas/EmailContactStatus'
+        CreationTime:
+          type: string
+          format: date-time
+        UpdateTime:
+          type: string
+          format: date-time
+      required:
+        - Address
+        - Arn
+        - CreationTime
+        - Name
+        - Status
+        - UpdateTime
+      additionalProperties: false
+    EmailContactStatus:
+      type: string
+      enum:
+        - inactive
+        - active
+    TagMap:
+      description: A list of tags that are attached to the role.
+      type: array
+      uniqueItems: false
+      x-insertionOrder: false
+      items:
+        $ref: '#/components/schemas/Tag'
+    Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
     EmailContact:
       type: object
       properties:
@@ -407,7 +466,7 @@ components:
           minLength: 1
           pattern: '[\w-.~]+'
         EmailContact:
-          $ref: '#/components/schemas/EmailContact'
+          $ref: '#/components/schemas/EmailContact_EmailContact'
         Tags:
           $ref: '#/components/schemas/TagMap'
       required:
@@ -465,33 +524,6 @@ components:
           - notifications-contacts:GetEmailContact
         list:
           - notifications-contacts:ListEmailContacts
-    EmailContactStatus:
-      type: string
-      enum:
-        - inactive
-        - active
-    TagMap:
-      description: A list of tags that are attached to the role.
-      type: array
-      uniqueItems: false
-      x-insertionOrder: false
-      items:
-        $ref: '#/components/schemas/Tag'
-    Tag:
-      type: object
-      additionalProperties: false
-      properties:
-        Key:
-          type: string
-          minLength: 1
-          maxLength: 128
-        Value:
-          type: string
-          minLength: 0
-          maxLength: 256
-      required:
-        - Key
-        - Value
     CreateEmailContactRequest:
       properties:
         ClientToken:
@@ -519,7 +551,7 @@ components:
               minLength: 1
               pattern: '[\w-.~]+'
             EmailContact:
-              $ref: '#/components/schemas/EmailContact'
+              $ref: '#/components/schemas/EmailContact_EmailContact'
             Tags:
               $ref: '#/components/schemas/TagMap'
           x-stackQL-stringOnly: true
@@ -539,7 +571,7 @@ components:
       id: awscc.notificationscontacts.email_contacts
       x-cfn-schema-name: EmailContact
       x-cfn-type-name: AWS::NotificationsContacts::EmailContact
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -616,8 +648,7 @@ components:
       id: awscc.notificationscontacts.email_contacts_list_only
       x-cfn-schema-name: EmailContact
       x-cfn-type-name: AWS::NotificationsContacts::EmailContact
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/oam.yaml b/openapi/src/awscc/v00.00.00000/services/oam.yaml
index 61315358a..4a984884b 100644
--- a/openapi/src/awscc/v00.00.00000/services/oam.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/oam.yaml
@@ -697,7 +697,7 @@ components:
       id: awscc.oam.links
       x-cfn-schema-name: Link
       x-cfn-type-name: AWS::Oam::Link
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -795,8 +795,7 @@ components:
       id: awscc.oam.links_list_only
       x-cfn-schema-name: Link
       x-cfn-type-name: AWS::Oam::Link
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -826,7 +825,7 @@ components:
       id: awscc.oam.sinks
       x-cfn-schema-name: Sink
       x-cfn-type-name: AWS::Oam::Sink
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -918,8 +917,7 @@ components:
       id: awscc.oam.sinks_list_only
       x-cfn-schema-name: Sink
       x-cfn-type-name: AWS::Oam::Sink
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/observabilityadmin.yaml b/openapi/src/awscc/v00.00.00000/services/observabilityadmin.yaml
index ce5c184bd..b478ee517 100644
--- a/openapi/src/awscc/v00.00.00000/services/observabilityadmin.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/observabilityadmin.yaml
@@ -391,12 +391,12 @@ components:
       type: object
   schemas:
     ResourceType:
-      description: Resource Type associated with the Telemetry Rule
+      description: Resource Type associated with the Organization Telemetry Rule
       type: string
       enum:
         - AWS::EC2::VPC
     TelemetryType:
-      description: Telemetry Type associated with the Telemetry Rule
+      description: Telemetry Type associated with the Organization Telemetry Rule
       type: string
       enum:
         - Logs
@@ -446,19 +446,55 @@ components:
           $ref: '#/components/schemas/VPCFlowLogParameters'
       required: []
       additionalProperties: false
-    TelemetryRule:
+    OrganizationTelemetryRule_TelemetryRule:
+      description: The telemetry rule
+      type: object
+      properties:
+        ResourceType:
+          $ref: '#/components/schemas/ResourceType'
+        TelemetryType:
+          $ref: '#/components/schemas/TelemetryType'
+        DestinationConfiguration:
+          $ref: '#/components/schemas/TelemetryDestinationConfiguration'
+        Scope:
+          $ref: '#/components/schemas/Scope'
+        SelectionCriteria:
+          $ref: '#/components/schemas/SelectionCriteria'
+      required:
+        - ResourceType
+        - TelemetryType
+      additionalProperties: false
+    Tag:
+      description: A key-value pair to associate with a resource
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
+    OrganizationTelemetryRule:
       type: object
       properties:
         RuleName:
-          description: The name of the telemetry rule
+          description: The name of the organization telemetry rule
           type: string
           minLength: 1
           maxLength: 100
           pattern: ^[0-9A-Za-z-]+$
         Rule:
-          $ref: '#/components/schemas/TelemetryRule'
+          $ref: '#/components/schemas/OrganizationTelemetryRule_TelemetryRule'
         RuleArn:
-          description: The arn of the telemetry rule
+          description: The arn of the organization telemetry rule
           type: string
           minLength: 1
           maxLength: 1011
@@ -473,9 +509,9 @@ components:
       required:
         - RuleName
         - Rule
-      x-stackql-resource-name: telemetry_rule
-      description: The AWS::ObservabilityAdmin::TelemetryRule resource defines a CloudWatch Observability Admin Telemetry Rule.
-      x-type-name: AWS::ObservabilityAdmin::TelemetryRule
+      x-stackql-resource-name: organization_telemetry_rule
+      description: The AWS::ObservabilityAdmin::OrganizationTelemetryRule resource defines a CloudWatch Observability Admin Organization Telemetry Rule.
+      x-type-name: AWS::ObservabilityAdmin::OrganizationTelemetryRule
       x-stackql-primary-identifier:
         - RuleArn
       x-create-only-properties:
@@ -497,60 +533,73 @@ components:
           - observabilityadmin:ListTagsForResource
       x-required-permissions:
         create:
-          - observabilityadmin:CreateTelemetryRule
-          - observabilityadmin:GetTelemetryRule
+          - observabilityadmin:CreateTelemetryRuleForOrganization
+          - observabilityadmin:GetTelemetryRuleForOrganization
           - observabilityadmin:TagResource
           - observabilityadmin:ListTagsForResource
-          - observabilityadmin:GetTelemetryEvaluationStatus
+          - observabilityadmin:GetTelemetryEvaluationStatusForOrganization
+          - organizations:ListDelegatedAdministrators
           - iam:CreateServiceLinkedRole
         read:
-          - observabilityadmin:GetTelemetryRule
+          - observabilityadmin:GetTelemetryRuleForOrganization
           - observabilityadmin:ListTagsForResource
-          - observabilityadmin:GetTelemetryEvaluationStatus
+          - observabilityadmin:GetTelemetryEvaluationStatusForOrganization
+          - organizations:ListDelegatedAdministrators
         update:
-          - observabilityadmin:UpdateTelemetryRule
-          - observabilityadmin:GetTelemetryRule
+          - observabilityadmin:UpdateTelemetryRuleForOrganization
+          - observabilityadmin:GetTelemetryRuleForOrganization
           - observabilityadmin:TagResource
           - observabilityadmin:UntagResource
           - observabilityadmin:ListTagsForResource
-          - observabilityadmin:GetTelemetryEvaluationStatus
+          - observabilityadmin:GetTelemetryEvaluationStatusForOrganization
+          - organizations:ListDelegatedAdministrators
         delete:
-          - observabilityadmin:DeleteTelemetryRule
-          - observabilityadmin:GetTelemetryEvaluationStatus
+          - observabilityadmin:DeleteTelemetryRuleForOrganization
+          - observabilityadmin:GetTelemetryEvaluationStatusForOrganization
+          - organizations:ListDelegatedAdministrators
         list:
-          - observabilityadmin:ListTelemetryRules
-          - observabilityadmin:GetTelemetryEvaluationStatus
-    Tag:
-      description: A key-value pair to associate with a resource
+          - observabilityadmin:ListTelemetryRulesForOrganization
+          - observabilityadmin:GetTelemetryEvaluationStatusForOrganization
+          - organizations:ListDelegatedAdministrators
+    TelemetryRule_ResourceType:
+      description: Resource Type associated with the Telemetry Rule
+      type: string
+      enum:
+        - AWS::EC2::VPC
+    TelemetryRule_TelemetryType:
+      description: Telemetry Type associated with the Telemetry Rule
+      type: string
+      enum:
+        - Logs
+    TelemetryRule_TelemetryRule:
+      description: The telemetry rule
       type: object
       properties:
-        Key:
-          type: string
-          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
-          minLength: 1
-          maxLength: 128
-        Value:
-          type: string
-          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
-          minLength: 0
-          maxLength: 256
+        ResourceType:
+          $ref: '#/components/schemas/TelemetryRule_ResourceType'
+        TelemetryType:
+          $ref: '#/components/schemas/TelemetryRule_TelemetryType'
+        DestinationConfiguration:
+          $ref: '#/components/schemas/TelemetryDestinationConfiguration'
+        SelectionCriteria:
+          $ref: '#/components/schemas/SelectionCriteria'
       required:
-        - Key
-        - Value
+        - ResourceType
+        - TelemetryType
       additionalProperties: false
-    OrganizationTelemetryRule:
+    TelemetryRule:
       type: object
       properties:
         RuleName:
-          description: The name of the organization telemetry rule
+          description: The name of the telemetry rule
           type: string
           minLength: 1
           maxLength: 100
           pattern: ^[0-9A-Za-z-]+$
         Rule:
-          $ref: '#/components/schemas/TelemetryRule'
+          $ref: '#/components/schemas/TelemetryRule_TelemetryRule'
         RuleArn:
-          description: The arn of the organization telemetry rule
+          description: The arn of the telemetry rule
           type: string
           minLength: 1
           maxLength: 1011
@@ -565,9 +614,9 @@ components:
       required:
         - RuleName
         - Rule
-      x-stackql-resource-name: organization_telemetry_rule
-      description: The AWS::ObservabilityAdmin::OrganizationTelemetryRule resource defines a CloudWatch Observability Admin Organization Telemetry Rule.
-      x-type-name: AWS::ObservabilityAdmin::OrganizationTelemetryRule
+      x-stackql-resource-name: telemetry_rule
+      description: The AWS::ObservabilityAdmin::TelemetryRule resource defines a CloudWatch Observability Admin Telemetry Rule.
+      x-type-name: AWS::ObservabilityAdmin::TelemetryRule
       x-stackql-primary-identifier:
         - RuleArn
       x-create-only-properties:
@@ -589,35 +638,30 @@ components:
           - observabilityadmin:ListTagsForResource
       x-required-permissions:
         create:
-          - observabilityadmin:CreateTelemetryRuleForOrganization
-          - observabilityadmin:GetTelemetryRuleForOrganization
+          - observabilityadmin:CreateTelemetryRule
+          - observabilityadmin:GetTelemetryRule
           - observabilityadmin:TagResource
           - observabilityadmin:ListTagsForResource
-          - observabilityadmin:GetTelemetryEvaluationStatusForOrganization
-          - organizations:ListDelegatedAdministrators
+          - observabilityadmin:GetTelemetryEvaluationStatus
           - iam:CreateServiceLinkedRole
         read:
-          - observabilityadmin:GetTelemetryRuleForOrganization
+          - observabilityadmin:GetTelemetryRule
           - observabilityadmin:ListTagsForResource
-          - observabilityadmin:GetTelemetryEvaluationStatusForOrganization
-          - organizations:ListDelegatedAdministrators
+          - observabilityadmin:GetTelemetryEvaluationStatus
         update:
-          - observabilityadmin:UpdateTelemetryRuleForOrganization
-          - observabilityadmin:GetTelemetryRuleForOrganization
+          - observabilityadmin:UpdateTelemetryRule
+          - observabilityadmin:GetTelemetryRule
           - observabilityadmin:TagResource
           - observabilityadmin:UntagResource
           - observabilityadmin:ListTagsForResource
-          - observabilityadmin:GetTelemetryEvaluationStatusForOrganization
-          - organizations:ListDelegatedAdministrators
+          - observabilityadmin:GetTelemetryEvaluationStatus
         delete:
-          - observabilityadmin:DeleteTelemetryRuleForOrganization
-          - observabilityadmin:GetTelemetryEvaluationStatusForOrganization
-          - organizations:ListDelegatedAdministrators
+          - observabilityadmin:DeleteTelemetryRule
+          - observabilityadmin:GetTelemetryEvaluationStatus
         list:
-          - observabilityadmin:ListTelemetryRulesForOrganization
-          - observabilityadmin:GetTelemetryEvaluationStatusForOrganization
-          - organizations:ListDelegatedAdministrators
-    CreateTelemetryRuleRequest:
+          - observabilityadmin:ListTelemetryRules
+          - observabilityadmin:GetTelemetryEvaluationStatus
+    CreateOrganizationTelemetryRuleRequest:
       properties:
         ClientToken:
           type: string
@@ -631,15 +675,15 @@ components:
           type: object
           properties:
             RuleName:
-              description: The name of the telemetry rule
+              description: The name of the organization telemetry rule
               type: string
               minLength: 1
               maxLength: 100
               pattern: ^[0-9A-Za-z-]+$
             Rule:
-              $ref: '#/components/schemas/TelemetryRule'
+              $ref: '#/components/schemas/OrganizationTelemetryRule_TelemetryRule'
             RuleArn:
-              description: The arn of the telemetry rule
+              description: The arn of the organization telemetry rule
               type: string
               minLength: 1
               maxLength: 1011
@@ -652,10 +696,10 @@ components:
               items:
                 $ref: '#/components/schemas/Tag'
           x-stackQL-stringOnly: true
-      x-title: CreateTelemetryRuleRequest
+      x-title: CreateOrganizationTelemetryRuleRequest
       type: object
       required: []
-    CreateOrganizationTelemetryRuleRequest:
+    CreateTelemetryRuleRequest:
       properties:
         ClientToken:
           type: string
@@ -669,15 +713,15 @@ components:
           type: object
           properties:
             RuleName:
-              description: The name of the organization telemetry rule
+              description: The name of the telemetry rule
               type: string
               minLength: 1
               maxLength: 100
               pattern: ^[0-9A-Za-z-]+$
             Rule:
-              $ref: '#/components/schemas/TelemetryRule'
+              $ref: '#/components/schemas/TelemetryRule_TelemetryRule'
             RuleArn:
-              description: The arn of the organization telemetry rule
+              description: The arn of the telemetry rule
               type: string
               minLength: 1
               maxLength: 1011
@@ -690,7 +734,7 @@ components:
               items:
                 $ref: '#/components/schemas/Tag'
           x-stackQL-stringOnly: true
-      x-title: CreateOrganizationTelemetryRuleRequest
+      x-title: CreateTelemetryRuleRequest
       type: object
       required: []
   securitySchemes:
@@ -701,12 +745,12 @@ components:
       description: Amazon Signature authorization v4
       x-amazon-apigateway-authtype: awsSigv4
   x-stackQL-resources:
-    telemetry_rules:
-      name: telemetry_rules
-      id: awscc.observabilityadmin.telemetry_rules
-      x-cfn-schema-name: TelemetryRule
-      x-cfn-type-name: AWS::ObservabilityAdmin::TelemetryRule
-      x-identifiers:
+    organization_telemetry_rules:
+      name: organization_telemetry_rules
+      id: awscc.observabilityadmin.organization_telemetry_rules
+      x-cfn-schema-name: OrganizationTelemetryRule
+      x-cfn-type-name: AWS::ObservabilityAdmin::OrganizationTelemetryRule
+      x-identifiers: &ref_0
         - RuleArn
       x-type: cloud_control
       methods:
@@ -715,12 +759,12 @@ components:
             requestBodyTranslate:
               algorithm: naive_DesiredState
           operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__TelemetryRule&__detailTransformed=true/post'
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__OrganizationTelemetryRule&__detailTransformed=true/post'
           request:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::ObservabilityAdmin::TelemetryRule"
+                "TypeName": "AWS::ObservabilityAdmin::OrganizationTelemetryRule"
               }
           response:
             mediaType: application/json
@@ -736,7 +780,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::ObservabilityAdmin::TelemetryRule"
+                "TypeName": "AWS::ObservabilityAdmin::OrganizationTelemetryRule"
               }
           response:
             mediaType: application/json
@@ -752,7 +796,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::ObservabilityAdmin::TelemetryRule"
+                "TypeName": "AWS::ObservabilityAdmin::OrganizationTelemetryRule"
               }
           response:
             mediaType: application/json
@@ -760,11 +804,11 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/telemetry_rules/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/organization_telemetry_rules/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/telemetry_rules/methods/delete_resource'
+          - $ref: '#/components/x-stackQL-resources/organization_telemetry_rules/methods/delete_resource'
         update:
-          - $ref: '#/components/x-stackQL-resources/telemetry_rules/methods/update_resource'
+          - $ref: '#/components/x-stackQL-resources/organization_telemetry_rules/methods/update_resource'
       config:
         views:
           select:
@@ -777,7 +821,7 @@ components:
               JSON_EXTRACT(Properties, '$.Rule') as rule,
               JSON_EXTRACT(Properties, '$.RuleArn') as rule_arn,
               JSON_EXTRACT(Properties, '$.Tags') as tags
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::ObservabilityAdmin::TelemetryRule'
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::ObservabilityAdmin::OrganizationTelemetryRule'
               AND Identifier = '<RuleArn>'
               AND region = 'us-east-1'
             fallback:
@@ -790,16 +834,15 @@ components:
                 json_extract_path_text(Properties, 'Rule') as rule,
                 json_extract_path_text(Properties, 'RuleArn') as rule_arn,
                 json_extract_path_text(Properties, 'Tags') as tags
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::ObservabilityAdmin::TelemetryRule'
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::ObservabilityAdmin::OrganizationTelemetryRule'
                 AND Identifier = '<RuleArn>'
                 AND region = 'us-east-1'
-    telemetry_rules_list_only:
-      name: telemetry_rules_list_only
-      id: awscc.observabilityadmin.telemetry_rules_list_only
-      x-cfn-schema-name: TelemetryRule
-      x-cfn-type-name: AWS::ObservabilityAdmin::TelemetryRule
-      x-identifiers:
-        - RuleArn
+    organization_telemetry_rules_list_only:
+      name: organization_telemetry_rules_list_only
+      id: awscc.observabilityadmin.organization_telemetry_rules_list_only
+      x-cfn-schema-name: OrganizationTelemetryRule
+      x-cfn-type-name: AWS::ObservabilityAdmin::OrganizationTelemetryRule
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -814,7 +857,7 @@ components:
               SELECT
               region,
               JSON_EXTRACT(Properties, '$.RuleArn') as rule_arn
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::ObservabilityAdmin::TelemetryRule'
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::ObservabilityAdmin::OrganizationTelemetryRule'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres"
@@ -822,14 +865,14 @@ components:
                 SELECT
                 region,
                 json_extract_path_text(Properties, 'RuleArn') as rule_arn
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::ObservabilityAdmin::TelemetryRule'
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::ObservabilityAdmin::OrganizationTelemetryRule'
                 AND region = 'us-east-1'
-    organization_telemetry_rules:
-      name: organization_telemetry_rules
-      id: awscc.observabilityadmin.organization_telemetry_rules
-      x-cfn-schema-name: OrganizationTelemetryRule
-      x-cfn-type-name: AWS::ObservabilityAdmin::OrganizationTelemetryRule
-      x-identifiers:
+    telemetry_rules:
+      name: telemetry_rules
+      id: awscc.observabilityadmin.telemetry_rules
+      x-cfn-schema-name: TelemetryRule
+      x-cfn-type-name: AWS::ObservabilityAdmin::TelemetryRule
+      x-identifiers: &ref_1
         - RuleArn
       x-type: cloud_control
       methods:
@@ -838,12 +881,12 @@ components:
             requestBodyTranslate:
               algorithm: naive_DesiredState
           operation:
-            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__OrganizationTelemetryRule&__detailTransformed=true/post'
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__TelemetryRule&__detailTransformed=true/post'
           request:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::ObservabilityAdmin::OrganizationTelemetryRule"
+                "TypeName": "AWS::ObservabilityAdmin::TelemetryRule"
               }
           response:
             mediaType: application/json
@@ -859,7 +902,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::ObservabilityAdmin::OrganizationTelemetryRule"
+                "TypeName": "AWS::ObservabilityAdmin::TelemetryRule"
               }
           response:
             mediaType: application/json
@@ -875,7 +918,7 @@ components:
             mediaType: application/x-amz-json-1.0
             base: |-
               {
-                "TypeName": "AWS::ObservabilityAdmin::OrganizationTelemetryRule"
+                "TypeName": "AWS::ObservabilityAdmin::TelemetryRule"
               }
           response:
             mediaType: application/json
@@ -883,11 +926,11 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/organization_telemetry_rules/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/telemetry_rules/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/organization_telemetry_rules/methods/delete_resource'
+          - $ref: '#/components/x-stackQL-resources/telemetry_rules/methods/delete_resource'
         update:
-          - $ref: '#/components/x-stackQL-resources/organization_telemetry_rules/methods/update_resource'
+          - $ref: '#/components/x-stackQL-resources/telemetry_rules/methods/update_resource'
       config:
         views:
           select:
@@ -900,7 +943,7 @@ components:
               JSON_EXTRACT(Properties, '$.Rule') as rule,
               JSON_EXTRACT(Properties, '$.RuleArn') as rule_arn,
               JSON_EXTRACT(Properties, '$.Tags') as tags
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::ObservabilityAdmin::OrganizationTelemetryRule'
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::ObservabilityAdmin::TelemetryRule'
               AND Identifier = '<RuleArn>'
               AND region = 'us-east-1'
             fallback:
@@ -913,16 +956,15 @@ components:
                 json_extract_path_text(Properties, 'Rule') as rule,
                 json_extract_path_text(Properties, 'RuleArn') as rule_arn,
                 json_extract_path_text(Properties, 'Tags') as tags
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::ObservabilityAdmin::OrganizationTelemetryRule'
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::ObservabilityAdmin::TelemetryRule'
                 AND Identifier = '<RuleArn>'
                 AND region = 'us-east-1'
-    organization_telemetry_rules_list_only:
-      name: organization_telemetry_rules_list_only
-      id: awscc.observabilityadmin.organization_telemetry_rules_list_only
-      x-cfn-schema-name: OrganizationTelemetryRule
-      x-cfn-type-name: AWS::ObservabilityAdmin::OrganizationTelemetryRule
-      x-identifiers:
-        - RuleArn
+    telemetry_rules_list_only:
+      name: telemetry_rules_list_only
+      id: awscc.observabilityadmin.telemetry_rules_list_only
+      x-cfn-schema-name: TelemetryRule
+      x-cfn-type-name: AWS::ObservabilityAdmin::TelemetryRule
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -937,7 +979,7 @@ components:
               SELECT
               region,
               JSON_EXTRACT(Properties, '$.RuleArn') as rule_arn
-              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::ObservabilityAdmin::OrganizationTelemetryRule'
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::ObservabilityAdmin::TelemetryRule'
               AND region = 'us-east-1'
             fallback:
               predicate: sqlDialect == "postgres"
@@ -945,7 +987,7 @@ components:
                 SELECT
                 region,
                 json_extract_path_text(Properties, 'RuleArn') as rule_arn
-                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::ObservabilityAdmin::OrganizationTelemetryRule'
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::ObservabilityAdmin::TelemetryRule'
                 AND region = 'us-east-1'
 paths:
   /?Action=CreateResource&Version=2021-09-30:
@@ -1091,7 +1133,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__TelemetryRule&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__OrganizationTelemetryRule&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -1101,7 +1143,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateTelemetryRule
+      operationId: CreateOrganizationTelemetryRule
       parameters:
         - description: Action Header
           in: header
@@ -1124,7 +1166,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateTelemetryRuleRequest'
+              $ref: '#/components/schemas/CreateOrganizationTelemetryRuleRequest'
         required: true
       responses:
         '200':
@@ -1133,7 +1175,7 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
-  /?Action=CreateResource&Version=2021-09-30&__OrganizationTelemetryRule&__detailTransformed=true:
+  /?Action=CreateResource&Version=2021-09-30&__TelemetryRule&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
       - $ref: '#/components/parameters/X-Amz-Date'
@@ -1143,7 +1185,7 @@ paths:
       - $ref: '#/components/parameters/X-Amz-Signature'
       - $ref: '#/components/parameters/X-Amz-SignedHeaders'
     post:
-      operationId: CreateOrganizationTelemetryRule
+      operationId: CreateTelemetryRule
       parameters:
         - description: Action Header
           in: header
@@ -1166,7 +1208,7 @@ paths:
         content:
           application/x-amz-json-1.0:
             schema:
-              $ref: '#/components/schemas/CreateOrganizationTelemetryRuleRequest'
+              $ref: '#/components/schemas/CreateTelemetryRuleRequest'
         required: true
       responses:
         '200':
diff --git a/openapi/src/awscc/v00.00.00000/services/odb.yaml b/openapi/src/awscc/v00.00.00000/services/odb.yaml
index dbaad03b3..7ce12c5e0 100644
--- a/openapi/src/awscc/v00.00.00000/services/odb.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/odb.yaml
@@ -1905,7 +1905,7 @@ components:
       id: awscc.odb.cloud_autonomous_vm_clusters
       x-cfn-schema-name: CloudAutonomousVmCluster
       x-cfn-type-name: AWS::ODB::CloudAutonomousVmCluster
-      x-identifiers:
+      x-identifiers: &ref_0
         - CloudAutonomousVmClusterArn
       x-type: cloud_control
       methods:
@@ -2077,8 +2077,7 @@ components:
       id: awscc.odb.cloud_autonomous_vm_clusters_list_only
       x-cfn-schema-name: CloudAutonomousVmCluster
       x-cfn-type-name: AWS::ODB::CloudAutonomousVmCluster
-      x-identifiers:
-        - CloudAutonomousVmClusterArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2108,7 +2107,7 @@ components:
       id: awscc.odb.cloud_exadata_infrastructures
       x-cfn-schema-name: CloudExadataInfrastructure
       x-cfn-type-name: AWS::ODB::CloudExadataInfrastructure
-      x-identifiers:
+      x-identifiers: &ref_1
         - CloudExadataInfrastructureArn
       x-type: cloud_control
       methods:
@@ -2254,8 +2253,7 @@ components:
       id: awscc.odb.cloud_exadata_infrastructures_list_only
       x-cfn-schema-name: CloudExadataInfrastructure
       x-cfn-type-name: AWS::ODB::CloudExadataInfrastructure
-      x-identifiers:
-        - CloudExadataInfrastructureArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2285,7 +2283,7 @@ components:
       id: awscc.odb.cloud_vm_clusters
       x-cfn-schema-name: CloudVmCluster
       x-cfn-type-name: AWS::ODB::CloudVmCluster
-      x-identifiers:
+      x-identifiers: &ref_2
         - CloudVmClusterArn
       x-type: cloud_control
       methods:
@@ -2439,8 +2437,7 @@ components:
       id: awscc.odb.cloud_vm_clusters_list_only
       x-cfn-schema-name: CloudVmCluster
       x-cfn-type-name: AWS::ODB::CloudVmCluster
-      x-identifiers:
-        - CloudVmClusterArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2470,7 +2467,7 @@ components:
       id: awscc.odb.odb_networks
       x-cfn-schema-name: OdbNetwork
       x-cfn-type-name: AWS::ODB::OdbNetwork
-      x-identifiers:
+      x-identifiers: &ref_3
         - OdbNetworkArn
       x-type: cloud_control
       methods:
@@ -2580,8 +2577,7 @@ components:
       id: awscc.odb.odb_networks_list_only
       x-cfn-schema-name: OdbNetwork
       x-cfn-type-name: AWS::ODB::OdbNetwork
-      x-identifiers:
-        - OdbNetworkArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/omics.yaml b/openapi/src/awscc/v00.00.00000/services/omics.yaml
index bcb2680a5..dd406d44a 100644
--- a/openapi/src/awscc/v00.00.00000/services/omics.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/omics.yaml
@@ -493,13 +493,11 @@ components:
         - FAILED
     TagMap:
       type: object
-      description: A map of resource tags
       x-patternProperties:
         .+:
           type: string
           maxLength: 256
           minLength: 0
-          description: Resource tag value
       additionalProperties: false
     TsvStoreOptions:
       type: object
@@ -622,6 +620,26 @@ components:
           - omics:ListAnnotationStores
         list:
           - omics:ListAnnotationStores
+    ReferenceStore_SseConfig:
+      type: object
+      description: Server-side encryption (SSE) settings for a store.
+      properties:
+        Type:
+          $ref: '#/components/schemas/EncryptionType'
+        KeyArn:
+          type: string
+          maxLength: 2048
+          minLength: 20
+          pattern: |-
+            arn:([^:
+            ]*):([^:
+            ]*):([^:
+            ]*):([0-9]{12}):([^:
+            ]*)
+          description: An encryption key ARN.
+      required:
+        - Type
+      additionalProperties: false
     ReferenceStore:
       type: object
       properties:
@@ -653,7 +671,7 @@ components:
           minLength: 10
           pattern: ^[0-9]+$
         SseConfig:
-          $ref: '#/components/schemas/SseConfig'
+          $ref: '#/components/schemas/ReferenceStore_SseConfig'
         Tags:
           $ref: '#/components/schemas/TagMap'
       required:
@@ -695,6 +713,16 @@ components:
           - omics:DeleteReferenceStore
         list:
           - omics:ListReferenceStores
+    RunGroup_TagMap:
+      type: object
+      description: A map of resource tags
+      x-patternProperties:
+        .+:
+          type: string
+          maxLength: 256
+          minLength: 0
+          description: Resource tag value
+      additionalProperties: false
     RunGroup:
       type: object
       properties:
@@ -733,7 +761,7 @@ components:
           minLength: 1
           pattern: ^[\p{L}||\p{M}||\p{Z}||\p{S}||\p{N}||\p{P}]+$
         Tags:
-          $ref: '#/components/schemas/TagMap'
+          $ref: '#/components/schemas/RunGroup_TagMap'
       x-stackql-resource-name: run_group
       description: Definition of AWS::Omics::RunGroup Resource Type
       x-type-name: AWS::Omics::RunGroup
@@ -784,6 +812,26 @@ components:
         - UPDATING
         - DELETING
         - FAILED
+    SequenceStore_SseConfig:
+      type: object
+      description: Server-side encryption (SSE) settings for a store.
+      properties:
+        Type:
+          $ref: '#/components/schemas/EncryptionType'
+        KeyArn:
+          type: string
+          maxLength: 2048
+          minLength: 20
+          pattern: |-
+            arn:([^:
+            ]*):([^:
+            ]*):([^:
+            ]*):([0-9]{12}):([^:
+            ]*)
+          description: An encryption key ARN.
+      required:
+        - Type
+      additionalProperties: false
     SequenceStore:
       type: object
       properties:
@@ -848,7 +896,7 @@ components:
           minLength: 10
           pattern: ^[0-9]+$
         SseConfig:
-          $ref: '#/components/schemas/SseConfig'
+          $ref: '#/components/schemas/SequenceStore_SseConfig'
         Status:
           $ref: '#/components/schemas/SequenceStoreStatus'
         StatusMessage:
@@ -1020,6 +1068,16 @@ components:
           - omics:ListVariantStores
         list:
           - omics:ListVariantStores
+    Workflow_TagMap:
+      type: object
+      description: A map of resource tags
+      x-patternProperties:
+        .+:
+          type: string
+          maxLength: 256
+          minLength: 0
+          description: Resource tag value
+      additionalProperties: false
     WorkflowEngine:
       type: string
       maxLength: 64
@@ -1063,14 +1121,12 @@ components:
         - UPDATING
         - DELETED
         - FAILED
-        - INACTIVE
     WorkflowType:
       type: string
       maxLength: 64
       minLength: 1
       enum:
         - PRIVATE
-        - READY2RUN
     StorageType:
       type: string
       maxLength: 64
@@ -1160,7 +1216,7 @@ components:
           maximum: 100000
           minimum: 0
         Tags:
-          $ref: '#/components/schemas/TagMap'
+          $ref: '#/components/schemas/Workflow_TagMap'
         Type:
           $ref: '#/components/schemas/WorkflowType'
         StorageType:
@@ -1262,6 +1318,34 @@ components:
           - omics:GetWorkflow
         list:
           - omics:ListWorkflows
+    WorkflowVersion_TagMap:
+      type: object
+      description: A map of resource tags
+      x-patternProperties:
+        .+:
+          type: string
+          maxLength: 256
+          minLength: 0
+          description: Resource tag value
+      additionalProperties: false
+    WorkflowVersion_WorkflowStatus:
+      type: string
+      maxLength: 64
+      minLength: 1
+      enum:
+        - CREATING
+        - ACTIVE
+        - UPDATING
+        - DELETED
+        - FAILED
+        - INACTIVE
+    WorkflowVersion_WorkflowType:
+      type: string
+      maxLength: 64
+      minLength: 1
+      enum:
+        - PRIVATE
+        - READY2RUN
     WorkflowVersion:
       type: object
       properties:
@@ -1303,7 +1387,7 @@ components:
         ParameterTemplate:
           $ref: '#/components/schemas/WorkflowParameterTemplate'
         Status:
-          $ref: '#/components/schemas/WorkflowStatus'
+          $ref: '#/components/schemas/WorkflowVersion_WorkflowStatus'
         Accelerators:
           $ref: '#/components/schemas/Accelerators'
         StorageType:
@@ -1313,9 +1397,9 @@ components:
           maximum: 100000
           minimum: 0
         Tags:
-          $ref: '#/components/schemas/TagMap'
+          $ref: '#/components/schemas/WorkflowVersion_TagMap'
         Type:
-          $ref: '#/components/schemas/WorkflowType'
+          $ref: '#/components/schemas/WorkflowVersion_WorkflowType'
         Uuid:
           type: string
           maxLength: 36
@@ -1528,7 +1612,7 @@ components:
               minLength: 10
               pattern: ^[0-9]+$
             SseConfig:
-              $ref: '#/components/schemas/SseConfig'
+              $ref: '#/components/schemas/ReferenceStore_SseConfig'
             Tags:
               $ref: '#/components/schemas/TagMap'
           x-stackQL-stringOnly: true
@@ -1583,7 +1667,7 @@ components:
               minLength: 1
               pattern: ^[\p{L}||\p{M}||\p{Z}||\p{S}||\p{N}||\p{P}]+$
             Tags:
-              $ref: '#/components/schemas/TagMap'
+              $ref: '#/components/schemas/RunGroup_TagMap'
           x-stackQL-stringOnly: true
       x-title: CreateRunGroupRequest
       type: object
@@ -1662,7 +1746,7 @@ components:
               minLength: 10
               pattern: ^[0-9]+$
             SseConfig:
-              $ref: '#/components/schemas/SseConfig'
+              $ref: '#/components/schemas/SequenceStore_SseConfig'
             Status:
               $ref: '#/components/schemas/SequenceStoreStatus'
             StatusMessage:
@@ -1797,7 +1881,7 @@ components:
               maximum: 100000
               minimum: 0
             Tags:
-              $ref: '#/components/schemas/TagMap'
+              $ref: '#/components/schemas/Workflow_TagMap'
             Type:
               $ref: '#/components/schemas/WorkflowType'
             StorageType:
@@ -1882,7 +1966,7 @@ components:
             ParameterTemplate:
               $ref: '#/components/schemas/WorkflowParameterTemplate'
             Status:
-              $ref: '#/components/schemas/WorkflowStatus'
+              $ref: '#/components/schemas/WorkflowVersion_WorkflowStatus'
             Accelerators:
               $ref: '#/components/schemas/Accelerators'
             StorageType:
@@ -1892,9 +1976,9 @@ components:
               maximum: 100000
               minimum: 0
             Tags:
-              $ref: '#/components/schemas/TagMap'
+              $ref: '#/components/schemas/WorkflowVersion_TagMap'
             Type:
-              $ref: '#/components/schemas/WorkflowType'
+              $ref: '#/components/schemas/WorkflowVersion_WorkflowType'
             Uuid:
               type: string
               maxLength: 36
@@ -1941,7 +2025,7 @@ components:
       id: awscc.omics.annotation_stores
       x-cfn-schema-name: AnnotationStore
       x-cfn-type-name: AWS::Omics::AnnotationStore
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -2053,8 +2137,7 @@ components:
       id: awscc.omics.annotation_stores_list_only
       x-cfn-schema-name: AnnotationStore
       x-cfn-type-name: AWS::Omics::AnnotationStore
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2084,7 +2167,7 @@ components:
       id: awscc.omics.reference_stores
       x-cfn-schema-name: ReferenceStore
       x-cfn-type-name: AWS::Omics::ReferenceStore
-      x-identifiers:
+      x-identifiers: &ref_1
         - ReferenceStoreId
       x-type: cloud_control
       methods:
@@ -2165,8 +2248,7 @@ components:
       id: awscc.omics.reference_stores_list_only
       x-cfn-schema-name: ReferenceStore
       x-cfn-type-name: AWS::Omics::ReferenceStore
-      x-identifiers:
-        - ReferenceStoreId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2196,7 +2278,7 @@ components:
       id: awscc.omics.run_groups
       x-cfn-schema-name: RunGroup
       x-cfn-type-name: AWS::Omics::RunGroup
-      x-identifiers:
+      x-identifiers: &ref_2
         - Id
       x-type: cloud_control
       methods:
@@ -2298,8 +2380,7 @@ components:
       id: awscc.omics.run_groups_list_only
       x-cfn-schema-name: RunGroup
       x-cfn-type-name: AWS::Omics::RunGroup
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2329,7 +2410,7 @@ components:
       id: awscc.omics.sequence_stores
       x-cfn-schema-name: SequenceStore
       x-cfn-type-name: AWS::Omics::SequenceStore
-      x-identifiers:
+      x-identifiers: &ref_3
         - SequenceStoreId
       x-type: cloud_control
       methods:
@@ -2447,8 +2528,7 @@ components:
       id: awscc.omics.sequence_stores_list_only
       x-cfn-schema-name: SequenceStore
       x-cfn-type-name: AWS::Omics::SequenceStore
-      x-identifiers:
-        - SequenceStoreId
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2478,7 +2558,7 @@ components:
       id: awscc.omics.variant_stores
       x-cfn-schema-name: VariantStore
       x-cfn-type-name: AWS::Omics::VariantStore
-      x-identifiers:
+      x-identifiers: &ref_4
         - Name
       x-type: cloud_control
       methods:
@@ -2586,8 +2666,7 @@ components:
       id: awscc.omics.variant_stores_list_only
       x-cfn-schema-name: VariantStore
       x-cfn-type-name: AWS::Omics::VariantStore
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2617,7 +2696,7 @@ components:
       id: awscc.omics.workflows
       x-cfn-schema-name: Workflow
       x-cfn-type-name: AWS::Omics::Workflow
-      x-identifiers:
+      x-identifiers: &ref_5
         - Id
       x-type: cloud_control
       methods:
@@ -2745,8 +2824,7 @@ components:
       id: awscc.omics.workflows_list_only
       x-cfn-schema-name: Workflow
       x-cfn-type-name: AWS::Omics::Workflow
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2776,7 +2854,7 @@ components:
       id: awscc.omics.workflow_versions
       x-cfn-schema-name: WorkflowVersion
       x-cfn-type-name: AWS::Omics::WorkflowVersion
-      x-identifiers:
+      x-identifiers: &ref_6
         - Arn
       x-type: cloud_control
       methods:
@@ -2904,8 +2982,7 @@ components:
       id: awscc.omics.workflow_versions_list_only
       x-cfn-schema-name: WorkflowVersion
       x-cfn-type-name: AWS::Omics::WorkflowVersion
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/opensearchserverless.yaml b/openapi/src/awscc/v00.00.00000/services/opensearchserverless.yaml
index 17da04697..3bc7c87ce 100644
--- a/openapi/src/awscc/v00.00.00000/services/opensearchserverless.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/opensearchserverless.yaml
@@ -1450,7 +1450,7 @@ components:
       id: awscc.opensearchserverless.access_policies
       x-cfn-schema-name: AccessPolicy
       x-cfn-type-name: AWS::OpenSearchServerless::AccessPolicy
-      x-identifiers:
+      x-identifiers: &ref_0
         - Type
         - Name
       x-type: cloud_control
@@ -1543,9 +1543,7 @@ components:
       id: awscc.opensearchserverless.access_policies_list_only
       x-cfn-schema-name: AccessPolicy
       x-cfn-type-name: AWS::OpenSearchServerless::AccessPolicy
-      x-identifiers:
-        - Type
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1577,7 +1575,7 @@ components:
       id: awscc.opensearchserverless.collections
       x-cfn-schema-name: Collection
       x-cfn-type-name: AWS::OpenSearchServerless::Collection
-      x-identifiers:
+      x-identifiers: &ref_1
         - Id
       x-type: cloud_control
       methods:
@@ -1679,8 +1677,7 @@ components:
       id: awscc.opensearchserverless.collections_list_only
       x-cfn-schema-name: Collection
       x-cfn-type-name: AWS::OpenSearchServerless::Collection
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1710,7 +1707,7 @@ components:
       id: awscc.opensearchserverless.indices
       x-cfn-schema-name: Index
       x-cfn-type-name: AWS::OpenSearchServerless::Index
-      x-identifiers:
+      x-identifiers: &ref_2
         - IndexName
         - CollectionEndpoint
       x-type: cloud_control
@@ -1805,9 +1802,7 @@ components:
       id: awscc.opensearchserverless.indices_list_only
       x-cfn-schema-name: Index
       x-cfn-type-name: AWS::OpenSearchServerless::Index
-      x-identifiers:
-        - IndexName
-        - CollectionEndpoint
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1839,7 +1834,7 @@ components:
       id: awscc.opensearchserverless.lifecycle_policies
       x-cfn-schema-name: LifecyclePolicy
       x-cfn-type-name: AWS::OpenSearchServerless::LifecyclePolicy
-      x-identifiers:
+      x-identifiers: &ref_3
         - Type
         - Name
       x-type: cloud_control
@@ -1932,9 +1927,7 @@ components:
       id: awscc.opensearchserverless.lifecycle_policies_list_only
       x-cfn-schema-name: LifecyclePolicy
       x-cfn-type-name: AWS::OpenSearchServerless::LifecyclePolicy
-      x-identifiers:
-        - Type
-        - Name
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1966,7 +1959,7 @@ components:
       id: awscc.opensearchserverless.security_configs
       x-cfn-schema-name: SecurityConfig
       x-cfn-type-name: AWS::OpenSearchServerless::SecurityConfig
-      x-identifiers:
+      x-identifiers: &ref_4
         - Id
       x-type: cloud_control
       methods:
@@ -2062,8 +2055,7 @@ components:
       id: awscc.opensearchserverless.security_configs_list_only
       x-cfn-schema-name: SecurityConfig
       x-cfn-type-name: AWS::OpenSearchServerless::SecurityConfig
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2093,7 +2085,7 @@ components:
       id: awscc.opensearchserverless.security_policies
       x-cfn-schema-name: SecurityPolicy
       x-cfn-type-name: AWS::OpenSearchServerless::SecurityPolicy
-      x-identifiers:
+      x-identifiers: &ref_5
         - Type
         - Name
       x-type: cloud_control
@@ -2186,9 +2178,7 @@ components:
       id: awscc.opensearchserverless.security_policies_list_only
       x-cfn-schema-name: SecurityPolicy
       x-cfn-type-name: AWS::OpenSearchServerless::SecurityPolicy
-      x-identifiers:
-        - Type
-        - Name
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2220,7 +2210,7 @@ components:
       id: awscc.opensearchserverless.vpc_endpoints
       x-cfn-schema-name: VpcEndpoint
       x-cfn-type-name: AWS::OpenSearchServerless::VpcEndpoint
-      x-identifiers:
+      x-identifiers: &ref_6
         - Id
       x-type: cloud_control
       methods:
@@ -2314,8 +2304,7 @@ components:
       id: awscc.opensearchserverless.vpc_endpoints_list_only
       x-cfn-schema-name: VpcEndpoint
       x-cfn-type-name: AWS::OpenSearchServerless::VpcEndpoint
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/opensearchservice.yaml b/openapi/src/awscc/v00.00.00000/services/opensearchservice.yaml
index fee24e314..e3d4a25f5 100644
--- a/openapi/src/awscc/v00.00.00000/services/opensearchservice.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/opensearchservice.yaml
@@ -398,21 +398,22 @@ components:
       description: AppConfig type values.
     Tag:
       type: object
-      additionalProperties: false
+      description: A key-value pair metadata associated with resource
       properties:
+        Key:
+          type: string
+          maxLength: 128
+          minLength: 1
+          description: The key in the key-value pair
         Value:
-          description: The key of the tag.
           type: string
-          minLength: 0
           maxLength: 256
-        Key:
-          description: The value of the tag.
-          type: string
           minLength: 0
-          maxLength: 128
+          description: The value in the key-value pair
       required:
-        - Value
         - Key
+        - Value
+      additionalProperties: false
     AppConfig:
       type: object
       description: A key-value pair of AppConfig
@@ -764,6 +765,23 @@ components:
           type: string
         Enabled:
           type: boolean
+    Domain_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Value:
+          description: The key of the tag.
+          type: string
+          minLength: 0
+          maxLength: 256
+        Key:
+          description: The value of the tag.
+          type: string
+          minLength: 0
+          maxLength: 128
+      required:
+        - Value
+        - Key
     ServiceSoftwareOptions:
       type: object
       additionalProperties: false
@@ -921,7 +939,7 @@ components:
         Tags:
           description: An arbitrary set of tags (key-value pairs) for this Domain.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Domain_Tag'
           type: array
           uniqueItems: true
         ServiceSoftwareOptions:
@@ -1127,7 +1145,7 @@ components:
             Tags:
               description: An arbitrary set of tags (key-value pairs) for this Domain.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Domain_Tag'
               type: array
               uniqueItems: true
             ServiceSoftwareOptions:
@@ -1157,7 +1175,7 @@ components:
       id: awscc.opensearchservice.applications
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::OpenSearchService::Application
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -1257,8 +1275,7 @@ components:
       id: awscc.opensearchservice.applications_list_only
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::OpenSearchService::Application
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/organizations.yaml b/openapi/src/awscc/v00.00.00000/services/organizations.yaml
index 1c43ce7f4..650d3294e 100644
--- a/openapi/src/awscc/v00.00.00000/services/organizations.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/organizations.yaml
@@ -393,21 +393,23 @@ components:
     Tag:
       description: A custom key-value pair associated with a resource within your organization.
       type: object
+      additionalProperties: false
       properties:
         Key:
-          type: string
           description: The key identifier, or name, of the tag.
+          type: string
+          pattern: '[\s\S]*'
           minLength: 1
           maxLength: 128
         Value:
-          type: string
           description: The string value that's associated with the key of the tag. You can set the value of a tag to an empty string, but you can't set the value of a tag to null.
+          type: string
+          pattern: '[\s\S]*'
           minLength: 0
           maxLength: 256
       required:
-        - Key
         - Value
-      additionalProperties: false
+        - Key
     Account:
       type: object
       properties:
@@ -592,6 +594,24 @@ components:
           - organizations:DescribeOrganization
         update:
           - organizations:DescribeOrganization
+    OrganizationalUnit_Tag:
+      description: A custom key-value pair associated with a resource within your organization.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: The key identifier, or name, of the tag.
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: The string value that's associated with the key of the tag. You can set the value of a tag to an empty string, but you can't set the value of a tag to null.
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     OrganizationalUnit:
       type: object
       properties:
@@ -621,7 +641,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/OrganizationalUnit_Tag'
       required:
         - Name
         - ParentId
@@ -788,6 +808,24 @@ components:
           - organizations:DeletePolicy
         list:
           - organizations:ListPolicies
+    ResourcePolicy_Tag:
+      description: A custom key-value pair associated with a resource within your organization.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: The key identifier, or name, of the tag.
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: The string value that's associated with the key of the tag. You can set the value of a tag to an empty string, but you can't set the value of a tag to null.
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     ResourcePolicy:
       type: object
       properties:
@@ -812,7 +850,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ResourcePolicy_Tag'
       required:
         - Content
       x-stackql-resource-name: resource_policy
@@ -1020,7 +1058,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/OrganizationalUnit_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateOrganizationalUnitRequest
       type: object
@@ -1132,7 +1170,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ResourcePolicy_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateResourcePolicyRequest
       type: object
@@ -1150,7 +1188,7 @@ components:
       id: awscc.organizations.accounts
       x-cfn-schema-name: Account
       x-cfn-type-name: AWS::Organizations::Account
-      x-identifiers:
+      x-identifiers: &ref_0
         - AccountId
       x-type: cloud_control
       methods:
@@ -1254,8 +1292,7 @@ components:
       id: awscc.organizations.accounts_list_only
       x-cfn-schema-name: Account
       x-cfn-type-name: AWS::Organizations::Account
-      x-identifiers:
-        - AccountId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1285,7 +1322,7 @@ components:
       id: awscc.organizations.organizations
       x-cfn-schema-name: Organization
       x-cfn-type-name: AWS::Organizations::Organization
-      x-identifiers:
+      x-identifiers: &ref_1
         - Id
       x-type: cloud_control
       methods:
@@ -1383,8 +1420,7 @@ components:
       id: awscc.organizations.organizations_list_only
       x-cfn-schema-name: Organization
       x-cfn-type-name: AWS::Organizations::Organization
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1414,7 +1450,7 @@ components:
       id: awscc.organizations.organizational_units
       x-cfn-schema-name: OrganizationalUnit
       x-cfn-type-name: AWS::Organizations::OrganizationalUnit
-      x-identifiers:
+      x-identifiers: &ref_2
         - Id
       x-type: cloud_control
       methods:
@@ -1508,8 +1544,7 @@ components:
       id: awscc.organizations.organizational_units_list_only
       x-cfn-schema-name: OrganizationalUnit
       x-cfn-type-name: AWS::Organizations::OrganizationalUnit
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1539,7 +1574,7 @@ components:
       id: awscc.organizations.policies
       x-cfn-schema-name: Policy
       x-cfn-type-name: AWS::Organizations::Policy
-      x-identifiers:
+      x-identifiers: &ref_3
         - Id
       x-type: cloud_control
       methods:
@@ -1641,8 +1676,7 @@ components:
       id: awscc.organizations.policies_list_only
       x-cfn-schema-name: Policy
       x-cfn-type-name: AWS::Organizations::Policy
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1672,7 +1706,7 @@ components:
       id: awscc.organizations.resource_policies
       x-cfn-schema-name: ResourcePolicy
       x-cfn-type-name: AWS::Organizations::ResourcePolicy
-      x-identifiers:
+      x-identifiers: &ref_4
         - Id
       x-type: cloud_control
       methods:
@@ -1764,8 +1798,7 @@ components:
       id: awscc.organizations.resource_policies_list_only
       x-cfn-schema-name: ResourcePolicy
       x-cfn-type-name: AWS::Organizations::ResourcePolicy
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/osis.yaml b/openapi/src/awscc/v00.00.00000/services/osis.yaml
index e21eb6204..baef923b8 100644
--- a/openapi/src/awscc/v00.00.00000/services/osis.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/osis.yaml
@@ -724,7 +724,7 @@ components:
       id: awscc.osis.pipelines
       x-cfn-schema-name: Pipeline
       x-cfn-type-name: AWS::OSIS::Pipeline
-      x-identifiers:
+      x-identifiers: &ref_0
         - PipelineArn
       x-type: cloud_control
       methods:
@@ -834,8 +834,7 @@ components:
       id: awscc.osis.pipelines_list_only
       x-cfn-schema-name: Pipeline
       x-cfn-type-name: AWS::OSIS::Pipeline
-      x-identifiers:
-        - PipelineArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/panorama.yaml b/openapi/src/awscc/v00.00.00000/services/panorama.yaml
index 664727281..ebaf461b1 100644
--- a/openapi/src/awscc/v00.00.00000/services/panorama.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/panorama.yaml
@@ -464,9 +464,10 @@ components:
         - PROCESSING_DEPLOYMENT
         - PROCESSING_REMOVAL
     TagList:
-      type: array
       uniqueItems: true
+      description: List of tags
       x-insertionOrder: false
+      type: array
       items:
         $ref: '#/components/schemas/Tag'
     ManifestPayload:
@@ -683,6 +684,12 @@ components:
           description: The location's manifest prefix.
       additionalProperties: false
       description: A storage location.
+    Package_TagList:
+      type: array
+      uniqueItems: true
+      x-insertionOrder: false
+      items:
+        $ref: '#/components/schemas/Tag'
     Package:
       type: object
       properties:
@@ -702,7 +709,7 @@ components:
           $ref: '#/components/schemas/Timestamp'
           description: ''
         Tags:
-          $ref: '#/components/schemas/TagList'
+          $ref: '#/components/schemas/Package_TagList'
           description: Tags for the package.
       required:
         - PackageName
@@ -994,7 +1001,7 @@ components:
               $ref: '#/components/schemas/Timestamp'
               description: ''
             Tags:
-              $ref: '#/components/schemas/TagList'
+              $ref: '#/components/schemas/Package_TagList'
               description: Tags for the package.
           x-stackQL-stringOnly: true
       x-title: CreatePackageRequest
@@ -1066,7 +1073,7 @@ components:
       id: awscc.panorama.application_instances
       x-cfn-schema-name: ApplicationInstance
       x-cfn-type-name: AWS::Panorama::ApplicationInstance
-      x-identifiers:
+      x-identifiers: &ref_0
         - ApplicationInstanceId
       x-type: cloud_control
       methods:
@@ -1182,8 +1189,7 @@ components:
       id: awscc.panorama.application_instances_list_only
       x-cfn-schema-name: ApplicationInstance
       x-cfn-type-name: AWS::Panorama::ApplicationInstance
-      x-identifiers:
-        - ApplicationInstanceId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1213,7 +1219,7 @@ components:
       id: awscc.panorama.packages
       x-cfn-schema-name: Package
       x-cfn-type-name: AWS::Panorama::Package
-      x-identifiers:
+      x-identifiers: &ref_1
         - PackageId
       x-type: cloud_control
       methods:
@@ -1309,8 +1315,7 @@ components:
       id: awscc.panorama.packages_list_only
       x-cfn-schema-name: Package
       x-cfn-type-name: AWS::Panorama::Package
-      x-identifiers:
-        - PackageId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/paymentcryptography.yaml b/openapi/src/awscc/v00.00.00000/services/paymentcryptography.yaml
index 0ef66e35b..e4c5fc916 100644
--- a/openapi/src/awscc/v00.00.00000/services/paymentcryptography.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/paymentcryptography.yaml
@@ -741,7 +741,7 @@ components:
       id: awscc.paymentcryptography.aliases
       x-cfn-schema-name: Alias
       x-cfn-type-name: AWS::PaymentCryptography::Alias
-      x-identifiers:
+      x-identifiers: &ref_0
         - AliasName
       x-type: cloud_control
       methods:
@@ -829,8 +829,7 @@ components:
       id: awscc.paymentcryptography.aliases_list_only
       x-cfn-schema-name: Alias
       x-cfn-type-name: AWS::PaymentCryptography::Alias
-      x-identifiers:
-        - AliasName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -860,7 +859,7 @@ components:
       id: awscc.paymentcryptography.keys
       x-cfn-schema-name: Key
       x-cfn-type-name: AWS::PaymentCryptography::Key
-      x-identifiers:
+      x-identifiers: &ref_1
         - KeyIdentifier
       x-type: cloud_control
       methods:
@@ -962,8 +961,7 @@ components:
       id: awscc.paymentcryptography.keys_list_only
       x-cfn-schema-name: Key
       x-cfn-type-name: AWS::PaymentCryptography::Key
-      x-identifiers:
-        - KeyIdentifier
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/pcaconnectorad.yaml b/openapi/src/awscc/v00.00.00000/services/pcaconnectorad.yaml
index 321aec2f8..800daefc1 100644
--- a/openapi/src/awscc/v00.00.00000/services/pcaconnectorad.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/pcaconnectorad.yaml
@@ -1568,7 +1568,7 @@ components:
       id: awscc.pcaconnectorad.connectors
       x-cfn-schema-name: Connector
       x-cfn-type-name: AWS::PCAConnectorAD::Connector
-      x-identifiers:
+      x-identifiers: &ref_0
         - ConnectorArn
       x-type: cloud_control
       methods:
@@ -1662,8 +1662,7 @@ components:
       id: awscc.pcaconnectorad.connectors_list_only
       x-cfn-schema-name: Connector
       x-cfn-type-name: AWS::PCAConnectorAD::Connector
-      x-identifiers:
-        - ConnectorArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1693,7 +1692,7 @@ components:
       id: awscc.pcaconnectorad.directory_registrations
       x-cfn-schema-name: DirectoryRegistration
       x-cfn-type-name: AWS::PCAConnectorAD::DirectoryRegistration
-      x-identifiers:
+      x-identifiers: &ref_1
         - DirectoryRegistrationArn
       x-type: cloud_control
       methods:
@@ -1783,8 +1782,7 @@ components:
       id: awscc.pcaconnectorad.directory_registrations_list_only
       x-cfn-schema-name: DirectoryRegistration
       x-cfn-type-name: AWS::PCAConnectorAD::DirectoryRegistration
-      x-identifiers:
-        - DirectoryRegistrationArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1814,7 +1812,7 @@ components:
       id: awscc.pcaconnectorad.service_principal_names
       x-cfn-schema-name: ServicePrincipalName
       x-cfn-type-name: AWS::PCAConnectorAD::ServicePrincipalName
-      x-identifiers:
+      x-identifiers: &ref_2
         - ConnectorArn
         - DirectoryRegistrationArn
       x-type: cloud_control
@@ -1886,9 +1884,7 @@ components:
       id: awscc.pcaconnectorad.service_principal_names_list_only
       x-cfn-schema-name: ServicePrincipalName
       x-cfn-type-name: AWS::PCAConnectorAD::ServicePrincipalName
-      x-identifiers:
-        - ConnectorArn
-        - DirectoryRegistrationArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1920,7 +1916,7 @@ components:
       id: awscc.pcaconnectorad.templates
       x-cfn-schema-name: Template
       x-cfn-type-name: AWS::PCAConnectorAD::Template
-      x-identifiers:
+      x-identifiers: &ref_3
         - TemplateArn
       x-type: cloud_control
       methods:
@@ -2016,8 +2012,7 @@ components:
       id: awscc.pcaconnectorad.templates_list_only
       x-cfn-schema-name: Template
       x-cfn-type-name: AWS::PCAConnectorAD::Template
-      x-identifiers:
-        - TemplateArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2047,7 +2042,7 @@ components:
       id: awscc.pcaconnectorad.template_group_access_control_entries
       x-cfn-schema-name: TemplateGroupAccessControlEntry
       x-cfn-type-name: AWS::PCAConnectorAD::TemplateGroupAccessControlEntry
-      x-identifiers:
+      x-identifiers: &ref_4
         - GroupSecurityIdentifier
         - TemplateArn
       x-type: cloud_control
@@ -2140,9 +2135,7 @@ components:
       id: awscc.pcaconnectorad.template_group_access_control_entries_list_only
       x-cfn-schema-name: TemplateGroupAccessControlEntry
       x-cfn-type-name: AWS::PCAConnectorAD::TemplateGroupAccessControlEntry
-      x-identifiers:
-        - GroupSecurityIdentifier
-        - TemplateArn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/pcaconnectorscep.yaml b/openapi/src/awscc/v00.00.00000/services/pcaconnectorscep.yaml
index 6b999aa52..240d8484c 100644
--- a/openapi/src/awscc/v00.00.00000/services/pcaconnectorscep.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/pcaconnectorscep.yaml
@@ -655,7 +655,7 @@ components:
       id: awscc.pcaconnectorscep.challenges
       x-cfn-schema-name: Challenge
       x-cfn-type-name: AWS::PCAConnectorSCEP::Challenge
-      x-identifiers:
+      x-identifiers: &ref_0
         - ChallengeArn
       x-type: cloud_control
       methods:
@@ -745,8 +745,7 @@ components:
       id: awscc.pcaconnectorscep.challenges_list_only
       x-cfn-schema-name: Challenge
       x-cfn-type-name: AWS::PCAConnectorSCEP::Challenge
-      x-identifiers:
-        - ChallengeArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -776,7 +775,7 @@ components:
       id: awscc.pcaconnectorscep.connectors
       x-cfn-schema-name: Connector
       x-cfn-type-name: AWS::PCAConnectorSCEP::Connector
-      x-identifiers:
+      x-identifiers: &ref_1
         - ConnectorArn
       x-type: cloud_control
       methods:
@@ -874,8 +873,7 @@ components:
       id: awscc.pcaconnectorscep.connectors_list_only
       x-cfn-schema-name: Connector
       x-cfn-type-name: AWS::PCAConnectorSCEP::Connector
-      x-identifiers:
-        - ConnectorArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/pcs.yaml b/openapi/src/awscc/v00.00.00000/services/pcs.yaml
index 879affb46..7b8f414b6 100644
--- a/openapi/src/awscc/v00.00.00000/services/pcs.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/pcs.yaml
@@ -465,16 +465,16 @@ components:
       type: string
       description: A VPC security group ID.
     SlurmCustomSetting:
-      description: Additional settings that directly map to Slurm settings.
-      additionalProperties: false
       type: object
+      description: Additional settings that directly map to Slurm settings.
       properties:
-        ParameterValue:
-          description: The value for the configured Slurm setting.
-          type: string
         ParameterName:
-          description: 'AWS PCS supports configuration of the following Slurm parameters for compute node groups: Weight and RealMemory.'
           type: string
+          description: 'AWS PCS supports configuration of the following Slurm parameters for clusters: Prolog, Epilog, and SelectTypeParameters.'
+        ParameterValue:
+          type: string
+          description: The value for the configured Slurm setting.
+      additionalProperties: false
       required:
         - ParameterName
         - ParameterValue
@@ -676,6 +676,20 @@ components:
         InstanceType:
           description: The EC2 instance type that AWS PCS can provision in the compute node group.
           type: string
+    ComputeNodeGroup_SlurmCustomSetting:
+      description: Additional settings that directly map to Slurm settings.
+      additionalProperties: false
+      type: object
+      properties:
+        ParameterValue:
+          description: The value for the configured Slurm setting.
+          type: string
+        ParameterName:
+          description: 'AWS PCS supports configuration of the following Slurm parameters for compute node groups: Weight and RealMemory.'
+          type: string
+      required:
+        - ParameterName
+        - ParameterValue
     ComputeNodeGroup:
       type: object
       properties:
@@ -721,7 +735,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/SlurmCustomSetting'
+                $ref: '#/components/schemas/ComputeNodeGroup_SlurmCustomSetting'
         SubnetIds:
           description: The list of subnet IDs where instances are provisioned by the compute node group. The subnets must be in the same VPC as the cluster.
           x-insertionOrder: false
@@ -1180,7 +1194,7 @@ components:
                   x-insertionOrder: false
                   type: array
                   items:
-                    $ref: '#/components/schemas/SlurmCustomSetting'
+                    $ref: '#/components/schemas/ComputeNodeGroup_SlurmCustomSetting'
             SubnetIds:
               description: The list of subnet IDs where instances are provisioned by the compute node group. The subnets must be in the same VPC as the cluster.
               x-insertionOrder: false
@@ -1328,7 +1342,7 @@ components:
       id: awscc.pcs.clusters
       x-cfn-schema-name: Cluster
       x-cfn-type-name: AWS::PCS::Cluster
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -1434,8 +1448,7 @@ components:
       id: awscc.pcs.clusters_list_only
       x-cfn-schema-name: Cluster
       x-cfn-type-name: AWS::PCS::Cluster
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1465,7 +1478,7 @@ components:
       id: awscc.pcs.compute_node_groups
       x-cfn-schema-name: ComputeNodeGroup
       x-cfn-type-name: AWS::PCS::ComputeNodeGroup
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -1581,8 +1594,7 @@ components:
       id: awscc.pcs.compute_node_groups_list_only
       x-cfn-schema-name: ComputeNodeGroup
       x-cfn-type-name: AWS::PCS::ComputeNodeGroup
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1612,7 +1624,7 @@ components:
       id: awscc.pcs.queues
       x-cfn-schema-name: Queue
       x-cfn-type-name: AWS::PCS::Queue
-      x-identifiers:
+      x-identifiers: &ref_2
         - Arn
       x-type: cloud_control
       methods:
@@ -1712,8 +1724,7 @@ components:
       id: awscc.pcs.queues_list_only
       x-cfn-schema-name: Queue
       x-cfn-type-name: AWS::PCS::Queue
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/personalize.yaml b/openapi/src/awscc/v00.00.00000/services/personalize.yaml
index d4ce7c852..241ed7beb 100644
--- a/openapi/src/awscc/v00.00.00000/services/personalize.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/personalize.yaml
@@ -1031,7 +1031,7 @@ components:
       id: awscc.personalize.datasets
       x-cfn-schema-name: Dataset
       x-cfn-type-name: AWS::Personalize::Dataset
-      x-identifiers:
+      x-identifiers: &ref_0
         - DatasetArn
       x-type: cloud_control
       methods:
@@ -1127,8 +1127,7 @@ components:
       id: awscc.personalize.datasets_list_only
       x-cfn-schema-name: Dataset
       x-cfn-type-name: AWS::Personalize::Dataset
-      x-identifiers:
-        - DatasetArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1158,7 +1157,7 @@ components:
       id: awscc.personalize.dataset_groups
       x-cfn-schema-name: DatasetGroup
       x-cfn-type-name: AWS::Personalize::DatasetGroup
-      x-identifiers:
+      x-identifiers: &ref_1
         - DatasetGroupArn
       x-type: cloud_control
       methods:
@@ -1235,8 +1234,7 @@ components:
       id: awscc.personalize.dataset_groups_list_only
       x-cfn-schema-name: DatasetGroup
       x-cfn-type-name: AWS::Personalize::DatasetGroup
-      x-identifiers:
-        - DatasetGroupArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1261,12 +1259,12 @@ components:
                 json_extract_path_text(Properties, 'DatasetGroupArn') as dataset_group_arn
                 FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::Personalize::DatasetGroup'
                 AND region = 'us-east-1'
-    schemata:
-      name: schemata
-      id: awscc.personalize.schemata
+    schemas:
+      name: schemas
+      id: awscc.personalize.schemas
       x-cfn-schema-name: Schema
       x-cfn-type-name: AWS::Personalize::Schema
-      x-identifiers:
+      x-identifiers: &ref_2
         - SchemaArn
       x-type: cloud_control
       methods:
@@ -1304,9 +1302,9 @@ components:
             objectKey: $.ProgressEvent
       sqlVerbs:
         insert:
-          - $ref: '#/components/x-stackQL-resources/schemata/methods/create_resource'
+          - $ref: '#/components/x-stackQL-resources/schemas/methods/create_resource'
         delete:
-          - $ref: '#/components/x-stackQL-resources/schemata/methods/delete_resource'
+          - $ref: '#/components/x-stackQL-resources/schemas/methods/delete_resource'
         update: []
       config:
         views:
@@ -1336,13 +1334,12 @@ components:
                 FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::Personalize::Schema'
                 AND Identifier = '<SchemaArn>'
                 AND region = 'us-east-1'
-    schemata_list_only:
-      name: schemata_list_only
-      id: awscc.personalize.schemata_list_only
+    schemas_list_only:
+      name: schemas_list_only
+      id: awscc.personalize.schemas_list_only
       x-cfn-schema-name: Schema
       x-cfn-type-name: AWS::Personalize::Schema
-      x-identifiers:
-        - SchemaArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1372,7 +1369,7 @@ components:
       id: awscc.personalize.solutions
       x-cfn-schema-name: Solution
       x-cfn-type-name: AWS::Personalize::Solution
-      x-identifiers:
+      x-identifiers: &ref_3
         - SolutionArn
       x-type: cloud_control
       methods:
@@ -1455,8 +1452,7 @@ components:
       id: awscc.personalize.solutions_list_only
       x-cfn-schema-name: Solution
       x-cfn-type-name: AWS::Personalize::Solution
-      x-identifiers:
-        - SolutionArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/pinpoint.yaml b/openapi/src/awscc/v00.00.00000/services/pinpoint.yaml
index ba6765a6f..884c96ea3 100644
--- a/openapi/src/awscc/v00.00.00000/services/pinpoint.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/pinpoint.yaml
@@ -596,7 +596,7 @@ components:
       id: awscc.pinpoint.in_app_templates
       x-cfn-schema-name: InAppTemplate
       x-cfn-type-name: AWS::Pinpoint::InAppTemplate
-      x-identifiers:
+      x-identifiers: &ref_0
         - TemplateName
       x-type: cloud_control
       methods:
@@ -694,8 +694,7 @@ components:
       id: awscc.pinpoint.in_app_templates_list_only
       x-cfn-schema-name: InAppTemplate
       x-cfn-type-name: AWS::Pinpoint::InAppTemplate
-      x-identifiers:
-        - TemplateName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/pipes.yaml b/openapi/src/awscc/v00.00.00000/services/pipes.yaml
index 38335e4d5..62cf249c1 100644
--- a/openapi/src/awscc/v00.00.00000/services/pipes.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/pipes.yaml
@@ -1906,7 +1906,7 @@ components:
       id: awscc.pipes.pipes
       x-cfn-schema-name: Pipe
       x-cfn-type-name: AWS::Pipes::Pipe
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -2026,8 +2026,7 @@ components:
       id: awscc.pipes.pipes_list_only
       x-cfn-schema-name: Pipe
       x-cfn-type-name: AWS::Pipes::Pipe
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/proton.yaml b/openapi/src/awscc/v00.00.00000/services/proton.yaml
index 9c0e6addf..627caa234 100644
--- a/openapi/src/awscc/v00.00.00000/services/proton.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/proton.yaml
@@ -1175,7 +1175,7 @@ components:
       id: awscc.proton.environment_account_connections
       x-cfn-schema-name: EnvironmentAccountConnection
       x-cfn-type-name: AWS::Proton::EnvironmentAccountConnection
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -1279,8 +1279,7 @@ components:
       id: awscc.proton.environment_account_connections_list_only
       x-cfn-schema-name: EnvironmentAccountConnection
       x-cfn-type-name: AWS::Proton::EnvironmentAccountConnection
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1310,7 +1309,7 @@ components:
       id: awscc.proton.environment_templates
       x-cfn-schema-name: EnvironmentTemplate
       x-cfn-type-name: AWS::Proton::EnvironmentTemplate
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -1408,8 +1407,7 @@ components:
       id: awscc.proton.environment_templates_list_only
       x-cfn-schema-name: EnvironmentTemplate
       x-cfn-type-name: AWS::Proton::EnvironmentTemplate
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1439,7 +1437,7 @@ components:
       id: awscc.proton.service_templates
       x-cfn-schema-name: ServiceTemplate
       x-cfn-type-name: AWS::Proton::ServiceTemplate
-      x-identifiers:
+      x-identifiers: &ref_2
         - Arn
       x-type: cloud_control
       methods:
@@ -1537,8 +1535,7 @@ components:
       id: awscc.proton.service_templates_list_only
       x-cfn-schema-name: ServiceTemplate
       x-cfn-type-name: AWS::Proton::ServiceTemplate
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/qbusiness.yaml b/openapi/src/awscc/v00.00.00000/services/qbusiness.yaml
index 7ff09e657..c01d8a70e 100644
--- a/openapi/src/awscc/v00.00.00000/services/qbusiness.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/qbusiness.yaml
@@ -775,7 +775,6 @@ components:
           properties:
             StringListValue:
               type: array
-              x-insertionOrder: true
               items:
                 type: string
                 maxLength: 2048
@@ -972,7 +971,7 @@ components:
         Operator:
           $ref: '#/components/schemas/DocumentEnrichmentConditionOperator'
         Value:
-          $ref: '#/components/schemas/DocumentAttributeValue'
+          $ref: '#/components/schemas/DataSource_DocumentAttributeValue'
       required:
         - Key
         - Operator
@@ -986,12 +985,53 @@ components:
           minLength: 1
           pattern: ^[a-zA-Z0-9_][a-zA-Z0-9_-]*$
         Value:
-          $ref: '#/components/schemas/DocumentAttributeValue'
+          $ref: '#/components/schemas/DataSource_DocumentAttributeValue'
         AttributeValueOperator:
           $ref: '#/components/schemas/AttributeValueOperator'
       required:
         - Key
       additionalProperties: false
+    DataSource_DocumentAttributeValue:
+      oneOf:
+        - type: object
+          title: StringValue
+          properties:
+            StringValue:
+              type: string
+              maxLength: 2048
+          required:
+            - StringValue
+          additionalProperties: false
+        - type: object
+          title: StringListValue
+          properties:
+            StringListValue:
+              type: array
+              x-insertionOrder: true
+              items:
+                type: string
+                maxLength: 2048
+                minLength: 1
+          required:
+            - StringListValue
+          additionalProperties: false
+        - type: object
+          title: LongValue
+          properties:
+            LongValue:
+              type: number
+          required:
+            - LongValue
+          additionalProperties: false
+        - type: object
+          title: DateValue
+          properties:
+            DateValue:
+              type: string
+              format: date-time
+          required:
+            - DateValue
+          additionalProperties: false
     DocumentContentOperator:
       type: string
       enum:
@@ -2729,7 +2769,7 @@ components:
       id: awscc.qbusiness.applications
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::QBusiness::Application
-      x-identifiers:
+      x-identifiers: &ref_0
         - ApplicationId
       x-type: cloud_control
       methods:
@@ -2853,8 +2893,7 @@ components:
       id: awscc.qbusiness.applications_list_only
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::QBusiness::Application
-      x-identifiers:
-        - ApplicationId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2884,7 +2923,7 @@ components:
       id: awscc.qbusiness.data_accessors
       x-cfn-schema-name: DataAccessor
       x-cfn-type-name: AWS::QBusiness::DataAccessor
-      x-identifiers:
+      x-identifiers: &ref_1
         - ApplicationId
         - DataAccessorId
       x-type: cloud_control
@@ -2991,9 +3030,7 @@ components:
       id: awscc.qbusiness.data_accessors_list_only
       x-cfn-schema-name: DataAccessor
       x-cfn-type-name: AWS::QBusiness::DataAccessor
-      x-identifiers:
-        - ApplicationId
-        - DataAccessorId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3025,7 +3062,7 @@ components:
       id: awscc.qbusiness.data_sources
       x-cfn-schema-name: DataSource
       x-cfn-type-name: AWS::QBusiness::DataSource
-      x-identifiers:
+      x-identifiers: &ref_2
         - ApplicationId
         - DataSourceId
         - IndexId
@@ -3145,10 +3182,7 @@ components:
       id: awscc.qbusiness.data_sources_list_only
       x-cfn-schema-name: DataSource
       x-cfn-type-name: AWS::QBusiness::DataSource
-      x-identifiers:
-        - ApplicationId
-        - DataSourceId
-        - IndexId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3182,7 +3216,7 @@ components:
       id: awscc.qbusiness.indices
       x-cfn-schema-name: Index
       x-cfn-type-name: AWS::QBusiness::Index
-      x-identifiers:
+      x-identifiers: &ref_3
         - ApplicationId
         - IndexId
       x-type: cloud_control
@@ -3293,9 +3327,7 @@ components:
       id: awscc.qbusiness.indices_list_only
       x-cfn-schema-name: Index
       x-cfn-type-name: AWS::QBusiness::Index
-      x-identifiers:
-        - ApplicationId
-        - IndexId
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3327,7 +3359,7 @@ components:
       id: awscc.qbusiness.permissions
       x-cfn-schema-name: Permission
       x-cfn-type-name: AWS::QBusiness::Permission
-      x-identifiers:
+      x-identifiers: &ref_4
         - ApplicationId
         - StatementId
       x-type: cloud_control
@@ -3405,9 +3437,7 @@ components:
       id: awscc.qbusiness.permissions_list_only
       x-cfn-schema-name: Permission
       x-cfn-type-name: AWS::QBusiness::Permission
-      x-identifiers:
-        - ApplicationId
-        - StatementId
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3439,7 +3469,7 @@ components:
       id: awscc.qbusiness.plugins
       x-cfn-schema-name: Plugin
       x-cfn-type-name: AWS::QBusiness::Plugin
-      x-identifiers:
+      x-identifiers: &ref_5
         - ApplicationId
         - PluginId
       x-type: cloud_control
@@ -3550,9 +3580,7 @@ components:
       id: awscc.qbusiness.plugins_list_only
       x-cfn-schema-name: Plugin
       x-cfn-type-name: AWS::QBusiness::Plugin
-      x-identifiers:
-        - ApplicationId
-        - PluginId
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3584,7 +3612,7 @@ components:
       id: awscc.qbusiness.retrievers
       x-cfn-schema-name: Retriever
       x-cfn-type-name: AWS::QBusiness::Retriever
-      x-identifiers:
+      x-identifiers: &ref_6
         - ApplicationId
         - RetrieverId
       x-type: cloud_control
@@ -3691,9 +3719,7 @@ components:
       id: awscc.qbusiness.retrievers_list_only
       x-cfn-schema-name: Retriever
       x-cfn-type-name: AWS::QBusiness::Retriever
-      x-identifiers:
-        - ApplicationId
-        - RetrieverId
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3725,7 +3751,7 @@ components:
       id: awscc.qbusiness.web_experiences
       x-cfn-schema-name: WebExperience
       x-cfn-type-name: AWS::QBusiness::WebExperience
-      x-identifiers:
+      x-identifiers: &ref_7
         - ApplicationId
         - WebExperienceId
       x-type: cloud_control
@@ -3844,9 +3870,7 @@ components:
       id: awscc.qbusiness.web_experiences_list_only
       x-cfn-schema-name: WebExperience
       x-cfn-type-name: AWS::QBusiness::WebExperience
-      x-identifiers:
-        - ApplicationId
-        - WebExperienceId
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/qldb.yaml b/openapi/src/awscc/v00.00.00000/services/qldb.yaml
index 1b1614614..e4f8584d7 100644
--- a/openapi/src/awscc/v00.00.00000/services/qldb.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/qldb.yaml
@@ -556,7 +556,7 @@ components:
       id: awscc.qldb.streams
       x-cfn-schema-name: Stream
       x-cfn-type-name: AWS::QLDB::Stream
-      x-identifiers:
+      x-identifiers: &ref_0
         - LedgerName
         - Id
       x-type: cloud_control
@@ -659,9 +659,7 @@ components:
       id: awscc.qldb.streams_list_only
       x-cfn-schema-name: Stream
       x-cfn-type-name: AWS::QLDB::Stream
-      x-identifiers:
-        - LedgerName
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/quicksight.yaml b/openapi/src/awscc/v00.00.00000/services/quicksight.yaml
index 42774ace3..9a09d1a9e 100644
--- a/openapi/src/awscc/v00.00.00000/services/quicksight.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/quicksight.yaml
@@ -410,7 +410,8 @@ components:
           $ref: '#/components/schemas/TableTotalsPlacement'
         TotalCellStyle:
           $ref: '#/components/schemas/TableCellStyle'
-        TotalsVisibility: {}
+        TotalsVisibility:
+          $ref: '#/components/schemas/Visibility'
         MetricHeaderCellStyle:
           $ref: '#/components/schemas/TableCellStyle'
     Entity:
@@ -428,8 +429,10 @@ components:
           $ref: '#/components/schemas/LabelOptions'
         InfoIconLabelOptions:
           $ref: '#/components/schemas/SheetControlInfoIconLabelOptions'
-        HelperTextVisibility: {}
-        DateIconVisibility: {}
+        HelperTextVisibility:
+          $ref: '#/components/schemas/Visibility'
+        DateIconVisibility:
+          $ref: '#/components/schemas/Visibility'
         DateTimeFormat:
           minLength: 1
           type: string
@@ -464,6 +467,8 @@ components:
           $ref: '#/components/schemas/GeospatialMapFieldWells'
         Tooltip:
           $ref: '#/components/schemas/TooltipOptions'
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
         WindowOptions:
           $ref: '#/components/schemas/GeospatialWindowOptions'
         PointStyleOptions:
@@ -476,7 +481,8 @@ components:
       properties:
         Symbol:
           $ref: '#/components/schemas/NumericSeparatorSymbol'
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
         GroupingStyle:
           $ref: '#/components/schemas/DigitGroupingStyle'
     PredefinedHierarchy:
@@ -602,7 +608,8 @@ components:
           $ref: '#/components/schemas/LineInterpolation'
         LineStyle:
           $ref: '#/components/schemas/LineChartLineStyle'
-        LineVisibility: {}
+        LineVisibility:
+          $ref: '#/components/schemas/Visibility'
         LineWidth:
           description: String based length that is composed of value and unit in px
           type: string
@@ -746,7 +753,8 @@ components:
       additionalProperties: false
       type: object
       properties:
-        MissingDateVisibility: {}
+        MissingDateVisibility:
+          $ref: '#/components/schemas/Visibility'
     KPIActualValueConditionalFormatting:
       additionalProperties: false
       type: object
@@ -809,8 +817,10 @@ components:
         AxisOffset:
           description: String based length that is composed of value and unit in px
           type: string
-        AxisLineVisibility: {}
-        GridLineVisibility: {}
+        AxisLineVisibility:
+          $ref: '#/components/schemas/Visibility'
+        GridLineVisibility:
+          $ref: '#/components/schemas/Visibility'
         ScrollbarOptions:
           $ref: '#/components/schemas/ScrollBarOptions'
     DataPathLabelType:
@@ -821,7 +831,8 @@ components:
           minLength: 1
           type: string
           maxLength: 512
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
         FieldValue:
           minLength: 0
           type: string
@@ -1041,7 +1052,8 @@ components:
           pattern: ^[\w\-]+$
           type: string
           maxLength: 512
-        ChartConfiguration: {}
+        ChartConfiguration:
+          $ref: '#/components/schemas/GeospatialLayerMapConfiguration'
         DataSetIdentifier:
           minLength: 1
           type: string
@@ -1387,7 +1399,8 @@ components:
       additionalProperties: false
       type: object
       properties:
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
     TooltipTarget:
       type: string
       enum:
@@ -1561,7 +1574,8 @@ components:
           minLength: 1
           type: string
           maxLength: 1024
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
     WordCloudOptions:
       additionalProperties: false
       type: object
@@ -1626,7 +1640,8 @@ components:
           minLength: 1
           type: string
           maxLength: 512
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
         Width:
           description: String based length that is composed of value and unit in px
           type: string
@@ -1677,7 +1692,8 @@ components:
       additionalProperties: false
       type: object
       properties:
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
         FormatText:
           $ref: '#/components/schemas/LongFormatText'
     GeospatialLayerItem:
@@ -2117,16 +2133,20 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/DataLabelType'
-        MeasureLabelVisibility: {}
+        MeasureLabelVisibility:
+          $ref: '#/components/schemas/Visibility'
         Position:
           $ref: '#/components/schemas/DataLabelPosition'
         LabelContent:
           $ref: '#/components/schemas/DataLabelContent'
-        Visibility: {}
-        TotalsVisibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
+        TotalsVisibility:
+          $ref: '#/components/schemas/Visibility'
         Overlap:
           $ref: '#/components/schemas/DataLabelOverlap'
-        CategoryLabelVisibility: {}
+        CategoryLabelVisibility:
+          $ref: '#/components/schemas/Visibility'
         LabelColor:
           pattern: ^#[A-F0-9]{6}$
           type: string
@@ -2215,7 +2235,8 @@ components:
       additionalProperties: false
       type: object
       properties:
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
         TooltipText:
           $ref: '#/components/schemas/SheetImageTooltipText'
     BodySectionRepeatConfiguration:
@@ -2319,8 +2340,10 @@ components:
       additionalProperties: false
       type: object
       properties:
-        OverflowColumnHeaderVisibility: {}
-        VerticalOverflowVisibility: {}
+        OverflowColumnHeaderVisibility:
+          $ref: '#/components/schemas/Visibility'
+        VerticalOverflowVisibility:
+          $ref: '#/components/schemas/Visibility'
     EmptyVisual:
       additionalProperties: false
       type: object
@@ -2352,8 +2375,10 @@ components:
         Color:
           pattern: ^#[A-F0-9]{6}$
           type: string
-        TooltipVisibility: {}
-        Visibility: {}
+        TooltipVisibility:
+          $ref: '#/components/schemas/Visibility'
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
       required:
         - Type
     CustomFilterConfiguration:
@@ -2446,7 +2471,8 @@ components:
       additionalProperties: false
       type: object
       properties:
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
     AxisDisplayDataDrivenRange:
       additionalProperties: false
       type: object
@@ -2550,7 +2576,8 @@ components:
       properties:
         VisibleRange:
           $ref: '#/components/schemas/VisibleRangeOptions'
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
     ConditionalFormattingCustomIconOptions:
       additionalProperties: false
       type: object
@@ -2959,7 +2986,8 @@ components:
         Height:
           description: String based length that is composed of value and unit in px
           type: string
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
         RenderingRules:
           minItems: 0
           maxItems: 10000
@@ -3246,7 +3274,8 @@ components:
         Color:
           pattern: ^#[A-F0-9]{6}(?:[A-F0-9]{2})?$
           type: string
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
     SheetImageScalingType:
       type: string
       enum:
@@ -3277,7 +3306,8 @@ components:
       additionalProperties: false
       type: object
       properties:
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
     ValidationStrategy:
       description: <p>The option to relax the validation that is required to create and update analyses, dashboards, and templates with definition objects. When you set this value to <code>LENIENT</code>, validation is skipped for specific errors.</p>
       additionalProperties: false
@@ -3325,7 +3355,8 @@ components:
       additionalProperties: false
       type: object
       properties:
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
         FontConfiguration:
           $ref: '#/components/schemas/FontConfiguration'
         HorizontalTextAlignment:
@@ -3412,7 +3443,8 @@ components:
         Color:
           pattern: ^#[A-F0-9]{6}(?:[A-F0-9]{2})?$
           type: string
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
     CategoryFilter:
       additionalProperties: false
       type: object
@@ -3882,7 +3914,8 @@ components:
       additionalProperties: false
       type: object
       properties:
-        CircleSymbolStyle: {}
+        CircleSymbolStyle:
+          $ref: '#/components/schemas/GeospatialCircleSymbolStyle'
     HorizontalTextAlignment:
       type: string
       enum:
@@ -3992,12 +4025,14 @@ components:
       additionalProperties: false
       type: object
       properties:
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
     DonutCenterOptions:
       additionalProperties: false
       type: object
       properties:
-        LabelVisibility: {}
+        LabelVisibility:
+          $ref: '#/components/schemas/Visibility'
     BodySectionContent:
       additionalProperties: false
       type: object
@@ -4341,7 +4376,8 @@ components:
       additionalProperties: false
       type: object
       properties:
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
     NumericFilterSelectAllOptions:
       type: string
       enum:
@@ -4354,7 +4390,8 @@ components:
       additionalProperties: false
       type: object
       properties:
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
     SheetControlLayoutConfiguration:
       additionalProperties: false
       type: object
@@ -4420,7 +4457,8 @@ components:
           $ref: '#/components/schemas/TableCellStyle'
         TotalCellStyle:
           $ref: '#/components/schemas/TableCellStyle'
-        TotalsVisibility: {}
+        TotalsVisibility:
+          $ref: '#/components/schemas/Visibility'
         FieldLevel:
           $ref: '#/components/schemas/PivotTableSubtotalLevel'
         MetricHeaderCellStyle:
@@ -4435,8 +4473,10 @@ components:
       additionalProperties: false
       type: object
       properties:
-        OverflowColumnHeaderVisibility: {}
-        VerticalOverflowVisibility: {}
+        OverflowColumnHeaderVisibility:
+          $ref: '#/components/schemas/Visibility'
+        VerticalOverflowVisibility:
+          $ref: '#/components/schemas/Visibility'
     TableOrientation:
       type: string
       enum:
@@ -5027,11 +5067,14 @@ components:
       additionalProperties: false
       type: object
       properties:
-        MeasureLabelVisibility: {}
+        MeasureLabelVisibility:
+          $ref: '#/components/schemas/Visibility'
         Position:
           $ref: '#/components/schemas/DataLabelPosition'
-        Visibility: {}
-        CategoryLabelVisibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
+        CategoryLabelVisibility:
+          $ref: '#/components/schemas/Visibility'
         LabelColor:
           pattern: ^#[A-F0-9]{6}$
           type: string
@@ -5048,7 +5091,8 @@ components:
       additionalProperties: false
       type: object
       properties:
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
     HeaderFooterSectionConfiguration:
       additionalProperties: false
       type: object
@@ -5325,8 +5369,10 @@ components:
       additionalProperties: false
       type: object
       properties:
-        Visibility: {}
-        SortIconVisibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
+        SortIconVisibility:
+          $ref: '#/components/schemas/Visibility'
         AxisLabelOptions:
           minItems: 0
           maxItems: 100
@@ -5564,7 +5610,8 @@ components:
           $ref: '#/components/schemas/TableCellStyle'
         RowHeaderStyle:
           $ref: '#/components/schemas/TableCellStyle'
-        CollapsedRowDimensionsVisibility: {}
+        CollapsedRowDimensionsVisibility:
+          $ref: '#/components/schemas/Visibility'
         RowsLayout:
           $ref: '#/components/schemas/PivotTableRowsLayout'
         MetricPlacement:
@@ -5572,13 +5619,16 @@ components:
         DefaultCellWidth:
           description: String based length that is composed of value and unit in px
           type: string
-        ColumnNamesVisibility: {}
+        ColumnNamesVisibility:
+          $ref: '#/components/schemas/Visibility'
         RowsLabelOptions:
           $ref: '#/components/schemas/PivotTableRowsLabelOptions'
-        SingleMetricVisibility: {}
+        SingleMetricVisibility:
+          $ref: '#/components/schemas/Visibility'
         ColumnHeaderStyle:
           $ref: '#/components/schemas/TableCellStyle'
-        ToggleButtonsVisibility: {}
+        ToggleButtonsVisibility:
+          $ref: '#/components/schemas/Visibility'
         CellStyle:
           $ref: '#/components/schemas/TableCellStyle'
         RowAlternateColorOptions:
@@ -5755,7 +5805,8 @@ components:
       additionalProperties: false
       type: object
       properties:
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
         InfoIconText:
           minLength: 1
           type: string
@@ -6172,7 +6223,8 @@ components:
       additionalProperties: false
       type: object
       properties:
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
     CategoryFilterConfiguration:
       additionalProperties: false
       type: object
@@ -6188,7 +6240,8 @@ components:
       additionalProperties: false
       type: object
       properties:
-        State: {}
+        State:
+          $ref: '#/components/schemas/GeospatialColorState'
         Color:
           pattern: ^#[A-F0-9]{6}(?:[A-F0-9]{2})?$
           type: string
@@ -6288,7 +6341,8 @@ components:
       additionalProperties: false
       type: object
       properties:
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
     LegendOptions:
       additionalProperties: false
       type: object
@@ -6299,7 +6353,8 @@ components:
           $ref: '#/components/schemas/FontConfiguration'
         Title:
           $ref: '#/components/schemas/LabelOptions'
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
         Height:
           description: String based length that is composed of value and unit in px
           type: string
@@ -6492,7 +6547,8 @@ components:
       properties:
         VerticalTextAlignment:
           $ref: '#/components/schemas/VerticalTextAlignment'
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
         Height:
           maximum: 500
           type: number
@@ -6600,7 +6656,8 @@ components:
       additionalProperties: false
       type: object
       properties:
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
     TotalOptions:
       additionalProperties: false
       type: object
@@ -6619,7 +6676,8 @@ components:
           $ref: '#/components/schemas/TableTotalsPlacement'
         TotalCellStyle:
           $ref: '#/components/schemas/TableCellStyle'
-        TotalsVisibility: {}
+        TotalsVisibility:
+          $ref: '#/components/schemas/Visibility'
     ForecastScenario:
       additionalProperties: false
       type: object
@@ -6666,7 +6724,8 @@ components:
       additionalProperties: false
       type: object
       properties:
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
     DonutOptions:
       additionalProperties: false
       type: object
@@ -7150,7 +7209,8 @@ components:
       additionalProperties: false
       type: object
       properties:
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
     UniqueValuesComputation:
       additionalProperties: false
       type: object
@@ -7185,7 +7245,8 @@ components:
       properties:
         CustomLabel:
           type: string
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
         FontConfiguration:
           $ref: '#/components/schemas/FontConfiguration'
     UnaggregatedField:
@@ -7261,7 +7322,8 @@ components:
           maxLength: 512
         Label:
           type: string
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
       required:
         - FieldId
     TableSideBorderOptions:
@@ -7289,7 +7351,8 @@ components:
         MarkerSize:
           description: String based length that is composed of value and unit in px
           type: string
-        MarkerVisibility: {}
+        MarkerVisibility:
+          $ref: '#/components/schemas/Visibility'
         MarkerColor:
           pattern: ^#[A-F0-9]{6}$
           type: string
@@ -7771,7 +7834,8 @@ components:
           minLength: 1
           type: string
           maxLength: 512
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
     SpatialStaticFile:
       additionalProperties: false
       type: object
@@ -7889,7 +7953,8 @@ components:
           minLength: 1
           type: string
           maxLength: 512
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
       required:
         - FieldId
     LayerCustomAction:
@@ -8221,7 +8286,8 @@ components:
           $ref: '#/components/schemas/ColumnIdentifier'
         Label:
           type: string
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
       required:
         - Column
     GeospatialGradientStepColor:
@@ -8442,7 +8508,8 @@ components:
       properties:
         SelectedTooltipType:
           $ref: '#/components/schemas/SelectedTooltipType'
-        TooltipVisibility: {}
+        TooltipVisibility:
+          $ref: '#/components/schemas/Visibility'
         FieldBasedTooltip:
           $ref: '#/components/schemas/FieldBasedTooltip'
     FieldBasedTooltip:
@@ -8455,7 +8522,8 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/TooltipItem'
-        AggregationVisibility: {}
+        AggregationVisibility:
+          $ref: '#/components/schemas/Visibility'
         TooltipTitleType:
           $ref: '#/components/schemas/TooltipTitleType'
     FilledMapAggregatedFieldWells:
@@ -8759,9 +8827,12 @@ components:
       additionalProperties: false
       type: object
       properties:
-        FillColor: {}
-        StrokeWidth: {}
-        StrokeColor: {}
+        FillColor:
+          $ref: '#/components/schemas/GeospatialColor'
+        StrokeWidth:
+          $ref: '#/components/schemas/GeospatialLineWidth'
+        StrokeColor:
+          $ref: '#/components/schemas/GeospatialColor'
     GeospatialColorState:
       description: Defines view state of the color
       type: string
@@ -8896,7 +8967,8 @@ components:
           $ref: '#/components/schemas/RadarChartAxesRangeScale'
         VisualPalette:
           $ref: '#/components/schemas/VisualPalette'
-        AlternateBandColorsVisibility: {}
+        AlternateBandColorsVisibility:
+          $ref: '#/components/schemas/Visibility'
         StartAngle:
           maximum: 360
           type: number
@@ -8919,7 +8991,8 @@ components:
       additionalProperties: false
       type: object
       properties:
-        Visibility: {}
+        Visibility:
+          $ref: '#/components/schemas/Visibility'
         FormatText:
           $ref: '#/components/schemas/ShortFormatText'
     ParameterTextFieldControl:
@@ -9067,6 +9140,8 @@ components:
           $ref: '#/components/schemas/FunnelChartVisual'
         BoxPlotVisual:
           $ref: '#/components/schemas/BoxPlotVisual'
+        LayerMapVisual:
+          $ref: '#/components/schemas/LayerMapVisual'
         GeospatialMapVisual:
           $ref: '#/components/schemas/GeospatialMapVisual'
         ScatterPlotVisual:
@@ -9174,14 +9249,17 @@ components:
         GutterSpacing:
           description: String based length that is composed of value and unit in px
           type: string
-        BackgroundVisibility: {}
-        BorderVisibility: {}
+        BackgroundVisibility:
+          $ref: '#/components/schemas/Visibility'
+        BorderVisibility:
+          $ref: '#/components/schemas/Visibility'
         BorderColor:
           pattern: ^#[A-F0-9]{6}(?:[A-F0-9]{2})?$
           type: string
         Title:
           $ref: '#/components/schemas/PanelTitleOptions'
-        GutterVisibility: {}
+        GutterVisibility:
+          $ref: '#/components/schemas/Visibility'
         BackgroundColor:
           pattern: ^#[A-F0-9]{6}(?:[A-F0-9]{2})?$
           type: string
@@ -9360,8 +9438,10 @@ components:
       properties:
         StyleOptions:
           $ref: '#/components/schemas/BoxPlotStyleOptions'
-        OutlierVisibility: {}
-        AllDataPointsVisibility: {}
+        OutlierVisibility:
+          $ref: '#/components/schemas/Visibility'
+        AllDataPointsVisibility:
+          $ref: '#/components/schemas/Visibility'
     KPIPrimaryValueConditionalFormatting:
       additionalProperties: false
       type: object
@@ -11740,6 +11820,43 @@ components:
         - GENERIC_SQL_FAILURE
         - CONFLICT
         - UNKNOWN
+    DataSource_ResourcePermission:
+      description: <p>Permission for the resource.</p>
+      additionalProperties: false
+      type: object
+      properties:
+        Actions:
+          minItems: 1
+          maxItems: 20
+          description: <p>The IAM action to grant or revoke permissions on.</p>
+          type: array
+          items:
+            type: string
+        Resource:
+          type: string
+        Principal:
+          minLength: 1
+          description: |-
+            <p>The Amazon Resource Name (ARN) of the principal. This can be one of the
+                        following:</p>
+                     <ul>
+                        <li>
+                           <p>The ARN of an Amazon QuickSight user or group associated with a data source or dataset. (This is common.)</p>
+                        </li>
+                        <li>
+                           <p>The ARN of an Amazon QuickSight user, group, or namespace associated with an analysis, dashboard, template, or theme. (This is common.)</p>
+                        </li>
+                        <li>
+                           <p>The ARN of an Amazon Web Services account root: This is an IAM ARN rather than a QuickSight
+                                ARN. Use this option only to share resources (templates) across Amazon Web Services accounts.
+                                (This is less common.) </p>
+                        </li>
+                     </ul>
+          type: string
+          maxLength: 256
+      required:
+        - Actions
+        - Principal
     AuthenticationType:
       type: string
       enum:
@@ -12227,7 +12344,7 @@ components:
           maxItems: 64
           type: array
           items:
-            $ref: '#/components/schemas/ResourcePermission'
+            $ref: '#/components/schemas/DataSource_ResourcePermission'
         Arn:
           description: <p>The Amazon Resource Name (ARN) of the data source.</p>
           type: string
@@ -12315,35 +12432,72 @@ components:
       enum:
         - SHARED
         - RESTRICTED
-    SharingModel:
-      type: string
-      enum:
-        - ACCOUNT
-        - NAMESPACE
-    Folder:
+    Folder_ResourcePermission:
       type: object
+      description: <p>Permission for the resource.</p>
       properties:
-        Arn:
-          type: string
-          description: <p>The Amazon Resource Name (ARN) for the folder.</p>
-          pattern: ^arn:.*
-        AwsAccountId:
-          type: string
-          maxLength: 12
-          minLength: 12
-          pattern: ^[0-9]{12}$
-        CreatedTime:
-          type: string
-          description: <p>The time that the folder was created.</p>
-          format: date-time
-        FolderId:
+        Principal:
           type: string
-          maxLength: 2048
+          maxLength: 256
           minLength: 1
-          pattern: ^[\w\-]+$
-        FolderType:
-          $ref: '#/components/schemas/FolderType'
-        LastUpdatedTime:
+          description: |-
+            <p>The Amazon Resource Name (ARN) of the principal. This can be one of the
+                        following:</p>
+                     <ul>
+                        <li>
+                           <p>The ARN of an Amazon QuickSight user or group associated with a data source or dataset. (This is common.)</p>
+                        </li>
+                        <li>
+                           <p>The ARN of an Amazon QuickSight user, group, or namespace associated with an analysis, dashboard, template, or theme. (This is common.)</p>
+                        </li>
+                        <li>
+                           <p>The ARN of an Amazon Web Services account root: This is an IAM ARN rather than a QuickSight
+                                ARN. Use this option only to share resources (templates) across Amazon Web Services accounts.
+                                (This is less common.) </p>
+                        </li>
+                     </ul>
+          pattern: ^arn:.*
+        Actions:
+          type: array
+          items:
+            type: string
+          maxItems: 20
+          minItems: 1
+          description: <p>The IAM action to grant or revoke permissions on.</p>
+          x-insertionOrder: false
+      required:
+        - Actions
+        - Principal
+      additionalProperties: false
+    SharingModel:
+      type: string
+      enum:
+        - ACCOUNT
+        - NAMESPACE
+    Folder:
+      type: object
+      properties:
+        Arn:
+          type: string
+          description: <p>The Amazon Resource Name (ARN) for the folder.</p>
+          pattern: ^arn:.*
+        AwsAccountId:
+          type: string
+          maxLength: 12
+          minLength: 12
+          pattern: ^[0-9]{12}$
+        CreatedTime:
+          type: string
+          description: <p>The time that the folder was created.</p>
+          format: date-time
+        FolderId:
+          type: string
+          maxLength: 2048
+          minLength: 1
+          pattern: ^[\w\-]+$
+        FolderType:
+          $ref: '#/components/schemas/FolderType'
+        LastUpdatedTime:
           type: string
           description: <p>The time that the folder was last updated.</p>
           format: date-time
@@ -12356,7 +12510,7 @@ components:
         Permissions:
           type: array
           items:
-            $ref: '#/components/schemas/ResourcePermission'
+            $ref: '#/components/schemas/Folder_ResourcePermission'
           maxItems: 64
           minItems: 1
           x-insertionOrder: false
@@ -12536,234 +12690,4812 @@ components:
           - quicksight:ListRefreshSchedules
         read:
           - quicksight:DescribeRefreshSchedule
-    TemplateVersionDefinition:
+    Template_PivotTotalOptions:
       additionalProperties: false
       type: object
       properties:
-        Options:
-          $ref: '#/components/schemas/AssetOptions'
-        FilterGroups:
+        TotalAggregationOptions:
           minItems: 0
-          maxItems: 2000
+          maxItems: 200
           type: array
           items:
-            $ref: '#/components/schemas/FilterGroup'
-        QueryExecutionOptions:
-          $ref: '#/components/schemas/QueryExecutionOptions'
-        CalculatedFields:
+            $ref: '#/components/schemas/TotalAggregationOption'
+        CustomLabel:
+          type: string
+        ValueCellStyle:
+          $ref: '#/components/schemas/Template_TableCellStyle'
+        ScrollStatus:
+          $ref: '#/components/schemas/TableTotalsScrollStatus'
+        Placement:
+          $ref: '#/components/schemas/TableTotalsPlacement'
+        TotalCellStyle:
+          $ref: '#/components/schemas/Template_TableCellStyle'
+        TotalsVisibility: {}
+        MetricHeaderCellStyle:
+          $ref: '#/components/schemas/Template_TableCellStyle'
+    Template_DateTimePickerControlDisplayOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        TitleOptions:
+          $ref: '#/components/schemas/Template_LabelOptions'
+        InfoIconLabelOptions:
+          $ref: '#/components/schemas/Template_SheetControlInfoIconLabelOptions'
+        HelperTextVisibility: {}
+        DateIconVisibility: {}
+        DateTimeFormat:
+          minLength: 1
+          type: string
+          maxLength: 128
+    Template_GeospatialMapConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        Legend:
+          $ref: '#/components/schemas/Template_LegendOptions'
+        MapStyleOptions:
+          $ref: '#/components/schemas/GeospatialMapStyleOptions'
+        FieldWells:
+          $ref: '#/components/schemas/Template_GeospatialMapFieldWells'
+        Tooltip:
+          $ref: '#/components/schemas/Template_TooltipOptions'
+        WindowOptions:
+          $ref: '#/components/schemas/GeospatialWindowOptions'
+        PointStyleOptions:
+          $ref: '#/components/schemas/GeospatialPointStyleOptions'
+        VisualPalette:
+          $ref: '#/components/schemas/VisualPalette'
+    Template_ThousandSeparatorOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Symbol:
+          $ref: '#/components/schemas/NumericSeparatorSymbol'
+        Visibility: {}
+        GroupingStyle:
+          $ref: '#/components/schemas/DigitGroupingStyle'
+    Template_DateTimeFormatConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        NumericFormatConfiguration:
+          $ref: '#/components/schemas/Template_NumericFormatConfiguration'
+        NullValueFormatConfiguration:
+          $ref: '#/components/schemas/NullValueFormatConfiguration'
+        DateTimeFormat:
+          minLength: 1
+          type: string
+          maxLength: 128
+    Template_FilterControl:
+      additionalProperties: false
+      type: object
+      properties:
+        Slider:
+          $ref: '#/components/schemas/Template_FilterSliderControl'
+        TextArea:
+          $ref: '#/components/schemas/Template_FilterTextAreaControl'
+        Dropdown:
+          $ref: '#/components/schemas/Template_FilterDropDownControl'
+        TextField:
+          $ref: '#/components/schemas/Template_FilterTextFieldControl'
+        List:
+          $ref: '#/components/schemas/Template_FilterListControl'
+        DateTimePicker:
+          $ref: '#/components/schemas/Template_FilterDateTimePickerControl'
+        RelativeDateTime:
+          $ref: '#/components/schemas/Template_FilterRelativeDateTimeControl'
+        CrossSheet:
+          $ref: '#/components/schemas/FilterCrossSheetControl'
+    Template_FormatConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        NumberFormatConfiguration:
+          $ref: '#/components/schemas/Template_NumberFormatConfiguration'
+        DateTimeFormatConfiguration:
+          $ref: '#/components/schemas/Template_DateTimeFormatConfiguration'
+        StringFormatConfiguration:
+          $ref: '#/components/schemas/Template_StringFormatConfiguration'
+    Template_RadarChartFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        RadarChartAggregatedFieldWells:
+          $ref: '#/components/schemas/Template_RadarChartAggregatedFieldWells'
+    Template_SeriesItem:
+      additionalProperties: false
+      type: object
+      properties:
+        FieldSeriesItem:
+          $ref: '#/components/schemas/Template_FieldSeriesItem'
+        DataFieldSeriesItem:
+          $ref: '#/components/schemas/Template_DataFieldSeriesItem'
+    Template_LineChartLineStyleSettings:
+      additionalProperties: false
+      type: object
+      properties:
+        LineInterpolation:
+          $ref: '#/components/schemas/LineInterpolation'
+        LineStyle:
+          $ref: '#/components/schemas/LineChartLineStyle'
+        LineVisibility: {}
+        LineWidth:
+          description: String based length that is composed of value and unit in px
+          type: string
+    Template_RelativeDateTimeControlDisplayOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        TitleOptions:
+          $ref: '#/components/schemas/Template_LabelOptions'
+        InfoIconLabelOptions:
+          $ref: '#/components/schemas/Template_SheetControlInfoIconLabelOptions'
+        DateTimeFormat:
+          minLength: 1
+          type: string
+          maxLength: 128
+    Template_BarChartVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_BarChartConfiguration'
+        Actions:
           minItems: 0
-          maxItems: 500
+          maxItems: 10
           type: array
           items:
-            $ref: '#/components/schemas/CalculatedField'
-        DataSetConfigurations:
+            $ref: '#/components/schemas/VisualCustomAction'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+        ColumnHierarchies:
           minItems: 0
-          maxItems: 30
+          maxItems: 2
           type: array
           items:
-            $ref: '#/components/schemas/DataSetConfiguration'
-        ColumnConfigurations:
+            $ref: '#/components/schemas/ColumnHierarchy'
+      required:
+        - VisualId
+    Template_DateAxisOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        MissingDateVisibility: {}
+    Template_TableUnaggregatedFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        Values:
           minItems: 0
-          maxItems: 2000
+          maxItems: 200
           type: array
           items:
-            $ref: '#/components/schemas/ColumnConfiguration'
-        AnalysisDefaults:
-          $ref: '#/components/schemas/AnalysisDefaults'
-        Sheets:
+            $ref: '#/components/schemas/Template_UnaggregatedField'
+    Template_TreeMapVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_TreeMapConfiguration'
+        Actions:
           minItems: 0
-          maxItems: 20
+          maxItems: 10
           type: array
           items:
-            $ref: '#/components/schemas/SheetDefinition'
-        ParameterDeclarations:
+            $ref: '#/components/schemas/VisualCustomAction'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+        ColumnHierarchies:
           minItems: 0
-          maxItems: 200
+          maxItems: 2
           type: array
           items:
-            $ref: '#/components/schemas/ParameterDeclaration'
+            $ref: '#/components/schemas/ColumnHierarchy'
       required:
-        - DataSetConfigurations
-    ColumnSchema:
-      description: <p>The column schema.</p>
+        - VisualId
+    Template_AxisDisplayOptions:
       additionalProperties: false
       type: object
       properties:
-        DataType:
-          description: <p>The data type of the column schema.</p>
-          type: string
-        GeographicRole:
-          description: <p>The geographic role of the column schema.</p>
-          type: string
-        Name:
-          description: <p>The name of the column schema.</p>
+        DataOptions:
+          $ref: '#/components/schemas/Template_AxisDataOptions'
+        TickLabelOptions:
+          $ref: '#/components/schemas/Template_AxisTickLabelOptions'
+        AxisOffset:
+          description: String based length that is composed of value and unit in px
           type: string
+        AxisLineVisibility: {}
+        GridLineVisibility: {}
+        ScrollbarOptions:
+          $ref: '#/components/schemas/Template_ScrollBarOptions'
+    Template_DataPathLabelType:
+      additionalProperties: false
+      type: object
+      properties:
+        FieldId:
+          minLength: 1
+          type: string
+          maxLength: 512
+        Visibility: {}
+        FieldValue:
+          minLength: 0
+          type: string
+          maxLength: 2048
+    Template_FreeFormSectionLayoutConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        Elements:
+          minItems: 0
+          maxItems: 430
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_FreeFormLayoutElement'
+      required:
+        - Elements
+    Template_LineChartDefaultSeriesSettings:
+      additionalProperties: false
+      type: object
+      properties:
+        LineStyleSettings:
+          $ref: '#/components/schemas/Template_LineChartLineStyleSettings'
+        AxisBinding:
+          $ref: '#/components/schemas/AxisBinding'
+        MarkerStyleSettings:
+          $ref: '#/components/schemas/Template_LineChartMarkerStyleSettings'
+    Template_FunnelChartVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_FunnelChartConfiguration'
+        Actions:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/VisualCustomAction'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+        ColumnHierarchies:
+          minItems: 0
+          maxItems: 2
+          type: array
+          items:
+            $ref: '#/components/schemas/ColumnHierarchy'
+      required:
+        - VisualId
+    Template_LineChartConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        SortConfiguration:
+          $ref: '#/components/schemas/LineChartSortConfiguration'
+        Legend:
+          $ref: '#/components/schemas/Template_LegendOptions'
+        ReferenceLines:
+          minItems: 0
+          maxItems: 20
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_ReferenceLine'
+        DataLabels:
+          $ref: '#/components/schemas/Template_DataLabelOptions'
+        Tooltip:
+          $ref: '#/components/schemas/Template_TooltipOptions'
+        SingleAxisOptions:
+          $ref: '#/components/schemas/SingleAxisOptions'
+        SmallMultiplesOptions:
+          $ref: '#/components/schemas/Template_SmallMultiplesOptions'
+        PrimaryYAxisDisplayOptions:
+          $ref: '#/components/schemas/Template_LineSeriesAxisDisplayOptions'
+        VisualPalette:
+          $ref: '#/components/schemas/VisualPalette'
+        XAxisDisplayOptions:
+          $ref: '#/components/schemas/Template_AxisDisplayOptions'
+        DefaultSeriesSettings:
+          $ref: '#/components/schemas/Template_LineChartDefaultSeriesSettings'
+        SecondaryYAxisLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        ForecastConfigurations:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/ForecastConfiguration'
+        Series:
+          minItems: 0
+          maxItems: 2000
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_SeriesItem'
+        Type:
+          $ref: '#/components/schemas/LineChartType'
+        PrimaryYAxisLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        ContributionAnalysisDefaults:
+          minItems: 1
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/ContributionAnalysisDefault'
+        FieldWells:
+          $ref: '#/components/schemas/Template_LineChartFieldWells'
+        SecondaryYAxisDisplayOptions:
+          $ref: '#/components/schemas/Template_LineSeriesAxisDisplayOptions'
+        XAxisLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
+    Template_ComboChartAggregatedFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        BarValues:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+        Category:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Colors:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        LineValues:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+    Template_LayerMapVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration: {}
+        DataSetIdentifier:
+          minLength: 1
+          type: string
+          maxLength: 2048
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+      required:
+        - DataSetIdentifier
+        - VisualId
+    Template_GaugeChartOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Arc:
+          $ref: '#/components/schemas/ArcConfiguration'
+        Comparison:
+          $ref: '#/components/schemas/Template_ComparisonConfiguration'
+        PrimaryValueDisplayType:
+          $ref: '#/components/schemas/PrimaryValueDisplayType'
+        ArcAxis:
+          $ref: '#/components/schemas/ArcAxisConfiguration'
+        PrimaryValueFontConfiguration:
+          $ref: '#/components/schemas/FontConfiguration'
+    Template_MeasureField:
+      additionalProperties: false
+      type: object
+      properties:
+        DateMeasureField:
+          $ref: '#/components/schemas/Template_DateMeasureField'
+        NumericalMeasureField:
+          $ref: '#/components/schemas/Template_NumericalMeasureField'
+        CategoricalMeasureField:
+          $ref: '#/components/schemas/Template_CategoricalMeasureField'
+        CalculatedMeasureField:
+          $ref: '#/components/schemas/CalculatedMeasureField'
+    Template_ScatterPlotVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_ScatterPlotConfiguration'
+        Actions:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/VisualCustomAction'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+        ColumnHierarchies:
+          minItems: 0
+          maxItems: 2
+          type: array
+          items:
+            $ref: '#/components/schemas/ColumnHierarchy'
+      required:
+        - VisualId
+    Template_HeatMapAggregatedFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        Values:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+        Columns:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Rows:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+    Template_DefaultFilterDropDownControlOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Type:
+          $ref: '#/components/schemas/SheetControlListType'
+        DisplayOptions:
+          $ref: '#/components/schemas/Template_DropDownControlDisplayOptions'
+        CommitMode:
+          $ref: '#/components/schemas/CommitMode'
+        SelectableValues:
+          $ref: '#/components/schemas/FilterSelectableValues'
+    Template_GaugeChartFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        TargetValues:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+        Values:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+    Template_PivotTableTotalOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        ColumnSubtotalOptions:
+          $ref: '#/components/schemas/Template_SubtotalOptions'
+        RowSubtotalOptions:
+          $ref: '#/components/schemas/Template_SubtotalOptions'
+        RowTotalOptions:
+          $ref: '#/components/schemas/Template_PivotTotalOptions'
+        ColumnTotalOptions:
+          $ref: '#/components/schemas/Template_PivotTotalOptions'
+    Template_BodySectionConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        Content:
+          $ref: '#/components/schemas/Template_BodySectionContent'
+        Style:
+          $ref: '#/components/schemas/SectionStyle'
+        PageBreakConfiguration:
+          $ref: '#/components/schemas/SectionPageBreakConfiguration'
+        SectionId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        RepeatConfiguration:
+          $ref: '#/components/schemas/BodySectionRepeatConfiguration'
+      required:
+        - Content
+        - SectionId
+    Template_WordCloudAggregatedFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        GroupBy:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Size:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+    Template_PluginVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        PluginArn:
+          type: string
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_PluginVisualConfiguration'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+      required:
+        - PluginArn
+        - VisualId
+    Template_DataLabelType:
+      additionalProperties: false
+      type: object
+      properties:
+        MaximumLabelType:
+          $ref: '#/components/schemas/Template_MaximumLabelType'
+        DataPathLabelType:
+          $ref: '#/components/schemas/Template_DataPathLabelType'
+        RangeEndsLabelType:
+          $ref: '#/components/schemas/Template_RangeEndsLabelType'
+        FieldLabelType:
+          $ref: '#/components/schemas/Template_FieldLabelType'
+        MinimumLabelType:
+          $ref: '#/components/schemas/Template_MinimumLabelType'
+    Template_MaximumLabelType:
+      additionalProperties: false
+      type: object
+      properties:
+        Visibility: {}
+    Template_Layout:
+      additionalProperties: false
+      type: object
+      properties:
+        Configuration:
+          $ref: '#/components/schemas/Template_LayoutConfiguration'
+      required:
+        - Configuration
+    Template_ReferenceLineValueLabelConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        FormatConfiguration:
+          $ref: '#/components/schemas/Template_NumericFormatConfiguration'
+        RelativePosition:
+          $ref: '#/components/schemas/ReferenceLineValueLabelRelativePosition'
+    Template_FilterDateTimePickerControl:
+      additionalProperties: false
+      type: object
+      properties:
+        FilterControlId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        Type:
+          $ref: '#/components/schemas/SheetControlDateTimePickerType'
+        DisplayOptions:
+          $ref: '#/components/schemas/Template_DateTimePickerControlDisplayOptions'
+        Title:
+          minLength: 1
+          type: string
+          maxLength: 2048
+        CommitMode:
+          $ref: '#/components/schemas/CommitMode'
+        SourceFilterId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+      required:
+        - FilterControlId
+        - SourceFilterId
+        - Title
+    Template_PluginVisualFieldWell:
+      additionalProperties: false
+      type: object
+      properties:
+        Unaggregated:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_UnaggregatedField'
+        AxisName:
+          $ref: '#/components/schemas/PluginVisualAxisName'
+        Measures:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+        Dimensions:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+    Template_PivotTableRowsLabelOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        CustomLabel:
+          minLength: 1
+          type: string
+          maxLength: 1024
+        Visibility: {}
+    Template_ParameterDropDownControl:
+      additionalProperties: false
+      type: object
+      properties:
+        ParameterControlId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        Type:
+          $ref: '#/components/schemas/SheetControlListType'
+        DisplayOptions:
+          $ref: '#/components/schemas/Template_DropDownControlDisplayOptions'
+        SourceParameterName:
+          minLength: 1
+          pattern: ^[a-zA-Z0-9]+$
+          type: string
+          maxLength: 2048
+        CascadingControlConfiguration:
+          $ref: '#/components/schemas/CascadingControlConfiguration'
+        Title:
+          minLength: 1
+          type: string
+          maxLength: 2048
+        CommitMode:
+          $ref: '#/components/schemas/CommitMode'
+        SelectableValues:
+          $ref: '#/components/schemas/ParameterSelectableValues'
+      required:
+        - ParameterControlId
+        - SourceParameterName
+        - Title
+    Template_TableFieldOption:
+      additionalProperties: false
+      type: object
+      properties:
+        CustomLabel:
+          minLength: 1
+          type: string
+          maxLength: 2048
+        URLStyling:
+          $ref: '#/components/schemas/TableFieldURLConfiguration'
+        FieldId:
+          minLength: 1
+          type: string
+          maxLength: 512
+        Visibility: {}
+        Width:
+          description: String based length that is composed of value and unit in px
+          type: string
+      required:
+        - FieldId
+    Template_VisualSubtitleLabelOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Visibility: {}
+        FormatText:
+          $ref: '#/components/schemas/LongFormatText'
+    Template_NumericEqualityFilter:
+      additionalProperties: false
+      type: object
+      properties:
+        AggregationFunction:
+          $ref: '#/components/schemas/AggregationFunction'
+        Column:
+          $ref: '#/components/schemas/ColumnIdentifier'
+        Value:
+          default: null
+          type: number
+        ParameterName:
+          minLength: 1
+          pattern: ^[a-zA-Z0-9]+$
+          type: string
+          maxLength: 2048
+        NullOption:
+          $ref: '#/components/schemas/FilterNullOption'
+        MatchOperator:
+          $ref: '#/components/schemas/NumericEqualityMatchOperator'
+        SelectAllOptions:
+          $ref: '#/components/schemas/NumericFilterSelectAllOptions'
+        DefaultFilterControlConfiguration:
+          $ref: '#/components/schemas/Template_DefaultFilterControlConfiguration'
+        FilterId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+      required:
+        - Column
+        - FilterId
+        - MatchOperator
+        - NullOption
+    Template_ScatterPlotCategoricallyAggregatedFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        Category:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Size:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+        Label:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        XAxis:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+        YAxis:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+    Template_RadarChartAggregatedFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        Category:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Color:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Values:
+          minItems: 0
+          maxItems: 20
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+    Template_GrowthRateComputation:
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          $ref: '#/components/schemas/Template_MeasureField'
+        Time:
+          $ref: '#/components/schemas/Template_DimensionField'
+        PeriodSize:
+          default: 0
+          maximum: 52
+          type: number
+          minimum: 2
+        ComputationId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        Name:
+          type: string
+      required:
+        - ComputationId
+    Template_KPIOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        SecondaryValueFontConfiguration:
+          $ref: '#/components/schemas/FontConfiguration'
+        VisualLayoutOptions:
+          $ref: '#/components/schemas/KPIVisualLayoutOptions'
+        TrendArrows:
+          $ref: '#/components/schemas/Template_TrendArrowOptions'
+        SecondaryValue:
+          $ref: '#/components/schemas/Template_SecondaryValueOptions'
+        Comparison:
+          $ref: '#/components/schemas/Template_ComparisonConfiguration'
+        PrimaryValueDisplayType:
+          $ref: '#/components/schemas/PrimaryValueDisplayType'
+        ProgressBar:
+          $ref: '#/components/schemas/Template_ProgressBarOptions'
+        PrimaryValueFontConfiguration:
+          $ref: '#/components/schemas/FontConfiguration'
+        Sparkline:
+          $ref: '#/components/schemas/Template_KPISparklineOptions'
+    Template_NumericRangeFilter:
+      additionalProperties: false
+      type: object
+      properties:
+        AggregationFunction:
+          $ref: '#/components/schemas/AggregationFunction'
+        Column:
+          $ref: '#/components/schemas/ColumnIdentifier'
+        IncludeMaximum:
+          default: null
+          type: boolean
+        RangeMinimum:
+          $ref: '#/components/schemas/NumericRangeFilterValue'
+        NullOption:
+          $ref: '#/components/schemas/FilterNullOption'
+        SelectAllOptions:
+          $ref: '#/components/schemas/NumericFilterSelectAllOptions'
+        DefaultFilterControlConfiguration:
+          $ref: '#/components/schemas/Template_DefaultFilterControlConfiguration'
+        FilterId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        RangeMaximum:
+          $ref: '#/components/schemas/NumericRangeFilterValue'
+        IncludeMinimum:
+          default: null
+          type: boolean
+      required:
+        - Column
+        - FilterId
+        - NullOption
+    Template_ComboChartConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        SortConfiguration:
+          $ref: '#/components/schemas/ComboChartSortConfiguration'
+        Legend:
+          $ref: '#/components/schemas/Template_LegendOptions'
+        ReferenceLines:
+          minItems: 0
+          maxItems: 20
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_ReferenceLine'
+        ColorLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        BarDataLabels:
+          $ref: '#/components/schemas/Template_DataLabelOptions'
+        CategoryLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        Tooltip:
+          $ref: '#/components/schemas/Template_TooltipOptions'
+        SingleAxisOptions:
+          $ref: '#/components/schemas/SingleAxisOptions'
+        PrimaryYAxisDisplayOptions:
+          $ref: '#/components/schemas/Template_AxisDisplayOptions'
+        VisualPalette:
+          $ref: '#/components/schemas/VisualPalette'
+        BarsArrangement:
+          $ref: '#/components/schemas/BarsArrangement'
+        SecondaryYAxisLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        LineDataLabels:
+          $ref: '#/components/schemas/Template_DataLabelOptions'
+        CategoryAxis:
+          $ref: '#/components/schemas/Template_AxisDisplayOptions'
+        PrimaryYAxisLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        FieldWells:
+          $ref: '#/components/schemas/Template_ComboChartFieldWells'
+        SecondaryYAxisDisplayOptions:
+          $ref: '#/components/schemas/Template_AxisDisplayOptions'
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
+    Template_TreeMapFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        TreeMapAggregatedFieldWells:
+          $ref: '#/components/schemas/Template_TreeMapAggregatedFieldWells'
+    Template_FunnelChartFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        FunnelChartAggregatedFieldWells:
+          $ref: '#/components/schemas/Template_FunnelChartAggregatedFieldWells'
+    Template_DataLabelOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        DataLabelTypes:
+          minItems: 0
+          maxItems: 100
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DataLabelType'
+        MeasureLabelVisibility: {}
+        Position:
+          $ref: '#/components/schemas/DataLabelPosition'
+        LabelContent:
+          $ref: '#/components/schemas/DataLabelContent'
+        Visibility: {}
+        TotalsVisibility: {}
+        Overlap:
+          $ref: '#/components/schemas/DataLabelOverlap'
+        CategoryLabelVisibility: {}
+        LabelColor:
+          pattern: ^#[A-F0-9]{6}$
+          type: string
+        LabelFontConfiguration:
+          $ref: '#/components/schemas/FontConfiguration'
+    Template_TreeMapConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        SortConfiguration:
+          $ref: '#/components/schemas/TreeMapSortConfiguration'
+        Legend:
+          $ref: '#/components/schemas/Template_LegendOptions'
+        DataLabels:
+          $ref: '#/components/schemas/Template_DataLabelOptions'
+        ColorLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        SizeLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        FieldWells:
+          $ref: '#/components/schemas/Template_TreeMapFieldWells'
+        Tooltip:
+          $ref: '#/components/schemas/Template_TooltipOptions'
+        ColorScale:
+          $ref: '#/components/schemas/ColorScale'
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
+        GroupLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+    Template_InnerFilter:
+      additionalProperties: false
+      type: object
+      properties:
+        CategoryInnerFilter:
+          $ref: '#/components/schemas/Template_CategoryInnerFilter'
+    Template_SheetImageTooltipConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        Visibility: {}
+        TooltipText:
+          $ref: '#/components/schemas/SheetImageTooltipText'
+    Template_DefaultFilterControlConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        ControlOptions:
+          $ref: '#/components/schemas/Template_DefaultFilterControlOptions'
+        Title:
+          minLength: 1
+          type: string
+          maxLength: 2048
+      required:
+        - ControlOptions
+        - Title
+    Template_TablePaginatedReportOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        OverflowColumnHeaderVisibility: {}
+        VerticalOverflowVisibility: {}
+    Template_KPISparklineOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Type:
+          $ref: '#/components/schemas/KPISparklineType'
+        Color:
+          pattern: ^#[A-F0-9]{6}$
+          type: string
+        TooltipVisibility: {}
+        Visibility: {}
+      required:
+        - Type
+    Template_TimeRangeFilter:
+      additionalProperties: false
+      type: object
+      properties:
+        RangeMinimumValue:
+          $ref: '#/components/schemas/TimeRangeFilterValue'
+        Column:
+          $ref: '#/components/schemas/ColumnIdentifier'
+        RangeMaximumValue:
+          $ref: '#/components/schemas/TimeRangeFilterValue'
+        IncludeMaximum:
+          default: null
+          type: boolean
+        TimeGranularity:
+          $ref: '#/components/schemas/TimeGranularity'
+        NullOption:
+          $ref: '#/components/schemas/FilterNullOption'
+        DefaultFilterControlConfiguration:
+          $ref: '#/components/schemas/Template_DefaultFilterControlConfiguration'
+        FilterId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        IncludeMinimum:
+          default: null
+          type: boolean
+        ExcludePeriodConfiguration:
+          $ref: '#/components/schemas/ExcludePeriodConfiguration'
+      required:
+        - Column
+        - FilterId
+        - NullOption
+    Template_RadarChartAreaStyleSettings:
+      additionalProperties: false
+      type: object
+      properties:
+        Visibility: {}
+    Template_FilterGroup:
+      additionalProperties: false
+      type: object
+      properties:
+        Status:
+          $ref: '#/components/schemas/WidgetStatus'
+        Filters:
+          minItems: 0
+          maxItems: 20
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_Filter'
+        CrossDataset:
+          $ref: '#/components/schemas/CrossDatasetTypes'
+        ScopeConfiguration:
+          $ref: '#/components/schemas/FilterScopeConfiguration'
+        FilterGroupId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+      required:
+        - CrossDataset
+        - FilterGroupId
+        - Filters
+        - ScopeConfiguration
+    Template_TooltipItem:
+      additionalProperties: false
+      type: object
+      properties:
+        FieldTooltipItem:
+          $ref: '#/components/schemas/Template_FieldTooltipItem'
+        ColumnTooltipItem:
+          $ref: '#/components/schemas/Template_ColumnTooltipItem'
+    Template_AxisDataOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        DateAxisOptions:
+          $ref: '#/components/schemas/Template_DateAxisOptions'
+        NumericAxisOptions:
+          $ref: '#/components/schemas/NumericAxisOptions'
+    Template_ScrollBarOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        VisibleRange:
+          $ref: '#/components/schemas/VisibleRangeOptions'
+        Visibility: {}
+    Template_LineChartSeriesSettings:
+      additionalProperties: false
+      type: object
+      properties:
+        LineStyleSettings:
+          $ref: '#/components/schemas/Template_LineChartLineStyleSettings'
+        MarkerStyleSettings:
+          $ref: '#/components/schemas/Template_LineChartMarkerStyleSettings'
+    Template_ScatterPlotConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        YAxisLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        SortConfiguration:
+          $ref: '#/components/schemas/ScatterPlotSortConfiguration'
+        Legend:
+          $ref: '#/components/schemas/Template_LegendOptions'
+        YAxisDisplayOptions:
+          $ref: '#/components/schemas/Template_AxisDisplayOptions'
+        DataLabels:
+          $ref: '#/components/schemas/Template_DataLabelOptions'
+        FieldWells:
+          $ref: '#/components/schemas/Template_ScatterPlotFieldWells'
+        Tooltip:
+          $ref: '#/components/schemas/Template_TooltipOptions'
+        XAxisLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
+        VisualPalette:
+          $ref: '#/components/schemas/VisualPalette'
+        XAxisDisplayOptions:
+          $ref: '#/components/schemas/Template_AxisDisplayOptions'
+    Template_DefaultTextAreaControlOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Delimiter:
+          minLength: 1
+          type: string
+          maxLength: 2048
+        DisplayOptions:
+          $ref: '#/components/schemas/Template_TextAreaControlDisplayOptions'
+    TemplateVersionDefinition:
+      additionalProperties: false
+      type: object
+      properties:
+        Options:
+          $ref: '#/components/schemas/AssetOptions'
+        FilterGroups:
+          minItems: 0
+          maxItems: 2000
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_FilterGroup'
+        QueryExecutionOptions:
+          $ref: '#/components/schemas/QueryExecutionOptions'
+        CalculatedFields:
+          minItems: 0
+          maxItems: 500
+          type: array
+          items:
+            $ref: '#/components/schemas/CalculatedField'
+        DataSetConfigurations:
+          minItems: 0
+          maxItems: 30
+          type: array
+          items:
+            $ref: '#/components/schemas/DataSetConfiguration'
+        ColumnConfigurations:
+          minItems: 0
+          maxItems: 2000
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_ColumnConfiguration'
+        AnalysisDefaults:
+          $ref: '#/components/schemas/AnalysisDefaults'
+        Sheets:
+          minItems: 0
+          maxItems: 20
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_SheetDefinition'
+        ParameterDeclarations:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/ParameterDeclaration'
+      required:
+        - DataSetConfigurations
+    Template_SankeyDiagramAggregatedFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        Destination:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Source:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Weight:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+    Template_FieldSeriesItem:
+      additionalProperties: false
+      type: object
+      properties:
+        FieldId:
+          minLength: 1
+          type: string
+          maxLength: 512
+        AxisBinding:
+          $ref: '#/components/schemas/AxisBinding'
+        Settings:
+          $ref: '#/components/schemas/Template_LineChartSeriesSettings'
+      required:
+        - AxisBinding
+        - FieldId
+    Template_FilterDropDownControl:
+      additionalProperties: false
+      type: object
+      properties:
+        FilterControlId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        Type:
+          $ref: '#/components/schemas/SheetControlListType'
+        DisplayOptions:
+          $ref: '#/components/schemas/Template_DropDownControlDisplayOptions'
+        CascadingControlConfiguration:
+          $ref: '#/components/schemas/CascadingControlConfiguration'
+        Title:
+          minLength: 1
+          type: string
+          maxLength: 2048
+        CommitMode:
+          $ref: '#/components/schemas/CommitMode'
+        SourceFilterId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        SelectableValues:
+          $ref: '#/components/schemas/FilterSelectableValues'
+      required:
+        - FilterControlId
+        - SourceFilterId
+        - Title
+    Template_BoxPlotAggregatedFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        GroupBy:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Values:
+          minItems: 0
+          maxItems: 5
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+    Template_RelativeDatesFilter:
+      additionalProperties: false
+      type: object
+      properties:
+        RelativeDateValue:
+          default: null
+          type: number
+        Column:
+          $ref: '#/components/schemas/ColumnIdentifier'
+        RelativeDateType:
+          $ref: '#/components/schemas/RelativeDateType'
+        TimeGranularity:
+          $ref: '#/components/schemas/TimeGranularity'
+        ParameterName:
+          minLength: 1
+          pattern: ^[a-zA-Z0-9]+$
+          type: string
+          maxLength: 2048
+        NullOption:
+          $ref: '#/components/schemas/FilterNullOption'
+        DefaultFilterControlConfiguration:
+          $ref: '#/components/schemas/Template_DefaultFilterControlConfiguration'
+        FilterId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        AnchorDateConfiguration:
+          $ref: '#/components/schemas/AnchorDateConfiguration'
+        MinimumGranularity:
+          $ref: '#/components/schemas/TimeGranularity'
+        ExcludePeriodConfiguration:
+          $ref: '#/components/schemas/ExcludePeriodConfiguration'
+      required:
+        - AnchorDateConfiguration
+        - Column
+        - FilterId
+        - NullOption
+        - RelativeDateType
+        - TimeGranularity
+    Template_ParameterControl:
+      additionalProperties: false
+      type: object
+      properties:
+        Slider:
+          $ref: '#/components/schemas/Template_ParameterSliderControl'
+        TextArea:
+          $ref: '#/components/schemas/Template_ParameterTextAreaControl'
+        Dropdown:
+          $ref: '#/components/schemas/Template_ParameterDropDownControl'
+        TextField:
+          $ref: '#/components/schemas/Template_ParameterTextFieldControl'
+        List:
+          $ref: '#/components/schemas/Template_ParameterListControl'
+        DateTimePicker:
+          $ref: '#/components/schemas/Template_ParameterDateTimePickerControl'
+    Template_ReferenceLineLabelConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        HorizontalPosition:
+          $ref: '#/components/schemas/ReferenceLineLabelHorizontalPosition'
+        ValueLabelConfiguration:
+          $ref: '#/components/schemas/Template_ReferenceLineValueLabelConfiguration'
+        CustomLabelConfiguration:
+          $ref: '#/components/schemas/ReferenceLineCustomLabelConfiguration'
+        FontColor:
+          pattern: ^#[A-F0-9]{6}$
+          type: string
+        FontConfiguration:
+          $ref: '#/components/schemas/FontConfiguration'
+        VerticalPosition:
+          $ref: '#/components/schemas/ReferenceLineLabelVerticalPosition'
+    Template_HistogramVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_HistogramConfiguration'
+        Actions:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/VisualCustomAction'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+      required:
+        - VisualId
+    Template_PivotTableVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        ConditionalFormatting:
+          $ref: '#/components/schemas/PivotTableConditionalFormatting'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_PivotTableConfiguration'
+        Actions:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/VisualCustomAction'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+      required:
+        - VisualId
+    Template_FreeFormLayoutElement:
+      additionalProperties: false
+      type: object
+      properties:
+        ElementType:
+          $ref: '#/components/schemas/LayoutElementType'
+        BorderStyle:
+          $ref: '#/components/schemas/Template_FreeFormLayoutElementBorderStyle'
+        Height:
+          description: String based length that is composed of value and unit in px
+          type: string
+        Visibility: {}
+        RenderingRules:
+          minItems: 0
+          maxItems: 10000
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_SheetElementRenderingRule'
+        YAxisLocation:
+          description: String based length that is composed of value and unit in px with Integer.MAX_VALUE as maximum value
+          type: string
+        LoadingAnimation:
+          $ref: '#/components/schemas/Template_LoadingAnimation'
+        Width:
+          description: String based length that is composed of value and unit in px
+          type: string
+        BackgroundStyle:
+          $ref: '#/components/schemas/Template_FreeFormLayoutElementBackgroundStyle'
+        ElementId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        XAxisLocation:
+          description: String based length that is composed of value and unit in px
+          type: string
+        SelectedBorderStyle:
+          $ref: '#/components/schemas/Template_FreeFormLayoutElementBorderStyle'
+      required:
+        - ElementId
+        - ElementType
+        - Height
+        - Width
+        - XAxisLocation
+        - YAxisLocation
+    Template_FilledMapFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        FilledMapAggregatedFieldWells:
+          $ref: '#/components/schemas/Template_FilledMapAggregatedFieldWells'
+    Template_ForecastComputation:
+      additionalProperties: false
+      type: object
+      properties:
+        PeriodsBackward:
+          maximum: 1000
+          type: number
+          minimum: 0
+        PeriodsForward:
+          maximum: 1000
+          type: number
+          minimum: 1
+        PredictionInterval:
+          maximum: 95
+          type: number
+          minimum: 50
+        Seasonality:
+          $ref: '#/components/schemas/ForecastComputationSeasonality'
+        CustomSeasonalityValue:
+          default: null
+          maximum: 180
+          type: number
+          minimum: 1
+        Value:
+          $ref: '#/components/schemas/Template_MeasureField'
+        Time:
+          $ref: '#/components/schemas/Template_DimensionField'
+        UpperBoundary:
+          default: null
+          type: number
+        ComputationId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        Name:
+          type: string
+        LowerBoundary:
+          default: null
+          type: number
+      required:
+        - ComputationId
+    Template_TextFieldControlDisplayOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        TitleOptions:
+          $ref: '#/components/schemas/Template_LabelOptions'
+        PlaceholderOptions:
+          $ref: '#/components/schemas/Template_TextControlPlaceholderOptions'
+        InfoIconLabelOptions:
+          $ref: '#/components/schemas/Template_SheetControlInfoIconLabelOptions'
+    Template_BoxPlotVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_BoxPlotChartConfiguration'
+        Actions:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/VisualCustomAction'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+        ColumnHierarchies:
+          minItems: 0
+          maxItems: 2
+          type: array
+          items:
+            $ref: '#/components/schemas/ColumnHierarchy'
+      required:
+        - VisualId
+    Template_FreeFormLayoutElementBackgroundStyle:
+      additionalProperties: false
+      type: object
+      properties:
+        Color:
+          pattern: ^#[A-F0-9]{6}(?:[A-F0-9]{2})?$
+          type: string
+        Visibility: {}
+    Template_BoxPlotFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        BoxPlotAggregatedFieldWells:
+          $ref: '#/components/schemas/Template_BoxPlotAggregatedFieldWells'
+    Template_SheetElementRenderingRule:
+      additionalProperties: false
+      type: object
+      properties:
+        Expression:
+          minLength: 1
+          type: string
+          maxLength: 4096
+        ConfigurationOverrides:
+          $ref: '#/components/schemas/Template_SheetElementConfigurationOverrides'
+      required:
+        - ConfigurationOverrides
+        - Expression
+    Template_TrendArrowOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Visibility: {}
+    Template_PanelTitleOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Visibility: {}
+        FontConfiguration:
+          $ref: '#/components/schemas/FontConfiguration'
+        HorizontalTextAlignment:
+          $ref: '#/components/schemas/HorizontalTextAlignment'
+    Template_FunnelChartAggregatedFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        Category:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Values:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+    Template_FreeFormLayoutElementBorderStyle:
+      additionalProperties: false
+      type: object
+      properties:
+        Color:
+          pattern: ^#[A-F0-9]{6}(?:[A-F0-9]{2})?$
+          type: string
+        Visibility: {}
+    Template_CategoryFilter:
+      additionalProperties: false
+      type: object
+      properties:
+        Configuration:
+          $ref: '#/components/schemas/CategoryFilterConfiguration'
+        Column:
+          $ref: '#/components/schemas/ColumnIdentifier'
+        DefaultFilterControlConfiguration:
+          $ref: '#/components/schemas/Template_DefaultFilterControlConfiguration'
+        FilterId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+      required:
+        - Column
+        - Configuration
+        - FilterId
+    Template_FilledMapVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        ConditionalFormatting:
+          $ref: '#/components/schemas/FilledMapConditionalFormatting'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_FilledMapConfiguration'
+        Actions:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/VisualCustomAction'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+        ColumnHierarchies:
+          minItems: 0
+          maxItems: 2
+          type: array
+          items:
+            $ref: '#/components/schemas/ColumnHierarchy'
+      required:
+        - VisualId
+    Template_FilterSliderControl:
+      additionalProperties: false
+      type: object
+      properties:
+        FilterControlId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        Type:
+          $ref: '#/components/schemas/SheetControlSliderType'
+        StepSize:
+          default: 0
+          type: number
+        DisplayOptions:
+          $ref: '#/components/schemas/Template_SliderControlDisplayOptions'
+        Title:
+          minLength: 1
+          type: string
+          maxLength: 2048
+        MaximumValue:
+          default: 0
+          type: number
+        SourceFilterId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        MinimumValue:
+          default: 0
+          type: number
+      required:
+        - FilterControlId
+        - MaximumValue
+        - MinimumValue
+        - SourceFilterId
+        - StepSize
+        - Title
+    Template_DefaultTextFieldControlOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        DisplayOptions:
+          $ref: '#/components/schemas/Template_TextFieldControlDisplayOptions'
+    Template_LayoutConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        GridLayout:
+          $ref: '#/components/schemas/GridLayoutConfiguration'
+        FreeFormLayout:
+          $ref: '#/components/schemas/Template_FreeFormLayoutConfiguration'
+        SectionBasedLayout:
+          $ref: '#/components/schemas/Template_SectionBasedLayoutConfiguration'
+    Template_GeospatialPolygonStyle:
+      additionalProperties: false
+      type: object
+      properties:
+        PolygonSymbolStyle:
+          $ref: '#/components/schemas/Template_GeospatialPolygonSymbolStyle'
+    Template_WaterfallChartAggregatedFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        Categories:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Breakdowns:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Values:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+    ColumnSchema:
+      description: <p>The column schema.</p>
+      additionalProperties: false
+      type: object
+      properties:
+        DataType:
+          description: <p>The data type of the column schema.</p>
+          type: string
+        GeographicRole:
+          description: <p>The geographic role of the column schema.</p>
+          type: string
+        Name:
+          description: <p>The name of the column schema.</p>
+          type: string
+    Template_GeospatialMapFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        GeospatialMapAggregatedFieldWells:
+          $ref: '#/components/schemas/Template_GeospatialMapAggregatedFieldWells'
+    Template_FunnelChartConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        SortConfiguration:
+          $ref: '#/components/schemas/FunnelChartSortConfiguration'
+        DataLabelOptions:
+          $ref: '#/components/schemas/Template_FunnelChartDataLabelOptions'
+        CategoryLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        FieldWells:
+          $ref: '#/components/schemas/Template_FunnelChartFieldWells'
+        Tooltip:
+          $ref: '#/components/schemas/Template_TooltipOptions'
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
+        ValueLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        VisualPalette:
+          $ref: '#/components/schemas/VisualPalette'
+    Template_PluginVisualConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        SortConfiguration:
+          $ref: '#/components/schemas/PluginVisualSortConfiguration'
+        VisualOptions:
+          $ref: '#/components/schemas/PluginVisualOptions'
+        FieldWells:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_PluginVisualFieldWell'
+    Template_GaugeChartConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        DataLabels:
+          $ref: '#/components/schemas/Template_DataLabelOptions'
+        FieldWells:
+          $ref: '#/components/schemas/Template_GaugeChartFieldWells'
+        TooltipOptions:
+          $ref: '#/components/schemas/Template_TooltipOptions'
+        GaugeChartOptions:
+          $ref: '#/components/schemas/Template_GaugeChartOptions'
+        ColorConfiguration:
+          $ref: '#/components/schemas/GaugeChartColorConfiguration'
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
+        VisualPalette:
+          $ref: '#/components/schemas/VisualPalette'
+    Template_GeospatialPointStyle:
+      additionalProperties: false
+      type: object
+      properties:
+        CircleSymbolStyle: {}
+    Template_SheetElementConfigurationOverrides:
+      additionalProperties: false
+      type: object
+      properties:
+        Visibility: {}
+    Template_DonutCenterOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        LabelVisibility: {}
+    Template_BodySectionContent:
+      additionalProperties: false
+      type: object
+      properties:
+        Layout:
+          $ref: '#/components/schemas/Template_SectionLayoutConfiguration'
+    Template_CategoryInnerFilter:
+      additionalProperties: false
+      type: object
+      properties:
+        Configuration:
+          $ref: '#/components/schemas/CategoryFilterConfiguration'
+        Column:
+          $ref: '#/components/schemas/ColumnIdentifier'
+        DefaultFilterControlConfiguration:
+          $ref: '#/components/schemas/Template_DefaultFilterControlConfiguration'
+      required:
+        - Column
+        - Configuration
     ColumnGroupColumnSchema:
       description: <p>A structure describing the name, data type, and geographic role of the columns.</p>
       additionalProperties: false
       type: object
       properties:
-        Name:
-          description: <p>The name of the column group's column schema.</p>
-          type: string
-    TemplateVersion:
-      description: <p>A version of a template.</p>
+        Name:
+          description: <p>The name of the column group's column schema.</p>
+          type: string
+    Template_ListControlDisplayOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        TitleOptions:
+          $ref: '#/components/schemas/Template_LabelOptions'
+        SearchOptions:
+          $ref: '#/components/schemas/Template_ListControlSearchOptions'
+        SelectAllOptions:
+          $ref: '#/components/schemas/Template_ListControlSelectAllOptions'
+        InfoIconLabelOptions:
+          $ref: '#/components/schemas/Template_SheetControlInfoIconLabelOptions'
+    Template_ScatterPlotUnaggregatedFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        Category:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Size:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+        Label:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        XAxis:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        YAxis:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+    Template_PieChartAggregatedFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        Category:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Values:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+        SmallMultiples:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+    Template_LineChartVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_LineChartConfiguration'
+        Actions:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/VisualCustomAction'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+        ColumnHierarchies:
+          minItems: 0
+          maxItems: 2
+          type: array
+          items:
+            $ref: '#/components/schemas/ColumnHierarchy'
+      required:
+        - VisualId
+    Template_ScatterPlotFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        ScatterPlotUnaggregatedFieldWells:
+          $ref: '#/components/schemas/Template_ScatterPlotUnaggregatedFieldWells'
+        ScatterPlotCategoricallyAggregatedFieldWells:
+          $ref: '#/components/schemas/Template_ScatterPlotCategoricallyAggregatedFieldWells'
+    TemplateVersion:
+      description: <p>A version of a template.</p>
+      additionalProperties: false
+      type: object
+      properties:
+        Status:
+          $ref: '#/components/schemas/ResourceStatus'
+        Errors:
+          minItems: 1
+          description: <p>Errors associated with this template version.</p>
+          type: array
+          items:
+            $ref: '#/components/schemas/TemplateError'
+        CreatedTime:
+          format: date-time
+          description: <p>The time that this template version was created.</p>
+          type: string
+        Description:
+          minLength: 1
+          description: <p>The description of the template.</p>
+          type: string
+          maxLength: 512
+        ThemeArn:
+          description: <p>The ARN of the theme associated with this version of the template.</p>
+          type: string
+        DataSetConfigurations:
+          minItems: 0
+          maxItems: 30
+          description: |-
+            <p>Schema of the dataset identified by the placeholder. Any dashboard created from this
+                        template should be bound to new datasets matching the same schema described through this
+                        API operation.</p>
+          type: array
+          items:
+            $ref: '#/components/schemas/DataSetConfiguration'
+        SourceEntityArn:
+          description: |-
+            <p>The Amazon Resource Name (ARN) of an analysis or template that was used to create this
+                        template.</p>
+          type: string
+        VersionNumber:
+          description: <p>The version number of the template version.</p>
+          type: number
+          minimum: 1
+        Sheets:
+          minItems: 0
+          maxItems: 20
+          description: <p>A list of the associated sheets with the unique identifier and name of each sheet.</p>
+          type: array
+          items:
+            $ref: '#/components/schemas/Sheet'
+    Template_BoxPlotChartConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        SortConfiguration:
+          $ref: '#/components/schemas/BoxPlotSortConfiguration'
+        Legend:
+          $ref: '#/components/schemas/Template_LegendOptions'
+        ReferenceLines:
+          minItems: 0
+          maxItems: 20
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_ReferenceLine'
+        CategoryAxis:
+          $ref: '#/components/schemas/Template_AxisDisplayOptions'
+        PrimaryYAxisLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        CategoryLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        FieldWells:
+          $ref: '#/components/schemas/Template_BoxPlotFieldWells'
+        Tooltip:
+          $ref: '#/components/schemas/Template_TooltipOptions'
+        BoxPlotOptions:
+          $ref: '#/components/schemas/Template_BoxPlotOptions'
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
+        PrimaryYAxisDisplayOptions:
+          $ref: '#/components/schemas/Template_AxisDisplayOptions'
+        VisualPalette:
+          $ref: '#/components/schemas/VisualPalette'
+    Template_DataFieldSeriesItem:
+      additionalProperties: false
+      type: object
+      properties:
+        FieldId:
+          minLength: 1
+          type: string
+          maxLength: 512
+        AxisBinding:
+          $ref: '#/components/schemas/AxisBinding'
+        FieldValue:
+          type: string
+        Settings:
+          $ref: '#/components/schemas/Template_LineChartSeriesSettings'
+      required:
+        - AxisBinding
+        - FieldId
+    Template_TableOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        HeaderStyle:
+          $ref: '#/components/schemas/Template_TableCellStyle'
+        CellStyle:
+          $ref: '#/components/schemas/Template_TableCellStyle'
+        Orientation:
+          $ref: '#/components/schemas/TableOrientation'
+        RowAlternateColorOptions:
+          $ref: '#/components/schemas/RowAlternateColorOptions'
+    Template_ColumnConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        Role:
+          $ref: '#/components/schemas/ColumnRole'
+        FormatConfiguration:
+          $ref: '#/components/schemas/Template_FormatConfiguration'
+        Column:
+          $ref: '#/components/schemas/ColumnIdentifier'
+        ColorsConfiguration:
+          $ref: '#/components/schemas/ColorsConfiguration'
+      required:
+        - Column
+    Template_ListControlSelectAllOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Visibility: {}
+    Template_ProgressBarOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Visibility: {}
+    Template_SubtotalOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        CustomLabel:
+          type: string
+        FieldLevelOptions:
+          minItems: 0
+          maxItems: 100
+          type: array
+          items:
+            $ref: '#/components/schemas/PivotTableFieldSubtotalOptions'
+        ValueCellStyle:
+          $ref: '#/components/schemas/Template_TableCellStyle'
+        TotalCellStyle:
+          $ref: '#/components/schemas/Template_TableCellStyle'
+        TotalsVisibility: {}
+        FieldLevel:
+          $ref: '#/components/schemas/PivotTableSubtotalLevel'
+        MetricHeaderCellStyle:
+          $ref: '#/components/schemas/Template_TableCellStyle'
+        StyleTargets:
+          minItems: 0
+          maxItems: 3
+          type: array
+          items:
+            $ref: '#/components/schemas/TableStyleTarget'
+    Template_PivotTablePaginatedReportOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        OverflowColumnHeaderVisibility: {}
+        VerticalOverflowVisibility: {}
+    Template_SectionLayoutConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        FreeFormLayout:
+          $ref: '#/components/schemas/Template_FreeFormSectionLayoutConfiguration'
+      required:
+        - FreeFormLayout
+    Template_HeatMapFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        HeatMapAggregatedFieldWells:
+          $ref: '#/components/schemas/Template_HeatMapAggregatedFieldWells'
+    Template_Computation:
+      additionalProperties: false
+      type: object
+      properties:
+        PeriodToDate:
+          $ref: '#/components/schemas/Template_PeriodToDateComputation'
+        GrowthRate:
+          $ref: '#/components/schemas/Template_GrowthRateComputation'
+        TopBottomRanked:
+          $ref: '#/components/schemas/Template_TopBottomRankedComputation'
+        TotalAggregation:
+          $ref: '#/components/schemas/Template_TotalAggregationComputation'
+        Forecast:
+          $ref: '#/components/schemas/Template_ForecastComputation'
+        MaximumMinimum:
+          $ref: '#/components/schemas/Template_MaximumMinimumComputation'
+        PeriodOverPeriod:
+          $ref: '#/components/schemas/Template_PeriodOverPeriodComputation'
+        MetricComparison:
+          $ref: '#/components/schemas/Template_MetricComparisonComputation'
+        TopBottomMovers:
+          $ref: '#/components/schemas/Template_TopBottomMoversComputation'
+        UniqueValues:
+          $ref: '#/components/schemas/Template_UniqueValuesComputation'
+    Template_GeospatialPolygonLayer:
+      additionalProperties: false
+      type: object
+      properties:
+        Style:
+          $ref: '#/components/schemas/Template_GeospatialPolygonStyle'
+      required:
+        - Style
+    Template_DefaultSliderControlOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Type:
+          $ref: '#/components/schemas/SheetControlSliderType'
+        StepSize:
+          default: 0
+          type: number
+        DisplayOptions:
+          $ref: '#/components/schemas/Template_SliderControlDisplayOptions'
+        MaximumValue:
+          default: 0
+          type: number
+        MinimumValue:
+          default: 0
+          type: number
+      required:
+        - MaximumValue
+        - MinimumValue
+        - StepSize
+    Template_ParameterListControl:
+      additionalProperties: false
+      type: object
+      properties:
+        ParameterControlId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        Type:
+          $ref: '#/components/schemas/SheetControlListType'
+        DisplayOptions:
+          $ref: '#/components/schemas/Template_ListControlDisplayOptions'
+        SourceParameterName:
+          minLength: 1
+          pattern: ^[a-zA-Z0-9]+$
+          type: string
+          maxLength: 2048
+        CascadingControlConfiguration:
+          $ref: '#/components/schemas/CascadingControlConfiguration'
+        Title:
+          minLength: 1
+          type: string
+          maxLength: 2048
+        SelectableValues:
+          $ref: '#/components/schemas/ParameterSelectableValues'
+      required:
+        - ParameterControlId
+        - SourceParameterName
+        - Title
+    Template_ParameterDateTimePickerControl:
+      additionalProperties: false
+      type: object
+      properties:
+        ParameterControlId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        DisplayOptions:
+          $ref: '#/components/schemas/Template_DateTimePickerControlDisplayOptions'
+        SourceParameterName:
+          minLength: 1
+          pattern: ^[a-zA-Z0-9]+$
+          type: string
+          maxLength: 2048
+        Title:
+          minLength: 1
+          type: string
+          maxLength: 2048
+      required:
+        - ParameterControlId
+        - SourceParameterName
+        - Title
+    DataSetSchema:
+      description: <p>Dataset schema.</p>
+      additionalProperties: false
+      type: object
+      properties:
+        ColumnSchemaList:
+          minItems: 0
+          maxItems: 500
+          description: <p>A structure containing the list of column schemas.</p>
+          type: array
+          items:
+            $ref: '#/components/schemas/ColumnSchema'
+    Template_LineChartFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        LineChartAggregatedFieldWells:
+          $ref: '#/components/schemas/Template_LineChartAggregatedFieldWells'
+    Template_RadarChartSeriesSettings:
+      additionalProperties: false
+      type: object
+      properties:
+        AreaStyleSettings:
+          $ref: '#/components/schemas/Template_RadarChartAreaStyleSettings'
+    Template_SankeyDiagramChartConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        SortConfiguration:
+          $ref: '#/components/schemas/SankeyDiagramSortConfiguration'
+        DataLabels:
+          $ref: '#/components/schemas/Template_DataLabelOptions'
+        FieldWells:
+          $ref: '#/components/schemas/Template_SankeyDiagramFieldWells'
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
+    Template_WordCloudVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_WordCloudChartConfiguration'
+        Actions:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/VisualCustomAction'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+        ColumnHierarchies:
+          minItems: 0
+          maxItems: 2
+          type: array
+          items:
+            $ref: '#/components/schemas/ColumnHierarchy'
+      required:
+        - VisualId
+    Template_SankeyDiagramVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_SankeyDiagramChartConfiguration'
+        Actions:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/VisualCustomAction'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+      required:
+        - VisualId
+    Template_WaterfallChartFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        WaterfallChartAggregatedFieldWells:
+          $ref: '#/components/schemas/Template_WaterfallChartAggregatedFieldWells'
+    Template_InsightConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        Computations:
+          minItems: 0
+          maxItems: 100
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_Computation'
+        CustomNarrative:
+          $ref: '#/components/schemas/CustomNarrativeOptions'
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
+    Template_FunnelChartDataLabelOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        MeasureLabelVisibility: {}
+        Position:
+          $ref: '#/components/schemas/DataLabelPosition'
+        Visibility: {}
+        CategoryLabelVisibility: {}
+        LabelColor:
+          pattern: ^#[A-F0-9]{6}$
+          type: string
+        MeasureDataLabelStyle:
+          $ref: '#/components/schemas/FunnelChartMeasureDataLabelStyle'
+        LabelFontConfiguration:
+          $ref: '#/components/schemas/FontConfiguration'
+    Template_SecondaryValueOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Visibility: {}
+    Template_HeaderFooterSectionConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        Layout:
+          $ref: '#/components/schemas/Template_SectionLayoutConfiguration'
+        Style:
+          $ref: '#/components/schemas/SectionStyle'
+        SectionId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+      required:
+        - Layout
+        - SectionId
+    Template_HeatMapConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        SortConfiguration:
+          $ref: '#/components/schemas/HeatMapSortConfiguration'
+        ColumnLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        Legend:
+          $ref: '#/components/schemas/Template_LegendOptions'
+        DataLabels:
+          $ref: '#/components/schemas/Template_DataLabelOptions'
+        FieldWells:
+          $ref: '#/components/schemas/Template_HeatMapFieldWells'
+        Tooltip:
+          $ref: '#/components/schemas/Template_TooltipOptions'
+        ColorScale:
+          $ref: '#/components/schemas/ColorScale'
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
+        RowLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+    Template_FilterListControl:
+      additionalProperties: false
+      type: object
+      properties:
+        FilterControlId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        Type:
+          $ref: '#/components/schemas/SheetControlListType'
+        DisplayOptions:
+          $ref: '#/components/schemas/Template_ListControlDisplayOptions'
+        CascadingControlConfiguration:
+          $ref: '#/components/schemas/CascadingControlConfiguration'
+        Title:
+          minLength: 1
+          type: string
+          maxLength: 2048
+        SourceFilterId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        SelectableValues:
+          $ref: '#/components/schemas/FilterSelectableValues'
+      required:
+        - FilterControlId
+        - SourceFilterId
+        - Title
+    Template_PeriodOverPeriodComputation:
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          $ref: '#/components/schemas/Template_MeasureField'
+        Time:
+          $ref: '#/components/schemas/Template_DimensionField'
+        ComputationId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        Name:
+          type: string
+      required:
+        - ComputationId
+    Template_BarChartFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        BarChartAggregatedFieldWells:
+          $ref: '#/components/schemas/Template_BarChartAggregatedFieldWells'
+    Template_GeospatialMapAggregatedFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        Colors:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Values:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+        Geospatial:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+    Template_DateMeasureField:
+      additionalProperties: false
+      type: object
+      properties:
+        AggregationFunction:
+          $ref: '#/components/schemas/DateAggregationFunction'
+        FormatConfiguration:
+          $ref: '#/components/schemas/Template_DateTimeFormatConfiguration'
+        Column:
+          $ref: '#/components/schemas/ColumnIdentifier'
+        FieldId:
+          minLength: 1
+          type: string
+          maxLength: 512
+      required:
+        - Column
+        - FieldId
+    Template_GeospatialMapVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_GeospatialMapConfiguration'
+        Actions:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/VisualCustomAction'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+        ColumnHierarchies:
+          minItems: 0
+          maxItems: 2
+          type: array
+          items:
+            $ref: '#/components/schemas/ColumnHierarchy'
+      required:
+        - VisualId
+    Template_ChartAxisLabelOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Visibility: {}
+        SortIconVisibility: {}
+        AxisLabelOptions:
+          minItems: 0
+          maxItems: 100
+          type: array
+          items:
+            $ref: '#/components/schemas/AxisLabelOptions'
+    Template_WaterfallChartConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        CategoryAxisLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        SortConfiguration:
+          $ref: '#/components/schemas/WaterfallChartSortConfiguration'
+        Legend:
+          $ref: '#/components/schemas/Template_LegendOptions'
+        DataLabels:
+          $ref: '#/components/schemas/Template_DataLabelOptions'
+        PrimaryYAxisLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        FieldWells:
+          $ref: '#/components/schemas/Template_WaterfallChartFieldWells'
+        WaterfallChartOptions:
+          $ref: '#/components/schemas/WaterfallChartOptions'
+        ColorConfiguration:
+          $ref: '#/components/schemas/WaterfallChartColorConfiguration'
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
+        CategoryAxisDisplayOptions:
+          $ref: '#/components/schemas/Template_AxisDisplayOptions'
+        PrimaryYAxisDisplayOptions:
+          $ref: '#/components/schemas/Template_AxisDisplayOptions'
+        VisualPalette:
+          $ref: '#/components/schemas/VisualPalette'
+    Template_NumericalDimensionField:
+      additionalProperties: false
+      type: object
+      properties:
+        HierarchyId:
+          minLength: 1
+          type: string
+          maxLength: 512
+        FormatConfiguration:
+          $ref: '#/components/schemas/Template_NumberFormatConfiguration'
+        Column:
+          $ref: '#/components/schemas/ColumnIdentifier'
+        FieldId:
+          minLength: 1
+          type: string
+          maxLength: 512
+      required:
+        - Column
+        - FieldId
+    Template_TableConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        SortConfiguration:
+          $ref: '#/components/schemas/TableSortConfiguration'
+        PaginatedReportOptions:
+          $ref: '#/components/schemas/Template_TablePaginatedReportOptions'
+        TableOptions:
+          $ref: '#/components/schemas/Template_TableOptions'
+        TableInlineVisualizations:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/TableInlineVisualization'
+        FieldWells:
+          $ref: '#/components/schemas/Template_TableFieldWells'
+        FieldOptions:
+          $ref: '#/components/schemas/Template_TableFieldOptions'
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
+        TotalOptions:
+          $ref: '#/components/schemas/Template_TotalOptions'
+    Template_HistogramConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        YAxisDisplayOptions:
+          $ref: '#/components/schemas/Template_AxisDisplayOptions'
+        DataLabels:
+          $ref: '#/components/schemas/Template_DataLabelOptions'
+        BinOptions:
+          $ref: '#/components/schemas/HistogramBinOptions'
+        FieldWells:
+          $ref: '#/components/schemas/Template_HistogramFieldWells'
+        Tooltip:
+          $ref: '#/components/schemas/Template_TooltipOptions'
+        XAxisLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
+        VisualPalette:
+          $ref: '#/components/schemas/VisualPalette'
+        XAxisDisplayOptions:
+          $ref: '#/components/schemas/Template_AxisDisplayOptions'
+    Template_TreeMapAggregatedFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        Sizes:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+        Colors:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+        Groups:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+    Template_NumberFormatConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        FormatConfiguration:
+          $ref: '#/components/schemas/Template_NumericFormatConfiguration'
+    Template_WaterfallVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_WaterfallChartConfiguration'
+        Actions:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/VisualCustomAction'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+        ColumnHierarchies:
+          minItems: 0
+          maxItems: 2
+          type: array
+          items:
+            $ref: '#/components/schemas/ColumnHierarchy'
+      required:
+        - VisualId
+    Template_PivotTableOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        RowFieldNamesStyle:
+          $ref: '#/components/schemas/Template_TableCellStyle'
+        RowHeaderStyle:
+          $ref: '#/components/schemas/Template_TableCellStyle'
+        CollapsedRowDimensionsVisibility: {}
+        RowsLayout:
+          $ref: '#/components/schemas/PivotTableRowsLayout'
+        MetricPlacement:
+          $ref: '#/components/schemas/PivotTableMetricPlacement'
+        DefaultCellWidth:
+          description: String based length that is composed of value and unit in px
+          type: string
+        ColumnNamesVisibility: {}
+        RowsLabelOptions:
+          $ref: '#/components/schemas/Template_PivotTableRowsLabelOptions'
+        SingleMetricVisibility: {}
+        ColumnHeaderStyle:
+          $ref: '#/components/schemas/Template_TableCellStyle'
+        ToggleButtonsVisibility: {}
+        CellStyle:
+          $ref: '#/components/schemas/Template_TableCellStyle'
+        RowAlternateColorOptions:
+          $ref: '#/components/schemas/RowAlternateColorOptions'
+    Template_PeriodToDateComputation:
+      additionalProperties: false
+      type: object
+      properties:
+        PeriodTimeGranularity:
+          $ref: '#/components/schemas/TimeGranularity'
+        Value:
+          $ref: '#/components/schemas/Template_MeasureField'
+        Time:
+          $ref: '#/components/schemas/Template_DimensionField'
+        ComputationId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        Name:
+          type: string
+      required:
+        - ComputationId
+    Template_TableAggregatedFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        GroupBy:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Values:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+    Template_TopBottomRankedComputation:
+      additionalProperties: false
+      type: object
+      properties:
+        Type:
+          $ref: '#/components/schemas/TopBottomComputationType'
+        Category:
+          $ref: '#/components/schemas/Template_DimensionField'
+        ResultSize:
+          default: 0
+          maximum: 20
+          type: number
+          minimum: 1
+        Value:
+          $ref: '#/components/schemas/Template_MeasureField'
+        ComputationId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        Name:
+          type: string
+      required:
+        - ComputationId
+        - Type
+    Template_ParameterSliderControl:
+      additionalProperties: false
+      type: object
+      properties:
+        ParameterControlId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        StepSize:
+          default: 0
+          type: number
+        DisplayOptions:
+          $ref: '#/components/schemas/Template_SliderControlDisplayOptions'
+        SourceParameterName:
+          minLength: 1
+          pattern: ^[a-zA-Z0-9]+$
+          type: string
+          maxLength: 2048
+        Title:
+          minLength: 1
+          type: string
+          maxLength: 2048
+        MaximumValue:
+          default: 0
+          type: number
+        MinimumValue:
+          default: 0
+          type: number
+      required:
+        - MaximumValue
+        - MinimumValue
+        - ParameterControlId
+        - SourceParameterName
+        - StepSize
+        - Title
+    Template_SheetControlInfoIconLabelOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Visibility: {}
+        InfoIconText:
+          minLength: 1
+          type: string
+          maxLength: 100
+    Template_FilterTextFieldControl:
+      additionalProperties: false
+      type: object
+      properties:
+        FilterControlId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        DisplayOptions:
+          $ref: '#/components/schemas/Template_TextFieldControlDisplayOptions'
+        Title:
+          minLength: 1
+          type: string
+          maxLength: 2048
+        SourceFilterId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+      required:
+        - FilterControlId
+        - SourceFilterId
+        - Title
+    Template_TimeEqualityFilter:
+      additionalProperties: false
+      type: object
+      properties:
+        Column:
+          $ref: '#/components/schemas/ColumnIdentifier'
+        RollingDate:
+          $ref: '#/components/schemas/RollingDateConfiguration'
+        Value:
+          format: date-time
+          type: string
+        TimeGranularity:
+          $ref: '#/components/schemas/TimeGranularity'
+        ParameterName:
+          minLength: 1
+          pattern: ^[a-zA-Z0-9]+$
+          type: string
+          maxLength: 2048
+        DefaultFilterControlConfiguration:
+          $ref: '#/components/schemas/Template_DefaultFilterControlConfiguration'
+        FilterId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+      required:
+        - Column
+        - FilterId
+    Template_NumericFormatConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        NumberDisplayFormatConfiguration:
+          $ref: '#/components/schemas/Template_NumberDisplayFormatConfiguration'
+        CurrencyDisplayFormatConfiguration:
+          $ref: '#/components/schemas/Template_CurrencyDisplayFormatConfiguration'
+        PercentageDisplayFormatConfiguration:
+          $ref: '#/components/schemas/Template_PercentageDisplayFormatConfiguration'
+    Template_FilterTextAreaControl:
+      additionalProperties: false
+      type: object
+      properties:
+        FilterControlId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        Delimiter:
+          minLength: 1
+          type: string
+          maxLength: 2048
+        DisplayOptions:
+          $ref: '#/components/schemas/Template_TextAreaControlDisplayOptions'
+        Title:
+          minLength: 1
+          type: string
+          maxLength: 2048
+        SourceFilterId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+      required:
+        - FilterControlId
+        - SourceFilterId
+        - Title
+    Template_InsightVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        Actions:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/VisualCustomAction'
+        DataSetIdentifier:
+          minLength: 1
+          type: string
+          maxLength: 2048
+        InsightConfiguration:
+          $ref: '#/components/schemas/Template_InsightConfiguration'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+      required:
+        - DataSetIdentifier
+        - VisualId
+    Template_PieChartFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        PieChartAggregatedFieldWells:
+          $ref: '#/components/schemas/Template_PieChartAggregatedFieldWells'
+    Template_TopBottomFilter:
+      additionalProperties: false
+      type: object
+      properties:
+        AggregationSortConfigurations:
+          minItems: 0
+          maxItems: 100
+          type: array
+          items:
+            $ref: '#/components/schemas/AggregationSortConfiguration'
+        Column:
+          $ref: '#/components/schemas/ColumnIdentifier'
+        TimeGranularity:
+          $ref: '#/components/schemas/TimeGranularity'
+        ParameterName:
+          minLength: 1
+          pattern: ^[a-zA-Z0-9]+$
+          type: string
+          maxLength: 2048
+        Limit:
+          default: null
+          type: number
+        DefaultFilterControlConfiguration:
+          $ref: '#/components/schemas/Template_DefaultFilterControlConfiguration'
+        FilterId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+      required:
+        - AggregationSortConfigurations
+        - Column
+        - FilterId
+    Template_KPIConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        SortConfiguration:
+          $ref: '#/components/schemas/KPISortConfiguration'
+        KPIOptions:
+          $ref: '#/components/schemas/Template_KPIOptions'
+        FieldWells:
+          $ref: '#/components/schemas/Template_KPIFieldWells'
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
+    Template_MinimumLabelType:
+      additionalProperties: false
+      type: object
+      properties:
+        Visibility: {}
+    Template_GeospatialSolidColor:
+      description: Describes the properties for a solid color
+      additionalProperties: false
+      type: object
+      properties:
+        State: {}
+        Color:
+          pattern: ^#[A-F0-9]{6}(?:[A-F0-9]{2})?$
+          type: string
+      required:
+        - Color
+    TemplateSourceTemplate:
+      description: <p>The source template of the template.</p>
+      additionalProperties: false
+      type: object
+      properties:
+        Arn:
+          description: <p>The Amazon Resource Name (ARN) of the resource.</p>
+          type: string
+      required:
+        - Arn
+    Template_GaugeChartVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        ConditionalFormatting:
+          $ref: '#/components/schemas/GaugeChartConditionalFormatting'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_GaugeChartConfiguration'
+        Actions:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/VisualCustomAction'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+      required:
+        - VisualId
+    Template_FilledMapConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        SortConfiguration:
+          $ref: '#/components/schemas/FilledMapSortConfiguration'
+        Legend:
+          $ref: '#/components/schemas/Template_LegendOptions'
+        MapStyleOptions:
+          $ref: '#/components/schemas/GeospatialMapStyleOptions'
+        FieldWells:
+          $ref: '#/components/schemas/Template_FilledMapFieldWells'
+        Tooltip:
+          $ref: '#/components/schemas/Template_TooltipOptions'
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
+        WindowOptions:
+          $ref: '#/components/schemas/GeospatialWindowOptions'
+    Template_RangeEndsLabelType:
+      additionalProperties: false
+      type: object
+      properties:
+        Visibility: {}
+    Template_LegendOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Position:
+          $ref: '#/components/schemas/LegendPosition'
+        ValueFontConfiguration:
+          $ref: '#/components/schemas/FontConfiguration'
+        Title:
+          $ref: '#/components/schemas/Template_LabelOptions'
+        Visibility: {}
+        Height:
+          description: String based length that is composed of value and unit in px
+          type: string
+        Width:
+          description: String based length that is composed of value and unit in px
+          type: string
+    Template_PieChartVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_PieChartConfiguration'
+        Actions:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/VisualCustomAction'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+        ColumnHierarchies:
+          minItems: 0
+          maxItems: 2
+          type: array
+          items:
+            $ref: '#/components/schemas/ColumnHierarchy'
+      required:
+        - VisualId
+    Template_ComparisonConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        ComparisonMethod:
+          $ref: '#/components/schemas/ComparisonMethod'
+        ComparisonFormat:
+          $ref: '#/components/schemas/Template_ComparisonFormatConfiguration'
+    Template_TotalAggregationComputation:
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          $ref: '#/components/schemas/Template_MeasureField'
+        ComputationId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        Name:
+          type: string
+      required:
+        - ComputationId
+    Template_ParameterTextAreaControl:
+      additionalProperties: false
+      type: object
+      properties:
+        ParameterControlId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        Delimiter:
+          minLength: 1
+          type: string
+          maxLength: 2048
+        DisplayOptions:
+          $ref: '#/components/schemas/Template_TextAreaControlDisplayOptions'
+        SourceParameterName:
+          minLength: 1
+          pattern: ^[a-zA-Z0-9]+$
+          type: string
+          maxLength: 2048
+        Title:
+          minLength: 1
+          type: string
+          maxLength: 2048
+      required:
+        - ParameterControlId
+        - SourceParameterName
+        - Title
+    Template_TableCellStyle:
+      additionalProperties: false
+      type: object
+      properties:
+        VerticalTextAlignment:
+          $ref: '#/components/schemas/VerticalTextAlignment'
+        Visibility: {}
+        Height:
+          maximum: 500
+          type: number
+          minimum: 8
+        FontConfiguration:
+          $ref: '#/components/schemas/FontConfiguration'
+        Border:
+          $ref: '#/components/schemas/GlobalTableBorderOptions'
+        TextWrap:
+          $ref: '#/components/schemas/TextWrap'
+        HorizontalTextAlignment:
+          $ref: '#/components/schemas/HorizontalTextAlignment'
+        BackgroundColor:
+          pattern: ^#[A-F0-9]{6}$
+          type: string
+    Template_ReferenceLine:
+      additionalProperties: false
+      type: object
+      properties:
+        Status:
+          $ref: '#/components/schemas/WidgetStatus'
+        DataConfiguration:
+          $ref: '#/components/schemas/ReferenceLineDataConfiguration'
+        LabelConfiguration:
+          $ref: '#/components/schemas/Template_ReferenceLineLabelConfiguration'
+        StyleConfiguration:
+          $ref: '#/components/schemas/ReferenceLineStyleConfiguration'
+      required:
+        - DataConfiguration
+    Template_HistogramAggregatedFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        Values:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+    Template_PivotTableConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        SortConfiguration:
+          $ref: '#/components/schemas/PivotTableSortConfiguration'
+        PaginatedReportOptions:
+          $ref: '#/components/schemas/Template_PivotTablePaginatedReportOptions'
+        TableOptions:
+          $ref: '#/components/schemas/Template_PivotTableOptions'
+        FieldWells:
+          $ref: '#/components/schemas/Template_PivotTableFieldWells'
+        FieldOptions:
+          $ref: '#/components/schemas/Template_PivotTableFieldOptions'
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
+        TotalOptions:
+          $ref: '#/components/schemas/Template_PivotTableTotalOptions'
+    Template_LoadingAnimation:
+      additionalProperties: false
+      type: object
+      properties:
+        Visibility: {}
+    Template_TotalOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        TotalAggregationOptions:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/TotalAggregationOption'
+        CustomLabel:
+          type: string
+        ScrollStatus:
+          $ref: '#/components/schemas/TableTotalsScrollStatus'
+        Placement:
+          $ref: '#/components/schemas/TableTotalsPlacement'
+        TotalCellStyle:
+          $ref: '#/components/schemas/Template_TableCellStyle'
+        TotalsVisibility: {}
+    Template_DefaultRelativeDateTimeControlOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        DisplayOptions:
+          $ref: '#/components/schemas/Template_RelativeDateTimeControlDisplayOptions'
+        CommitMode:
+          $ref: '#/components/schemas/CommitMode'
+    Template_TextControlPlaceholderOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Visibility: {}
+    Template_DonutOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        DonutCenterOptions:
+          $ref: '#/components/schemas/Template_DonutCenterOptions'
+        ArcOptions:
+          $ref: '#/components/schemas/ArcOptions'
+    Template_RadarChartVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_RadarChartConfiguration'
+        Actions:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/VisualCustomAction'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+        ColumnHierarchies:
+          minItems: 0
+          maxItems: 2
+          type: array
+          items:
+            $ref: '#/components/schemas/ColumnHierarchy'
+      required:
+        - VisualId
+    ColumnGroupSchema:
+      description: <p>The column group schema.</p>
+      additionalProperties: false
+      type: object
+      properties:
+        ColumnGroupColumnSchemaList:
+          minItems: 0
+          maxItems: 500
+          description: <p>A structure containing the list of schemas for column group columns.</p>
+          type: array
+          items:
+            $ref: '#/components/schemas/ColumnGroupColumnSchema'
+        Name:
+          description: <p>The name of the column group schema.</p>
+          type: string
+    Template_NestedFilter:
+      additionalProperties: false
+      type: object
+      properties:
+        Column:
+          $ref: '#/components/schemas/ColumnIdentifier'
+        InnerFilter:
+          $ref: '#/components/schemas/Template_InnerFilter'
+        IncludeInnerSet:
+          default: false
+          type: boolean
+        FilterId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+      required:
+        - Column
+        - FilterId
+        - IncludeInnerSet
+        - InnerFilter
+    Template_MaximumMinimumComputation:
+      additionalProperties: false
+      type: object
+      properties:
+        Type:
+          $ref: '#/components/schemas/MaximumMinimumComputationType'
+        Value:
+          $ref: '#/components/schemas/Template_MeasureField'
+        Time:
+          $ref: '#/components/schemas/Template_DimensionField'
+        ComputationId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        Name:
+          type: string
+      required:
+        - ComputationId
+        - Type
+    TemplateErrorType:
+      type: string
+      enum:
+        - SOURCE_NOT_FOUND
+        - DATA_SET_NOT_FOUND
+        - INTERNAL_FAILURE
+        - ACCESS_DENIED
+    Template_SheetDefinition:
+      additionalProperties: false
+      type: object
+      properties:
+        Description:
+          minLength: 1
+          type: string
+          maxLength: 1024
+        ParameterControls:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_ParameterControl'
+        ContentType:
+          $ref: '#/components/schemas/SheetContentType'
+        SheetId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        Images:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_SheetImage'
+        SheetControlLayouts:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/SheetControlLayout'
+        Title:
+          minLength: 1
+          type: string
+          maxLength: 1024
+        Name:
+          minLength: 1
+          type: string
+          maxLength: 2048
+        TextBoxes:
+          minItems: 0
+          maxItems: 100
+          type: array
+          items:
+            $ref: '#/components/schemas/SheetTextBox'
+        Layouts:
+          minItems: 1
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_Layout'
+        FilterControls:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_FilterControl'
+        Visuals:
+          minItems: 0
+          maxItems: 50
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_Visual'
+      required:
+        - SheetId
+    Template_Filter:
+      additionalProperties: false
+      type: object
+      properties:
+        NestedFilter:
+          $ref: '#/components/schemas/Template_NestedFilter'
+        NumericEqualityFilter:
+          $ref: '#/components/schemas/Template_NumericEqualityFilter'
+        NumericRangeFilter:
+          $ref: '#/components/schemas/Template_NumericRangeFilter'
+        TimeRangeFilter:
+          $ref: '#/components/schemas/Template_TimeRangeFilter'
+        RelativeDatesFilter:
+          $ref: '#/components/schemas/Template_RelativeDatesFilter'
+        TopBottomFilter:
+          $ref: '#/components/schemas/Template_TopBottomFilter'
+        TimeEqualityFilter:
+          $ref: '#/components/schemas/Template_TimeEqualityFilter'
+        CategoryFilter:
+          $ref: '#/components/schemas/Template_CategoryFilter'
+    Template_KPIFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        TargetValues:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+        TrendGroups:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Values:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+    TemplateError:
+      description: <p>List of errors that occurred when the template version creation failed.</p>
+      additionalProperties: false
+      type: object
+      properties:
+        Type:
+          $ref: '#/components/schemas/TemplateErrorType'
+        Message:
+          pattern: \S
+          description: <p>Description of the error type.</p>
+          type: string
+        ViolatedEntities:
+          minItems: 0
+          maxItems: 200
+          description: <p>An error path that shows which entities caused the template error.</p>
+          type: array
+          items:
+            $ref: '#/components/schemas/Entity'
+    Template_ComboChartFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        ComboChartAggregatedFieldWells:
+          $ref: '#/components/schemas/Template_ComboChartAggregatedFieldWells'
+    Template_CategoricalMeasureField:
+      additionalProperties: false
+      type: object
+      properties:
+        AggregationFunction:
+          $ref: '#/components/schemas/CategoricalAggregationFunction'
+        FormatConfiguration:
+          $ref: '#/components/schemas/Template_StringFormatConfiguration'
+        Column:
+          $ref: '#/components/schemas/ColumnIdentifier'
+        FieldId:
+          minLength: 1
+          type: string
+          maxLength: 512
+      required:
+        - Column
+        - FieldId
+    Template_ListControlSearchOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Visibility: {}
+    Template_UniqueValuesComputation:
+      additionalProperties: false
+      type: object
+      properties:
+        Category:
+          $ref: '#/components/schemas/Template_DimensionField'
+        ComputationId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        Name:
+          type: string
+      required:
+        - ComputationId
+    Template_LabelOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        CustomLabel:
+          type: string
+        Visibility: {}
+        FontConfiguration:
+          $ref: '#/components/schemas/FontConfiguration'
+    Template_UnaggregatedField:
+      additionalProperties: false
+      type: object
+      properties:
+        FormatConfiguration:
+          $ref: '#/components/schemas/Template_FormatConfiguration'
+        Column:
+          $ref: '#/components/schemas/ColumnIdentifier'
+        FieldId:
+          minLength: 1
+          type: string
+          maxLength: 512
+      required:
+        - Column
+        - FieldId
+    Template_BarChartConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        SortConfiguration:
+          $ref: '#/components/schemas/BarChartSortConfiguration'
+        Legend:
+          $ref: '#/components/schemas/Template_LegendOptions'
+        ReferenceLines:
+          minItems: 0
+          maxItems: 20
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_ReferenceLine'
+        DataLabels:
+          $ref: '#/components/schemas/Template_DataLabelOptions'
+        ColorLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        CategoryLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        Tooltip:
+          $ref: '#/components/schemas/Template_TooltipOptions'
+        SmallMultiplesOptions:
+          $ref: '#/components/schemas/Template_SmallMultiplesOptions'
+        Orientation:
+          $ref: '#/components/schemas/BarChartOrientation'
+        VisualPalette:
+          $ref: '#/components/schemas/VisualPalette'
+        ValueLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        BarsArrangement:
+          $ref: '#/components/schemas/BarsArrangement'
+        CategoryAxis:
+          $ref: '#/components/schemas/Template_AxisDisplayOptions'
+        ContributionAnalysisDefaults:
+          minItems: 1
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/ContributionAnalysisDefault'
+        FieldWells:
+          $ref: '#/components/schemas/Template_BarChartFieldWells'
+        ValueAxis:
+          $ref: '#/components/schemas/Template_AxisDisplayOptions'
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
+    Template_FieldTooltipItem:
+      additionalProperties: false
+      type: object
+      properties:
+        TooltipTarget:
+          $ref: '#/components/schemas/TooltipTarget'
+        FieldId:
+          minLength: 1
+          type: string
+          maxLength: 512
+        Label:
+          type: string
+        Visibility: {}
+      required:
+        - FieldId
+    Template_LineChartMarkerStyleSettings:
+      additionalProperties: false
+      type: object
+      properties:
+        MarkerShape:
+          $ref: '#/components/schemas/LineChartMarkerShape'
+        MarkerSize:
+          description: String based length that is composed of value and unit in px
+          type: string
+        MarkerVisibility: {}
+        MarkerColor:
+          pattern: ^#[A-F0-9]{6}$
+          type: string
+    Template_ComparisonFormatConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        NumberDisplayFormatConfiguration:
+          $ref: '#/components/schemas/Template_NumberDisplayFormatConfiguration'
+        PercentageDisplayFormatConfiguration:
+          $ref: '#/components/schemas/Template_PercentageDisplayFormatConfiguration'
+    Template_FilterRelativeDateTimeControl:
+      additionalProperties: false
+      type: object
+      properties:
+        FilterControlId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        DisplayOptions:
+          $ref: '#/components/schemas/Template_RelativeDateTimeControlDisplayOptions'
+        Title:
+          minLength: 1
+          type: string
+          maxLength: 2048
+        CommitMode:
+          $ref: '#/components/schemas/CommitMode'
+        SourceFilterId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+      required:
+        - FilterControlId
+        - SourceFilterId
+        - Title
+    Template_TableFieldOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Order:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            minLength: 1
+            type: string
+            maxLength: 512
+        PinnedFieldOptions:
+          $ref: '#/components/schemas/TablePinnedFieldOptions'
+        TransposedTableOptions:
+          minItems: 0
+          maxItems: 10001
+          type: array
+          items:
+            $ref: '#/components/schemas/TransposedTableOption'
+        SelectedFieldOptions:
+          minItems: 0
+          maxItems: 100
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_TableFieldOption'
+    Template_DateDimensionField:
+      additionalProperties: false
+      type: object
+      properties:
+        HierarchyId:
+          minLength: 1
+          type: string
+          maxLength: 512
+        FormatConfiguration:
+          $ref: '#/components/schemas/Template_DateTimeFormatConfiguration'
+        Column:
+          $ref: '#/components/schemas/ColumnIdentifier'
+        FieldId:
+          minLength: 1
+          type: string
+          maxLength: 512
+        DateGranularity:
+          $ref: '#/components/schemas/TimeGranularity'
+      required:
+        - Column
+        - FieldId
+    Template_DefaultFilterListControlOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Type:
+          $ref: '#/components/schemas/SheetControlListType'
+        DisplayOptions:
+          $ref: '#/components/schemas/Template_ListControlDisplayOptions'
+        SelectableValues:
+          $ref: '#/components/schemas/FilterSelectableValues'
+    Template_KPIVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        ConditionalFormatting:
+          $ref: '#/components/schemas/KPIConditionalFormatting'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_KPIConfiguration'
+        Actions:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/VisualCustomAction'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+        ColumnHierarchies:
+          minItems: 0
+          maxItems: 2
+          type: array
+          items:
+            $ref: '#/components/schemas/ColumnHierarchy'
+      required:
+        - VisualId
+    Template_PercentageDisplayFormatConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        NegativeValueConfiguration:
+          $ref: '#/components/schemas/NegativeValueConfiguration'
+        DecimalPlacesConfiguration:
+          $ref: '#/components/schemas/DecimalPlacesConfiguration'
+        NullValueFormatConfiguration:
+          $ref: '#/components/schemas/NullValueFormatConfiguration'
+        Suffix:
+          minLength: 1
+          type: string
+          maxLength: 128
+        SeparatorConfiguration:
+          $ref: '#/components/schemas/Template_NumericSeparatorConfiguration'
+        Prefix:
+          minLength: 1
+          type: string
+          maxLength: 128
+    Template_TableVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        ConditionalFormatting:
+          $ref: '#/components/schemas/TableConditionalFormatting'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_TableConfiguration'
+        Actions:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/VisualCustomAction'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+      required:
+        - VisualId
+    Template_SheetImage:
+      additionalProperties: false
+      type: object
+      properties:
+        Actions:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/ImageCustomAction'
+        SheetImageId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        Tooltip:
+          $ref: '#/components/schemas/Template_SheetImageTooltipConfiguration'
+        Scaling:
+          $ref: '#/components/schemas/SheetImageScalingConfiguration'
+        Interactions:
+          $ref: '#/components/schemas/ImageInteractionOptions'
+        Source:
+          $ref: '#/components/schemas/SheetImageSource'
+        ImageContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+      required:
+        - SheetImageId
+        - Source
+    Template_TextAreaControlDisplayOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        TitleOptions:
+          $ref: '#/components/schemas/Template_LabelOptions'
+        PlaceholderOptions:
+          $ref: '#/components/schemas/Template_TextControlPlaceholderOptions'
+        InfoIconLabelOptions:
+          $ref: '#/components/schemas/Template_SheetControlInfoIconLabelOptions'
+    Template_TopBottomMoversComputation:
+      additionalProperties: false
+      type: object
+      properties:
+        Type:
+          $ref: '#/components/schemas/TopBottomComputationType'
+        Category:
+          $ref: '#/components/schemas/Template_DimensionField'
+        Value:
+          $ref: '#/components/schemas/Template_MeasureField'
+        SortOrder:
+          $ref: '#/components/schemas/TopBottomSortOrder'
+        Time:
+          $ref: '#/components/schemas/Template_DimensionField'
+        MoverSize:
+          default: 0
+          maximum: 20
+          type: number
+          minimum: 1
+        ComputationId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        Name:
+          type: string
+      required:
+        - ComputationId
+        - Type
+    Template_DropDownControlDisplayOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        TitleOptions:
+          $ref: '#/components/schemas/Template_LabelOptions'
+        SelectAllOptions:
+          $ref: '#/components/schemas/Template_ListControlSelectAllOptions'
+        InfoIconLabelOptions:
+          $ref: '#/components/schemas/Template_SheetControlInfoIconLabelOptions'
+    Template_FieldLabelType:
+      additionalProperties: false
+      type: object
+      properties:
+        FieldId:
+          minLength: 1
+          type: string
+          maxLength: 512
+        Visibility: {}
+    Template_PivotTableFieldOption:
+      additionalProperties: false
+      type: object
+      properties:
+        CustomLabel:
+          minLength: 1
+          type: string
+          maxLength: 2048
+        FieldId:
+          minLength: 1
+          type: string
+          maxLength: 512
+        Visibility: {}
+      required:
+        - FieldId
+    Template_SectionBasedLayoutConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        CanvasSizeOptions:
+          $ref: '#/components/schemas/SectionBasedLayoutCanvasSizeOptions'
+        FooterSections:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_HeaderFooterSectionConfiguration'
+        BodySections:
+          minItems: 0
+          maxItems: 28
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_BodySectionConfiguration'
+        HeaderSections:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_HeaderFooterSectionConfiguration'
+      required:
+        - BodySections
+        - CanvasSizeOptions
+        - FooterSections
+        - HeaderSections
+    TemplateSourceAnalysis:
+      description: <p>The source analysis of the template.</p>
+      additionalProperties: false
+      type: object
+      properties:
+        DataSetReferences:
+          minItems: 1
+          description: |-
+            <p>A structure containing information about the dataset references used as placeholders
+                        in the template.</p>
+          type: array
+          items:
+            $ref: '#/components/schemas/DataSetReference'
+        Arn:
+          description: <p>The Amazon Resource Name (ARN) of the resource.</p>
+          type: string
+      required:
+        - Arn
+        - DataSetReferences
+    Template_DefaultDateTimePickerControlOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Type:
+          $ref: '#/components/schemas/SheetControlDateTimePickerType'
+        DisplayOptions:
+          $ref: '#/components/schemas/Template_DateTimePickerControlDisplayOptions'
+        CommitMode:
+          $ref: '#/components/schemas/CommitMode'
+    Template_GeospatialPointLayer:
+      additionalProperties: false
+      type: object
+      properties:
+        Style:
+          $ref: '#/components/schemas/Template_GeospatialPointStyle'
+      required:
+        - Style
+    Template_NumericalMeasureField:
+      additionalProperties: false
+      type: object
+      properties:
+        AggregationFunction:
+          $ref: '#/components/schemas/NumericalAggregationFunction'
+        FormatConfiguration:
+          $ref: '#/components/schemas/Template_NumberFormatConfiguration'
+        Column:
+          $ref: '#/components/schemas/ColumnIdentifier'
+        FieldId:
+          minLength: 1
+          type: string
+          maxLength: 512
+      required:
+        - Column
+        - FieldId
+    Template_LineChartAggregatedFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        Category:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Colors:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Values:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+        SmallMultiples:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+    Template_FreeFormLayoutConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        CanvasSizeOptions:
+          $ref: '#/components/schemas/FreeFormLayoutCanvasSizeOptions'
+        Elements:
+          minItems: 0
+          maxItems: 430
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_FreeFormLayoutElement'
+      required:
+        - Elements
+    Template_MetricComparisonComputation:
+      additionalProperties: false
+      type: object
+      properties:
+        TargetValue:
+          $ref: '#/components/schemas/Template_MeasureField'
+        Time:
+          $ref: '#/components/schemas/Template_DimensionField'
+        ComputationId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        FromValue:
+          $ref: '#/components/schemas/Template_MeasureField'
+        Name:
+          type: string
+      required:
+        - ComputationId
+    Template_ColumnTooltipItem:
+      additionalProperties: false
+      type: object
+      properties:
+        Aggregation:
+          $ref: '#/components/schemas/AggregationFunction'
+        TooltipTarget:
+          $ref: '#/components/schemas/TooltipTarget'
+        Column:
+          $ref: '#/components/schemas/ColumnIdentifier'
+        Label:
+          type: string
+        Visibility: {}
+      required:
+        - Column
+    Template_PivotTableFieldOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        CollapseStateOptions:
+          type: array
+          items:
+            $ref: '#/components/schemas/PivotTableFieldCollapseStateOption'
+        DataPathOptions:
+          minItems: 0
+          maxItems: 100
+          type: array
+          items:
+            $ref: '#/components/schemas/PivotTableDataPathOption'
+        SelectedFieldOptions:
+          minItems: 0
+          maxItems: 100
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_PivotTableFieldOption'
+    Template_CategoricalDimensionField:
+      additionalProperties: false
+      type: object
+      properties:
+        HierarchyId:
+          minLength: 1
+          type: string
+          maxLength: 512
+        FormatConfiguration:
+          $ref: '#/components/schemas/Template_StringFormatConfiguration'
+        Column:
+          $ref: '#/components/schemas/ColumnIdentifier'
+        FieldId:
+          minLength: 1
+          type: string
+          maxLength: 512
+      required:
+        - Column
+        - FieldId
+    Template_StringFormatConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        NumericFormatConfiguration:
+          $ref: '#/components/schemas/Template_NumericFormatConfiguration'
+        NullValueFormatConfiguration:
+          $ref: '#/components/schemas/NullValueFormatConfiguration'
+    Template_DefaultFilterControlOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        DefaultSliderOptions:
+          $ref: '#/components/schemas/Template_DefaultSliderControlOptions'
+        DefaultRelativeDateTimeOptions:
+          $ref: '#/components/schemas/Template_DefaultRelativeDateTimeControlOptions'
+        DefaultTextFieldOptions:
+          $ref: '#/components/schemas/Template_DefaultTextFieldControlOptions'
+        DefaultTextAreaOptions:
+          $ref: '#/components/schemas/Template_DefaultTextAreaControlOptions'
+        DefaultDropdownOptions:
+          $ref: '#/components/schemas/Template_DefaultFilterDropDownControlOptions'
+        DefaultDateTimePickerOptions:
+          $ref: '#/components/schemas/Template_DefaultDateTimePickerControlOptions'
+        DefaultListOptions:
+          $ref: '#/components/schemas/Template_DefaultFilterListControlOptions'
+    Template_TooltipOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        SelectedTooltipType:
+          $ref: '#/components/schemas/SelectedTooltipType'
+        TooltipVisibility: {}
+        FieldBasedTooltip:
+          $ref: '#/components/schemas/Template_FieldBasedTooltip'
+    Template_FieldBasedTooltip:
+      additionalProperties: false
+      type: object
+      properties:
+        TooltipFields:
+          minItems: 0
+          maxItems: 100
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_TooltipItem'
+        AggregationVisibility: {}
+        TooltipTitleType:
+          $ref: '#/components/schemas/TooltipTitleType'
+    Template_FilledMapAggregatedFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        Values:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+        Geospatial:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+    Template_BarChartAggregatedFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        Category:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Colors:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Values:
+          minItems: 0
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+        SmallMultiples:
+          minItems: 0
+          maxItems: 1
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+    Template_ComboChartVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_ComboChartConfiguration'
+        Actions:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/VisualCustomAction'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+        ColumnHierarchies:
+          minItems: 0
+          maxItems: 2
+          type: array
+          items:
+            $ref: '#/components/schemas/ColumnHierarchy'
+      required:
+        - VisualId
+    Template_AxisTickLabelOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        RotationAngle:
+          default: null
+          type: number
+        LabelOptions:
+          $ref: '#/components/schemas/Template_LabelOptions'
+    Template_DimensionField:
+      additionalProperties: false
+      type: object
+      properties:
+        DateDimensionField:
+          $ref: '#/components/schemas/Template_DateDimensionField'
+        NumericalDimensionField:
+          $ref: '#/components/schemas/Template_NumericalDimensionField'
+        CategoricalDimensionField:
+          $ref: '#/components/schemas/Template_CategoricalDimensionField'
+    Template_PivotTableAggregatedFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        Values:
+          minItems: 0
+          maxItems: 40
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_MeasureField'
+        Columns:
+          minItems: 0
+          maxItems: 40
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+        Rows:
+          minItems: 0
+          maxItems: 40
+          type: array
+          items:
+            $ref: '#/components/schemas/Template_DimensionField'
+    Template_HistogramFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        HistogramAggregatedFieldWells:
+          $ref: '#/components/schemas/Template_HistogramAggregatedFieldWells'
+    Template_PieChartConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        SortConfiguration:
+          $ref: '#/components/schemas/PieChartSortConfiguration'
+        Legend:
+          $ref: '#/components/schemas/Template_LegendOptions'
+        DataLabels:
+          $ref: '#/components/schemas/Template_DataLabelOptions'
+        ContributionAnalysisDefaults:
+          minItems: 1
+          maxItems: 200
+          type: array
+          items:
+            $ref: '#/components/schemas/ContributionAnalysisDefault'
+        CategoryLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        FieldWells:
+          $ref: '#/components/schemas/Template_PieChartFieldWells'
+        Tooltip:
+          $ref: '#/components/schemas/Template_TooltipOptions'
+        DonutOptions:
+          $ref: '#/components/schemas/Template_DonutOptions'
+        SmallMultiplesOptions:
+          $ref: '#/components/schemas/Template_SmallMultiplesOptions'
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
+        ValueLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        VisualPalette:
+          $ref: '#/components/schemas/VisualPalette'
+    Template_CurrencyDisplayFormatConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        NegativeValueConfiguration:
+          $ref: '#/components/schemas/NegativeValueConfiguration'
+        DecimalPlacesConfiguration:
+          $ref: '#/components/schemas/DecimalPlacesConfiguration'
+        NumberScale:
+          $ref: '#/components/schemas/NumberScale'
+        NullValueFormatConfiguration:
+          $ref: '#/components/schemas/NullValueFormatConfiguration'
+        Suffix:
+          minLength: 1
+          type: string
+          maxLength: 128
+        SeparatorConfiguration:
+          $ref: '#/components/schemas/Template_NumericSeparatorConfiguration'
+        Symbol:
+          pattern: ^[A-Z]{3}$
+          type: string
+        Prefix:
+          minLength: 1
+          type: string
+          maxLength: 128
+    Template_SliderControlDisplayOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        TitleOptions:
+          $ref: '#/components/schemas/Template_LabelOptions'
+        InfoIconLabelOptions:
+          $ref: '#/components/schemas/Template_SheetControlInfoIconLabelOptions'
+    Template_GeospatialPolygonSymbolStyle:
+      additionalProperties: false
+      type: object
+      properties:
+        FillColor: {}
+        StrokeWidth: {}
+        StrokeColor: {}
+    DataSetConfiguration:
+      description: <p>Dataset configuration.</p>
+      additionalProperties: false
+      type: object
+      properties:
+        Placeholder:
+          description: <p>Placeholder.</p>
+          type: string
+        DataSetSchema:
+          $ref: '#/components/schemas/DataSetSchema'
+        ColumnGroupSchemaList:
+          minItems: 0
+          maxItems: 500
+          description: <p>A structure containing the list of column group schemas.</p>
+          type: array
+          items:
+            $ref: '#/components/schemas/ColumnGroupSchema'
+    Template_LineSeriesAxisDisplayOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        MissingDataConfigurations:
+          minItems: 0
+          maxItems: 100
+          type: array
+          items:
+            $ref: '#/components/schemas/MissingDataConfiguration'
+        AxisOptions:
+          $ref: '#/components/schemas/Template_AxisDisplayOptions'
+    Template_HeatMapVisual:
+      additionalProperties: false
+      type: object
+      properties:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        VisualId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        ChartConfiguration:
+          $ref: '#/components/schemas/Template_HeatMapConfiguration'
+        Actions:
+          minItems: 0
+          maxItems: 10
+          type: array
+          items:
+            $ref: '#/components/schemas/VisualCustomAction'
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+        ColumnHierarchies:
+          minItems: 0
+          maxItems: 2
+          type: array
+          items:
+            $ref: '#/components/schemas/ColumnHierarchy'
+      required:
+        - VisualId
+    Template_SankeyDiagramFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        SankeyDiagramAggregatedFieldWells:
+          $ref: '#/components/schemas/Template_SankeyDiagramAggregatedFieldWells'
+    Template_TableFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        TableUnaggregatedFieldWells:
+          $ref: '#/components/schemas/Template_TableUnaggregatedFieldWells'
+        TableAggregatedFieldWells:
+          $ref: '#/components/schemas/Template_TableAggregatedFieldWells'
+    Template_RadarChartConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        SortConfiguration:
+          $ref: '#/components/schemas/RadarChartSortConfiguration'
+        Legend:
+          $ref: '#/components/schemas/Template_LegendOptions'
+        Shape:
+          $ref: '#/components/schemas/RadarChartShape'
+        BaseSeriesSettings:
+          $ref: '#/components/schemas/Template_RadarChartSeriesSettings'
+        ColorLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        CategoryLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        AxesRangeScale:
+          $ref: '#/components/schemas/RadarChartAxesRangeScale'
+        VisualPalette:
+          $ref: '#/components/schemas/VisualPalette'
+        AlternateBandColorsVisibility: {}
+        StartAngle:
+          maximum: 360
+          type: number
+          minimum: -360
+        CategoryAxis:
+          $ref: '#/components/schemas/Template_AxisDisplayOptions'
+        FieldWells:
+          $ref: '#/components/schemas/Template_RadarChartFieldWells'
+        ColorAxis:
+          $ref: '#/components/schemas/Template_AxisDisplayOptions'
+        AlternateBandOddColor:
+          pattern: ^#[A-F0-9]{6}$
+          type: string
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
+        AlternateBandEvenColor:
+          pattern: ^#[A-F0-9]{6}$
+          type: string
+    Template_VisualTitleLabelOptions:
+      additionalProperties: false
+      type: object
+      properties:
+        Visibility: {}
+        FormatText:
+          $ref: '#/components/schemas/ShortFormatText'
+    Template_ParameterTextFieldControl:
+      additionalProperties: false
+      type: object
+      properties:
+        ParameterControlId:
+          minLength: 1
+          pattern: ^[\w\-]+$
+          type: string
+          maxLength: 512
+        DisplayOptions:
+          $ref: '#/components/schemas/Template_TextFieldControlDisplayOptions'
+        SourceParameterName:
+          minLength: 1
+          pattern: ^[a-zA-Z0-9]+$
+          type: string
+          maxLength: 2048
+        Title:
+          minLength: 1
+          type: string
+          maxLength: 2048
+      required:
+        - ParameterControlId
+        - SourceParameterName
+        - Title
+    Template_WordCloudFieldWells:
+      additionalProperties: false
+      type: object
+      properties:
+        WordCloudAggregatedFieldWells:
+          $ref: '#/components/schemas/Template_WordCloudAggregatedFieldWells'
+    TemplateSourceEntity:
+      description: <p>The source entity of the template.</p>
+      additionalProperties: false
+      type: object
+      properties:
+        SourceAnalysis:
+          $ref: '#/components/schemas/TemplateSourceAnalysis'
+        SourceTemplate:
+          $ref: '#/components/schemas/TemplateSourceTemplate'
+    Template_Visual:
+      additionalProperties: false
+      type: object
+      properties:
+        FunnelChartVisual:
+          $ref: '#/components/schemas/Template_FunnelChartVisual'
+        BoxPlotVisual:
+          $ref: '#/components/schemas/Template_BoxPlotVisual'
+        GeospatialMapVisual:
+          $ref: '#/components/schemas/Template_GeospatialMapVisual'
+        ScatterPlotVisual:
+          $ref: '#/components/schemas/Template_ScatterPlotVisual'
+        RadarChartVisual:
+          $ref: '#/components/schemas/Template_RadarChartVisual'
+        ComboChartVisual:
+          $ref: '#/components/schemas/Template_ComboChartVisual'
+        WordCloudVisual:
+          $ref: '#/components/schemas/Template_WordCloudVisual'
+        SankeyDiagramVisual:
+          $ref: '#/components/schemas/Template_SankeyDiagramVisual'
+        GaugeChartVisual:
+          $ref: '#/components/schemas/Template_GaugeChartVisual'
+        FilledMapVisual:
+          $ref: '#/components/schemas/Template_FilledMapVisual'
+        WaterfallVisual:
+          $ref: '#/components/schemas/Template_WaterfallVisual'
+        CustomContentVisual:
+          $ref: '#/components/schemas/Template_CustomContentVisual'
+        PieChartVisual:
+          $ref: '#/components/schemas/Template_PieChartVisual'
+        KPIVisual:
+          $ref: '#/components/schemas/Template_KPIVisual'
+        HistogramVisual:
+          $ref: '#/components/schemas/Template_HistogramVisual'
+        PluginVisual:
+          $ref: '#/components/schemas/Template_PluginVisual'
+        TableVisual:
+          $ref: '#/components/schemas/Template_TableVisual'
+        PivotTableVisual:
+          $ref: '#/components/schemas/Template_PivotTableVisual'
+        BarChartVisual:
+          $ref: '#/components/schemas/Template_BarChartVisual'
+        HeatMapVisual:
+          $ref: '#/components/schemas/Template_HeatMapVisual'
+        TreeMapVisual:
+          $ref: '#/components/schemas/Template_TreeMapVisual'
+        InsightVisual:
+          $ref: '#/components/schemas/Template_InsightVisual'
+        LineChartVisual:
+          $ref: '#/components/schemas/Template_LineChartVisual'
+        EmptyVisual:
+          $ref: '#/components/schemas/EmptyVisual'
+    Template_WordCloudChartConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        SortConfiguration:
+          $ref: '#/components/schemas/WordCloudSortConfiguration'
+        CategoryLabelOptions:
+          $ref: '#/components/schemas/Template_ChartAxisLabelOptions'
+        FieldWells:
+          $ref: '#/components/schemas/Template_WordCloudFieldWells'
+        WordCloudOptions:
+          $ref: '#/components/schemas/WordCloudOptions'
+        Interactions:
+          $ref: '#/components/schemas/VisualInteractionOptions'
+    Template_CustomContentVisual:
       additionalProperties: false
       type: object
       properties:
-        Status:
-          $ref: '#/components/schemas/ResourceStatus'
-        Errors:
-          minItems: 1
-          description: <p>Errors associated with this template version.</p>
-          type: array
-          items:
-            $ref: '#/components/schemas/TemplateError'
-        CreatedTime:
-          format: date-time
-          description: <p>The time that this template version was created.</p>
-          type: string
-        Description:
+        Subtitle:
+          $ref: '#/components/schemas/Template_VisualSubtitleLabelOptions'
+        VisualId:
           minLength: 1
-          description: <p>The description of the template.</p>
+          pattern: ^[\w\-]+$
           type: string
           maxLength: 512
-        ThemeArn:
-          description: <p>The ARN of the theme associated with this version of the template.</p>
-          type: string
-        DataSetConfigurations:
+        ChartConfiguration:
+          $ref: '#/components/schemas/CustomContentConfiguration'
+        Actions:
           minItems: 0
-          maxItems: 30
-          description: |-
-            <p>Schema of the dataset identified by the placeholder. Any dashboard created from this
-                        template should be bound to new datasets matching the same schema described through this
-                        API operation.</p>
+          maxItems: 10
           type: array
           items:
-            $ref: '#/components/schemas/DataSetConfiguration'
-        SourceEntityArn:
-          description: |-
-            <p>The Amazon Resource Name (ARN) of an analysis or template that was used to create this
-                        template.</p>
+            $ref: '#/components/schemas/VisualCustomAction'
+        DataSetIdentifier:
+          minLength: 1
           type: string
-        VersionNumber:
-          description: <p>The version number of the template version.</p>
-          type: number
-          minimum: 1
-        Sheets:
-          minItems: 0
-          maxItems: 20
-          description: <p>A list of the associated sheets with the unique identifier and name of each sheet.</p>
-          type: array
-          items:
-            $ref: '#/components/schemas/Sheet'
-    DataSetSchema:
-      description: <p>Dataset schema.</p>
-      additionalProperties: false
-      type: object
-      properties:
-        ColumnSchemaList:
-          minItems: 0
-          maxItems: 500
-          description: <p>A structure containing the list of column schemas.</p>
-          type: array
-          items:
-            $ref: '#/components/schemas/ColumnSchema'
-    TemplateSourceTemplate:
-      description: <p>The source template of the template.</p>
+          maxLength: 2048
+        Title:
+          $ref: '#/components/schemas/Template_VisualTitleLabelOptions'
+        VisualContentAltText:
+          minLength: 1
+          type: string
+          maxLength: 1024
+      required:
+        - DataSetIdentifier
+        - VisualId
+    Template_PanelConfiguration:
       additionalProperties: false
       type: object
       properties:
-        Arn:
-          description: <p>The Amazon Resource Name (ARN) of the resource.</p>
+        BorderThickness:
+          description: String based length that is composed of value and unit in px
           type: string
-      required:
-        - Arn
-    ColumnGroupSchema:
-      description: <p>The column group schema.</p>
+        BorderStyle:
+          $ref: '#/components/schemas/PanelBorderStyle'
+        GutterSpacing:
+          description: String based length that is composed of value and unit in px
+          type: string
+        BackgroundVisibility: {}
+        BorderVisibility: {}
+        BorderColor:
+          pattern: ^#[A-F0-9]{6}(?:[A-F0-9]{2})?$
+          type: string
+        Title:
+          $ref: '#/components/schemas/Template_PanelTitleOptions'
+        GutterVisibility: {}
+        BackgroundColor:
+          pattern: ^#[A-F0-9]{6}(?:[A-F0-9]{2})?$
+          type: string
+    Template_SmallMultiplesOptions:
       additionalProperties: false
       type: object
       properties:
-        ColumnGroupColumnSchemaList:
-          minItems: 0
-          maxItems: 500
-          description: <p>A structure containing the list of schemas for column group columns.</p>
-          type: array
-          items:
-            $ref: '#/components/schemas/ColumnGroupColumnSchema'
-        Name:
-          description: <p>The name of the column group schema.</p>
-          type: string
-    TemplateErrorType:
-      type: string
-      enum:
-        - SOURCE_NOT_FOUND
-        - DATA_SET_NOT_FOUND
-        - INTERNAL_FAILURE
-        - ACCESS_DENIED
-    TemplateError:
-      description: <p>List of errors that occurred when the template version creation failed.</p>
+        MaxVisibleRows:
+          maximum: 10
+          type: number
+          minimum: 1
+        PanelConfiguration:
+          $ref: '#/components/schemas/Template_PanelConfiguration'
+        MaxVisibleColumns:
+          maximum: 10
+          type: number
+          minimum: 1
+        XAxis:
+          $ref: '#/components/schemas/SmallMultiplesAxisProperties'
+        YAxis:
+          $ref: '#/components/schemas/SmallMultiplesAxisProperties'
+    Template_NumericSeparatorConfiguration:
       additionalProperties: false
       type: object
       properties:
-        Type:
-          $ref: '#/components/schemas/TemplateErrorType'
-        Message:
-          pattern: \S
-          description: <p>Description of the error type.</p>
-          type: string
-        ViolatedEntities:
-          minItems: 0
-          maxItems: 200
-          description: <p>An error path that shows which entities caused the template error.</p>
-          type: array
-          items:
-            $ref: '#/components/schemas/Entity'
-    TemplateSourceAnalysis:
-      description: <p>The source analysis of the template.</p>
+        DecimalSeparator:
+          $ref: '#/components/schemas/NumericSeparatorSymbol'
+        ThousandsSeparator:
+          $ref: '#/components/schemas/Template_ThousandSeparatorOptions'
+    Template_BoxPlotOptions:
       additionalProperties: false
       type: object
       properties:
-        DataSetReferences:
-          minItems: 1
-          description: |-
-            <p>A structure containing information about the dataset references used as placeholders
-                        in the template.</p>
-          type: array
-          items:
-            $ref: '#/components/schemas/DataSetReference'
-        Arn:
-          description: <p>The Amazon Resource Name (ARN) of the resource.</p>
-          type: string
-      required:
-        - Arn
-        - DataSetReferences
-    DataSetConfiguration:
-      description: <p>Dataset configuration.</p>
+        StyleOptions:
+          $ref: '#/components/schemas/BoxPlotStyleOptions'
+        OutlierVisibility: {}
+        AllDataPointsVisibility: {}
+    Template_NumberDisplayFormatConfiguration:
       additionalProperties: false
       type: object
       properties:
-        Placeholder:
-          description: <p>Placeholder.</p>
+        NegativeValueConfiguration:
+          $ref: '#/components/schemas/NegativeValueConfiguration'
+        DecimalPlacesConfiguration:
+          $ref: '#/components/schemas/DecimalPlacesConfiguration'
+        NumberScale:
+          $ref: '#/components/schemas/NumberScale'
+        NullValueFormatConfiguration:
+          $ref: '#/components/schemas/NullValueFormatConfiguration'
+        Suffix:
+          minLength: 1
           type: string
-        DataSetSchema:
-          $ref: '#/components/schemas/DataSetSchema'
-        ColumnGroupSchemaList:
-          minItems: 0
-          maxItems: 500
-          description: <p>A structure containing the list of column group schemas.</p>
-          type: array
-          items:
-            $ref: '#/components/schemas/ColumnGroupSchema'
-    TemplateSourceEntity:
-      description: <p>The source entity of the template.</p>
+          maxLength: 128
+        SeparatorConfiguration:
+          $ref: '#/components/schemas/Template_NumericSeparatorConfiguration'
+        Prefix:
+          minLength: 1
+          type: string
+          maxLength: 128
+    Template_PivotTableFieldWells:
       additionalProperties: false
       type: object
       properties:
-        SourceAnalysis:
-          $ref: '#/components/schemas/TemplateSourceAnalysis'
-        SourceTemplate:
-          $ref: '#/components/schemas/TemplateSourceTemplate'
+        PivotTableAggregatedFieldWells:
+          $ref: '#/components/schemas/Template_PivotTableAggregatedFieldWells'
     Template:
       type: object
       properties:
@@ -14636,7 +19368,7 @@ components:
               maxItems: 64
               type: array
               items:
-                $ref: '#/components/schemas/ResourcePermission'
+                $ref: '#/components/schemas/DataSource_ResourcePermission'
             Arn:
               description: <p>The Amazon Resource Name (ARN) of the data source.</p>
               type: string
@@ -14702,7 +19434,7 @@ components:
             Permissions:
               type: array
               items:
-                $ref: '#/components/schemas/ResourcePermission'
+                $ref: '#/components/schemas/Folder_ResourcePermission'
               maxItems: 64
               minItems: 1
               x-insertionOrder: false
@@ -15046,7 +19778,7 @@ components:
       id: awscc.quicksight.analyses
       x-cfn-schema-name: Analysis
       x-cfn-type-name: AWS::QuickSight::Analysis
-      x-identifiers:
+      x-identifiers: &ref_0
         - AnalysisId
         - AwsAccountId
       x-type: cloud_control
@@ -15167,9 +19899,7 @@ components:
       id: awscc.quicksight.analyses_list_only
       x-cfn-schema-name: Analysis
       x-cfn-type-name: AWS::QuickSight::Analysis
-      x-identifiers:
-        - AnalysisId
-        - AwsAccountId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -15201,7 +19931,7 @@ components:
       id: awscc.quicksight.custom_permissions
       x-cfn-schema-name: CustomPermissions
       x-cfn-type-name: AWS::QuickSight::CustomPermissions
-      x-identifiers:
+      x-identifiers: &ref_1
         - AwsAccountId
         - CustomPermissionsName
       x-type: cloud_control
@@ -15296,9 +20026,7 @@ components:
       id: awscc.quicksight.custom_permissions_list_only
       x-cfn-schema-name: CustomPermissions
       x-cfn-type-name: AWS::QuickSight::CustomPermissions
-      x-identifiers:
-        - AwsAccountId
-        - CustomPermissionsName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -15330,7 +20058,7 @@ components:
       id: awscc.quicksight.dashboards
       x-cfn-schema-name: Dashboard
       x-cfn-type-name: AWS::QuickSight::Dashboard
-      x-identifiers:
+      x-identifiers: &ref_2
         - AwsAccountId
         - DashboardId
       x-type: cloud_control
@@ -15455,9 +20183,7 @@ components:
       id: awscc.quicksight.dashboards_list_only
       x-cfn-schema-name: Dashboard
       x-cfn-type-name: AWS::QuickSight::Dashboard
-      x-identifiers:
-        - AwsAccountId
-        - DashboardId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -15489,7 +20215,7 @@ components:
       id: awscc.quicksight.data_sets
       x-cfn-schema-name: DataSet
       x-cfn-type-name: AWS::QuickSight::DataSet
-      x-identifiers:
+      x-identifiers: &ref_3
         - AwsAccountId
         - DataSetId
       x-type: cloud_control
@@ -15624,9 +20350,7 @@ components:
       id: awscc.quicksight.data_sets_list_only
       x-cfn-schema-name: DataSet
       x-cfn-type-name: AWS::QuickSight::DataSet
-      x-identifiers:
-        - AwsAccountId
-        - DataSetId
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -15658,7 +20382,7 @@ components:
       id: awscc.quicksight.data_sources
       x-cfn-schema-name: DataSource
       x-cfn-type-name: AWS::QuickSight::DataSource
-      x-identifiers:
+      x-identifiers: &ref_4
         - AwsAccountId
         - DataSourceId
       x-type: cloud_control
@@ -15777,9 +20501,7 @@ components:
       id: awscc.quicksight.data_sources_list_only
       x-cfn-schema-name: DataSource
       x-cfn-type-name: AWS::QuickSight::DataSource
-      x-identifiers:
-        - AwsAccountId
-        - DataSourceId
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -15811,7 +20533,7 @@ components:
       id: awscc.quicksight.folders
       x-cfn-schema-name: Folder
       x-cfn-type-name: AWS::QuickSight::Folder
-      x-identifiers:
+      x-identifiers: &ref_5
         - AwsAccountId
         - FolderId
       x-type: cloud_control
@@ -15918,9 +20640,7 @@ components:
       id: awscc.quicksight.folders_list_only
       x-cfn-schema-name: Folder
       x-cfn-type-name: AWS::QuickSight::Folder
-      x-identifiers:
-        - AwsAccountId
-        - FolderId
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -15952,7 +20672,7 @@ components:
       id: awscc.quicksight.refresh_schedules
       x-cfn-schema-name: RefreshSchedule
       x-cfn-type-name: AWS::QuickSight::RefreshSchedule
-      x-identifiers:
+      x-identifiers: &ref_6
         - AwsAccountId
         - DataSetId
         - Schedule/ScheduleId
@@ -16046,10 +20766,7 @@ components:
       id: awscc.quicksight.refresh_schedules_list_only
       x-cfn-schema-name: RefreshSchedule
       x-cfn-type-name: AWS::QuickSight::RefreshSchedule
-      x-identifiers:
-        - AwsAccountId
-        - DataSetId
-        - Schedule/ScheduleId
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -16083,7 +20800,7 @@ components:
       id: awscc.quicksight.templates
       x-cfn-schema-name: Template
       x-cfn-type-name: AWS::QuickSight::Template
-      x-identifiers:
+      x-identifiers: &ref_7
         - AwsAccountId
         - TemplateId
       x-type: cloud_control
@@ -16194,9 +20911,7 @@ components:
       id: awscc.quicksight.templates_list_only
       x-cfn-schema-name: Template
       x-cfn-type-name: AWS::QuickSight::Template
-      x-identifiers:
-        - AwsAccountId
-        - TemplateId
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -16228,7 +20943,7 @@ components:
       id: awscc.quicksight.themes
       x-cfn-schema-name: Theme
       x-cfn-type-name: AWS::QuickSight::Theme
-      x-identifiers:
+      x-identifiers: &ref_8
         - ThemeId
         - AwsAccountId
       x-type: cloud_control
@@ -16339,9 +21054,7 @@ components:
       id: awscc.quicksight.themes_list_only
       x-cfn-schema-name: Theme
       x-cfn-type-name: AWS::QuickSight::Theme
-      x-identifiers:
-        - ThemeId
-        - AwsAccountId
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -16373,7 +21086,7 @@ components:
       id: awscc.quicksight.topics
       x-cfn-schema-name: Topic
       x-cfn-type-name: AWS::QuickSight::Topic
-      x-identifiers:
+      x-identifiers: &ref_9
         - AwsAccountId
         - TopicId
       x-type: cloud_control
@@ -16480,9 +21193,7 @@ components:
       id: awscc.quicksight.topics_list_only
       x-cfn-schema-name: Topic
       x-cfn-type-name: AWS::QuickSight::Topic
-      x-identifiers:
-        - AwsAccountId
-        - TopicId
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -16514,7 +21225,7 @@ components:
       id: awscc.quicksight.vpc_connections
       x-cfn-schema-name: VPCConnection
       x-cfn-type-name: AWS::QuickSight::VPCConnection
-      x-identifiers:
+      x-identifiers: &ref_10
         - AwsAccountId
         - VPCConnectionId
       x-type: cloud_control
@@ -16629,9 +21340,7 @@ components:
       id: awscc.quicksight.vpc_connections_list_only
       x-cfn-schema-name: VPCConnection
       x-cfn-type-name: AWS::QuickSight::VPCConnection
-      x-identifiers:
-        - AwsAccountId
-        - VPCConnectionId
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/ram.yaml b/openapi/src/awscc/v00.00.00000/services/ram.yaml
index 6ad7261f7..91b1ab4e4 100644
--- a/openapi/src/awscc/v00.00.00000/services/ram.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/ram.yaml
@@ -391,19 +391,22 @@ components:
       type: object
   schemas:
     Tag:
-      description: A key-value pair to associate with a resource.
       type: object
+      additionalProperties: false
       properties:
         Key:
           type: string
           description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
         Value:
           type: string
           description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
       required:
         - Key
         - Value
-      additionalProperties: false
     Permission:
       type: object
       properties:
@@ -485,6 +488,20 @@ components:
         list:
           - ram:ListPermissions
           - ram:ListPermissionVersions
+    ResourceShare_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     ResourceShare:
       type: object
       properties:
@@ -537,7 +554,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ResourceShare_Tag'
       required:
         - Name
       x-stackql-resource-name: resource_share
@@ -689,7 +706,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ResourceShare_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateResourceShareRequest
       type: object
@@ -707,7 +724,7 @@ components:
       id: awscc.ram.permissions
       x-cfn-schema-name: Permission
       x-cfn-type-name: AWS::RAM::Permission
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -807,8 +824,7 @@ components:
       id: awscc.ram.permissions_list_only
       x-cfn-schema-name: Permission
       x-cfn-type-name: AWS::RAM::Permission
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -838,7 +854,7 @@ components:
       id: awscc.ram.resource_shares
       x-cfn-schema-name: ResourceShare
       x-cfn-type-name: AWS::RAM::ResourceShare
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -938,8 +954,7 @@ components:
       id: awscc.ram.resource_shares_list_only
       x-cfn-schema-name: ResourceShare
       x-cfn-type-name: AWS::RAM::ResourceShare
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/rbin.yaml b/openapi/src/awscc/v00.00.00000/services/rbin.yaml
index 011ff1485..db03be6a4 100644
--- a/openapi/src/awscc/v00.00.00000/services/rbin.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/rbin.yaml
@@ -666,7 +666,7 @@ components:
       id: awscc.rbin.rules
       x-cfn-schema-name: Rule
       x-cfn-type-name: AWS::Rbin::Rule
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -772,8 +772,7 @@ components:
       id: awscc.rbin.rules_list_only
       x-cfn-schema-name: Rule
       x-cfn-type-name: AWS::Rbin::Rule
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/rds.yaml b/openapi/src/awscc/v00.00.00000/services/rds.yaml
index 46044386c..5d346aa6a 100644
--- a/openapi/src/awscc/v00.00.00000/services/rds.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/rds.yaml
@@ -565,21 +565,12 @@ components:
       additionalProperties: false
       properties:
         Address:
+          description: Specifies the connection endpoint for the primary instance of the DB cluster.
           type: string
-          description: Specifies the DNS address of the DB instance.
         Port:
-          type: string
           description: Specifies the port that the database engine is listening on.
-        HostedZoneId:
           type: string
-          description: Specifies the ID that Amazon Route 53 assigns when you create a hosted zone.
-      description: |-
-        This data type represents the information you need to connect to an Amazon RDS DB instance. This data type is used as a response element in the following actions:
-          +   ``CreateDBInstance`` 
-          +   ``DescribeDBInstances`` 
-          +   ``DeleteDBInstance`` 
-          
-         For the data structure that represents Amazon Aurora DB cluster endpoints, see ``DBClusterEndpoint``.
+      description: The ``Endpoint`` return value specifies the connection endpoint for the primary instance of the DB cluster.
     ReadEndpoint:
       type: object
       additionalProperties: false
@@ -680,7 +671,7 @@ components:
       properties:
         SecretArn:
           type: string
-          description: The Amazon Resource Name (ARN) of the secret. This parameter is a return value that you can retrieve using the ``Fn::GetAtt`` intrinsic function. For more information, see [Return values](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbinstance.html#aws-resource-rds-dbinstance-return-values).
+          description: The Amazon Resource Name (ARN) of the secret. This parameter is a return value that you can retrieve using the ``Fn::GetAtt`` intrinsic function. For more information, see [Return values](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#aws-resource-rds-dbcluster-return-values).
         KmsKeyId:
           type: string
           description: The AWS KMS key identifier that is used to encrypt the secret.
@@ -1462,6 +1453,26 @@ components:
       description: |-
         The details of the DB instance’s server certificate.
          For more information, see [Using SSL/TLS to encrypt a connection to a DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/UsingWithRDS.SSL.html) in the *Amazon RDS User Guide* and [Using SSL/TLS to encrypt a connection to a DB cluster](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/UsingWithRDS.SSL.html) in the *Amazon Aurora User Guide*.
+    DBInstance_Endpoint:
+      type: object
+      additionalProperties: false
+      properties:
+        Address:
+          type: string
+          description: Specifies the DNS address of the DB instance.
+        Port:
+          type: string
+          description: Specifies the port that the database engine is listening on.
+        HostedZoneId:
+          type: string
+          description: Specifies the ID that Amazon Route 53 assigns when you create a hosted zone.
+      description: |-
+        This data type represents the information you need to connect to an Amazon RDS DB instance. This data type is used as a response element in the following actions:
+          +   ``CreateDBInstance`` 
+          +   ``DescribeDBInstances`` 
+          +   ``DeleteDBInstance`` 
+          
+         For the data structure that represents Amazon Aurora DB cluster endpoints, see ``DBClusterEndpoint``.
     DBInstanceRole:
       type: object
       additionalProperties: false
@@ -1507,6 +1518,19 @@ components:
           type: string
           description: The value of a processor feature.
       description: The ``ProcessorFeature`` property type specifies the processor features of a DB instance class.
+    DBInstance_MasterUserSecret:
+      type: object
+      additionalProperties: false
+      properties:
+        SecretArn:
+          type: string
+          description: The Amazon Resource Name (ARN) of the secret. This parameter is a return value that you can retrieve using the ``Fn::GetAtt`` intrinsic function. For more information, see [Return values](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbinstance.html#aws-resource-rds-dbinstance-return-values).
+        KmsKeyId:
+          type: string
+          description: The AWS KMS key identifier that is used to encrypt the secret.
+      description: |-
+        The ``MasterUserSecret`` return value specifies the secret managed by RDS in AWS Secrets Manager for the master user password.
+         For more information, see [Password management with Secrets Manager](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/rds-secrets-manager.html) in the *Amazon RDS User Guide* and [Password management with Secrets Manager](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/rds-secrets-manager.html) in the *Amazon Aurora User Guide.*
     DBInstance:
       type: object
       properties:
@@ -1912,7 +1936,7 @@ components:
             Specifies whether to enable Performance Insights for the DB instance. For more information, see [Using Amazon Performance Insights](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PerfInsights.html) in the *Amazon RDS User Guide*.
              This setting doesn't apply to RDS Custom DB instances.
         Endpoint:
-          $ref: '#/components/schemas/Endpoint'
+          $ref: '#/components/schemas/DBInstance_Endpoint'
           description: ''
         Engine:
           type: string
@@ -2024,7 +2048,7 @@ components:
               
               If you've specified ``DBSecurityGroups`` and then you update the license model, AWS CloudFormation replaces the underlying DB instance. This will incur some interruptions to database availability.
         ListenerEndpoint:
-          $ref: '#/components/schemas/Endpoint'
+          $ref: '#/components/schemas/DBInstance_Endpoint'
           description: ''
         MasterUsername:
           type: string
@@ -2090,7 +2114,7 @@ components:
               *RDS for PostgreSQL* 
              Constraints: Must contain from 8 to 128 characters.
         MasterUserSecret:
-          $ref: '#/components/schemas/MasterUserSecret'
+          $ref: '#/components/schemas/DBInstance_MasterUserSecret'
           description: |-
             The secret managed by RDS in AWS Secrets Manager for the master user password.
              For more information, see [Password management with Secrets Manager](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/rds-secrets-manager.html) in the *Amazon RDS User Guide.*
@@ -3308,6 +3332,23 @@ components:
           - rds:DescribeEventSubscriptions
         list:
           - rds:DescribeEventSubscriptions
+    GlobalCluster_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
     GlobalEndpoint:
       type: object
       additionalProperties: false
@@ -3334,7 +3375,7 @@ components:
           x-insertionOrder: false
           description: An array of key-value pairs to apply to this resource.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/GlobalCluster_Tag'
         EngineLifecycleSupport:
           description: The life cycle type of the global cluster. You can use this setting to enroll your global cluster into Amazon RDS Extended Support.
           type: string
@@ -3410,7 +3451,26 @@ components:
       x-insertionOrder: false
       description: An array of key-value pairs to apply to this resource.
       items:
-        $ref: '#/components/schemas/Tag'
+        $ref: '#/components/schemas/Integration_Tag'
+    Integration_Tag:
+      description: |-
+        Metadata assigned to an Amazon RDS resource consisting of a key-value pair.
+         For more information, see [Tagging Amazon RDS Resources](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) in the *Amazon RDS User Guide* or [Tagging Amazon Aurora and Amazon RDS Resources](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_Tagging.html) in the *Amazon Aurora User Guide*.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'A key is the required name of the tag. The string value can be from 1 to 128 Unicode characters in length and can''t be prefixed with ``aws:`` or ``rds:``. The string can only contain only the set of Unicode letters, digits, white-space, ''_'', ''.'', '':'', ''/'', ''='', ''+'', ''-'', ''@'' (Java regex: "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$").'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'A value is the optional value of the tag. The string value can be from 1 to 256 Unicode characters in length and can''t be prefixed with ``aws:`` or ``rds:``. The string can only contain only the set of Unicode letters, digits, white-space, ''_'', ''.'', '':'', ''/'', ''='', ''+'', ''-'', ''@'' (Java regex: "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$").'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
     EncryptionContextMap:
       type: object
       x-patternProperties:
@@ -3440,7 +3500,7 @@ components:
           x-insertionOrder: false
           description: A list of tags. For more information, see [Tagging Amazon RDS Resources](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) in the *Amazon RDS User Guide.*.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Integration_Tag'
         DataFilter:
           type: string
           description: Data filters for the integration. These filters determine which tables from the source database are sent to the target Amazon Redshift data warehouse.
@@ -4775,7 +4835,7 @@ components:
                 Specifies whether to enable Performance Insights for the DB instance. For more information, see [Using Amazon Performance Insights](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PerfInsights.html) in the *Amazon RDS User Guide*.
                  This setting doesn't apply to RDS Custom DB instances.
             Endpoint:
-              $ref: '#/components/schemas/Endpoint'
+              $ref: '#/components/schemas/DBInstance_Endpoint'
               description: ''
             Engine:
               type: string
@@ -4887,7 +4947,7 @@ components:
                   
                   If you've specified ``DBSecurityGroups`` and then you update the license model, AWS CloudFormation replaces the underlying DB instance. This will incur some interruptions to database availability.
             ListenerEndpoint:
-              $ref: '#/components/schemas/Endpoint'
+              $ref: '#/components/schemas/DBInstance_Endpoint'
               description: ''
             MasterUsername:
               type: string
@@ -4953,7 +5013,7 @@ components:
                   *RDS for PostgreSQL* 
                  Constraints: Must contain from 8 to 128 characters.
             MasterUserSecret:
-              $ref: '#/components/schemas/MasterUserSecret'
+              $ref: '#/components/schemas/DBInstance_MasterUserSecret'
               description: |-
                 The secret managed by RDS in AWS Secrets Manager for the master user password.
                  For more information, see [Password management with Secrets Manager](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/rds-secrets-manager.html) in the *Amazon RDS User Guide.*
@@ -5701,7 +5761,7 @@ components:
               x-insertionOrder: false
               description: An array of key-value pairs to apply to this resource.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/GlobalCluster_Tag'
             EngineLifecycleSupport:
               description: The life cycle type of the global cluster. You can use this setting to enroll your global cluster into Amazon RDS Extended Support.
               type: string
@@ -5764,7 +5824,7 @@ components:
               x-insertionOrder: false
               description: A list of tags. For more information, see [Tagging Amazon RDS Resources](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) in the *Amazon RDS User Guide.*.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Integration_Tag'
             DataFilter:
               type: string
               description: Data filters for the integration. These filters determine which tables from the source database are sent to the target Amazon Redshift data warehouse.
@@ -5872,7 +5932,7 @@ components:
       id: awscc.rds.customdb_engine_versions
       x-cfn-schema-name: CustomDBEngineVersion
       x-cfn-type-name: AWS::RDS::CustomDBEngineVersion
-      x-identifiers:
+      x-identifiers: &ref_0
         - Engine
         - EngineVersion
       x-type: cloud_control
@@ -5983,9 +6043,7 @@ components:
       id: awscc.rds.customdb_engine_versions_list_only
       x-cfn-schema-name: CustomDBEngineVersion
       x-cfn-type-name: AWS::RDS::CustomDBEngineVersion
-      x-identifiers:
-        - Engine
-        - EngineVersion
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6017,7 +6075,7 @@ components:
       id: awscc.rds.db_clusters
       x-cfn-schema-name: DBCluster
       x-cfn-type-name: AWS::RDS::DBCluster
-      x-identifiers:
+      x-identifiers: &ref_1
         - DBClusterIdentifier
       x-type: cloud_control
       methods:
@@ -6231,8 +6289,7 @@ components:
       id: awscc.rds.db_clusters_list_only
       x-cfn-schema-name: DBCluster
       x-cfn-type-name: AWS::RDS::DBCluster
-      x-identifiers:
-        - DBClusterIdentifier
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6262,7 +6319,7 @@ components:
       id: awscc.rds.db_cluster_parameter_groups
       x-cfn-schema-name: DBClusterParameterGroup
       x-cfn-type-name: AWS::RDS::DBClusterParameterGroup
-      x-identifiers:
+      x-identifiers: &ref_2
         - DBClusterParameterGroupName
       x-type: cloud_control
       methods:
@@ -6356,8 +6413,7 @@ components:
       id: awscc.rds.db_cluster_parameter_groups_list_only
       x-cfn-schema-name: DBClusterParameterGroup
       x-cfn-type-name: AWS::RDS::DBClusterParameterGroup
-      x-identifiers:
-        - DBClusterParameterGroupName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6387,7 +6443,7 @@ components:
       id: awscc.rds.db_instances
       x-cfn-schema-name: DBInstance
       x-cfn-type-name: AWS::RDS::DBInstance
-      x-identifiers:
+      x-identifiers: &ref_3
         - DBInstanceIdentifier
       x-type: cloud_control
       methods:
@@ -6665,8 +6721,7 @@ components:
       id: awscc.rds.db_instances_list_only
       x-cfn-schema-name: DBInstance
       x-cfn-type-name: AWS::RDS::DBInstance
-      x-identifiers:
-        - DBInstanceIdentifier
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6696,7 +6751,7 @@ components:
       id: awscc.rds.db_parameter_groups
       x-cfn-schema-name: DBParameterGroup
       x-cfn-type-name: AWS::RDS::DBParameterGroup
-      x-identifiers:
+      x-identifiers: &ref_4
         - DBParameterGroupName
       x-type: cloud_control
       methods:
@@ -6790,8 +6845,7 @@ components:
       id: awscc.rds.db_parameter_groups_list_only
       x-cfn-schema-name: DBParameterGroup
       x-cfn-type-name: AWS::RDS::DBParameterGroup
-      x-identifiers:
-        - DBParameterGroupName
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6821,7 +6875,7 @@ components:
       id: awscc.rds.db_proxies
       x-cfn-schema-name: DBProxy
       x-cfn-type-name: AWS::RDS::DBProxy
-      x-identifiers:
+      x-identifiers: &ref_5
         - DBProxyName
       x-type: cloud_control
       methods:
@@ -6931,8 +6985,7 @@ components:
       id: awscc.rds.db_proxies_list_only
       x-cfn-schema-name: DBProxy
       x-cfn-type-name: AWS::RDS::DBProxy
-      x-identifiers:
-        - DBProxyName
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -6962,7 +7015,7 @@ components:
       id: awscc.rds.db_proxy_endpoints
       x-cfn-schema-name: DBProxyEndpoint
       x-cfn-type-name: AWS::RDS::DBProxyEndpoint
-      x-identifiers:
+      x-identifiers: &ref_6
         - DBProxyEndpointName
       x-type: cloud_control
       methods:
@@ -7066,8 +7119,7 @@ components:
       id: awscc.rds.db_proxy_endpoints_list_only
       x-cfn-schema-name: DBProxyEndpoint
       x-cfn-type-name: AWS::RDS::DBProxyEndpoint
-      x-identifiers:
-        - DBProxyEndpointName
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7097,7 +7149,7 @@ components:
       id: awscc.rds.db_proxy_target_groups
       x-cfn-schema-name: DBProxyTargetGroup
       x-cfn-type-name: AWS::RDS::DBProxyTargetGroup
-      x-identifiers:
+      x-identifiers: &ref_7
         - TargetGroupArn
       x-type: cloud_control
       methods:
@@ -7193,8 +7245,7 @@ components:
       id: awscc.rds.db_proxy_target_groups_list_only
       x-cfn-schema-name: DBProxyTargetGroup
       x-cfn-type-name: AWS::RDS::DBProxyTargetGroup
-      x-identifiers:
-        - TargetGroupArn
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7224,7 +7275,7 @@ components:
       id: awscc.rds.db_shard_groups
       x-cfn-schema-name: DBShardGroup
       x-cfn-type-name: AWS::RDS::DBShardGroup
-      x-identifiers:
+      x-identifiers: &ref_8
         - DBShardGroupIdentifier
       x-type: cloud_control
       methods:
@@ -7326,8 +7377,7 @@ components:
       id: awscc.rds.db_shard_groups_list_only
       x-cfn-schema-name: DBShardGroup
       x-cfn-type-name: AWS::RDS::DBShardGroup
-      x-identifiers:
-        - DBShardGroupIdentifier
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7357,7 +7407,7 @@ components:
       id: awscc.rds.db_subnet_groups
       x-cfn-schema-name: DBSubnetGroup
       x-cfn-type-name: AWS::RDS::DBSubnetGroup
-      x-identifiers:
+      x-identifiers: &ref_9
         - DBSubnetGroupName
       x-type: cloud_control
       methods:
@@ -7449,8 +7499,7 @@ components:
       id: awscc.rds.db_subnet_groups_list_only
       x-cfn-schema-name: DBSubnetGroup
       x-cfn-type-name: AWS::RDS::DBSubnetGroup
-      x-identifiers:
-        - DBSubnetGroupName
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7480,7 +7529,7 @@ components:
       id: awscc.rds.event_subscriptions
       x-cfn-schema-name: EventSubscription
       x-cfn-type-name: AWS::RDS::EventSubscription
-      x-identifiers:
+      x-identifiers: &ref_10
         - SubscriptionName
       x-type: cloud_control
       methods:
@@ -7578,8 +7627,7 @@ components:
       id: awscc.rds.event_subscriptions_list_only
       x-cfn-schema-name: EventSubscription
       x-cfn-type-name: AWS::RDS::EventSubscription
-      x-identifiers:
-        - SubscriptionName
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7609,7 +7657,7 @@ components:
       id: awscc.rds.global_clusters
       x-cfn-schema-name: GlobalCluster
       x-cfn-type-name: AWS::RDS::GlobalCluster
-      x-identifiers:
+      x-identifiers: &ref_11
         - GlobalClusterIdentifier
       x-type: cloud_control
       methods:
@@ -7711,8 +7759,7 @@ components:
       id: awscc.rds.global_clusters_list_only
       x-cfn-schema-name: GlobalCluster
       x-cfn-type-name: AWS::RDS::GlobalCluster
-      x-identifiers:
-        - GlobalClusterIdentifier
+      x-identifiers: *ref_11
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7742,7 +7789,7 @@ components:
       id: awscc.rds.integrations
       x-cfn-schema-name: Integration
       x-cfn-type-name: AWS::RDS::Integration
-      x-identifiers:
+      x-identifiers: &ref_12
         - IntegrationArn
       x-type: cloud_control
       methods:
@@ -7846,8 +7893,7 @@ components:
       id: awscc.rds.integrations_list_only
       x-cfn-schema-name: Integration
       x-cfn-type-name: AWS::RDS::Integration
-      x-identifiers:
-        - IntegrationArn
+      x-identifiers: *ref_12
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -7877,7 +7923,7 @@ components:
       id: awscc.rds.option_groups
       x-cfn-schema-name: OptionGroup
       x-cfn-type-name: AWS::RDS::OptionGroup
-      x-identifiers:
+      x-identifiers: &ref_13
         - OptionGroupName
       x-type: cloud_control
       methods:
@@ -7973,8 +8019,7 @@ components:
       id: awscc.rds.option_groups_list_only
       x-cfn-schema-name: OptionGroup
       x-cfn-type-name: AWS::RDS::OptionGroup
-      x-identifiers:
-        - OptionGroupName
+      x-identifiers: *ref_13
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/redshift.yaml b/openapi/src/awscc/v00.00.00000/services/redshift.yaml
index 474a1851a..ebf636d11 100644
--- a/openapi/src/awscc/v00.00.00000/services/redshift.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/redshift.yaml
@@ -421,15 +421,16 @@ components:
       properties:
         Key:
           type: string
-          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
           minLength: 1
-          maxLength: 128
+          maxLength: 127
         Value:
           type: string
-          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
-          minLength: 0
-          maxLength: 256
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 255
       required:
+        - Value
         - Key
     Cluster:
       type: object
@@ -792,6 +793,24 @@ components:
       required:
         - ParameterValue
         - ParameterName
+    ClusterParameterGroup_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     ClusterParameterGroup:
       type: object
       properties:
@@ -816,7 +835,7 @@ components:
           type: array
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ClusterParameterGroup_Tag'
       required:
         - Description
         - ParameterGroupFamily
@@ -1294,6 +1313,24 @@ components:
           - ec2:DescribeAddresses
           - ec2:DescribeInternetGateways
           - ec2:DescribeSubnets
+    EventSubscription_Tag:
+      description: A key-value pair to associate with a resource.
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          minLength: 0
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+          maxLength: 256
+        Key:
+          minLength: 1
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+          maxLength: 128
+      required:
+        - Key
+        - Value
     EventSubscription:
       type: object
       properties:
@@ -1375,7 +1412,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/EventSubscription_Tag'
       required:
         - SubscriptionName
       x-stackql-resource-name: event_subscription
@@ -1434,7 +1471,24 @@ components:
       x-insertionOrder: false
       description: An array of key-value pairs to apply to this resource.
       items:
-        $ref: '#/components/schemas/Tag'
+        $ref: '#/components/schemas/Integration_Tag'
+    Integration_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
     EncryptionContextMap:
       type: object
       x-patternProperties:
@@ -1468,7 +1522,7 @@ components:
           x-insertionOrder: false
           description: An array of key-value pairs to apply to this resource.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Integration_Tag'
         CreateTime:
           type: string
           description: The time (UTC) when the integration was created.
@@ -1948,7 +2002,7 @@ components:
               type: array
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ClusterParameterGroup_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateClusterParameterGroupRequest
       type: object
@@ -2224,7 +2278,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/EventSubscription_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateEventSubscriptionRequest
       type: object
@@ -2263,7 +2317,7 @@ components:
               x-insertionOrder: false
               description: An array of key-value pairs to apply to this resource.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Integration_Tag'
             CreateTime:
               type: string
               description: The time (UTC) when the integration was created.
@@ -2342,7 +2396,7 @@ components:
       id: awscc.redshift.clusters
       x-cfn-schema-name: Cluster
       x-cfn-type-name: AWS::Redshift::Cluster
-      x-identifiers:
+      x-identifiers: &ref_0
         - ClusterIdentifier
       x-type: cloud_control
       methods:
@@ -2536,8 +2590,7 @@ components:
       id: awscc.redshift.clusters_list_only
       x-cfn-schema-name: Cluster
       x-cfn-type-name: AWS::Redshift::Cluster
-      x-identifiers:
-        - ClusterIdentifier
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2567,7 +2620,7 @@ components:
       id: awscc.redshift.cluster_parameter_groups
       x-cfn-schema-name: ClusterParameterGroup
       x-cfn-type-name: AWS::Redshift::ClusterParameterGroup
-      x-identifiers:
+      x-identifiers: &ref_1
         - ParameterGroupName
       x-type: cloud_control
       methods:
@@ -2661,8 +2714,7 @@ components:
       id: awscc.redshift.cluster_parameter_groups_list_only
       x-cfn-schema-name: ClusterParameterGroup
       x-cfn-type-name: AWS::Redshift::ClusterParameterGroup
-      x-identifiers:
-        - ParameterGroupName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2692,7 +2744,7 @@ components:
       id: awscc.redshift.cluster_subnet_groups
       x-cfn-schema-name: ClusterSubnetGroup
       x-cfn-type-name: AWS::Redshift::ClusterSubnetGroup
-      x-identifiers:
+      x-identifiers: &ref_2
         - ClusterSubnetGroupName
       x-type: cloud_control
       methods:
@@ -2784,8 +2836,7 @@ components:
       id: awscc.redshift.cluster_subnet_groups_list_only
       x-cfn-schema-name: ClusterSubnetGroup
       x-cfn-type-name: AWS::Redshift::ClusterSubnetGroup
-      x-identifiers:
-        - ClusterSubnetGroupName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2815,7 +2866,7 @@ components:
       id: awscc.redshift.endpoint_accesses
       x-cfn-schema-name: EndpointAccess
       x-cfn-type-name: AWS::Redshift::EndpointAccess
-      x-identifiers:
+      x-identifiers: &ref_3
         - EndpointName
       x-type: cloud_control
       methods:
@@ -2921,8 +2972,7 @@ components:
       id: awscc.redshift.endpoint_accesses_list_only
       x-cfn-schema-name: EndpointAccess
       x-cfn-type-name: AWS::Redshift::EndpointAccess
-      x-identifiers:
-        - EndpointName
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2952,7 +3002,7 @@ components:
       id: awscc.redshift.endpoint_authorizations
       x-cfn-schema-name: EndpointAuthorization
       x-cfn-type-name: AWS::Redshift::EndpointAuthorization
-      x-identifiers:
+      x-identifiers: &ref_4
         - ClusterIdentifier
         - Account
       x-type: cloud_control
@@ -3061,9 +3111,7 @@ components:
       id: awscc.redshift.endpoint_authorizations_list_only
       x-cfn-schema-name: EndpointAuthorization
       x-cfn-type-name: AWS::Redshift::EndpointAuthorization
-      x-identifiers:
-        - ClusterIdentifier
-        - Account
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3095,7 +3143,7 @@ components:
       id: awscc.redshift.event_subscriptions
       x-cfn-schema-name: EventSubscription
       x-cfn-type-name: AWS::Redshift::EventSubscription
-      x-identifiers:
+      x-identifiers: &ref_5
         - SubscriptionName
       x-type: cloud_control
       methods:
@@ -3207,8 +3255,7 @@ components:
       id: awscc.redshift.event_subscriptions_list_only
       x-cfn-schema-name: EventSubscription
       x-cfn-type-name: AWS::Redshift::EventSubscription
-      x-identifiers:
-        - SubscriptionName
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3238,7 +3285,7 @@ components:
       id: awscc.redshift.integrations
       x-cfn-schema-name: Integration
       x-cfn-type-name: AWS::Redshift::Integration
-      x-identifiers:
+      x-identifiers: &ref_6
         - IntegrationArn
       x-type: cloud_control
       methods:
@@ -3338,8 +3385,7 @@ components:
       id: awscc.redshift.integrations_list_only
       x-cfn-schema-name: Integration
       x-cfn-type-name: AWS::Redshift::Integration
-      x-identifiers:
-        - IntegrationArn
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3369,7 +3415,7 @@ components:
       id: awscc.redshift.scheduled_actions
       x-cfn-schema-name: ScheduledAction
       x-cfn-type-name: AWS::Redshift::ScheduledAction
-      x-identifiers:
+      x-identifiers: &ref_7
         - ScheduledActionName
       x-type: cloud_control
       methods:
@@ -3473,8 +3519,7 @@ components:
       id: awscc.redshift.scheduled_actions_list_only
       x-cfn-schema-name: ScheduledAction
       x-cfn-type-name: AWS::Redshift::ScheduledAction
-      x-identifiers:
-        - ScheduledActionName
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/redshiftserverless.yaml b/openapi/src/awscc/v00.00.00000/services/redshiftserverless.yaml
index ea579766c..e66213522 100644
--- a/openapi/src/awscc/v00.00.00000/services/redshiftserverless.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/redshiftserverless.yaml
@@ -396,6 +396,83 @@ components:
         - useractivitylog
         - userlog
         - connectionlog
+    Namespace_Namespace:
+      type: object
+      properties:
+        NamespaceArn:
+          type: string
+        NamespaceId:
+          type: string
+        NamespaceName:
+          type: string
+          maxLength: 64
+          minLength: 3
+          pattern: ^[a-z0-9-]+$
+        AdminUsername:
+          type: string
+        DbName:
+          type: string
+          pattern: '[a-zA-Z][a-zA-Z_0-9+.@-]*'
+        KmsKeyId:
+          type: string
+        DefaultIamRoleArn:
+          type: string
+        IamRoles:
+          type: array
+          x-insertionOrder: false
+          items:
+            type: string
+            maxLength: 512
+            minLength: 0
+        LogExports:
+          type: array
+          x-insertionOrder: false
+          items:
+            $ref: '#/components/schemas/LogExport'
+          maxItems: 16
+          minItems: 0
+        Status:
+          $ref: '#/components/schemas/NamespaceStatus'
+        CreationDate:
+          type: string
+        AdminPasswordSecretArn:
+          type: string
+        AdminPasswordSecretKmsKeyId:
+          type: string
+      additionalProperties: false
+    NamespaceStatus:
+      type: string
+      enum:
+        - AVAILABLE
+        - MODIFYING
+        - DELETING
+    Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          maxLength: 128
+          minLength: 1
+        Value:
+          type: string
+          maxLength: 256
+          minLength: 0
+      required:
+        - Key
+        - Value
+      additionalProperties: false
+    SnapshotCopyConfiguration:
+      type: object
+      properties:
+        DestinationRegion:
+          type: string
+        DestinationKmsKeyId:
+          type: string
+        SnapshotRetentionPeriod:
+          type: integer
+      required:
+        - DestinationRegion
+      additionalProperties: false
     Namespace:
       type: object
       properties:
@@ -443,7 +520,7 @@ components:
           description: If true, Amazon Redshift uses AWS Secrets Manager to manage the namespace's admin credentials. You can't use adminUserPassword if manageAdminPassword is true. If manageAdminPassword is false or not set, Amazon Redshift uses adminUserPassword for the admin user account's password.
           type: boolean
         Namespace:
-          $ref: '#/components/schemas/Namespace'
+          $ref: '#/components/schemas/Namespace_Namespace'
           description: Definition of Namespace resource.
         NamespaceName:
           description: A unique identifier for the namespace. You use this identifier to refer to the namespace for any subsequent namespace operations such as deleting or modifying. All alphabetical characters must be lower case. Namespace name should be unique for all namespaces within an AWS account.
@@ -603,48 +680,45 @@ components:
           - iam:PassRole
           - redshift-serverless:ListNamespaces
           - redshift-serverless:ListTagsForResource
-    NamespaceStatus:
+    SnapshotStatus:
       type: string
       enum:
         - AVAILABLE
-        - MODIFYING
-        - DELETING
-    Tag:
+        - CREATING
+        - DELETED
+        - CANCELLED
+        - FAILED
+        - COPYING
+    Snapshot_Snapshot:
       type: object
       properties:
-        Key:
+        NamespaceArn:
           type: string
-          maxLength: 128
-          minLength: 1
-        Value:
+        NamespaceName:
           type: string
-          maxLength: 256
-          minLength: 0
-      required:
-        - Key
-        - Value
-      additionalProperties: false
-    SnapshotCopyConfiguration:
-      type: object
-      properties:
-        DestinationRegion:
+          maxLength: 64
+          minLength: 3
+          pattern: ^[a-z0-9-]+$
+        SnapshotName:
           type: string
-        DestinationKmsKeyId:
+          maxLength: 64
+          minLength: 3
+          pattern: ^[a-z0-9-]+$
+        SnapshotCreateTime:
           type: string
-        SnapshotRetentionPeriod:
+        Status:
+          $ref: '#/components/schemas/SnapshotStatus'
+        AdminUsername:
+          type: string
+        KmsKeyId:
+          type: string
+        OwnerAccount:
+          type: string
+        RetentionPeriod:
           type: integer
-      required:
-        - DestinationRegion
+        SnapshotArn:
+          type: string
       additionalProperties: false
-    SnapshotStatus:
-      type: string
-      enum:
-        - AVAILABLE
-        - CREATING
-        - DELETED
-        - CANCELLED
-        - FAILED
-        - COPYING
     Snapshot:
       type: object
       properties:
@@ -676,7 +750,7 @@ components:
           minItems: 0
         Snapshot:
           description: Definition for snapshot resource
-          $ref: '#/components/schemas/Snapshot'
+          $ref: '#/components/schemas/Snapshot_Snapshot'
       required:
         - SnapshotName
       x-stackql-resource-name: snapshot
@@ -804,6 +878,79 @@ components:
             $ref: '#/components/schemas/NetworkInterface'
           x-insertionOrder: false
       additionalProperties: false
+    Workgroup_Workgroup:
+      type: object
+      properties:
+        WorkgroupId:
+          type: string
+        WorkgroupArn:
+          type: string
+        WorkgroupName:
+          type: string
+          pattern: ^[a-z0-9-]*$
+          maxLength: 64
+          minLength: 3
+        NamespaceName:
+          type: string
+          pattern: ^[a-z0-9-]+$
+          maxLength: 64
+          minLength: 3
+        BaseCapacity:
+          type: integer
+        MaxCapacity:
+          type: integer
+        EnhancedVpcRouting:
+          type: boolean
+        ConfigParameters:
+          type: array
+          items:
+            $ref: '#/components/schemas/ConfigParameter'
+          uniqueItems: true
+          x-insertionOrder: false
+        SecurityGroupIds:
+          type: array
+          items:
+            type: string
+            pattern: ^sg-[0-9a-fA-F]{8,}$
+            maxLength: 255
+            minLength: 0
+          x-insertionOrder: false
+        SubnetIds:
+          type: array
+          items:
+            type: string
+            pattern: ^subnet-[0-9a-fA-F]{8,}$
+            maxLength: 255
+            minLength: 0
+          x-insertionOrder: false
+        Status:
+          $ref: '#/components/schemas/WorkgroupStatus'
+        Endpoint:
+          $ref: '#/components/schemas/Endpoint'
+        PubliclyAccessible:
+          type: boolean
+        CreationDate:
+          type: string
+        PricePerformanceTarget:
+          $ref: '#/components/schemas/PerformanceTarget'
+        TrackName:
+          type: string
+          maxLength: 256
+          minLength: 1
+          pattern: ^[a-zA-Z0-9_]+$
+      additionalProperties: false
+    WorkgroupStatus:
+      type: string
+      enum:
+        - CREATING
+        - AVAILABLE
+        - MODIFYING
+        - DELETING
+    PerformanceTargetStatus:
+      type: string
+      enum:
+        - ENABLED
+        - DISABLED
     Workgroup:
       type: object
       properties:
@@ -897,7 +1044,7 @@ components:
           pattern: ^[a-zA-Z0-9_]+$
         Workgroup:
           description: Definition for workgroup resource
-          $ref: '#/components/schemas/Workgroup'
+          $ref: '#/components/schemas/Workgroup_Workgroup'
       required:
         - WorkgroupName
       x-stackql-resource-name: workgroup
@@ -1020,18 +1167,6 @@ components:
           - ec2:DescribeAvailabilityZones
           - redshift-serverless:ListWorkgroups
           - redshift-serverless:ListTagsForResource
-    WorkgroupStatus:
-      type: string
-      enum:
-        - CREATING
-        - AVAILABLE
-        - MODIFYING
-        - DELETING
-    PerformanceTargetStatus:
-      type: string
-      enum:
-        - ENABLED
-        - DISABLED
     CreateNamespaceRequest:
       properties:
         ClientToken:
@@ -1089,7 +1224,7 @@ components:
               description: If true, Amazon Redshift uses AWS Secrets Manager to manage the namespace's admin credentials. You can't use adminUserPassword if manageAdminPassword is true. If manageAdminPassword is false or not set, Amazon Redshift uses adminUserPassword for the admin user account's password.
               type: boolean
             Namespace:
-              $ref: '#/components/schemas/Namespace'
+              $ref: '#/components/schemas/Namespace_Namespace'
               description: Definition of Namespace resource.
             NamespaceName:
               description: A unique identifier for the namespace. You use this identifier to refer to the namespace for any subsequent namespace operations such as deleting or modifying. All alphabetical characters must be lower case. Namespace name should be unique for all namespaces within an AWS account.
@@ -1172,7 +1307,7 @@ components:
               minItems: 0
             Snapshot:
               description: Definition for snapshot resource
-              $ref: '#/components/schemas/Snapshot'
+              $ref: '#/components/schemas/Snapshot_Snapshot'
           x-stackQL-stringOnly: true
       x-title: CreateSnapshotRequest
       type: object
@@ -1280,7 +1415,7 @@ components:
               pattern: ^[a-zA-Z0-9_]+$
             Workgroup:
               description: Definition for workgroup resource
-              $ref: '#/components/schemas/Workgroup'
+              $ref: '#/components/schemas/Workgroup_Workgroup'
           x-stackQL-stringOnly: true
       x-title: CreateWorkgroupRequest
       type: object
@@ -1298,7 +1433,7 @@ components:
       id: awscc.redshiftserverless.namespaces
       x-cfn-schema-name: Namespace
       x-cfn-type-name: AWS::RedshiftServerless::Namespace
-      x-identifiers:
+      x-identifiers: &ref_0
         - NamespaceName
       x-type: cloud_control
       methods:
@@ -1416,8 +1551,7 @@ components:
       id: awscc.redshiftserverless.namespaces_list_only
       x-cfn-schema-name: Namespace
       x-cfn-type-name: AWS::RedshiftServerless::Namespace
-      x-identifiers:
-        - NamespaceName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1447,7 +1581,7 @@ components:
       id: awscc.redshiftserverless.snapshots
       x-cfn-schema-name: Snapshot
       x-cfn-type-name: AWS::RedshiftServerless::Snapshot
-      x-identifiers:
+      x-identifiers: &ref_1
         - SnapshotName
       x-type: cloud_control
       methods:
@@ -1543,8 +1677,7 @@ components:
       id: awscc.redshiftserverless.snapshots_list_only
       x-cfn-schema-name: Snapshot
       x-cfn-type-name: AWS::RedshiftServerless::Snapshot
-      x-identifiers:
-        - SnapshotName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1574,7 +1707,7 @@ components:
       id: awscc.redshiftserverless.workgroups
       x-cfn-schema-name: Workgroup
       x-cfn-type-name: AWS::RedshiftServerless::Workgroup
-      x-identifiers:
+      x-identifiers: &ref_2
         - WorkgroupName
       x-type: cloud_control
       methods:
@@ -1694,8 +1827,7 @@ components:
       id: awscc.redshiftserverless.workgroups_list_only
       x-cfn-schema-name: Workgroup
       x-cfn-type-name: AWS::RedshiftServerless::Workgroup
-      x-identifiers:
-        - WorkgroupName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/refactorspaces.yaml b/openapi/src/awscc/v00.00.00000/services/refactorspaces.yaml
index de0b6a1ad..57c12febb 100644
--- a/openapi/src/awscc/v00.00.00000/services/refactorspaces.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/refactorspaces.yaml
@@ -1323,7 +1323,7 @@ components:
       id: awscc.refactorspaces.applications
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::RefactorSpaces::Application
-      x-identifiers:
+      x-identifiers: &ref_0
         - EnvironmentIdentifier
         - ApplicationIdentifier
       x-type: cloud_control
@@ -1419,9 +1419,7 @@ components:
       id: awscc.refactorspaces.applications_list_only
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::RefactorSpaces::Application
-      x-identifiers:
-        - EnvironmentIdentifier
-        - ApplicationIdentifier
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1453,7 +1451,7 @@ components:
       id: awscc.refactorspaces.environments
       x-cfn-schema-name: Environment
       x-cfn-type-name: AWS::RefactorSpaces::Environment
-      x-identifiers:
+      x-identifiers: &ref_1
         - EnvironmentIdentifier
       x-type: cloud_control
       methods:
@@ -1551,8 +1549,7 @@ components:
       id: awscc.refactorspaces.environments_list_only
       x-cfn-schema-name: Environment
       x-cfn-type-name: AWS::RefactorSpaces::Environment
-      x-identifiers:
-        - EnvironmentIdentifier
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1582,7 +1579,7 @@ components:
       id: awscc.refactorspaces.routes
       x-cfn-schema-name: Route
       x-cfn-type-name: AWS::RefactorSpaces::Route
-      x-identifiers:
+      x-identifiers: &ref_2
         - EnvironmentIdentifier
         - ApplicationIdentifier
         - RouteIdentifier
@@ -1688,10 +1685,7 @@ components:
       id: awscc.refactorspaces.routes_list_only
       x-cfn-schema-name: Route
       x-cfn-type-name: AWS::RefactorSpaces::Route
-      x-identifiers:
-        - EnvironmentIdentifier
-        - ApplicationIdentifier
-        - RouteIdentifier
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1725,7 +1719,7 @@ components:
       id: awscc.refactorspaces.services
       x-cfn-schema-name: Service
       x-cfn-type-name: AWS::RefactorSpaces::Service
-      x-identifiers:
+      x-identifiers: &ref_3
         - EnvironmentIdentifier
         - ApplicationIdentifier
         - ServiceIdentifier
@@ -1816,10 +1810,7 @@ components:
       id: awscc.refactorspaces.services_list_only
       x-cfn-schema-name: Service
       x-cfn-type-name: AWS::RefactorSpaces::Service
-      x-identifiers:
-        - EnvironmentIdentifier
-        - ApplicationIdentifier
-        - ServiceIdentifier
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/rekognition.yaml b/openapi/src/awscc/v00.00.00000/services/rekognition.yaml
index a6a96e91b..254b8ab0f 100644
--- a/openapi/src/awscc/v00.00.00000/services/rekognition.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/rekognition.yaml
@@ -391,9 +391,10 @@ components:
       type: object
   schemas:
     Arn:
-      description: The ARN of the stream processor
+      x-$comment: Use the `definitions` block to provide shared resource property schemas
       type: string
       maxLength: 2048
+      format: (^arn:[a-z\d-]+:rekognition:[a-z\d-]+:\d{12}:collection\/([a-zA-Z0-9_.\-]+){1,255})
     CollectionId:
       description: The name of the collection
       type: string
@@ -406,13 +407,11 @@ components:
         Key:
           type: string
           description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
-          minLength: 1
           maxLength: 128
           pattern: \A(?!aws:)[a-zA-Z0-9+\-=\._\:\/@]+$
         Value:
           type: string
           description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
-          minLength: 0
           maxLength: 256
           pattern: \A[a-zA-Z0-9+\-=\._\:\/@]+$
       required:
@@ -476,6 +475,10 @@ components:
           - rekognition:DeleteCollection
         list:
           - rekognition:ListCollections
+    Project_Arn:
+      type: string
+      maxLength: 2048
+      pattern: (^arn:[a-z\d-]+:rekognition:[a-z\d-]+:\d{12}:project/[a-zA-Z0-9_.\-]{1,255}/[0-9]+$)
     ProjectName:
       description: The name of the project
       type: string
@@ -486,7 +489,7 @@ components:
       type: object
       properties:
         Arn:
-          $ref: '#/components/schemas/Arn'
+          $ref: '#/components/schemas/Project_Arn'
         ProjectName:
           $ref: '#/components/schemas/ProjectName'
       required:
@@ -513,6 +516,10 @@ components:
           - rekognition:DeleteProject
         list:
           - rekognition:DescribeProjects
+    StreamProcessor_Arn:
+      description: The ARN of the stream processor
+      type: string
+      maxLength: 2048
     KinesisVideoStream:
       description: The Kinesis Video Stream that streams the source video.
       type: object
@@ -662,11 +669,31 @@ components:
         - OptIn
       type: object
       additionalProperties: false
+    StreamProcessor_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+          pattern: \A(?!aws:)[a-zA-Z0-9+\-=\._\:\/@]+$
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+          pattern: \A[a-zA-Z0-9+\-=\._\:\/@]+$
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     StreamProcessor:
       type: object
       properties:
         Arn:
-          $ref: '#/components/schemas/Arn'
+          $ref: '#/components/schemas/StreamProcessor_Arn'
         Name:
           description: Name of the stream processor. It's an identifier you assign to the stream processor. You can use it to manage the stream processor.
           type: string
@@ -725,7 +752,7 @@ components:
           minItems: 0
           maxItems: 200
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/StreamProcessor_Tag'
       required:
         - RoleArn
         - KinesisVideoStream
@@ -830,7 +857,7 @@ components:
           type: object
           properties:
             Arn:
-              $ref: '#/components/schemas/Arn'
+              $ref: '#/components/schemas/Project_Arn'
             ProjectName:
               $ref: '#/components/schemas/ProjectName'
           x-stackQL-stringOnly: true
@@ -851,7 +878,7 @@ components:
           type: object
           properties:
             Arn:
-              $ref: '#/components/schemas/Arn'
+              $ref: '#/components/schemas/StreamProcessor_Arn'
             Name:
               description: Name of the stream processor. It's an identifier you assign to the stream processor. You can use it to manage the stream processor.
               type: string
@@ -910,7 +937,7 @@ components:
               minItems: 0
               maxItems: 200
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/StreamProcessor_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateStreamProcessorRequest
       type: object
@@ -928,7 +955,7 @@ components:
       id: awscc.rekognition.collections
       x-cfn-schema-name: Collection
       x-cfn-type-name: AWS::Rekognition::Collection
-      x-identifiers:
+      x-identifiers: &ref_0
         - CollectionId
       x-type: cloud_control
       methods:
@@ -1018,8 +1045,7 @@ components:
       id: awscc.rekognition.collections_list_only
       x-cfn-schema-name: Collection
       x-cfn-type-name: AWS::Rekognition::Collection
-      x-identifiers:
-        - CollectionId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1049,7 +1075,7 @@ components:
       id: awscc.rekognition.projects
       x-cfn-schema-name: Project
       x-cfn-type-name: AWS::Rekognition::Project
-      x-identifiers:
+      x-identifiers: &ref_1
         - ProjectName
       x-type: cloud_control
       methods:
@@ -1120,8 +1146,7 @@ components:
       id: awscc.rekognition.projects_list_only
       x-cfn-schema-name: Project
       x-cfn-type-name: AWS::Rekognition::Project
-      x-identifiers:
-        - ProjectName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1151,7 +1176,7 @@ components:
       id: awscc.rekognition.stream_processors
       x-cfn-schema-name: StreamProcessor
       x-cfn-type-name: AWS::Rekognition::StreamProcessor
-      x-identifiers:
+      x-identifiers: &ref_2
         - Name
       x-type: cloud_control
       methods:
@@ -1267,8 +1292,7 @@ components:
       id: awscc.rekognition.stream_processors_list_only
       x-cfn-schema-name: StreamProcessor
       x-cfn-type-name: AWS::Rekognition::StreamProcessor
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/resiliencehub.yaml b/openapi/src/awscc/v00.00.00000/services/resiliencehub.yaml
index d42e72213..ff46bc093 100644
--- a/openapi/src/awscc/v00.00.00000/services/resiliencehub.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/resiliencehub.yaml
@@ -893,7 +893,7 @@ components:
       id: awscc.resiliencehub.apps
       x-cfn-schema-name: App
       x-cfn-type-name: AWS::ResilienceHub::App
-      x-identifiers:
+      x-identifiers: &ref_0
         - AppArn
       x-type: cloud_control
       methods:
@@ -999,8 +999,7 @@ components:
       id: awscc.resiliencehub.apps_list_only
       x-cfn-schema-name: App
       x-cfn-type-name: AWS::ResilienceHub::App
-      x-identifiers:
-        - AppArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1030,7 +1029,7 @@ components:
       id: awscc.resiliencehub.resiliency_policies
       x-cfn-schema-name: ResiliencyPolicy
       x-cfn-type-name: AWS::ResilienceHub::ResiliencyPolicy
-      x-identifiers:
+      x-identifiers: &ref_1
         - PolicyArn
       x-type: cloud_control
       methods:
@@ -1128,8 +1127,7 @@ components:
       id: awscc.resiliencehub.resiliency_policies_list_only
       x-cfn-schema-name: ResiliencyPolicy
       x-cfn-type-name: AWS::ResilienceHub::ResiliencyPolicy
-      x-identifiers:
-        - PolicyArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/resourceexplorer2.yaml b/openapi/src/awscc/v00.00.00000/services/resourceexplorer2.yaml
index 85a227eb0..3a3a2de6f 100644
--- a/openapi/src/awscc/v00.00.00000/services/resourceexplorer2.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/resourceexplorer2.yaml
@@ -758,7 +758,7 @@ components:
       id: awscc.resourceexplorer2.indices
       x-cfn-schema-name: Index
       x-cfn-type-name: AWS::ResourceExplorer2::Index
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -850,8 +850,7 @@ components:
       id: awscc.resourceexplorer2.indices_list_only
       x-cfn-schema-name: Index
       x-cfn-type-name: AWS::ResourceExplorer2::Index
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -881,7 +880,7 @@ components:
       id: awscc.resourceexplorer2.views
       x-cfn-schema-name: View
       x-cfn-type-name: AWS::ResourceExplorer2::View
-      x-identifiers:
+      x-identifiers: &ref_1
         - ViewArn
       x-type: cloud_control
       methods:
@@ -977,8 +976,7 @@ components:
       id: awscc.resourceexplorer2.views_list_only
       x-cfn-schema-name: View
       x-cfn-type-name: AWS::ResourceExplorer2::View
-      x-identifiers:
-        - ViewArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/resourcegroups.yaml b/openapi/src/awscc/v00.00.00000/services/resourcegroups.yaml
index 1259ea05b..11b0d5d7d 100644
--- a/openapi/src/awscc/v00.00.00000/services/resourcegroups.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/resourcegroups.yaml
@@ -749,7 +749,7 @@ components:
       id: awscc.resourcegroups.groups
       x-cfn-schema-name: Group
       x-cfn-type-name: AWS::ResourceGroups::Group
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -847,8 +847,7 @@ components:
       id: awscc.resourcegroups.groups_list_only
       x-cfn-schema-name: Group
       x-cfn-type-name: AWS::ResourceGroups::Group
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -878,7 +877,7 @@ components:
       id: awscc.resourcegroups.tag_sync_tasks
       x-cfn-schema-name: TagSyncTask
       x-cfn-type-name: AWS::ResourceGroups::TagSyncTask
-      x-identifiers:
+      x-identifiers: &ref_1
         - TaskArn
       x-type: cloud_control
       methods:
@@ -961,8 +960,7 @@ components:
       id: awscc.resourcegroups.tag_sync_tasks_list_only
       x-cfn-schema-name: TagSyncTask
       x-cfn-type-name: AWS::ResourceGroups::TagSyncTask
-      x-identifiers:
-        - TaskArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/robomaker.yaml b/openapi/src/awscc/v00.00.00000/services/robomaker.yaml
index b3ff94cdf..b7e3a3dee 100644
--- a/openapi/src/awscc/v00.00.00000/services/robomaker.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/robomaker.yaml
@@ -503,20 +503,18 @@ components:
           - robomaker:UntagResource
     SourceConfig:
       type: object
-      description: Information about a source configuration.
       properties:
         S3Bucket:
           type: string
-          description: The Amazon S3 bucket name.
-          pattern: '[a-z0-9][a-z0-9.\-]*[a-z0-9]'
+          description: The Arn of the S3Bucket that stores the robot application source.
         S3Key:
           type: string
-          description: The s3 object key.
-          minLength: 1
-          maxLength: 1024
+          description: The s3 key of robot application source.
         Architecture:
           type: string
-          description: The target processor architecture for the application.
+          description: The architecture of robot application.
+          minLength: 1
+          maxLength: 255
           enum:
             - X86_64
             - ARM64
@@ -527,24 +525,23 @@ components:
         - Architecture
       additionalProperties: false
     RobotSoftwareSuite:
-      description: Information about a robot software suite.
+      description: The robot software suite used by the robot application.
       type: object
       properties:
         Name:
           type: string
-          description: The name of the robot software suite.
+          description: The name of robot software suite.
           enum:
             - ROS
             - ROS2
             - General
         Version:
           type: string
-          description: The version of the robot software suite.
+          description: The version of robot software suite.
           enum:
             - Kinetic
             - Melodic
             - Dashing
-            - Foxy
       required:
         - Name
       additionalProperties: false
@@ -678,6 +675,53 @@ components:
         - Name
         - Version
       additionalProperties: false
+    SimulationApplication_RobotSoftwareSuite:
+      description: Information about a robot software suite.
+      type: object
+      properties:
+        Name:
+          type: string
+          description: The name of the robot software suite.
+          enum:
+            - ROS
+            - ROS2
+            - General
+        Version:
+          type: string
+          description: The version of the robot software suite.
+          enum:
+            - Kinetic
+            - Melodic
+            - Dashing
+            - Foxy
+      required:
+        - Name
+      additionalProperties: false
+    SimulationApplication_SourceConfig:
+      type: object
+      description: Information about a source configuration.
+      properties:
+        S3Bucket:
+          type: string
+          description: The Amazon S3 bucket name.
+          pattern: '[a-z0-9][a-z0-9.\-]*[a-z0-9]'
+        S3Key:
+          type: string
+          description: The s3 object key.
+          minLength: 1
+          maxLength: 1024
+        Architecture:
+          type: string
+          description: The target processor architecture for the application.
+          enum:
+            - X86_64
+            - ARM64
+            - ARMHF
+      required:
+        - S3Bucket
+        - S3Key
+        - Architecture
+      additionalProperties: false
     SimulationSoftwareSuite:
       description: Information about a simulation software suite.
       type: object
@@ -722,7 +766,7 @@ components:
           $ref: '#/components/schemas/RenderingEngine'
         RobotSoftwareSuite:
           description: The robot software suite used by the simulation application.
-          $ref: '#/components/schemas/RobotSoftwareSuite'
+          $ref: '#/components/schemas/SimulationApplication_RobotSoftwareSuite'
         SimulationSoftwareSuite:
           description: The simulation software suite used by the simulation application.
           $ref: '#/components/schemas/SimulationSoftwareSuite'
@@ -731,7 +775,7 @@ components:
           type: array
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/SourceConfig'
+            $ref: '#/components/schemas/SimulationApplication_SourceConfig'
         Environment:
           description: The URI of the Docker image for the robot application.
           type: string
@@ -996,7 +1040,7 @@ components:
               $ref: '#/components/schemas/RenderingEngine'
             RobotSoftwareSuite:
               description: The robot software suite used by the simulation application.
-              $ref: '#/components/schemas/RobotSoftwareSuite'
+              $ref: '#/components/schemas/SimulationApplication_RobotSoftwareSuite'
             SimulationSoftwareSuite:
               description: The simulation software suite used by the simulation application.
               $ref: '#/components/schemas/SimulationSoftwareSuite'
@@ -1005,7 +1049,7 @@ components:
               type: array
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/SourceConfig'
+                $ref: '#/components/schemas/SimulationApplication_SourceConfig'
             Environment:
               description: The URI of the Docker image for the robot application.
               type: string
@@ -1057,7 +1101,7 @@ components:
       id: awscc.robomaker.fleets
       x-cfn-schema-name: Fleet
       x-cfn-type-name: AWS::RoboMaker::Fleet
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -1147,8 +1191,7 @@ components:
       id: awscc.robomaker.fleets_list_only
       x-cfn-schema-name: Fleet
       x-cfn-type-name: AWS::RoboMaker::Fleet
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1178,7 +1221,7 @@ components:
       id: awscc.robomaker.robots
       x-cfn-schema-name: Robot
       x-cfn-type-name: AWS::RoboMaker::Robot
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -1274,8 +1317,7 @@ components:
       id: awscc.robomaker.robots_list_only
       x-cfn-schema-name: Robot
       x-cfn-type-name: AWS::RoboMaker::Robot
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1305,7 +1347,7 @@ components:
       id: awscc.robomaker.robot_applications
       x-cfn-schema-name: RobotApplication
       x-cfn-type-name: AWS::RoboMaker::RobotApplication
-      x-identifiers:
+      x-identifiers: &ref_2
         - Arn
       x-type: cloud_control
       methods:
@@ -1403,8 +1445,7 @@ components:
       id: awscc.robomaker.robot_applications_list_only
       x-cfn-schema-name: RobotApplication
       x-cfn-type-name: AWS::RoboMaker::RobotApplication
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1509,7 +1550,7 @@ components:
       id: awscc.robomaker.simulation_applications
       x-cfn-schema-name: SimulationApplication
       x-cfn-type-name: AWS::RoboMaker::SimulationApplication
-      x-identifiers:
+      x-identifiers: &ref_3
         - Arn
       x-type: cloud_control
       methods:
@@ -1611,8 +1652,7 @@ components:
       id: awscc.robomaker.simulation_applications_list_only
       x-cfn-schema-name: SimulationApplication
       x-cfn-type-name: AWS::RoboMaker::SimulationApplication
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/rolesanywhere.yaml b/openapi/src/awscc/v00.00.00000/services/rolesanywhere.yaml
index cd636e487..0ebea6f1a 100644
--- a/openapi/src/awscc/v00.00.00000/services/rolesanywhere.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/rolesanywhere.yaml
@@ -875,7 +875,7 @@ components:
       id: awscc.rolesanywhere.crls
       x-cfn-schema-name: CRL
       x-cfn-type-name: AWS::RolesAnywhere::CRL
-      x-identifiers:
+      x-identifiers: &ref_0
         - CrlId
       x-type: cloud_control
       methods:
@@ -971,8 +971,7 @@ components:
       id: awscc.rolesanywhere.crls_list_only
       x-cfn-schema-name: CRL
       x-cfn-type-name: AWS::RolesAnywhere::CRL
-      x-identifiers:
-        - CrlId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1002,7 +1001,7 @@ components:
       id: awscc.rolesanywhere.profiles
       x-cfn-schema-name: Profile
       x-cfn-type-name: AWS::RolesAnywhere::Profile
-      x-identifiers:
+      x-identifiers: &ref_1
         - ProfileId
       x-type: cloud_control
       methods:
@@ -1110,8 +1109,7 @@ components:
       id: awscc.rolesanywhere.profiles_list_only
       x-cfn-schema-name: Profile
       x-cfn-type-name: AWS::RolesAnywhere::Profile
-      x-identifiers:
-        - ProfileId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1141,7 +1139,7 @@ components:
       id: awscc.rolesanywhere.trust_anchors
       x-cfn-schema-name: TrustAnchor
       x-cfn-type-name: AWS::RolesAnywhere::TrustAnchor
-      x-identifiers:
+      x-identifiers: &ref_2
         - TrustAnchorId
       x-type: cloud_control
       methods:
@@ -1239,8 +1237,7 @@ components:
       id: awscc.rolesanywhere.trust_anchors_list_only
       x-cfn-schema-name: TrustAnchor
       x-cfn-type-name: AWS::RolesAnywhere::TrustAnchor
-      x-identifiers:
-        - TrustAnchorId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/route53.yaml b/openapi/src/awscc/v00.00.00000/services/route53.yaml
index 45431b845..d83516732 100644
--- a/openapi/src/awscc/v00.00.00000/services/route53.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/route53.yaml
@@ -1200,7 +1200,7 @@ components:
       id: awscc.route53.cidr_collections
       x-cfn-schema-name: CidrCollection
       x-cfn-type-name: AWS::Route53::CidrCollection
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
       x-type: cloud_control
       methods:
@@ -1292,8 +1292,7 @@ components:
       id: awscc.route53.cidr_collections_list_only
       x-cfn-schema-name: CidrCollection
       x-cfn-type-name: AWS::Route53::CidrCollection
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1323,7 +1322,7 @@ components:
       id: awscc.route53.dnssecs
       x-cfn-schema-name: DNSSEC
       x-cfn-type-name: AWS::Route53::DNSSEC
-      x-identifiers:
+      x-identifiers: &ref_1
         - HostedZoneId
       x-type: cloud_control
       methods:
@@ -1392,8 +1391,7 @@ components:
       id: awscc.route53.dnssecs_list_only
       x-cfn-schema-name: DNSSEC
       x-cfn-type-name: AWS::Route53::DNSSEC
-      x-identifiers:
-        - HostedZoneId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1423,7 +1421,7 @@ components:
       id: awscc.route53.health_checks
       x-cfn-schema-name: HealthCheck
       x-cfn-type-name: AWS::Route53::HealthCheck
-      x-identifiers:
+      x-identifiers: &ref_2
         - HealthCheckId
       x-type: cloud_control
       methods:
@@ -1513,8 +1511,7 @@ components:
       id: awscc.route53.health_checks_list_only
       x-cfn-schema-name: HealthCheck
       x-cfn-type-name: AWS::Route53::HealthCheck
-      x-identifiers:
-        - HealthCheckId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1544,7 +1541,7 @@ components:
       id: awscc.route53.hosted_zones
       x-cfn-schema-name: HostedZone
       x-cfn-type-name: AWS::Route53::HostedZone
-      x-identifiers:
+      x-identifiers: &ref_3
         - Id
       x-type: cloud_control
       methods:
@@ -1642,8 +1639,7 @@ components:
       id: awscc.route53.hosted_zones_list_only
       x-cfn-schema-name: HostedZone
       x-cfn-type-name: AWS::Route53::HostedZone
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1673,7 +1669,7 @@ components:
       id: awscc.route53.key_signing_keys
       x-cfn-schema-name: KeySigningKey
       x-cfn-type-name: AWS::Route53::KeySigningKey
-      x-identifiers:
+      x-identifiers: &ref_4
         - HostedZoneId
         - Name
       x-type: cloud_control
@@ -1766,9 +1762,7 @@ components:
       id: awscc.route53.key_signing_keys_list_only
       x-cfn-schema-name: KeySigningKey
       x-cfn-type-name: AWS::Route53::KeySigningKey
-      x-identifiers:
-        - HostedZoneId
-        - Name
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/route53profiles.yaml b/openapi/src/awscc/v00.00.00000/services/route53profiles.yaml
index 8ab966087..cc6eb0152 100644
--- a/openapi/src/awscc/v00.00.00000/services/route53profiles.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/route53profiles.yaml
@@ -755,7 +755,7 @@ components:
       id: awscc.route53profiles.profiles
       x-cfn-schema-name: Profile
       x-cfn-type-name: AWS::Route53Profiles::Profile
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
       x-type: cloud_control
       methods:
@@ -849,8 +849,7 @@ components:
       id: awscc.route53profiles.profiles_list_only
       x-cfn-schema-name: Profile
       x-cfn-type-name: AWS::Route53Profiles::Profile
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -880,7 +879,7 @@ components:
       id: awscc.route53profiles.profile_associations
       x-cfn-schema-name: ProfileAssociation
       x-cfn-type-name: AWS::Route53Profiles::ProfileAssociation
-      x-identifiers:
+      x-identifiers: &ref_1
         - Id
       x-type: cloud_control
       methods:
@@ -976,8 +975,7 @@ components:
       id: awscc.route53profiles.profile_associations_list_only
       x-cfn-schema-name: ProfileAssociation
       x-cfn-type-name: AWS::Route53Profiles::ProfileAssociation
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1007,7 +1005,7 @@ components:
       id: awscc.route53profiles.profile_resource_associations
       x-cfn-schema-name: ProfileResourceAssociation
       x-cfn-type-name: AWS::Route53Profiles::ProfileResourceAssociation
-      x-identifiers:
+      x-identifiers: &ref_2
         - Id
       x-type: cloud_control
       methods:
@@ -1103,8 +1101,7 @@ components:
       id: awscc.route53profiles.profile_resource_associations_list_only
       x-cfn-schema-name: ProfileResourceAssociation
       x-cfn-type-name: AWS::Route53Profiles::ProfileResourceAssociation
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/route53recoverycontrol.yaml b/openapi/src/awscc/v00.00.00000/services/route53recoverycontrol.yaml
index e1148e331..990ba8b16 100644
--- a/openapi/src/awscc/v00.00.00000/services/route53recoverycontrol.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/route53recoverycontrol.yaml
@@ -1000,7 +1000,7 @@ components:
       id: awscc.route53recoverycontrol.clusters
       x-cfn-schema-name: Cluster
       x-cfn-type-name: AWS::Route53RecoveryControl::Cluster
-      x-identifiers:
+      x-identifiers: &ref_0
         - ClusterArn
       x-type: cloud_control
       methods:
@@ -1096,8 +1096,7 @@ components:
       id: awscc.route53recoverycontrol.clusters_list_only
       x-cfn-schema-name: Cluster
       x-cfn-type-name: AWS::Route53RecoveryControl::Cluster
-      x-identifiers:
-        - ClusterArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1127,7 +1126,7 @@ components:
       id: awscc.route53recoverycontrol.control_panels
       x-cfn-schema-name: ControlPanel
       x-cfn-type-name: AWS::Route53RecoveryControl::ControlPanel
-      x-identifiers:
+      x-identifiers: &ref_1
         - ControlPanelArn
       x-type: cloud_control
       methods:
@@ -1225,8 +1224,7 @@ components:
       id: awscc.route53recoverycontrol.control_panels_list_only
       x-cfn-schema-name: ControlPanel
       x-cfn-type-name: AWS::Route53RecoveryControl::ControlPanel
-      x-identifiers:
-        - ControlPanelArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1256,7 +1254,7 @@ components:
       id: awscc.route53recoverycontrol.routing_controls
       x-cfn-schema-name: RoutingControl
       x-cfn-type-name: AWS::Route53RecoveryControl::RoutingControl
-      x-identifiers:
+      x-identifiers: &ref_2
         - RoutingControlArn
       x-type: cloud_control
       methods:
@@ -1350,8 +1348,7 @@ components:
       id: awscc.route53recoverycontrol.routing_controls_list_only
       x-cfn-schema-name: RoutingControl
       x-cfn-type-name: AWS::Route53RecoveryControl::RoutingControl
-      x-identifiers:
-        - RoutingControlArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1381,7 +1378,7 @@ components:
       id: awscc.route53recoverycontrol.safety_rules
       x-cfn-schema-name: SafetyRule
       x-cfn-type-name: AWS::Route53RecoveryControl::SafetyRule
-      x-identifiers:
+      x-identifiers: &ref_3
         - SafetyRuleArn
       x-type: cloud_control
       methods:
@@ -1481,8 +1478,7 @@ components:
       id: awscc.route53recoverycontrol.safety_rules_list_only
       x-cfn-schema-name: SafetyRule
       x-cfn-type-name: AWS::Route53RecoveryControl::SafetyRule
-      x-identifiers:
-        - SafetyRuleArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/route53recoveryreadiness.yaml b/openapi/src/awscc/v00.00.00000/services/route53recoveryreadiness.yaml
index d0e551291..e552373af 100644
--- a/openapi/src/awscc/v00.00.00000/services/route53recoveryreadiness.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/route53recoveryreadiness.yaml
@@ -955,7 +955,7 @@ components:
       id: awscc.route53recoveryreadiness.cells
       x-cfn-schema-name: Cell
       x-cfn-type-name: AWS::Route53RecoveryReadiness::Cell
-      x-identifiers:
+      x-identifiers: &ref_0
         - CellName
       x-type: cloud_control
       methods:
@@ -1049,8 +1049,7 @@ components:
       id: awscc.route53recoveryreadiness.cells_list_only
       x-cfn-schema-name: Cell
       x-cfn-type-name: AWS::Route53RecoveryReadiness::Cell
-      x-identifiers:
-        - CellName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1080,7 +1079,7 @@ components:
       id: awscc.route53recoveryreadiness.readiness_checks
       x-cfn-schema-name: ReadinessCheck
       x-cfn-type-name: AWS::Route53RecoveryReadiness::ReadinessCheck
-      x-identifiers:
+      x-identifiers: &ref_1
         - ReadinessCheckName
       x-type: cloud_control
       methods:
@@ -1172,8 +1171,7 @@ components:
       id: awscc.route53recoveryreadiness.readiness_checks_list_only
       x-cfn-schema-name: ReadinessCheck
       x-cfn-type-name: AWS::Route53RecoveryReadiness::ReadinessCheck
-      x-identifiers:
-        - ReadinessCheckName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1203,7 +1201,7 @@ components:
       id: awscc.route53recoveryreadiness.recovery_groups
       x-cfn-schema-name: RecoveryGroup
       x-cfn-type-name: AWS::Route53RecoveryReadiness::RecoveryGroup
-      x-identifiers:
+      x-identifiers: &ref_2
         - RecoveryGroupName
       x-type: cloud_control
       methods:
@@ -1295,8 +1293,7 @@ components:
       id: awscc.route53recoveryreadiness.recovery_groups_list_only
       x-cfn-schema-name: RecoveryGroup
       x-cfn-type-name: AWS::Route53RecoveryReadiness::RecoveryGroup
-      x-identifiers:
-        - RecoveryGroupName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1326,7 +1323,7 @@ components:
       id: awscc.route53recoveryreadiness.resource_sets
       x-cfn-schema-name: ResourceSet
       x-cfn-type-name: AWS::Route53RecoveryReadiness::ResourceSet
-      x-identifiers:
+      x-identifiers: &ref_3
         - ResourceSetName
       x-type: cloud_control
       methods:
@@ -1420,8 +1417,7 @@ components:
       id: awscc.route53recoveryreadiness.resource_sets_list_only
       x-cfn-schema-name: ResourceSet
       x-cfn-type-name: AWS::Route53RecoveryReadiness::ResourceSet
-      x-identifiers:
-        - ResourceSetName
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/route53resolver.yaml b/openapi/src/awscc/v00.00.00000/services/route53resolver.yaml
index 26e0ce09f..47579efb7 100644
--- a/openapi/src/awscc/v00.00.00000/services/route53resolver.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/route53resolver.yaml
@@ -400,22 +400,23 @@ components:
         minLength: 1
         maxLength: 255
     Tag:
+      description: A key-value pair to associate with a resource.
       type: object
-      additionalProperties: false
       properties:
         Key:
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
           type: string
-          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
           minLength: 1
-          maxLength: 128
+          maxLength: 127
         Value:
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
           type: string
-          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
           minLength: 0
-          maxLength: 256
+          maxLength: 255
       required:
-        - Value
         - Key
+        - Value
+      additionalProperties: false
     FirewallDomainList:
       type: object
       properties:
@@ -883,6 +884,24 @@ components:
           - route53resolver:TagResource
           - route53resolver:UntagResource
           - route53resolver:ListTagsForResource
+    OutpostResolver_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     OutpostResolver:
       type: object
       properties:
@@ -951,7 +970,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/OutpostResolver_Tag'
       required:
         - OutpostArn
         - PreferredInstanceType
@@ -1146,6 +1165,19 @@ components:
           description: The ID of the subnet that contains the IP address.
       required:
         - SubnetId
+    ResolverEndpoint_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: The name for the tag. For example, if you want to associate Resolver resources with the account IDs of your customers for billing purposes, the value of Key might be account-id.
+        Value:
+          type: string
+          description: The value for the tag. For example, if Key is account-id, then Value might be the ID of the customer account that you're creating the resource for.
+      required:
+        - Key
+        - Value
     ResolverEndpoint:
       type: object
       properties:
@@ -1211,7 +1243,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ResolverEndpoint_Tag'
       required:
         - Direction
         - IpAddresses
@@ -1286,6 +1318,24 @@ components:
           - ec2:DescribeNetworkInterfaces
         list:
           - route53resolver:ListResolverEndpoints
+    ResolverQueryLoggingConfig_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     ResolverQueryLoggingConfig:
       type: object
       properties:
@@ -1349,7 +1399,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ResolverQueryLoggingConfig_Tag'
       x-stackql-resource-name: resolver_query_logging_config
       description: Resource schema for AWS::Route53Resolver::ResolverQueryLoggingConfig.
       x-type-name: AWS::Route53Resolver::ResolverQueryLoggingConfig
@@ -1515,6 +1565,23 @@ components:
           description: The SNI of the target name servers for DoH/DoH-FIPS outbound endpoints
           minLength: 0
           maxLength: 255
+    ResolverRule_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Value
+        - Key
     ResolverRule:
       type: object
       properties:
@@ -1552,7 +1619,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ResolverRule_Tag'
         TargetIps:
           type: array
           description: An array that contains the IP addresses and ports that an outbound endpoint forwards DNS queries to. Typically, these are the IP addresses of DNS resolvers on your network. Specify IPv4 addresses. IPv6 is not supported.
@@ -2000,7 +2067,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/OutpostResolver_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateOutpostResolverRequest
       type: object
@@ -2165,7 +2232,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ResolverEndpoint_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateResolverEndpointRequest
       type: object
@@ -2243,7 +2310,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ResolverQueryLoggingConfig_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateResolverQueryLoggingConfigRequest
       type: object
@@ -2352,7 +2419,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ResolverRule_Tag'
             TargetIps:
               type: array
               description: An array that contains the IP addresses and ports that an outbound endpoint forwards DNS queries to. Typically, these are the IP addresses of DNS resolvers on your network. Specify IPv4 addresses. IPv6 is not supported.
@@ -2412,7 +2479,7 @@ components:
       id: awscc.route53resolver.firewall_domain_lists
       x-cfn-schema-name: FirewallDomainList
       x-cfn-type-name: AWS::Route53Resolver::FirewallDomainList
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
       x-type: cloud_control
       methods:
@@ -2522,8 +2589,7 @@ components:
       id: awscc.route53resolver.firewall_domain_lists_list_only
       x-cfn-schema-name: FirewallDomainList
       x-cfn-type-name: AWS::Route53Resolver::FirewallDomainList
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2553,7 +2619,7 @@ components:
       id: awscc.route53resolver.firewall_rule_groups
       x-cfn-schema-name: FirewallRuleGroup
       x-cfn-type-name: AWS::Route53Resolver::FirewallRuleGroup
-      x-identifiers:
+      x-identifiers: &ref_1
         - Id
       x-type: cloud_control
       methods:
@@ -2663,8 +2729,7 @@ components:
       id: awscc.route53resolver.firewall_rule_groups_list_only
       x-cfn-schema-name: FirewallRuleGroup
       x-cfn-type-name: AWS::Route53Resolver::FirewallRuleGroup
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2694,7 +2759,7 @@ components:
       id: awscc.route53resolver.firewall_rule_group_associations
       x-cfn-schema-name: FirewallRuleGroupAssociation
       x-cfn-type-name: AWS::Route53Resolver::FirewallRuleGroupAssociation
-      x-identifiers:
+      x-identifiers: &ref_2
         - Id
       x-type: cloud_control
       methods:
@@ -2806,8 +2871,7 @@ components:
       id: awscc.route53resolver.firewall_rule_group_associations_list_only
       x-cfn-schema-name: FirewallRuleGroupAssociation
       x-cfn-type-name: AWS::Route53Resolver::FirewallRuleGroupAssociation
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2837,7 +2901,7 @@ components:
       id: awscc.route53resolver.outpost_resolvers
       x-cfn-schema-name: OutpostResolver
       x-cfn-type-name: AWS::Route53Resolver::OutpostResolver
-      x-identifiers:
+      x-identifiers: &ref_3
         - Id
       x-type: cloud_control
       methods:
@@ -2945,8 +3009,7 @@ components:
       id: awscc.route53resolver.outpost_resolvers_list_only
       x-cfn-schema-name: OutpostResolver
       x-cfn-type-name: AWS::Route53Resolver::OutpostResolver
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2976,7 +3039,7 @@ components:
       id: awscc.route53resolver.resolver_configs
       x-cfn-schema-name: ResolverConfig
       x-cfn-type-name: AWS::Route53Resolver::ResolverConfig
-      x-identifiers:
+      x-identifiers: &ref_4
         - ResourceId
       x-type: cloud_control
       methods:
@@ -3053,8 +3116,7 @@ components:
       id: awscc.route53resolver.resolver_configs_list_only
       x-cfn-schema-name: ResolverConfig
       x-cfn-type-name: AWS::Route53Resolver::ResolverConfig
-      x-identifiers:
-        - ResourceId
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3084,7 +3146,7 @@ components:
       id: awscc.route53resolver.resolverdnssec_configs
       x-cfn-schema-name: ResolverDNSSECConfig
       x-cfn-type-name: AWS::Route53Resolver::ResolverDNSSECConfig
-      x-identifiers:
+      x-identifiers: &ref_5
         - Id
       x-type: cloud_control
       methods:
@@ -3159,8 +3221,7 @@ components:
       id: awscc.route53resolver.resolverdnssec_configs_list_only
       x-cfn-schema-name: ResolverDNSSECConfig
       x-cfn-type-name: AWS::Route53Resolver::ResolverDNSSECConfig
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3190,7 +3251,7 @@ components:
       id: awscc.route53resolver.resolver_endpoints
       x-cfn-schema-name: ResolverEndpoint
       x-cfn-type-name: AWS::Route53Resolver::ResolverEndpoint
-      x-identifiers:
+      x-identifiers: &ref_6
         - ResolverEndpointId
       x-type: cloud_control
       methods:
@@ -3300,8 +3361,7 @@ components:
       id: awscc.route53resolver.resolver_endpoints_list_only
       x-cfn-schema-name: ResolverEndpoint
       x-cfn-type-name: AWS::Route53Resolver::ResolverEndpoint
-      x-identifiers:
-        - ResolverEndpointId
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3331,7 +3391,7 @@ components:
       id: awscc.route53resolver.resolver_query_logging_configs
       x-cfn-schema-name: ResolverQueryLoggingConfig
       x-cfn-type-name: AWS::Route53Resolver::ResolverQueryLoggingConfig
-      x-identifiers:
+      x-identifiers: &ref_7
         - Id
       x-type: cloud_control
       methods:
@@ -3420,8 +3480,7 @@ components:
       id: awscc.route53resolver.resolver_query_logging_configs_list_only
       x-cfn-schema-name: ResolverQueryLoggingConfig
       x-cfn-type-name: AWS::Route53Resolver::ResolverQueryLoggingConfig
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3451,7 +3510,7 @@ components:
       id: awscc.route53resolver.resolver_query_logging_config_associations
       x-cfn-schema-name: ResolverQueryLoggingConfigAssociation
       x-cfn-type-name: AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation
-      x-identifiers:
+      x-identifiers: &ref_8
         - Id
       x-type: cloud_control
       methods:
@@ -3532,8 +3591,7 @@ components:
       id: awscc.route53resolver.resolver_query_logging_config_associations_list_only
       x-cfn-schema-name: ResolverQueryLoggingConfigAssociation
       x-cfn-type-name: AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3563,7 +3621,7 @@ components:
       id: awscc.route53resolver.resolver_rules
       x-cfn-schema-name: ResolverRule
       x-cfn-type-name: AWS::Route53Resolver::ResolverRule
-      x-identifiers:
+      x-identifiers: &ref_9
         - ResolverRuleId
       x-type: cloud_control
       methods:
@@ -3665,8 +3723,7 @@ components:
       id: awscc.route53resolver.resolver_rules_list_only
       x-cfn-schema-name: ResolverRule
       x-cfn-type-name: AWS::Route53Resolver::ResolverRule
-      x-identifiers:
-        - ResolverRuleId
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3696,7 +3753,7 @@ components:
       id: awscc.route53resolver.resolver_rule_associations
       x-cfn-schema-name: ResolverRuleAssociation
       x-cfn-type-name: AWS::Route53Resolver::ResolverRuleAssociation
-      x-identifiers:
+      x-identifiers: &ref_10
         - ResolverRuleAssociationId
       x-type: cloud_control
       methods:
@@ -3771,8 +3828,7 @@ components:
       id: awscc.route53resolver.resolver_rule_associations_list_only
       x-cfn-schema-name: ResolverRuleAssociation
       x-cfn-type-name: AWS::Route53Resolver::ResolverRuleAssociation
-      x-identifiers:
-        - ResolverRuleAssociationId
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/rum.yaml b/openapi/src/awscc/v00.00.00000/services/rum.yaml
index 0aefc687a..caaf9182e 100644
--- a/openapi/src/awscc/v00.00.00000/services/rum.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/rum.yaml
@@ -929,7 +929,7 @@ components:
       id: awscc.rum.app_monitors
       x-cfn-schema-name: AppMonitor
       x-cfn-type-name: AWS::RUM::AppMonitor
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -1033,8 +1033,7 @@ components:
       id: awscc.rum.app_monitors_list_only
       x-cfn-schema-name: AppMonitor
       x-cfn-type-name: AWS::RUM::AppMonitor
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/s3.yaml b/openapi/src/awscc/v00.00.00000/services/s3.yaml
index 8aa8a57f4..3c57a9414 100644
--- a/openapi/src/awscc/v00.00.00000/services/s3.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/s3.yaml
@@ -425,15 +425,11 @@ components:
       properties:
         Key:
           type: string
-          minLength: 1
-          maxLength: 128
         Value:
           type: string
-          minLength: 0
-          maxLength: 256
       required:
-        - Key
         - Value
+        - Key
     AccessGrant:
       type: object
       properties:
@@ -671,31 +667,44 @@ components:
           minLength: 1
           maxLength: 1024
     PublicAccessBlockConfiguration:
-      additionalProperties: false
       type: object
       properties:
-        RestrictPublicBuckets:
-          description: |-
-            Specifies whether Amazon S3 should restrict public bucket policies for this bucket. Setting this element to TRUE restricts access to this bucket to only AWS services and authorized users within this account if the bucket has a public policy.
-            Enabling this setting doesn't affect previously stored bucket policies, except that public and cross-account access within any public bucket policy, including non-public delegation to specific accounts, is blocked.
-          type: boolean
-        BlockPublicPolicy:
-          description: Specifies whether Amazon S3 should block public bucket policies for buckets in this account. Setting this element to TRUE causes Amazon S3 to reject calls to PUT Bucket policy if the specified bucket policy allows public access. Enabling this setting doesn't affect existing bucket policies.
-          type: boolean
         BlockPublicAcls:
+          type: boolean
           description: |-
             Specifies whether Amazon S3 should block public access control lists (ACLs) for buckets in this account. Setting this element to TRUE causes the following behavior:
             - PUT Bucket acl and PUT Object acl calls fail if the specified ACL is public.
              - PUT Object calls fail if the request includes a public ACL.
             . - PUT Bucket calls fail if the request includes a public ACL.
             Enabling this setting doesn't affect existing policies or ACLs.
-          type: boolean
         IgnorePublicAcls:
+          type: boolean
           description: Specifies whether Amazon S3 should ignore public ACLs for buckets in this account. Setting this element to TRUE causes Amazon S3 to ignore all public ACLs on buckets in this account and any objects that they contain. Enabling this setting doesn't affect the persistence of any existing ACLs and doesn't prevent new public ACLs from being set.
+        BlockPublicPolicy:
+          type: boolean
+          description: Specifies whether Amazon S3 should block public bucket policies for buckets in this account. Setting this element to TRUE causes Amazon S3 to reject calls to PUT Bucket policy if the specified bucket policy allows public access. Enabling this setting doesn't affect existing bucket policies.
+        RestrictPublicBuckets:
           type: boolean
+          description: |-
+            Specifies whether Amazon S3 should restrict public bucket policies for this bucket. Setting this element to TRUE restricts access to this bucket to only AWS services and authorized users within this account if the bucket has a public policy.
+            Enabling this setting doesn't affect previously stored bucket policies, except that public and cross-account access within any public bucket policy, including non-public delegation to specific accounts, is blocked.
     Arn:
-      description: The Amazon Resource Name (ARN) of the specified resource.
+      description: the Amazon Resource Name (ARN) of the specified accesspoint.
       type: string
+    AccessPoint_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          maxLength: 256
+      required:
+        - Value
+        - Key
     AccessPoint:
       type: object
       properties:
@@ -745,7 +754,7 @@ components:
           description: An arbitrary set of tags (key-value pairs) for this S3 Access Point.
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/AccessPoint_Tag'
           type: array
       required:
         - Bucket
@@ -889,14 +898,20 @@ components:
           $ref: '#/components/schemas/DataExport'
           description: Specifies how data related to the storage class analysis for an Amazon S3 bucket should be exported.
     DataExport:
-      description: Specifies how Amazon S3 Storage Lens metrics should be exported.
-      additionalProperties: false
+      description: Specifies how data related to the storage class analysis for an Amazon S3 bucket should be exported.
       type: object
+      additionalProperties: false
       properties:
-        S3BucketDestination:
-          $ref: '#/components/schemas/S3BucketDestination'
-        CloudWatchMetrics:
-          $ref: '#/components/schemas/CloudWatchMetrics'
+        Destination:
+          $ref: '#/components/schemas/Destination'
+          description: The place to store the data for an analysis.
+        OutputSchemaVersion:
+          description: The version of the output schema to use when exporting data. Must be ``V_1``.
+          type: string
+          x-const: V_1
+      required:
+        - Destination
+        - OutputSchemaVersion
     BucketEncryption:
       description: Specifies default encryption for a bucket using server-side encryption with Amazon S3-managed keys (SSE-S3), AWS KMS-managed keys (SSE-KMS), or dual-layer server-side encryption with KMS-managed keys (DSSE-KMS). For information about the Amazon S3 default encryption feature, see [Amazon S3 Default Encryption for S3 Buckets](https://docs.aws.amazon.com/AmazonS3/latest/dev/bucket-encryption.html) in the *Amazon S3 User Guide*.
       type: object
@@ -1624,6 +1639,35 @@ components:
       description: |-
         Specifies an Object Ownership rule.
          S3 Object Ownership is an Amazon S3 bucket-level setting that you can use to disable access control lists (ACLs) and take ownership of every object in your bucket, simplifying access management for data stored in Amazon S3. For more information, see [Controlling ownership of objects and disabling ACLs](https://docs.aws.amazon.com/AmazonS3/latest/userguide/about-object-ownership.html) in the *Amazon S3 User Guide*.
+    Bucket_PublicAccessBlockConfiguration:
+      description: The PublicAccessBlock configuration that you want to apply to this Amazon S3 bucket. You can enable the configuration options in any combination. For more information about when Amazon S3 considers a bucket or object public, see [The Meaning of "Public"](https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html#access-control-block-public-access-policy-status) in the *Amazon S3 User Guide*.
+      type: object
+      additionalProperties: false
+      properties:
+        BlockPublicAcls:
+          type: boolean
+          description: |-
+            Specifies whether Amazon S3 should block public access control lists (ACLs) for this bucket and objects in this bucket. Setting this element to ``TRUE`` causes the following behavior:
+              +  PUT Bucket ACL and PUT Object ACL calls fail if the specified ACL is public.
+              +  PUT Object calls fail if the request includes a public ACL.
+              +  PUT Bucket calls fail if the request includes a public ACL.
+              
+             Enabling this setting doesn't affect existing policies or ACLs.
+        BlockPublicPolicy:
+          type: boolean
+          description: |-
+            Specifies whether Amazon S3 should block public bucket policies for this bucket. Setting this element to ``TRUE`` causes Amazon S3 to reject calls to PUT Bucket policy if the specified bucket policy allows public access. 
+             Enabling this setting doesn't affect existing bucket policies.
+        IgnorePublicAcls:
+          type: boolean
+          description: |-
+            Specifies whether Amazon S3 should ignore public ACLs for this bucket and objects in this bucket. Setting this element to ``TRUE`` causes Amazon S3 to ignore all public ACLs on this bucket and objects in this bucket.
+             Enabling this setting doesn't affect the persistence of any existing ACLs and doesn't prevent new public ACLs from being set.
+        RestrictPublicBuckets:
+          type: boolean
+          description: |-
+            Specifies whether Amazon S3 should restrict public bucket policies for this bucket. Setting this element to ``TRUE`` restricts access to this bucket to only AWS-service principals and authorized users within this account if the bucket has a public policy.
+             Enabling this setting doesn't affect previously stored bucket policies, except that public and cross-account access within any public bucket policy, including non-public delegation to specific accounts, is blocked.
     ReplicationConfiguration:
       type: object
       description: A container for replication rules. You can add up to 1,000 rules. The maximum size of a replication configuration is 2 MB. The latest version of the replication configuration XML is V2. For more information about XML V2 replication configurations, see [Replication configuration](https://docs.aws.amazon.com/AmazonS3/latest/userguide/replication-add-config.html) in the *Amazon S3 User Guide*.
@@ -1894,6 +1938,23 @@ components:
             - Enabled
       required:
         - Status
+    Bucket_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+          description: Name of the object key.
+        Value:
+          type: string
+          maxLength: 256
+          description: Value of the tag.
+      required:
+        - Value
+        - Key
+      description: A container of a key value name pair.
     VersioningConfiguration:
       description: |-
         Describes the versioning state of an Amazon S3 bucket. For more information, see [PUT Bucket versioning](https://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketPUTVersioningStatus.html) in the *Amazon S3 API Reference*.
@@ -2003,6 +2064,9 @@ components:
             - https
       required:
         - HostName
+    Bucket_Arn:
+      description: the Amazon Resource Name (ARN) of the specified bucket.
+      type: string
     MetadataTableConfiguration:
       type: object
       additionalProperties: false
@@ -2232,7 +2296,7 @@ components:
           description: Configuration that defines how Amazon S3 handles Object Ownership rules.
           $ref: '#/components/schemas/OwnershipControls'
         PublicAccessBlockConfiguration:
-          $ref: '#/components/schemas/PublicAccessBlockConfiguration'
+          $ref: '#/components/schemas/Bucket_PublicAccessBlockConfiguration'
           description: Configuration that defines how Amazon S3 handles public access.
         ReplicationConfiguration:
           $ref: '#/components/schemas/ReplicationConfiguration'
@@ -2243,7 +2307,7 @@ components:
           description: An arbitrary set of tags (key-value pairs) for this S3 bucket.
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Bucket_Tag'
           type: array
         VersioningConfiguration:
           $ref: '#/components/schemas/VersioningConfiguration'
@@ -2254,7 +2318,7 @@ components:
           $ref: '#/components/schemas/WebsiteConfiguration'
           description: Information used to configure the bucket as a static website. For more information, see [Hosting Websites on Amazon S3](https://docs.aws.amazon.com/AmazonS3/latest/dev/WebsiteHosting.html).
         Arn:
-          $ref: '#/components/schemas/Arn'
+          $ref: '#/components/schemas/Bucket_Arn'
           description: ''
           x-examples:
             - arn:aws:s3:::mybucket
@@ -2485,6 +2549,29 @@ components:
         list:
           - s3:GetBucketPolicy
           - s3:ListAllMyBuckets
+    MultiRegionAccessPoint_PublicAccessBlockConfiguration:
+      additionalProperties: false
+      type: object
+      properties:
+        RestrictPublicBuckets:
+          description: |-
+            Specifies whether Amazon S3 should restrict public bucket policies for this bucket. Setting this element to TRUE restricts access to this bucket to only AWS services and authorized users within this account if the bucket has a public policy.
+            Enabling this setting doesn't affect previously stored bucket policies, except that public and cross-account access within any public bucket policy, including non-public delegation to specific accounts, is blocked.
+          type: boolean
+        BlockPublicPolicy:
+          description: Specifies whether Amazon S3 should block public bucket policies for buckets in this account. Setting this element to TRUE causes Amazon S3 to reject calls to PUT Bucket policy if the specified bucket policy allows public access. Enabling this setting doesn't affect existing bucket policies.
+          type: boolean
+        BlockPublicAcls:
+          description: |-
+            Specifies whether Amazon S3 should block public access control lists (ACLs) for buckets in this account. Setting this element to TRUE causes the following behavior:
+            - PUT Bucket acl and PUT Object acl calls fail if the specified ACL is public.
+             - PUT Object calls fail if the request includes a public ACL.
+            . - PUT Bucket calls fail if the request includes a public ACL.
+            Enabling this setting doesn't affect existing policies or ACLs.
+          type: boolean
+        IgnorePublicAcls:
+          description: Specifies whether Amazon S3 should ignore public ACLs for buckets in this account. Setting this element to TRUE causes Amazon S3 to ignore all public ACLs on buckets in this account and any objects that they contain. Enabling this setting doesn't affect the persistence of any existing ACLs and doesn't prevent new public ACLs from being set.
+          type: boolean
     Region:
       additionalProperties: false
       type: object
@@ -2506,7 +2593,7 @@ components:
       properties:
         PublicAccessBlockConfiguration:
           description: The PublicAccessBlock configuration that you want to apply to this Multi Region Access Point. You can enable the configuration options in any combination. For more information about when Amazon S3 considers a bucket or object public, see https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html#access-control-block-public-access-policy-status 'The Meaning of Public' in the Amazon Simple Storage Service Developer Guide.
-          $ref: '#/components/schemas/PublicAccessBlockConfiguration'
+          $ref: '#/components/schemas/MultiRegionAccessPoint_PublicAccessBlockConfiguration'
         Alias:
           description: The alias is a unique identifier to, and is part of the public DNS name for this Multi Region Access Point
           type: string
@@ -2646,7 +2733,7 @@ components:
           description: The ARN for the Amazon S3 Storage Lens configuration.
           type: string
         DataExport:
-          $ref: '#/components/schemas/DataExport'
+          $ref: '#/components/schemas/StorageLens_DataExport'
       required:
         - Id
         - AccountLevel
@@ -2669,7 +2756,7 @@ components:
       type: object
       properties:
         Arn:
-          $ref: '#/components/schemas/Arn'
+          $ref: '#/components/schemas/StorageLens_Arn'
       required:
         - Arn
     Encryption:
@@ -2840,7 +2927,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Arn'
+            $ref: '#/components/schemas/StorageLens_Arn'
     Id:
       minLength: 1
       pattern: ^[a-zA-Z0-9\-_.]+$
@@ -2862,6 +2949,35 @@ components:
           $ref: '#/components/schemas/AdvancedCostOptimizationMetrics'
         DetailedStatusCodesMetrics:
           $ref: '#/components/schemas/DetailedStatusCodesMetrics'
+    StorageLens_Tag:
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          minLength: 1
+          pattern: ^(?!aws:.*)[a-zA-Z0-9\s\_\.\/\=\+\-\@\:]+$
+          type: string
+          maxLength: 255
+        Key:
+          minLength: 1
+          pattern: ^(?!aws:.*)[a-zA-Z0-9\s\_\.\/\=\+\-\@\:]+$
+          type: string
+          maxLength: 127
+      required:
+        - Key
+        - Value
+    StorageLens_Arn:
+      description: The Amazon Resource Name (ARN) of the specified resource.
+      type: string
+    StorageLens_DataExport:
+      description: Specifies how Amazon S3 Storage Lens metrics should be exported.
+      additionalProperties: false
+      type: object
+      properties:
+        S3BucketDestination:
+          $ref: '#/components/schemas/S3BucketDestination'
+        CloudWatchMetrics:
+          $ref: '#/components/schemas/CloudWatchMetrics'
     AdvancedCostOptimizationMetrics:
       description: Enables advanced cost optimization metrics.
       additionalProperties: false
@@ -2882,7 +2998,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/StorageLens_Tag'
       required:
         - StorageLensConfiguration
       x-stackql-resource-name: storage_lens
@@ -2963,7 +3079,7 @@ components:
       x-insertionOrder: false
       uniqueItems: true
       items:
-        $ref: '#/components/schemas/Tag'
+        $ref: '#/components/schemas/StorageLensGroup_Tag'
     MatchObjectAge:
       description: Filter to match all of the specified values for the minimum and maximum object age.
       type: object
@@ -3045,6 +3161,21 @@ components:
         Or:
           $ref: '#/components/schemas/Or'
       additionalProperties: false
+    StorageLensGroup_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
     StorageLensGroup:
       type: object
       properties:
@@ -3061,7 +3192,7 @@ components:
           x-insertionOrder: true
           uniqueItems: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/StorageLensGroup_Tag'
       required:
         - Name
         - Filter
@@ -3304,7 +3435,7 @@ components:
               description: An arbitrary set of tags (key-value pairs) for this S3 Access Point.
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/AccessPoint_Tag'
               type: array
           x-stackQL-stringOnly: true
       x-title: CreateAccessPointRequest
@@ -3412,7 +3543,7 @@ components:
               description: Configuration that defines how Amazon S3 handles Object Ownership rules.
               $ref: '#/components/schemas/OwnershipControls'
             PublicAccessBlockConfiguration:
-              $ref: '#/components/schemas/PublicAccessBlockConfiguration'
+              $ref: '#/components/schemas/Bucket_PublicAccessBlockConfiguration'
               description: Configuration that defines how Amazon S3 handles public access.
             ReplicationConfiguration:
               $ref: '#/components/schemas/ReplicationConfiguration'
@@ -3423,7 +3554,7 @@ components:
               description: An arbitrary set of tags (key-value pairs) for this S3 bucket.
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Bucket_Tag'
               type: array
             VersioningConfiguration:
               $ref: '#/components/schemas/VersioningConfiguration'
@@ -3434,7 +3565,7 @@ components:
               $ref: '#/components/schemas/WebsiteConfiguration'
               description: Information used to configure the bucket as a static website. For more information, see [Hosting Websites on Amazon S3](https://docs.aws.amazon.com/AmazonS3/latest/dev/WebsiteHosting.html).
             Arn:
-              $ref: '#/components/schemas/Arn'
+              $ref: '#/components/schemas/Bucket_Arn'
               description: ''
               x-examples:
                 - arn:aws:s3:::mybucket
@@ -3504,7 +3635,7 @@ components:
           properties:
             PublicAccessBlockConfiguration:
               description: The PublicAccessBlock configuration that you want to apply to this Multi Region Access Point. You can enable the configuration options in any combination. For more information about when Amazon S3 considers a bucket or object public, see https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html#access-control-block-public-access-policy-status 'The Meaning of Public' in the Amazon Simple Storage Service Developer Guide.
-              $ref: '#/components/schemas/PublicAccessBlockConfiguration'
+              $ref: '#/components/schemas/MultiRegionAccessPoint_PublicAccessBlockConfiguration'
             Alias:
               description: The alias is a unique identifier to, and is part of the public DNS name for this Multi Region Access Point
               type: string
@@ -3590,7 +3721,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/StorageLens_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateStorageLensRequest
       type: object
@@ -3621,7 +3752,7 @@ components:
               x-insertionOrder: true
               uniqueItems: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/StorageLensGroup_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateStorageLensGroupRequest
       type: object
@@ -3639,7 +3770,7 @@ components:
       id: awscc.s3.access_grants
       x-cfn-schema-name: AccessGrant
       x-cfn-type-name: AWS::S3::AccessGrant
-      x-identifiers:
+      x-identifiers: &ref_0
         - AccessGrantId
       x-type: cloud_control
       methods:
@@ -3743,8 +3874,7 @@ components:
       id: awscc.s3.access_grants_list_only
       x-cfn-schema-name: AccessGrant
       x-cfn-type-name: AWS::S3::AccessGrant
-      x-identifiers:
-        - AccessGrantId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3774,7 +3904,7 @@ components:
       id: awscc.s3.access_grants_instances
       x-cfn-schema-name: AccessGrantsInstance
       x-cfn-type-name: AWS::S3::AccessGrantsInstance
-      x-identifiers:
+      x-identifiers: &ref_1
         - AccessGrantsInstanceArn
       x-type: cloud_control
       methods:
@@ -3866,8 +3996,7 @@ components:
       id: awscc.s3.access_grants_instances_list_only
       x-cfn-schema-name: AccessGrantsInstance
       x-cfn-type-name: AWS::S3::AccessGrantsInstance
-      x-identifiers:
-        - AccessGrantsInstanceArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3897,7 +4026,7 @@ components:
       id: awscc.s3.access_grants_locations
       x-cfn-schema-name: AccessGrantsLocation
       x-cfn-type-name: AWS::S3::AccessGrantsLocation
-      x-identifiers:
+      x-identifiers: &ref_2
         - AccessGrantsLocationId
       x-type: cloud_control
       methods:
@@ -3991,8 +4120,7 @@ components:
       id: awscc.s3.access_grants_locations_list_only
       x-cfn-schema-name: AccessGrantsLocation
       x-cfn-type-name: AWS::S3::AccessGrantsLocation
-      x-identifiers:
-        - AccessGrantsLocationId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4022,7 +4150,7 @@ components:
       id: awscc.s3.access_points
       x-cfn-schema-name: AccessPoint
       x-cfn-type-name: AWS::S3::AccessPoint
-      x-identifiers:
+      x-identifiers: &ref_3
         - Name
       x-type: cloud_control
       methods:
@@ -4126,8 +4254,7 @@ components:
       id: awscc.s3.access_points_list_only
       x-cfn-schema-name: AccessPoint
       x-cfn-type-name: AWS::S3::AccessPoint
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4157,7 +4284,7 @@ components:
       id: awscc.s3.buckets
       x-cfn-schema-name: Bucket
       x-cfn-type-name: AWS::S3::Bucket
-      x-identifiers:
+      x-identifiers: &ref_4
         - BucketName
       x-type: cloud_control
       methods:
@@ -4295,8 +4422,7 @@ components:
       id: awscc.s3.buckets_list_only
       x-cfn-schema-name: Bucket
       x-cfn-type-name: AWS::S3::Bucket
-      x-identifiers:
-        - BucketName
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4326,7 +4452,7 @@ components:
       id: awscc.s3.bucket_policies
       x-cfn-schema-name: BucketPolicy
       x-cfn-type-name: AWS::S3::BucketPolicy
-      x-identifiers:
+      x-identifiers: &ref_5
         - Bucket
       x-type: cloud_control
       methods:
@@ -4414,8 +4540,7 @@ components:
       id: awscc.s3.bucket_policies_list_only
       x-cfn-schema-name: BucketPolicy
       x-cfn-type-name: AWS::S3::BucketPolicy
-      x-identifiers:
-        - Bucket
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4445,7 +4570,7 @@ components:
       id: awscc.s3.multi_region_access_points
       x-cfn-schema-name: MultiRegionAccessPoint
       x-cfn-type-name: AWS::S3::MultiRegionAccessPoint
-      x-identifiers:
+      x-identifiers: &ref_6
         - Name
       x-type: cloud_control
       methods:
@@ -4522,8 +4647,7 @@ components:
       id: awscc.s3.multi_region_access_points_list_only
       x-cfn-schema-name: MultiRegionAccessPoint
       x-cfn-type-name: AWS::S3::MultiRegionAccessPoint
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4643,7 +4767,7 @@ components:
       id: awscc.s3.storage_lens
       x-cfn-schema-name: StorageLens
       x-cfn-type-name: AWS::S3::StorageLens
-      x-identifiers:
+      x-identifiers: &ref_7
         - StorageLensConfiguration/Id
       x-type: cloud_control
       methods:
@@ -4731,8 +4855,7 @@ components:
       id: awscc.s3.storage_lens_list_only
       x-cfn-schema-name: StorageLens
       x-cfn-type-name: AWS::S3::StorageLens
-      x-identifiers:
-        - StorageLensConfiguration/Id
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4762,7 +4885,7 @@ components:
       id: awscc.s3.storage_lens_groups
       x-cfn-schema-name: StorageLensGroup
       x-cfn-type-name: AWS::S3::StorageLensGroup
-      x-identifiers:
+      x-identifiers: &ref_8
         - Name
       x-type: cloud_control
       methods:
@@ -4854,8 +4977,7 @@ components:
       id: awscc.s3.storage_lens_groups_list_only
       x-cfn-schema-name: StorageLensGroup
       x-cfn-type-name: AWS::S3::StorageLensGroup
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/s3express.yaml b/openapi/src/awscc/v00.00.00000/services/s3express.yaml
index 93bdb9bb5..8d528ce94 100644
--- a/openapi/src/awscc/v00.00.00000/services/s3express.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/s3express.yaml
@@ -422,7 +422,7 @@ components:
             Specifies whether Amazon S3 should restrict public bucket policies for this bucket. Setting this element to TRUE restricts access to this bucket to only AWS services and authorized users within this account if the bucket has a public policy.
             Enabling this setting doesn't affect previously stored bucket policies, except that public and cross-account access within any public bucket policy, including non-public delegation to specific accounts, is blocked.
     Arn:
-      description: The Amazon Resource Name (ARN) of the specified bucket.
+      description: the Amazon Resource Name (ARN) of the specified accesspoint.
       type: string
     Scope:
       type: object
@@ -613,6 +613,9 @@ components:
         list:
           - s3express:GetBucketPolicy
           - s3express:ListAllMyDirectoryBuckets
+    DirectoryBucket_Arn:
+      description: The Amazon Resource Name (ARN) of the specified bucket.
+      type: string
     BucketEncryption:
       description: Specifies default encryption for a bucket using server-side encryption with Amazon S3 managed keys (SSE-S3) or AWS KMS keys (SSE-KMS).
       type: object
@@ -735,7 +738,7 @@ components:
             - SingleAvailabilityZone
             - SingleLocalZone
         Arn:
-          $ref: '#/components/schemas/Arn'
+          $ref: '#/components/schemas/DirectoryBucket_Arn'
           description: Returns the Amazon Resource Name (ARN) of the specified bucket.
           x-examples:
             - arn:aws:s3express:us-west-2:123456789123:bucket/DOC-EXAMPLE-BUCKET--usw2-az1--x-s3
@@ -922,7 +925,7 @@ components:
                 - SingleAvailabilityZone
                 - SingleLocalZone
             Arn:
-              $ref: '#/components/schemas/Arn'
+              $ref: '#/components/schemas/DirectoryBucket_Arn'
               description: Returns the Amazon Resource Name (ARN) of the specified bucket.
               x-examples:
                 - arn:aws:s3express:us-west-2:123456789123:bucket/DOC-EXAMPLE-BUCKET--usw2-az1--x-s3
@@ -954,7 +957,7 @@ components:
       id: awscc.s3express.access_points
       x-cfn-schema-name: AccessPoint
       x-cfn-type-name: AWS::S3Express::AccessPoint
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -1058,8 +1061,7 @@ components:
       id: awscc.s3express.access_points_list_only
       x-cfn-schema-name: AccessPoint
       x-cfn-type-name: AWS::S3Express::AccessPoint
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1089,7 +1091,7 @@ components:
       id: awscc.s3express.bucket_policies
       x-cfn-schema-name: BucketPolicy
       x-cfn-type-name: AWS::S3Express::BucketPolicy
-      x-identifiers:
+      x-identifiers: &ref_1
         - Bucket
       x-type: cloud_control
       methods:
@@ -1177,8 +1179,7 @@ components:
       id: awscc.s3express.bucket_policies_list_only
       x-cfn-schema-name: BucketPolicy
       x-cfn-type-name: AWS::S3Express::BucketPolicy
-      x-identifiers:
-        - Bucket
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1208,7 +1209,7 @@ components:
       id: awscc.s3express.directory_buckets
       x-cfn-schema-name: DirectoryBucket
       x-cfn-type-name: AWS::S3Express::DirectoryBucket
-      x-identifiers:
+      x-identifiers: &ref_2
         - BucketName
       x-type: cloud_control
       methods:
@@ -1308,8 +1309,7 @@ components:
       id: awscc.s3express.directory_buckets_list_only
       x-cfn-schema-name: DirectoryBucket
       x-cfn-type-name: AWS::S3Express::DirectoryBucket
-      x-identifiers:
-        - BucketName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/s3objectlambda.yaml b/openapi/src/awscc/v00.00.00000/services/s3objectlambda.yaml
index 4e04f205c..036e77645 100644
--- a/openapi/src/awscc/v00.00.00000/services/s3objectlambda.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/s3objectlambda.yaml
@@ -682,7 +682,7 @@ components:
       id: awscc.s3objectlambda.access_points
       x-cfn-schema-name: AccessPoint
       x-cfn-type-name: AWS::S3ObjectLambda::AccessPoint
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -780,8 +780,7 @@ components:
       id: awscc.s3objectlambda.access_points_list_only
       x-cfn-schema-name: AccessPoint
       x-cfn-type-name: AWS::S3ObjectLambda::AccessPoint
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/s3outposts.yaml b/openapi/src/awscc/v00.00.00000/services/s3outposts.yaml
index 1a4669f56..61cc26f67 100644
--- a/openapi/src/awscc/v00.00.00000/services/s3outposts.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/s3outposts.yaml
@@ -1056,7 +1056,7 @@ components:
       id: awscc.s3outposts.access_points
       x-cfn-schema-name: AccessPoint
       x-cfn-type-name: AWS::S3Outposts::AccessPoint
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -1150,8 +1150,7 @@ components:
       id: awscc.s3outposts.access_points_list_only
       x-cfn-schema-name: AccessPoint
       x-cfn-type-name: AWS::S3Outposts::AccessPoint
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1181,7 +1180,7 @@ components:
       id: awscc.s3outposts.buckets
       x-cfn-schema-name: Bucket
       x-cfn-type-name: AWS::S3Outposts::Bucket
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -1275,8 +1274,7 @@ components:
       id: awscc.s3outposts.buckets_list_only
       x-cfn-schema-name: Bucket
       x-cfn-type-name: AWS::S3Outposts::Bucket
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1394,7 +1392,7 @@ components:
       id: awscc.s3outposts.endpoints
       x-cfn-schema-name: Endpoint
       x-cfn-type-name: AWS::S3Outposts::Endpoint
-      x-identifiers:
+      x-identifiers: &ref_2
         - Arn
       x-type: cloud_control
       methods:
@@ -1485,8 +1483,7 @@ components:
       id: awscc.s3outposts.endpoints_list_only
       x-cfn-schema-name: Endpoint
       x-cfn-type-name: AWS::S3Outposts::Endpoint
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/s3tables.yaml b/openapi/src/awscc/v00.00.00000/services/s3tables.yaml
index 3eaaea14d..c0142bdad 100644
--- a/openapi/src/awscc/v00.00.00000/services/s3tables.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/s3tables.yaml
@@ -395,9 +395,48 @@ components:
       type: string
       x-examples:
         - arn:aws:s3tables:us-west-2:123456789012:bucket/mytablebucket
-    Namespace:
-      description: The namespace that the table belongs to.
+    Namespace_Namespace:
+      description: A name for the namespace.
       type: string
+      minLength: 1
+      maxLength: 255
+    Namespace:
+      type: object
+      properties:
+        TableBucketARN:
+          $ref: '#/components/schemas/TableBucketARN'
+        Namespace:
+          $ref: '#/components/schemas/Namespace_Namespace'
+      required:
+        - Namespace
+        - TableBucketARN
+      x-stackql-resource-name: namespace
+      description: Resource Type definition for AWS::S3Tables::Namespace
+      x-type-name: AWS::S3Tables::Namespace
+      x-stackql-primary-identifier:
+        - TableBucketARN
+        - Namespace
+      x-create-only-properties:
+        - TableBucketARN
+        - Namespace
+      x-required-properties:
+        - Namespace
+        - TableBucketARN
+      x-tagging:
+        taggable: false
+        tagOnCreate: false
+        tagUpdatable: false
+        cloudFormationSystemTags: false
+      x-required-permissions:
+        create:
+          - s3tables:CreateNamespace
+        read:
+          - s3tables:GetNamespace
+        delete:
+          - s3tables:DeleteNamespace
+        list:
+          - s3tables:ListNamespaces
+          - s3tables:ListTableBuckets
     WithoutMetadata:
       description: Indicates that you don't want to specify a schema for the table. This property is mutually exclusive to 'IcebergMetadata', and its only possible value is 'Yes'.
       type: string
@@ -418,6 +457,9 @@ components:
           description: The target file size for the table in MB.
           type: integer
           minimum: 64
+    Table_Namespace:
+      description: The namespace that the table belongs to.
+      type: string
     SchemaField:
       description: Contains details about the schema for an Iceberg table
       additionalProperties: false
@@ -505,7 +547,7 @@ components:
         Compaction:
           $ref: '#/components/schemas/Compaction'
         Namespace:
-          $ref: '#/components/schemas/Namespace'
+          $ref: '#/components/schemas/Table_Namespace'
         TableName:
           $ref: '#/components/schemas/TableName'
         TableBucketARN:
@@ -667,15 +709,20 @@ components:
         list:
           - s3tables:ListTableBuckets
     ResourcePolicy:
-      description: A policy document containing permissions to add to the specified table. In IAM, you must provide policy documents in JSON format. However, in CloudFormation you can provide the policy in JSON or YAML format because CloudFormation converts YAML to JSON before submitting it to IAM.
+      description: A policy document containing permissions to add to the specified table bucket. In IAM, you must provide policy documents in JSON format. However, in CloudFormation you can provide the policy in JSON or YAML format because CloudFormation converts YAML to JSON before submitting it to IAM.
       type: object
+    TableBucketPolicy_TableBucketARN:
+      description: The Amazon Resource Name (ARN) of the table bucket to which the policy applies.
+      type: string
+      x-examples:
+        - arn:aws:s3tables:us-west-2:123456789012:bucket/mytablebucket
     TableBucketPolicy:
       type: object
       properties:
         ResourcePolicy:
           $ref: '#/components/schemas/ResourcePolicy'
         TableBucketARN:
-          $ref: '#/components/schemas/TableBucketARN'
+          $ref: '#/components/schemas/TableBucketPolicy_TableBucketARN'
       required:
         - ResourcePolicy
         - TableBucketARN
@@ -710,11 +757,17 @@ components:
         list:
           - s3tables:GetTableBucketPolicy
           - s3tables:ListTableBuckets
+    TablePolicy_ResourcePolicy:
+      description: A policy document containing permissions to add to the specified table. In IAM, you must provide policy documents in JSON format. However, in CloudFormation you can provide the policy in JSON or YAML format because CloudFormation converts YAML to JSON before submitting it to IAM.
+      type: object
+    TablePolicy_Namespace:
+      description: The namespace that the table belongs to.
+      type: string
     TablePolicy:
       type: object
       properties:
         ResourcePolicy:
-          $ref: '#/components/schemas/ResourcePolicy'
+          $ref: '#/components/schemas/TablePolicy_ResourcePolicy'
         TableName:
           $ref: '#/components/schemas/TableName'
         TableBucketARN:
@@ -722,7 +775,7 @@ components:
         TableARN:
           $ref: '#/components/schemas/TableARN'
         Namespace:
-          $ref: '#/components/schemas/Namespace'
+          $ref: '#/components/schemas/TablePolicy_Namespace'
       required:
         - TableARN
         - ResourcePolicy
@@ -764,6 +817,27 @@ components:
         list:
           - s3tables:ListTables
           - s3tables:GetTablePolicy
+    CreateNamespaceRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            TableBucketARN:
+              $ref: '#/components/schemas/TableBucketARN'
+            Namespace:
+              $ref: '#/components/schemas/Namespace_Namespace'
+          x-stackQL-stringOnly: true
+      x-title: CreateNamespaceRequest
+      type: object
+      required: []
     CreateTableRequest:
       properties:
         ClientToken:
@@ -782,7 +856,7 @@ components:
             Compaction:
               $ref: '#/components/schemas/Compaction'
             Namespace:
-              $ref: '#/components/schemas/Namespace'
+              $ref: '#/components/schemas/Table_Namespace'
             TableName:
               $ref: '#/components/schemas/TableName'
             TableBucketARN:
@@ -844,7 +918,7 @@ components:
             ResourcePolicy:
               $ref: '#/components/schemas/ResourcePolicy'
             TableBucketARN:
-              $ref: '#/components/schemas/TableBucketARN'
+              $ref: '#/components/schemas/TableBucketPolicy_TableBucketARN'
           x-stackQL-stringOnly: true
       x-title: CreateTableBucketPolicyRequest
       type: object
@@ -863,7 +937,7 @@ components:
           type: object
           properties:
             ResourcePolicy:
-              $ref: '#/components/schemas/ResourcePolicy'
+              $ref: '#/components/schemas/TablePolicy_ResourcePolicy'
             TableName:
               $ref: '#/components/schemas/TableName'
             TableBucketARN:
@@ -871,7 +945,7 @@ components:
             TableARN:
               $ref: '#/components/schemas/TableARN'
             Namespace:
-              $ref: '#/components/schemas/Namespace'
+              $ref: '#/components/schemas/TablePolicy_Namespace'
           x-stackQL-stringOnly: true
       x-title: CreateTablePolicyRequest
       type: object
@@ -884,12 +958,116 @@ components:
       description: Amazon Signature authorization v4
       x-amazon-apigateway-authtype: awsSigv4
   x-stackQL-resources:
+    namespaces:
+      name: namespaces
+      id: awscc.s3tables.namespaces
+      x-cfn-schema-name: Namespace
+      x-cfn-type-name: AWS::S3Tables::Namespace
+      x-identifiers: &ref_0
+        - TableBucketARN
+        - Namespace
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Namespace&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::S3Tables::Namespace"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::S3Tables::Namespace"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/namespaces/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/namespaces/methods/delete_resource'
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.TableBucketARN') as table_bucket_arn,
+              JSON_EXTRACT(Properties, '$.Namespace') as namespace
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::S3Tables::Namespace'
+              AND Identifier = '<TableBucketARN>|<Namespace>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'TableBucketARN') as table_bucket_arn,
+                json_extract_path_text(Properties, 'Namespace') as namespace
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::S3Tables::Namespace'
+                AND Identifier = '<TableBucketARN>|<Namespace>'
+                AND region = 'us-east-1'
+    namespaces_list_only:
+      name: namespaces_list_only
+      id: awscc.s3tables.namespaces_list_only
+      x-cfn-schema-name: Namespace
+      x-cfn-type-name: AWS::S3Tables::Namespace
+      x-identifiers: *ref_0
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.TableBucketARN') as table_bucket_arn,
+              JSON_EXTRACT(Properties, '$.Namespace') as namespace
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::S3Tables::Namespace'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'TableBucketARN') as table_bucket_arn,
+                json_extract_path_text(Properties, 'Namespace') as namespace
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::S3Tables::Namespace'
+                AND region = 'us-east-1'
     tables:
       name: tables
       id: awscc.s3tables.tables
       x-cfn-schema-name: Table
       x-cfn-type-name: AWS::S3Tables::Table
-      x-identifiers:
+      x-identifiers: &ref_1
         - TableARN
       x-type: cloud_control
       methods:
@@ -995,8 +1173,7 @@ components:
       id: awscc.s3tables.tables_list_only
       x-cfn-schema-name: Table
       x-cfn-type-name: AWS::S3Tables::Table
-      x-identifiers:
-        - TableARN
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1026,7 +1203,7 @@ components:
       id: awscc.s3tables.table_buckets
       x-cfn-schema-name: TableBucket
       x-cfn-type-name: AWS::S3Tables::TableBucket
-      x-identifiers:
+      x-identifiers: &ref_2
         - TableBucketARN
       x-type: cloud_control
       methods:
@@ -1118,8 +1295,7 @@ components:
       id: awscc.s3tables.table_buckets_list_only
       x-cfn-schema-name: TableBucket
       x-cfn-type-name: AWS::S3Tables::TableBucket
-      x-identifiers:
-        - TableBucketARN
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1149,7 +1325,7 @@ components:
       id: awscc.s3tables.table_bucket_policies
       x-cfn-schema-name: TableBucketPolicy
       x-cfn-type-name: AWS::S3Tables::TableBucketPolicy
-      x-identifiers:
+      x-identifiers: &ref_3
         - TableBucketARN
       x-type: cloud_control
       methods:
@@ -1237,8 +1413,7 @@ components:
       id: awscc.s3tables.table_bucket_policies_list_only
       x-cfn-schema-name: TableBucketPolicy
       x-cfn-type-name: AWS::S3Tables::TableBucketPolicy
-      x-identifiers:
-        - TableBucketARN
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1268,7 +1443,7 @@ components:
       id: awscc.s3tables.table_policies
       x-cfn-schema-name: TablePolicy
       x-cfn-type-name: AWS::S3Tables::TablePolicy
-      x-identifiers:
+      x-identifiers: &ref_4
         - TableARN
       x-type: cloud_control
       methods:
@@ -1362,8 +1537,7 @@ components:
       id: awscc.s3tables.table_policies_list_only
       x-cfn-schema-name: TablePolicy
       x-cfn-type-name: AWS::S3Tables::TablePolicy
-      x-identifiers:
-        - TableARN
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1532,6 +1706,48 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
+  /?Action=CreateResource&Version=2021-09-30&__Namespace&__detailTransformed=true:
+    parameters:
+      - $ref: '#/components/parameters/X-Amz-Content-Sha256'
+      - $ref: '#/components/parameters/X-Amz-Date'
+      - $ref: '#/components/parameters/X-Amz-Algorithm'
+      - $ref: '#/components/parameters/X-Amz-Credential'
+      - $ref: '#/components/parameters/X-Amz-Security-Token'
+      - $ref: '#/components/parameters/X-Amz-Signature'
+      - $ref: '#/components/parameters/X-Amz-SignedHeaders'
+    post:
+      operationId: CreateNamespace
+      parameters:
+        - description: Action Header
+          in: header
+          name: X-Amz-Target
+          required: false
+          schema:
+            default: CloudApiService.CreateResource
+            enum:
+              - CloudApiService.CreateResource
+            type: string
+        - in: header
+          name: Content-Type
+          required: false
+          schema:
+            default: application/x-amz-json-1.0
+            enum:
+              - application/x-amz-json-1.0
+            type: string
+      requestBody:
+        content:
+          application/x-amz-json-1.0:
+            schema:
+              $ref: '#/components/schemas/CreateNamespaceRequest'
+        required: true
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
+          description: Success
   /?Action=CreateResource&Version=2021-09-30&__Table&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
diff --git a/openapi/src/awscc/v00.00.00000/services/sagemaker.yaml b/openapi/src/awscc/v00.00.00000/services/sagemaker.yaml
index ccd818736..b4d70e2b9 100644
--- a/openapi/src/awscc/v00.00.00000/services/sagemaker.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/sagemaker.yaml
@@ -464,11 +464,13 @@ components:
         SageMakerImageArn:
           type: string
           description: The ARN of the SageMaker image that the image version belongs to.
+          minLength: 1
           maxLength: 256
           pattern: ^arn:aws(-[\w]+)*:sagemaker:.+:[0-9]{12}:image/[a-z0-9]([-.]?[a-z0-9])*$
         SageMakerImageVersionArn:
           type: string
           description: The ARN of the image version created on the instance.
+          minLength: 1
           maxLength: 256
           pattern: ^arn:aws(-[\w]+)*:sagemaker:.+:[0-9]{12}:image-version/[a-z0-9]([-.]?[a-z0-9])*/[0-9]+$
         LifecycleConfigArn:
@@ -821,24 +823,16 @@ components:
       required:
         - ClusterArn
     RollingUpdatePolicy:
-      type: object
+      description: The policy that SageMaker uses when updating the AMI versions of the cluster.
       additionalProperties: false
+      type: object
       properties:
         MaximumBatchSize:
-          $ref: '#/components/schemas/CapacitySize'
-          description: Specifies the maximum batch size for each rolling update.
-        MaximumExecutionTimeoutInSeconds:
-          type: integer
-          description: The maximum time allowed for the rolling update, in seconds.
+          $ref: '#/components/schemas/CapacitySizeConfig'
         RollbackMaximumBatchSize:
-          $ref: '#/components/schemas/CapacitySize'
-          description: The maximum batch size for rollback during an update failure.
-        WaitIntervalInSeconds:
-          type: integer
-          description: The time to wait between steps during the rolling update, in seconds.
+          $ref: '#/components/schemas/CapacitySizeConfig'
       required:
         - MaximumBatchSize
-        - WaitIntervalInSeconds
     AlarmDetails:
       description: The details of the alarm to monitor during the AMI update.
       additionalProperties: false
@@ -862,34 +856,30 @@ components:
       description: Defines the configuration for attaching additional storage to the instances in the SageMaker HyperPod cluster instance group.
       type: object
     VpcConfig:
-      description: Specifies an Amazon Virtual Private Cloud (VPC) that your SageMaker jobs, hosted models, and compute resources have access to. You can control access to and from your resources by configuring a VPC. For more information, see https://docs.aws.amazon.com/sagemaker/latest/dg/infrastructure-give-access.html
-      type: object
+      description: Specifies an Amazon Virtual Private Cloud (VPC) that your SageMaker jobs, hosted models, and compute resources have access to. You can control access to and from your resources by configuring a VPC.
       additionalProperties: false
+      type: object
       properties:
-        SecurityGroupIds:
-          description: The VPC security group IDs, in the form 'sg-xxxxxxxx'. Specify the security groups for the VPC that is specified in the 'Subnets' field.
-          type: array
-          uniqueItems: false
+        Subnets:
+          minItems: 1
+          maxItems: 16
+          description: The ID of the subnets in the VPC to which you want to connect your training job or model.
           x-insertionOrder: false
-          minItems: 0
-          maxItems: 5
+          type: array
           items:
+            pattern: '[-0-9a-zA-Z]+'
             type: string
-            minLength: 0
             maxLength: 32
-            pattern: '[-0-9a-zA-Z]+'
-        Subnets:
-          description: The ID of the subnets in the VPC to which you want to connect your training job or model. For information about the availability of specific instance types, see https://docs.aws.amazon.com/sagemaker/latest/dg/regions-quotas.html
-          type: array
-          uniqueItems: false
+        SecurityGroupIds:
+          minItems: 1
+          maxItems: 5
+          description: The VPC security group IDs, in the form sg-xxxxxxxx. Specify the security groups for the VPC that is specified in the Subnets field.
           x-insertionOrder: false
-          minItems: 0
-          maxItems: 16
+          type: array
           items:
+            pattern: '[-0-9a-zA-Z]+'
             type: string
-            minLength: 0
             maxLength: 32
-            pattern: '[-0-9a-zA-Z]+'
       required:
         - SecurityGroupIds
         - Subnets
@@ -938,17 +928,11 @@ components:
         - InstanceType
         - EnvironmentConfig
     AutoRollbackConfiguration:
-      type: object
-      additionalProperties: false
-      properties:
-        Alarms:
-          type: array
-          minItems: 1
-          maxItems: 10
-          items:
-            $ref: '#/components/schemas/Alarm'
-      required:
-        - Alarms
+      description: An array that contains the alarms that SageMaker monitors to know whether to roll back the AMI update.
+      x-insertionOrder: false
+      type: array
+      items:
+        $ref: '#/components/schemas/AlarmDetails'
     ImageId:
       minLength: 7
       pattern: ^ami-[0-9a-fA-F]{8,17}|default$
@@ -1153,19 +1137,40 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/ClusterInstanceStorageConfig'
-    DeploymentConfig:
+    Cluster_Tag:
+      description: A key-value pair to associate with a resource.
+      additionalProperties: false
       type: object
+      properties:
+        Value:
+          minLength: 0
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+          maxLength: 256
+        Key:
+          minLength: 1
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          type: string
+          maxLength: 128
+      required:
+        - Key
+        - Value
+    DeploymentConfig:
+      description: The configuration to use when updating the AMI versions.
       additionalProperties: false
+      type: object
       properties:
         AutoRollbackConfiguration:
-          $ref: '#/components/schemas/AutoRollbackConfig'
-          description: Configuration for automatic rollback if an error occurs during deployment.
-        BlueGreenUpdatePolicy:
-          $ref: '#/components/schemas/BlueGreenUpdatePolicy'
-          description: Configuration for blue-green update deployment policies.
+          $ref: '#/components/schemas/AutoRollbackConfiguration'
         RollingUpdatePolicy:
           $ref: '#/components/schemas/RollingUpdatePolicy'
-          description: Configuration for rolling update deployment policies.
+        WaitIntervalInSeconds:
+          description: The duration in seconds that SageMaker waits before updating more instances in the cluster.
+          maximum: 3600
+          type: integer
+          minimum: 0
     FSxLustreConfig:
       description: Configuration settings for an Amazon FSx for Lustre file system to be used with the cluster.
       additionalProperties: false
@@ -1249,7 +1254,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Cluster_Tag'
       required: []
       x-stackql-resource-name: cluster
       description: Resource Type definition for AWS::SageMaker::Cluster
@@ -1529,31 +1534,29 @@ components:
       required:
         - S3Output
     S3Output:
-      description: Configuration for uploading output data to Amazon S3 from the processing container.
       type: object
       additionalProperties: false
+      description: Information about where and how to store the results of a monitoring job.
       properties:
         LocalPath:
-          description: The local path of a directory where you want Amazon SageMaker to upload its contents to Amazon S3. LocalPath is an absolute path to a directory containing output files. This directory will be created by the platform and exist when your container's entrypoint is invoked.
           type: string
-          minLength: 0
-          maxLength: 256
+          description: The local path to the Amazon S3 storage location where Amazon SageMaker saves the results of a monitoring job. LocalPath is an absolute path for the output data.
           pattern: .*
+          maxLength: 256
         S3UploadMode:
-          description: Whether to upload the results of the processing job continuously or after the job completes.
           type: string
+          description: Whether to upload the results of the monitoring job continuously or after the job completes.
           enum:
             - Continuous
             - EndOfJob
         S3Uri:
-          description: A URI that identifies the Amazon S3 bucket where you want Amazon SageMaker to save the results of a processing job.
           type: string
-          minLength: 0
-          maxLength: 1024
-          pattern: (https|s3)://([^/]+)/?(.*)
+          description: A URI that identifies the Amazon S3 storage location where Amazon SageMaker saves the results of a monitoring job.
+          pattern: ^(https|s3)://([^/]+)/?(.*)$
+          maxLength: 512
       required:
+        - LocalPath
         - S3Uri
-        - S3UploadMode
     MonitoringResources:
       type: object
       additionalProperties: false
@@ -1564,152 +1567,36 @@ components:
       required:
         - ClusterConfig
     ClusterConfig:
-      description: Configuration for the cluster used to run a processing job.
       type: object
       additionalProperties: false
+      description: Configuration for the cluster used to run model monitoring jobs.
       properties:
         InstanceCount:
-          description: The number of ML compute instances to use in the processing job. For distributed processing jobs, specify a value greater than 1. The default value is 1.
+          description: The number of ML compute instances to use in the model monitoring job. For distributed processing jobs, specify a value greater than 1. The default value is 1.
           type: integer
           minimum: 1
           maximum: 100
         InstanceType:
           description: The ML compute instance type for the processing job.
           type: string
-          enum:
-            - ml.t3.medium
-            - ml.t3.large
-            - ml.t3.xlarge
-            - ml.t3.2xlarge
-            - ml.m4.xlarge
-            - ml.m4.2xlarge
-            - ml.m4.4xlarge
-            - ml.m4.10xlarge
-            - ml.m4.16xlarge
-            - ml.c4.xlarge
-            - ml.c4.2xlarge
-            - ml.c4.4xlarge
-            - ml.c4.8xlarge
-            - ml.c5.xlarge
-            - ml.c5.2xlarge
-            - ml.c5.4xlarge
-            - ml.c5.9xlarge
-            - ml.c5.18xlarge
-            - ml.m5.large
-            - ml.m5.xlarge
-            - ml.m5.2xlarge
-            - ml.m5.4xlarge
-            - ml.m5.12xlarge
-            - ml.m5.24xlarge
-            - ml.r5.large
-            - ml.r5.xlarge
-            - ml.r5.2xlarge
-            - ml.r5.4xlarge
-            - ml.r5.8xlarge
-            - ml.r5.12xlarge
-            - ml.r5.16xlarge
-            - ml.r5.24xlarge
-            - ml.g4dn.xlarge
-            - ml.g4dn.2xlarge
-            - ml.g4dn.4xlarge
-            - ml.g4dn.8xlarge
-            - ml.g4dn.12xlarge
-            - ml.g4dn.16xlarge
-            - ml.g5.xlarge
-            - ml.g5.2xlarge
-            - ml.g5.4xlarge
-            - ml.g5.8xlarge
-            - ml.g5.16xlarge
-            - ml.g5.12xlarge
-            - ml.g5.24xlarge
-            - ml.g5.48xlarge
-            - ml.r5d.large
-            - ml.r5d.xlarge
-            - ml.r5d.2xlarge
-            - ml.r5d.4xlarge
-            - ml.r5d.8xlarge
-            - ml.r5d.12xlarge
-            - ml.r5d.16xlarge
-            - ml.r5d.24xlarge
-            - ml.g6.xlarge
-            - ml.g6.2xlarge
-            - ml.g6.4xlarge
-            - ml.g6.8xlarge
-            - ml.g6.12xlarge
-            - ml.g6.16xlarge
-            - ml.g6.24xlarge
-            - ml.g6.48xlarge
-            - ml.g6e.xlarge
-            - ml.g6e.2xlarge
-            - ml.g6e.4xlarge
-            - ml.g6e.8xlarge
-            - ml.g6e.12xlarge
-            - ml.g6e.16xlarge
-            - ml.g6e.24xlarge
-            - ml.g6e.48xlarge
-            - ml.m6i.large
-            - ml.m6i.xlarge
-            - ml.m6i.2xlarge
-            - ml.m6i.4xlarge
-            - ml.m6i.8xlarge
-            - ml.m6i.12xlarge
-            - ml.m6i.16xlarge
-            - ml.m6i.24xlarge
-            - ml.m6i.32xlarge
-            - ml.c6i.xlarge
-            - ml.c6i.2xlarge
-            - ml.c6i.4xlarge
-            - ml.c6i.8xlarge
-            - ml.c6i.12xlarge
-            - ml.c6i.16xlarge
-            - ml.c6i.24xlarge
-            - ml.c6i.32xlarge
-            - ml.m7i.large
-            - ml.m7i.xlarge
-            - ml.m7i.2xlarge
-            - ml.m7i.4xlarge
-            - ml.m7i.8xlarge
-            - ml.m7i.12xlarge
-            - ml.m7i.16xlarge
-            - ml.m7i.24xlarge
-            - ml.m7i.48xlarge
-            - ml.c7i.large
-            - ml.c7i.xlarge
-            - ml.c7i.2xlarge
-            - ml.c7i.4xlarge
-            - ml.c7i.8xlarge
-            - ml.c7i.12xlarge
-            - ml.c7i.16xlarge
-            - ml.c7i.24xlarge
-            - ml.c7i.48xlarge
-            - ml.r7i.large
-            - ml.r7i.xlarge
-            - ml.r7i.2xlarge
-            - ml.r7i.4xlarge
-            - ml.r7i.8xlarge
-            - ml.r7i.12xlarge
-            - ml.r7i.16xlarge
-            - ml.r7i.24xlarge
-            - ml.r7i.48xlarge
+        VolumeKmsKeyId:
+          description: The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt data on the storage volume attached to the ML compute instance(s) that run the model monitoring job.
+          type: string
+          minimum: 1
+          maximum: 2048
         VolumeSizeInGB:
-          description: The size of the ML storage volume in gigabytes that you want to provision. You must specify sufficient ML storage for your scenario.
+          description: The size of the ML storage volume, in gigabytes, that you want to provision. You must specify sufficient ML storage for your scenario.
           type: integer
           minimum: 1
           maximum: 16384
-        VolumeKmsKeyId:
-          description: The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt data on the storage volume attached to the ML compute instance(s) that run the processing job.
-          type: string
-          minLength: 0
-          maxLength: 2048
-          pattern: '[a-zA-Z0-9:/_-]*'
       required:
         - InstanceCount
         - InstanceType
         - VolumeSizeInGB
     NetworkConfig:
-      description: Networking options for a job, such as network traffic encryption between containers, whether to allow inbound and outbound network calls to and from containers, and the VPC subnets and security groups to use for VPC-enabled jobs.
       type: object
       additionalProperties: false
+      description: Networking options for a job, such as network traffic encryption between containers, whether to allow inbound and outbound network calls to and from containers, and the VPC subnets and security groups to use for VPC-enabled jobs.
       properties:
         EnableInterContainerTrafficEncryption:
           description: Whether to encrypt all communications between distributed processing jobs. Choose True to encrypt communications. Encryption provides greater security for distributed processing jobs, but the processing might take longer.
@@ -1718,20 +1605,65 @@ components:
           description: Whether to allow inbound and outbound network calls to and from the containers used for the processing job.
           type: boolean
         VpcConfig:
-          $ref: '#/components/schemas/VpcConfig'
+          $ref: '#/components/schemas/DataQualityJobDefinition_VpcConfig'
+    DataQualityJobDefinition_VpcConfig:
+      type: object
+      additionalProperties: false
+      description: Specifies a VPC that your training jobs and hosted models have access to. Control access to and from your training and model containers by configuring the VPC.
+      properties:
+        SecurityGroupIds:
+          description: The VPC security group IDs, in the form sg-xxxxxxxx. Specify the security groups for the VPC that is specified in the Subnets field.
+          type: array
+          minItems: 1
+          maxItems: 5
+          items:
+            type: string
+            maxLength: 32
+            pattern: '[-0-9a-zA-Z]+'
+        Subnets:
+          description: The ID of the subnets in the VPC to which you want to connect to your monitoring jobs.
+          type: array
+          minItems: 1
+          maxItems: 16
+          items:
+            type: string
+            maxLength: 32
+            pattern: '[-0-9a-zA-Z]+'
+      required:
+        - SecurityGroupIds
+        - Subnets
     StoppingCondition:
-      description: Configures conditions under which the processing job should be stopped, such as how long the processing job has been running. After the condition is met, the processing job is stopped.
       type: object
       additionalProperties: false
+      description: Specifies a time limit for how long the monitoring job is allowed to run.
       properties:
         MaxRuntimeInSeconds:
-          description: Specifies the maximum runtime in seconds.
+          description: The maximum runtime allowed in seconds.
           type: integer
           minimum: 1
-          maximum: 777600
+          maximum: 86400
       required:
         - MaxRuntimeInSeconds
-    EndpointName:
+    DataQualityJobDefinition_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          maxLength: 256
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+      required:
+        - Key
+        - Value
+    EndpointName:
       type: string
       description: The name of the endpoint used to run the monitoring job.
       pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9])*
@@ -1772,7 +1704,7 @@ components:
           description: A boolean flag indicating if it is JSON line format
           type: boolean
     Parquet:
-      description: A flag indicating if the dataset format is Parquet
+      description: A flag indicate if the dataset format is Parquet
       type: boolean
     DataQualityJobDefinition:
       type: object
@@ -1811,7 +1743,7 @@ components:
           maxItems: 50
           description: An array of key-value pairs to apply to this resource.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/DataQualityJobDefinition_Tag'
         CreationTime:
           description: The time at which the job definition was created.
           type: string
@@ -1873,6 +1805,49 @@ components:
         list:
           - sagemaker:ListDataQualityJobDefinitions
           - sagemaker:ListTags
+    Device_Device:
+      description: Edge device you want to create
+      type: object
+      properties:
+        Description:
+          description: Description of the device
+          type: string
+          pattern: '[\S\s]+'
+          minLength: 1
+          maxLength: 40
+        DeviceName:
+          description: The name of the device
+          type: string
+          pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9])*$
+          minLength: 1
+          maxLength: 63
+        IotThingName:
+          description: AWS Internet of Things (IoT) object name.
+          type: string
+          pattern: '[a-zA-Z0-9:_-]+'
+          maxLength: 128
+      required:
+        - DeviceName
+      additionalProperties: false
+    Device_Tag:
+      type: object
+      properties:
+        Key:
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          type: string
+          pattern: ^((?!aws:)[\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+          minLength: 1
+          maxLength: 128
+        Value:
+          description: 'The key value of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          type: string
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     Device:
       type: object
       properties:
@@ -1884,12 +1859,12 @@ components:
           maxLength: 63
         Device:
           description: The Edge Device you want to register against a device fleet
-          $ref: '#/components/schemas/Device'
+          $ref: '#/components/schemas/Device_Device'
         Tags:
           description: Associate tags with the resource
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Device_Tag'
       required:
         - DeviceFleetName
       x-stackql-resource-name: device
@@ -1927,6 +1902,26 @@ components:
       required:
         - S3OutputLocation
       additionalProperties: false
+    DeviceFleet_Tag:
+      description: Key-value pair to associate as a tag for the resource
+      type: object
+      properties:
+        Key:
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          type: string
+          pattern: ^((?!aws:)[\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+          minLength: 1
+          maxLength: 128
+        Value:
+          description: 'The key value of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          type: string
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     DeviceFleet:
       type: object
       properties:
@@ -1955,7 +1950,7 @@ components:
           description: Associate tags with the resource
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/DeviceFleet_Tag'
       required:
         - DeviceFleetName
         - OutputConfig
@@ -1989,7 +1984,7 @@ components:
       properties:
         ExecutionRole:
           type: string
-          description: The user profile Amazon Resource Name (ARN).
+          description: The execution role for the user.
           minLength: 20
           maxLength: 2048
           pattern: ^arn:aws[a-z\-]*:iam::\d{12}:role/?[a-zA-Z_0-9+=,.@\-_/]+$
@@ -2008,6 +2003,8 @@ components:
           description: The kernel gateway app settings.
         RStudioServerProAppSettings:
           $ref: '#/components/schemas/RStudioServerProAppSettings'
+        RSessionAppSettings:
+          $ref: '#/components/schemas/RSessionAppSettings'
         JupyterLabAppSettings:
           $ref: '#/components/schemas/JupyterLabAppSettings'
         SpaceStorageSettings:
@@ -2039,6 +2036,7 @@ components:
           type: array
           description: The security groups for the Amazon Virtual Private Cloud (VPC) that Studio uses for communication.
           uniqueItems: false
+          x-insertionOrder: false
           minItems: 0
           maxItems: 5
           items:
@@ -2048,6 +2046,8 @@ components:
         SharingSettings:
           $ref: '#/components/schemas/SharingSettings'
           description: The sharing settings.
+      required:
+        - ExecutionRole
     DefaultSpaceSettings:
       type: object
       description: A collection of settings that apply to spaces of Amazon SageMaker Studio. These settings are specified when the Create/Update Domain API is called.
@@ -2100,7 +2100,7 @@ components:
       additionalProperties: false
       properties:
         DefaultResourceSpec:
-          $ref: '#/components/schemas/ResourceSpec'
+          $ref: '#/components/schemas/Domain_ResourceSpec'
         LifecycleConfigArns:
           type: array
           description: A list of LifecycleConfigArns available for use with JupyterServer apps.
@@ -2109,6 +2109,92 @@ components:
           maxItems: 30
           items:
             $ref: '#/components/schemas/StudioLifecycleConfigArn'
+    Domain_ResourceSpec:
+      type: object
+      additionalProperties: false
+      properties:
+        InstanceType:
+          type: string
+          description: The instance type that the image version runs on.
+          enum:
+            - system
+            - ml.t3.micro
+            - ml.t3.small
+            - ml.t3.medium
+            - ml.t3.large
+            - ml.t3.xlarge
+            - ml.t3.2xlarge
+            - ml.m5.large
+            - ml.m5.xlarge
+            - ml.m5.2xlarge
+            - ml.m5.4xlarge
+            - ml.m5.8xlarge
+            - ml.m5.12xlarge
+            - ml.m5.16xlarge
+            - ml.m5.24xlarge
+            - ml.c5.large
+            - ml.c5.xlarge
+            - ml.c5.2xlarge
+            - ml.c5.4xlarge
+            - ml.c5.9xlarge
+            - ml.c5.12xlarge
+            - ml.c5.18xlarge
+            - ml.c5.24xlarge
+            - ml.p3.2xlarge
+            - ml.p3.8xlarge
+            - ml.p3.16xlarge
+            - ml.g4dn.xlarge
+            - ml.g4dn.2xlarge
+            - ml.g4dn.4xlarge
+            - ml.g4dn.8xlarge
+            - ml.g4dn.12xlarge
+            - ml.g4dn.16xlarge
+            - ml.r5.large
+            - ml.r5.xlarge
+            - ml.r5.2xlarge
+            - ml.r5.4xlarge
+            - ml.r5.8xlarge
+            - ml.r5.12xlarge
+            - ml.r5.16xlarge
+            - ml.r5.24xlarge
+            - ml.p3dn.24xlarge
+            - ml.m5d.large
+            - ml.m5d.xlarge
+            - ml.m5d.2xlarge
+            - ml.m5d.4xlarge
+            - ml.m5d.8xlarge
+            - ml.m5d.12xlarge
+            - ml.m5d.16xlarge
+            - ml.m5d.24xlarge
+            - ml.g5.xlarge
+            - ml.g5.2xlarge
+            - ml.g5.4xlarge
+            - ml.g5.8xlarge
+            - ml.g5.12xlarge
+            - ml.g5.16xlarge
+            - ml.g5.24xlarge
+            - ml.g5.48xlarge
+            - ml.p4d.24xlarge
+            - ml.p4de.24xlarge
+            - ml.geospatial.interactive
+            - ml.trn1.2xlarge
+            - ml.trn1.32xlarge
+            - ml.trn1n.32xlarge
+        SageMakerImageArn:
+          type: string
+          description: The Amazon Resource Name (ARN) of the SageMaker image that the image version belongs to.
+          maxLength: 256
+          pattern: ^arn:aws(-[\w]+)*:sagemaker:.+:[0-9]{12}:image/[a-z0-9]([-.]?[a-z0-9])*$
+        SageMakerImageVersionArn:
+          type: string
+          description: The Amazon Resource Name (ARN) of the image version created on the instance.
+          maxLength: 256
+          pattern: ^arn:aws(-[\w]+)*:sagemaker:.+:[0-9]{12}:image-version/[a-z0-9]([-.]?[a-z0-9])*/[0-9]+$
+        LifecycleConfigArn:
+          type: string
+          description: The Amazon Resource Name (ARN) of the Lifecycle Configuration to attach to the Resource.
+          maxLength: 256
+          pattern: ^(arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]*:[0-9]{12}:studio-lifecycle-config/.*|None)$
     KernelGatewayAppSettings:
       type: object
       description: The kernel gateway app settings.
@@ -2118,12 +2204,13 @@ components:
           type: array
           description: A list of custom SageMaker images that are configured to run as a KernelGateway app.
           uniqueItems: false
+          x-insertionOrder: false
           minItems: 0
-          maxItems: 30
+          maxItems: 200
           items:
             $ref: '#/components/schemas/CustomImage'
         DefaultResourceSpec:
-          $ref: '#/components/schemas/ResourceSpec'
+          $ref: '#/components/schemas/Domain_ResourceSpec'
           description: The default instance type and the Amazon Resource Name (ARN) of the default SageMaker image used by the KernelGateway app.
         LifecycleConfigArns:
           type: array
@@ -2139,7 +2226,7 @@ components:
       additionalProperties: false
       properties:
         DefaultResourceSpec:
-          $ref: '#/components/schemas/ResourceSpec'
+          $ref: '#/components/schemas/Domain_ResourceSpec'
           description: The default instance type and the Amazon Resource Name (ARN) of the default SageMaker image used by the JupyterLab app.
         LifecycleConfigArns:
           type: array
@@ -2159,7 +2246,7 @@ components:
             $ref: '#/components/schemas/CodeRepository'
         CustomImages:
           type: array
-          description: A list of custom images available for use for JupyterLab apps
+          description: A list of custom images for use for JupyterLab apps.
           uniqueItems: false
           minItems: 0
           maxItems: 200
@@ -2231,7 +2318,7 @@ components:
           $ref: '#/components/schemas/DefaultEbsStorageSettings'
     DefaultEbsStorageSettings:
       type: object
-      description: Properties related to the Amazon Elastic Block Store volume.
+      description: Properties related to the Amazon Elastic Block Store volume. Must be provided if storage type is Amazon EBS and must not be provided if storage type is not Amazon EBS
       additionalProperties: false
       properties:
         DefaultEbsVolumeSizeInGb:
@@ -2253,7 +2340,7 @@ components:
       additionalProperties: false
       properties:
         DefaultResourceSpec:
-          $ref: '#/components/schemas/ResourceSpec'
+          $ref: '#/components/schemas/Domain_ResourceSpec'
           description: The default instance type and the Amazon Resource Name (ARN) of the default SageMaker image used by the CodeEditor app.
         LifecycleConfigArns:
           type: array
@@ -2516,7 +2603,7 @@ components:
           description: A URL pointing to an RStudio Package Manager server.
           pattern: ^(https:|http:|www\.)\S*
         DefaultResourceSpec:
-          $ref: '#/components/schemas/ResourceSpec'
+          $ref: '#/components/schemas/Domain_ResourceSpec'
       required:
         - DomainExecutionRoleArn
     RSessionAppSettings:
@@ -2534,7 +2621,7 @@ components:
           items:
             $ref: '#/components/schemas/CustomImage'
         DefaultResourceSpec:
-          $ref: '#/components/schemas/ResourceSpec'
+          $ref: '#/components/schemas/Domain_ResourceSpec'
     RStudioServerProAppSettings:
       type: object
       description: A collection of settings that configure user interaction with the RStudioServerPro app.
@@ -2808,17 +2895,172 @@ components:
             maxLength: 128
             pattern: ^(0|[1-9]\d*)\.(0|[1-9]\d*)$
     Domain:
-      description: The machine learning domain of the model package you specified.
-      type: string
+      type: object
+      properties:
+        DomainArn:
+          type: string
+          description: The Amazon Resource Name (ARN) of the created domain.
+          maxLength: 256
+          pattern: arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]*:[0-9]{12}:domain/.*
+        Url:
+          type: string
+          description: The URL to the created domain.
+          maxLength: 1024
+        AppNetworkAccessType:
+          type: string
+          description: Specifies the VPC used for non-EFS traffic. The default value is PublicInternetOnly.
+          enum:
+            - PublicInternetOnly
+            - VpcOnly
+        AuthMode:
+          type: string
+          description: The mode of authentication that members use to access the domain.
+          enum:
+            - SSO
+            - IAM
+        DefaultUserSettings:
+          $ref: '#/components/schemas/UserSettings'
+          description: The default user settings.
+        DefaultSpaceSettings:
+          $ref: '#/components/schemas/DefaultSpaceSettings'
+          description: The default space settings.
+        DomainName:
+          type: string
+          description: A name for the domain.
+          maxLength: 63
+          pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}
+        KmsKeyId:
+          type: string
+          description: SageMaker uses AWS KMS to encrypt the EFS volume attached to the domain with an AWS managed customer master key (CMK) by default.
+          maxLength: 2048
+          pattern: .*
+        SubnetIds:
+          type: array
+          description: The VPC subnets that Studio uses for communication.
+          uniqueItems: false
+          x-insertionOrder: false
+          minItems: 1
+          maxItems: 16
+          items:
+            type: string
+            maxLength: 32
+            pattern: '[-0-9a-zA-Z]+'
+        Tags:
+          type: array
+          description: A list of tags to apply to the user profile.
+          uniqueItems: false
+          x-insertionOrder: false
+          minItems: 0
+          maxItems: 50
+          items:
+            $ref: '#/components/schemas/Tag'
+        VpcId:
+          type: string
+          description: The ID of the Amazon Virtual Private Cloud (VPC) that Studio uses for communication.
+          maxLength: 32
+          pattern: '[-0-9a-zA-Z]+'
+        DomainId:
+          type: string
+          description: The domain name.
+          maxLength: 63
+          pattern: ^d-(-*[a-z0-9])+
+        HomeEfsFileSystemId:
+          type: string
+          description: The ID of the Amazon Elastic File System (EFS) managed by this Domain.
+          maxLength: 32
+        SingleSignOnManagedApplicationInstanceId:
+          type: string
+          description: The SSO managed application instance ID.
+          maxLength: 256
+        SingleSignOnApplicationArn:
+          type: string
+          description: The ARN of the application managed by SageMaker in IAM Identity Center. This value is only returned for domains created after October 1, 2023.
+          pattern: ^arn:(aws|aws-us-gov|aws-cn|aws-iso|aws-iso-b):sso::[0-9]+:application/[a-zA-Z0-9-_.]+/apl-[a-zA-Z0-9]+$
+        DomainSettings:
+          $ref: '#/components/schemas/DomainSettings'
+        AppSecurityGroupManagement:
+          type: string
+          description: The entity that creates and manages the required security groups for inter-app communication in VPCOnly mode. Required when CreateDomain.AppNetworkAccessType is VPCOnly and DomainSettings.RStudioServerProDomainSettings.DomainExecutionRoleArn is provided.
+          enum:
+            - Service
+            - Customer
+        SecurityGroupIdForDomainBoundary:
+          type: string
+          description: The ID of the security group that authorizes traffic between the RSessionGateway apps and the RStudioServerPro app.
+          maxLength: 32
+          pattern: '[-0-9a-zA-Z]+'
+        TagPropagation:
+          type: string
+          description: Indicates whether the tags added to Domain, User Profile and Space entity is propagated to all SageMaker resources.
+          enum:
+            - ENABLED
+            - DISABLED
+      required:
+        - AuthMode
+        - DefaultUserSettings
+        - DomainName
+      x-stackql-resource-name: domain
+      description: Resource Type definition for AWS::SageMaker::Domain
+      x-type-name: AWS::SageMaker::Domain
+      x-stackql-primary-identifier:
+        - DomainId
+      x-create-only-properties:
+        - AuthMode
+        - DomainName
+        - DomainSettings/RStudioServerProDomainSettings/DefaultResourceSpec
+        - KmsKeyId
+        - VpcId
+        - Tags
+      x-write-only-properties:
+        - Tags
+      x-read-only-properties:
+        - DomainArn
+        - Url
+        - DomainId
+        - HomeEfsFileSystemId
+        - SecurityGroupIdForDomainBoundary
+        - SingleSignOnManagedApplicationInstanceId
+        - SingleSignOnApplicationArn
+      x-required-properties:
+        - AuthMode
+        - DefaultUserSettings
+        - DomainName
+      x-required-permissions:
+        create:
+          - sagemaker:CreateApp
+          - sagemaker:CreateDomain
+          - sagemaker:DescribeDomain
+          - sagemaker:DescribeImage
+          - sagemaker:DescribeImageVersion
+          - iam:CreateServiceLinkedRole
+          - iam:PassRole
+          - efs:CreateFileSystem
+          - kms:CreateGrant
+          - kms:Decrypt
+          - kms:DescribeKey
+          - kms:GenerateDataKeyWithoutPlainText
+        read:
+          - sagemaker:DescribeDomain
+        update:
+          - sagemaker:CreateApp
+          - sagemaker:UpdateDomain
+          - sagemaker:DescribeDomain
+          - sagemaker:DescribeImage
+          - sagemaker:DescribeImageVersion
+          - iam:PassRole
+        delete:
+          - sagemaker:DeleteApp
+          - sagemaker:DeleteDomain
+          - sagemaker:DescribeDomain
+        list:
+          - sagemaker:ListDomains
     Alarm:
       type: object
       additionalProperties: false
       properties:
         AlarmName:
           type: string
-          minLength: 1
-          maxLength: 255
-          pattern: ^(?!\s*$).+
+          description: The name of the CloudWatch alarm.
       required:
         - AlarmName
     AutoRollbackConfig:
@@ -2861,13 +3103,58 @@ components:
       required:
         - Type
         - Value
-    TrafficRoutingConfig:
+    Endpoint_DeploymentConfig:
       type: object
       additionalProperties: false
       properties:
-        CanarySize:
-          $ref: '#/components/schemas/CapacitySize'
-          description: Specifies the size of the canary traffic in a canary deployment.
+        AutoRollbackConfiguration:
+          $ref: '#/components/schemas/AutoRollbackConfig'
+          description: Configuration for automatic rollback if an error occurs during deployment.
+        BlueGreenUpdatePolicy:
+          $ref: '#/components/schemas/BlueGreenUpdatePolicy'
+          description: Configuration for blue-green update deployment policies.
+        RollingUpdatePolicy:
+          $ref: '#/components/schemas/Endpoint_RollingUpdatePolicy'
+          description: Configuration for rolling update deployment policies.
+    Endpoint_RollingUpdatePolicy:
+      type: object
+      additionalProperties: false
+      properties:
+        MaximumBatchSize:
+          $ref: '#/components/schemas/CapacitySize'
+          description: Specifies the maximum batch size for each rolling update.
+        MaximumExecutionTimeoutInSeconds:
+          type: integer
+          description: The maximum time allowed for the rolling update, in seconds.
+        RollbackMaximumBatchSize:
+          $ref: '#/components/schemas/CapacitySize'
+          description: The maximum batch size for rollback during an update failure.
+        WaitIntervalInSeconds:
+          type: integer
+          description: The time to wait between steps during the rolling update, in seconds.
+      required:
+        - MaximumBatchSize
+        - WaitIntervalInSeconds
+    Endpoint_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: The key of the tag.
+        Value:
+          type: string
+          description: The value of the tag.
+      required:
+        - Value
+        - Key
+    TrafficRoutingConfig:
+      type: object
+      additionalProperties: false
+      properties:
+        CanarySize:
+          $ref: '#/components/schemas/CapacitySize'
+          description: Specifies the size of the canary traffic in a canary deployment.
         LinearStepSize:
           $ref: '#/components/schemas/CapacitySize'
           description: Specifies the step size for linear traffic routing.
@@ -2890,7 +3177,7 @@ components:
       type: object
       properties:
         DeploymentConfig:
-          $ref: '#/components/schemas/DeploymentConfig'
+          $ref: '#/components/schemas/Endpoint_DeploymentConfig'
           description: Specifies deployment configuration for updating the SageMaker endpoint. Includes rollback and update policies.
         EndpointArn:
           type: string
@@ -2917,7 +3204,7 @@ components:
           type: array
           uniqueItems: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Endpoint_Tag'
           description: An array of key-value pairs to apply to this resource.
       required:
         - EndpointConfigName
@@ -3079,6 +3366,18 @@ components:
           description: For provisioned feature groups, this indicates the write throughput you are billed for and can consume without throttling.
       required:
         - ThroughputMode
+    FeatureGroup_Tag:
+      type: object
+      description: A key-value pair to associate with a resource.
+      additionalProperties: false
+      properties:
+        Value:
+          type: string
+        Key:
+          type: string
+      required:
+        - Value
+        - Key
     FeatureGroup:
       type: object
       properties:
@@ -3160,7 +3459,7 @@ components:
           x-insertionOrder: false
           maxItems: 50
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/FeatureGroup_Tag'
       required:
         - FeatureGroupName
         - RecordIdentifierFeatureName
@@ -3229,13 +3528,13 @@ components:
           - sagemaker:ListFeatureGroups
     ImageName:
       type: string
-      description: The name of the image this version belongs to.
-      pattern: ^[A-Za-z0-9]([-.]?[A-Za-z0-9])*$
+      description: The name of the image.
+      pattern: ^[a-zA-Z0-9]([-.]?[a-zA-Z0-9])*$
       minLength: 1
       maxLength: 63
     ImageArn:
+      description: The Amazon Resource Name (ARN) of the image.
       type: string
-      description: The Amazon Resource Name (ARN) of the parent image.
       minLength: 1
       maxLength: 256
       pattern: ^arn:aws(-[\w]+)*:sagemaker:[a-z0-9\-]*:[0-9]{12}:image\/[a-zA-Z0-9]([-.]?[a-zA-Z0-9])*$
@@ -3257,6 +3556,23 @@ components:
       pattern: .+
       minLength: 1
       maxLength: 512
+    Image_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     Image:
       type: object
       properties:
@@ -3275,7 +3591,7 @@ components:
           maxItems: 50
           description: An array of key-value pairs to apply to this resource.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Image_Tag'
       required:
         - ImageName
         - ImageRoleArn
@@ -3325,6 +3641,18 @@ components:
           - sagemaker:DescribeImage
         list:
           - sagemaker:ListImages
+    ImageVersion_ImageName:
+      type: string
+      description: The name of the image this version belongs to.
+      pattern: ^[A-Za-z0-9]([-.]?[A-Za-z0-9])*$
+      minLength: 1
+      maxLength: 63
+    ImageVersion_ImageArn:
+      type: string
+      description: The Amazon Resource Name (ARN) of the parent image.
+      minLength: 1
+      maxLength: 256
+      pattern: ^arn:aws(-[\w]+)*:sagemaker:[a-z0-9\-]*:[0-9]{12}:image\/[a-zA-Z0-9]([-.]?[a-zA-Z0-9])*$
     ImageVersionArn:
       type: string
       description: The Amazon Resource Name (ARN) of the image version.
@@ -3338,10 +3666,11 @@ components:
       maxLength: 255
       pattern: .+
     ContainerImage:
-      description: The image to use for the container that will be materialized for the inference component
       type: string
-      pattern: '[\S]+'
+      description: The registry path of the container image that contains this image version.
+      minLength: 1
       maxLength: 255
+      pattern: .+
     Alias:
       type: string
       description: The alias of the image version.
@@ -3403,9 +3732,9 @@ components:
       type: object
       properties:
         ImageName:
-          $ref: '#/components/schemas/ImageName'
+          $ref: '#/components/schemas/ImageVersion_ImageName'
         ImageArn:
-          $ref: '#/components/schemas/ImageArn'
+          $ref: '#/components/schemas/ImageVersion_ImageArn'
         ImageVersionArn:
           $ref: '#/components/schemas/ImageVersionArn'
         BaseImage:
@@ -3489,6 +3818,11 @@ components:
       type: string
       minLength: 1
       maxLength: 256
+    InferenceComponent_EndpointName:
+      description: The name of the endpoint the inference component is associated with
+      type: string
+      pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9])*$
+      maxLength: 63
     VariantName:
       description: The name of the endpoint variant the inference component is associated with
       type: string
@@ -3505,15 +3839,20 @@ components:
       maxLength: 63
     Timestamp:
       type: string
+    InferenceComponent_ContainerImage:
+      description: The image to use for the container that will be materialized for the inference component
+      type: string
+      pattern: '[\S]+'
+      maxLength: 255
     DeployedImage:
       description: ''
       type: object
       additionalProperties: false
       properties:
         SpecifiedImage:
-          $ref: '#/components/schemas/ContainerImage'
+          $ref: '#/components/schemas/InferenceComponent_ContainerImage'
         ResolvedImage:
-          $ref: '#/components/schemas/ContainerImage'
+          $ref: '#/components/schemas/InferenceComponent_ContainerImage'
         ResolutionTime:
           $ref: '#/components/schemas/Timestamp'
     Url:
@@ -3538,7 +3877,7 @@ components:
         DeployedImage:
           $ref: '#/components/schemas/DeployedImage'
         Image:
-          $ref: '#/components/schemas/ContainerImage'
+          $ref: '#/components/schemas/InferenceComponent_ContainerImage'
         ArtifactUrl:
           $ref: '#/components/schemas/Url'
         Environment:
@@ -3621,7 +3960,30 @@ components:
         RollingUpdatePolicy:
           $ref: '#/components/schemas/InferenceComponentRollingUpdatePolicy'
         AutoRollbackConfiguration:
-          $ref: '#/components/schemas/AutoRollbackConfiguration'
+          $ref: '#/components/schemas/InferenceComponent_AutoRollbackConfiguration'
+    InferenceComponent_AutoRollbackConfiguration:
+      type: object
+      additionalProperties: false
+      properties:
+        Alarms:
+          type: array
+          minItems: 1
+          maxItems: 10
+          items:
+            $ref: '#/components/schemas/InferenceComponent_Alarm'
+      required:
+        - Alarms
+    InferenceComponent_Alarm:
+      type: object
+      additionalProperties: false
+      properties:
+        AlarmName:
+          type: string
+          minLength: 1
+          maxLength: 255
+          pattern: ^(?!\s*$).+
+      required:
+        - AlarmName
     InferenceComponentRollingUpdatePolicy:
       description: The rolling update policy for the inference component
       type: object
@@ -3671,12 +4033,30 @@ components:
         - Updating
         - Failed
         - Deleting
+    InferenceComponent_Tag:
+      description: A tag in the form of a key-value pair to associate with the resource
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -'
+          minLength: 1
+          maxLength: 256
+      required:
+        - Key
+        - Value
     TagList:
       type: array
       maxItems: 50
       description: An array of tags to apply to the resource
       items:
-        $ref: '#/components/schemas/Tag'
+        $ref: '#/components/schemas/InferenceComponent_Tag'
     InferenceComponent:
       type: object
       properties:
@@ -3687,7 +4067,7 @@ components:
         EndpointArn:
           $ref: '#/components/schemas/EndpointArn'
         EndpointName:
-          $ref: '#/components/schemas/EndpointName'
+          $ref: '#/components/schemas/InferenceComponent_EndpointName'
         VariantName:
           $ref: '#/components/schemas/VariantName'
         FailureReason:
@@ -3764,13 +4144,18 @@ components:
           - sagemaker:ListInferenceComponents
           - sagemaker:DescribeInferenceComponent
           - sagemaker:ListTags
+    InferenceExperiment_EndpointName:
+      description: The name of the endpoint used to run the inference experiment.
+      type: string
+      pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9])*
+      maxLength: 63
     EndpointMetadata:
       description: The metadata of the endpoint on which the inference experiment ran.
       type: object
       additionalProperties: false
       properties:
         EndpointName:
-          $ref: '#/components/schemas/EndpointName'
+          $ref: '#/components/schemas/InferenceExperiment_EndpointName'
         EndpointConfigName:
           description: The name of the endpoint configuration.
           type: string
@@ -3933,6 +4318,25 @@ components:
       required:
         - SourceModelVariantName
         - ShadowModelVariants
+    InferenceExperiment_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          maxLength: 256
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+      required:
+        - Key
+        - Value
     InferenceExperiment:
       type: object
       properties:
@@ -3965,7 +4369,7 @@ components:
           minLength: 20
           maxLength: 2048
         EndpointName:
-          $ref: '#/components/schemas/EndpointName'
+          $ref: '#/components/schemas/InferenceExperiment_EndpointName'
         EndpointMetadata:
           $ref: '#/components/schemas/EndpointMetadata'
         Schedule:
@@ -3990,7 +4394,7 @@ components:
           type: array
           maxItems: 50
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/InferenceExperiment_Tag'
         CreationTime:
           description: The timestamp at which you created the inference experiment.
           type: string
@@ -4082,6 +4486,23 @@ components:
           - sagemaker:AddTags
           - sagemaker:DeleteTags
           - sagemaker:ListTags
+    MlflowTrackingServer_Tag:
+      type: object
+      additionalProperties: false
+      description: A key-value pair to associate with a resource.
+      properties:
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          maxLength: 256
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+      required:
+        - Value
+        - Key
     MlflowTrackingServer:
       type: object
       properties:
@@ -4136,7 +4557,7 @@ components:
           description: An array of key-value pairs to apply to this resource.
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/MlflowTrackingServer_Tag'
       required:
         - TrackingServerName
         - ArtifactStoreUri
@@ -4232,69 +4653,229 @@ components:
       description: The inputs for a monitoring job.
       properties:
         EndpointInput:
-          $ref: '#/components/schemas/EndpointInput'
+          $ref: '#/components/schemas/ModelBiasJobDefinition_EndpointInput'
         BatchTransformInput:
-          $ref: '#/components/schemas/BatchTransformInput'
+          $ref: '#/components/schemas/ModelBiasJobDefinition_BatchTransformInput'
         GroundTruthS3Input:
           $ref: '#/components/schemas/MonitoringGroundTruthS3Input'
       required:
         - GroundTruthS3Input
-    MonitoringTimeOffsetString:
-      type: string
-      description: The time offsets in ISO duration format
-      pattern: ^.?P.*
-      minLength: 1
-      maxLength: 15
-    MonitoringGroundTruthS3Input:
+    ModelBiasJobDefinition_EndpointInput:
       type: object
       additionalProperties: false
-      description: 'Ground truth input provided in S3 '
+      description: The endpoint for a monitoring job.
       properties:
-        S3Uri:
+        EndpointName:
+          $ref: '#/components/schemas/EndpointName'
+        LocalPath:
           type: string
-          description: A URI that identifies the Amazon S3 storage location where Amazon SageMaker saves the results of a monitoring job.
-          pattern: ^(https|s3)://([^/]+)/?(.*)$
-          maxLength: 512
+          description: Path to the filesystem where the endpoint data is available to the container.
+          pattern: .*
+          maxLength: 256
+        S3DataDistributionType:
+          type: string
+          description: Whether input data distributed in Amazon S3 is fully replicated or sharded by an S3 key. Defauts to FullyReplicated
+          enum:
+            - FullyReplicated
+            - ShardedByS3Key
+        S3InputMode:
+          type: string
+          description: Whether the Pipe or File is used as the input mode for transfering data for the monitoring job. Pipe mode is recommended for large datasets. File mode is useful for small files that fit in memory. Defaults to File.
+          enum:
+            - Pipe
+            - File
+        StartTimeOffset:
+          description: Monitoring start time offset, e.g. -PT1H
+          $ref: '#/components/schemas/MonitoringTimeOffsetString'
+        EndTimeOffset:
+          description: Monitoring end time offset, e.g. PT0H
+          $ref: '#/components/schemas/MonitoringTimeOffsetString'
+        FeaturesAttribute:
+          type: string
+          description: JSONpath to locate features in JSONlines dataset
+          maxLength: 256
+        InferenceAttribute:
+          type: string
+          description: Index or JSONpath to locate predicted label(s)
+          maxLength: 256
+        ProbabilityAttribute:
+          type: string
+          description: Index or JSONpath to locate probabilities
+          maxLength: 256
+        ProbabilityThresholdAttribute:
+          type: number
+          format: double
       required:
-        - S3Uri
-    ModelBiasJobDefinition:
+        - EndpointName
+        - LocalPath
+    ModelBiasJobDefinition_BatchTransformInput:
       type: object
+      additionalProperties: false
+      description: The batch transform input for a monitoring job.
       properties:
-        JobDefinitionArn:
-          description: The Amazon Resource Name (ARN) of job definition.
+        DataCapturedDestinationS3Uri:
           type: string
-          minLength: 1
+          description: A URI that identifies the Amazon S3 storage location where Batch Transform Job captures data.
+          pattern: ^(https|s3)://([^/]+)/?(.*)$
+          maxLength: 512
+        DatasetFormat:
+          $ref: '#/components/schemas/DatasetFormat'
+        LocalPath:
+          type: string
+          description: Path to the filesystem where the endpoint data is available to the container.
+          pattern: .*
           maxLength: 256
-        JobDefinitionName:
-          $ref: '#/components/schemas/JobDefinitionName'
-        ModelBiasBaselineConfig:
-          $ref: '#/components/schemas/ModelBiasBaselineConfig'
-        ModelBiasAppSpecification:
-          $ref: '#/components/schemas/ModelBiasAppSpecification'
-        ModelBiasJobInput:
-          $ref: '#/components/schemas/ModelBiasJobInput'
-        ModelBiasJobOutputConfig:
-          $ref: '#/components/schemas/MonitoringOutputConfig'
-        JobResources:
-          $ref: '#/components/schemas/MonitoringResources'
-        NetworkConfig:
-          $ref: '#/components/schemas/NetworkConfig'
-        EndpointName:
-          $ref: '#/components/schemas/EndpointName'
-        RoleArn:
-          description: The Amazon Resource Name (ARN) of an IAM role that Amazon SageMaker can assume to perform tasks on your behalf.
+        S3DataDistributionType:
           type: string
-          pattern: ^arn:aws[a-z\-]*:iam::\d{12}:role/?[a-zA-Z_0-9+=,.@\-_/]+$
-          minLength: 20
-          maxLength: 2048
-        StoppingCondition:
-          $ref: '#/components/schemas/StoppingCondition'
-        Tags:
-          type: array
-          maxItems: 50
-          description: An array of key-value pairs to apply to this resource.
-          items:
-            $ref: '#/components/schemas/Tag'
+          description: Whether input data distributed in Amazon S3 is fully replicated or sharded by an S3 key. Defauts to FullyReplicated
+          enum:
+            - FullyReplicated
+            - ShardedByS3Key
+        S3InputMode:
+          type: string
+          description: Whether the Pipe or File is used as the input mode for transfering data for the monitoring job. Pipe mode is recommended for large datasets. File mode is useful for small files that fit in memory. Defaults to File.
+          enum:
+            - Pipe
+            - File
+        StartTimeOffset:
+          description: Monitoring start time offset, e.g. -PT1H
+          $ref: '#/components/schemas/MonitoringTimeOffsetString'
+        EndTimeOffset:
+          description: Monitoring end time offset, e.g. PT0H
+          $ref: '#/components/schemas/MonitoringTimeOffsetString'
+        FeaturesAttribute:
+          type: string
+          description: JSONpath to locate features in JSONlines dataset
+          maxLength: 256
+        InferenceAttribute:
+          type: string
+          description: Index or JSONpath to locate predicted label(s)
+          maxLength: 256
+        ProbabilityAttribute:
+          type: string
+          description: Index or JSONpath to locate probabilities
+          maxLength: 256
+        ProbabilityThresholdAttribute:
+          type: number
+          format: double
+      required:
+        - DataCapturedDestinationS3Uri
+        - DatasetFormat
+        - LocalPath
+    ModelBiasJobDefinition_NetworkConfig:
+      type: object
+      additionalProperties: false
+      description: Networking options for a job, such as network traffic encryption between containers, whether to allow inbound and outbound network calls to and from containers, and the VPC subnets and security groups to use for VPC-enabled jobs.
+      properties:
+        EnableInterContainerTrafficEncryption:
+          description: Whether to encrypt all communications between distributed processing jobs. Choose True to encrypt communications. Encryption provides greater security for distributed processing jobs, but the processing might take longer.
+          type: boolean
+        EnableNetworkIsolation:
+          description: Whether to allow inbound and outbound network calls to and from the containers used for the processing job.
+          type: boolean
+        VpcConfig:
+          $ref: '#/components/schemas/ModelBiasJobDefinition_VpcConfig'
+    ModelBiasJobDefinition_VpcConfig:
+      type: object
+      additionalProperties: false
+      description: Specifies a VPC that your training jobs and hosted models have access to. Control access to and from your training and model containers by configuring the VPC.
+      properties:
+        SecurityGroupIds:
+          description: The VPC security group IDs, in the form sg-xxxxxxxx. Specify the security groups for the VPC that is specified in the Subnets field.
+          type: array
+          minItems: 1
+          maxItems: 5
+          items:
+            type: string
+            maxLength: 32
+            pattern: '[-0-9a-zA-Z]+'
+        Subnets:
+          description: The ID of the subnets in the VPC to which you want to connect to your monitoring jobs.
+          type: array
+          minItems: 1
+          maxItems: 16
+          items:
+            type: string
+            maxLength: 32
+            pattern: '[-0-9a-zA-Z]+'
+      required:
+        - SecurityGroupIds
+        - Subnets
+    ModelBiasJobDefinition_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          maxLength: 256
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+      required:
+        - Key
+        - Value
+    MonitoringTimeOffsetString:
+      type: string
+      description: The time offsets in ISO duration format
+      pattern: ^.?P.*
+      minLength: 1
+      maxLength: 15
+    MonitoringGroundTruthS3Input:
+      type: object
+      additionalProperties: false
+      description: 'Ground truth input provided in S3 '
+      properties:
+        S3Uri:
+          type: string
+          description: A URI that identifies the Amazon S3 storage location where Amazon SageMaker saves the results of a monitoring job.
+          pattern: ^(https|s3)://([^/]+)/?(.*)$
+          maxLength: 512
+      required:
+        - S3Uri
+    ModelBiasJobDefinition:
+      type: object
+      properties:
+        JobDefinitionArn:
+          description: The Amazon Resource Name (ARN) of job definition.
+          type: string
+          minLength: 1
+          maxLength: 256
+        JobDefinitionName:
+          $ref: '#/components/schemas/JobDefinitionName'
+        ModelBiasBaselineConfig:
+          $ref: '#/components/schemas/ModelBiasBaselineConfig'
+        ModelBiasAppSpecification:
+          $ref: '#/components/schemas/ModelBiasAppSpecification'
+        ModelBiasJobInput:
+          $ref: '#/components/schemas/ModelBiasJobInput'
+        ModelBiasJobOutputConfig:
+          $ref: '#/components/schemas/MonitoringOutputConfig'
+        JobResources:
+          $ref: '#/components/schemas/MonitoringResources'
+        NetworkConfig:
+          $ref: '#/components/schemas/ModelBiasJobDefinition_NetworkConfig'
+        EndpointName:
+          $ref: '#/components/schemas/EndpointName'
+        RoleArn:
+          description: The Amazon Resource Name (ARN) of an IAM role that Amazon SageMaker can assume to perform tasks on your behalf.
+          type: string
+          pattern: ^arn:aws[a-z\-]*:iam::\d{12}:role/?[a-zA-Z_0-9+=,.@\-_/]+$
+          minLength: 20
+          maxLength: 2048
+        StoppingCondition:
+          $ref: '#/components/schemas/StoppingCondition'
+        Tags:
+          type: array
+          maxItems: 50
+          description: An array of key-value pairs to apply to this resource.
+          items:
+            $ref: '#/components/schemas/ModelBiasJobDefinition_Tag'
         CreationTime:
           description: The time at which the job definition was created.
           type: string
@@ -4357,17 +4938,17 @@ components:
           - sagemaker:ListModelBiasJobDefinitions
           - sagemaker:ListTags
     SecurityConfig:
-      description: An optional AWS Key Management Service key to encrypt, decrypt, and re-encrypt model package information for regulated workloads with highly sensitive data.
       type: object
+      description: |+
+        An optional Key Management Service key to encrypt, decrypt, and re-encrypt model card content for regulated workloads with highly sensitive data.
+
       additionalProperties: false
       properties:
         KmsKeyId:
-          description: The AWS KMS Key ID (KMSKeyId) used for encryption of model package information.
           type: string
+          description: A Key Management Service key ID to use for encrypting a model card.
           maxLength: 2048
-          pattern: ^[a-zA-Z0-9:/_-]*$
-      required:
-        - KmsKeyId
+          pattern: .*
     UserContext:
       description: Information about the user who created or modified an experiment, trial, trial component, lineage group, project, or model card.
       type: object
@@ -4385,6 +4966,23 @@ components:
           description: The domain associated with the user.
           type: string
           default: UnsetValue
+    ModelCard_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: The tag key. Tag keys must be unique per resource.
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: The tag value.
+          maxLength: 256
+      required:
+        - Key
+        - Value
     Content:
       type: object
       description: The content of the model card.
@@ -4724,66 +5322,33 @@ components:
       items:
         $ref: '#/components/schemas/SourceAlgorithm'
     SourceAlgorithm:
-      description: Specifies an algorithm that was used to create the model package. The algorithm must be either an algorithm resource in your Amazon SageMaker account or an algorithm in AWS Marketplace that you are subscribed to.
       type: object
       additionalProperties: false
+      required:
+        - AlgorithmName
       properties:
         AlgorithmName:
-          description: The name of an algorithm that was used to create the model package. The algorithm must be either an algorithm resource in your Amazon SageMaker account or an algorithm in AWS Marketplace that you are subscribed to.
+          description: The name of an algorithm that was used to create the model package. The algorithm must be either an algorithm resource in your SageMaker account or an algorithm in AWS Marketplace that you are subscribed to.
           type: string
-          minLength: 1
           maxLength: 170
-          pattern: (arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]*:[0-9]{12}:[a-z\-]*\/)?([a-zA-Z0-9]([a-zA-Z0-9-]){0,62})(?<!-)$
         ModelDataUrl:
-          description: The Amazon S3 path where the model artifacts, which result from model training, are stored. This path must point to a single gzip compressed tar archive (.tar.gz suffix).
+          description: The Amazon S3 path where the model artifacts, which result from model training, are stored.
           type: string
           maxLength: 1024
-          pattern: ^(https|s3)://([^/]+)/?(.*)$
-      required:
-        - AlgorithmName
     InferenceSpecification:
-      description: Details about inference jobs that can be run with models based on this model package.
       type: object
       additionalProperties: false
+      required:
+        - Containers
       properties:
         Containers:
-          description: The Amazon ECR registry path of the Docker image that contains the inference code.
-          type: array
-          uniqueItems: true
-          items:
-            $ref: '#/components/schemas/ModelPackageContainerDefinition'
-          minItems: 1
-          maxItems: 15
-          x-insertionOrder: true
-        SupportedContentTypes:
-          description: The supported MIME types for the input data.
-          type: array
-          items:
-            $ref: '#/components/schemas/ContentType'
-          x-insertionOrder: true
-        SupportedRealtimeInferenceInstanceTypes:
-          description: A list of the instance types that are used to generate inferences in real-time
-          type: array
-          items:
-            $ref: '#/components/schemas/InferenceInstanceType'
-          x-insertionOrder: true
-        SupportedResponseMIMETypes:
-          description: The supported MIME types for the output data.
+          description: Contains inference related information which were used to create model package.
           type: array
-          items:
-            $ref: '#/components/schemas/ResponseMIMEType'
           x-insertionOrder: true
-        SupportedTransformInstanceTypes:
-          description: A list of the instance types on which a transformation job can be run or on which an endpoint can be deployed.
-          type: array
           minItems: 1
+          maxItems: 15
           items:
-            $ref: '#/components/schemas/TransformInstanceType'
-          x-insertionOrder: true
-      required:
-        - Containers
-        - SupportedContentTypes
-        - SupportedResponseMIMETypes
+            $ref: '#/components/schemas/Container'
     Container:
       type: object
       additionalProperties: false
@@ -5003,60 +5568,177 @@ components:
         type: string
         maxLength: 63
     ModelCard:
-      description: The model card associated with the model package.
       type: object
-      additionalProperties: false
       properties:
-        ModelCardContent:
-          description: The content of the model card.
+        ModelCardArn:
+          description: The Amazon Resource Name (ARN) of the successfully created model card.
           type: string
-          minLength: 0
-          maxLength: 100000
-          pattern: .*
+          minLength: 1
+          maxLength: 256
+          pattern: ^arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]{9,16}:[0-9]{12}:model-card/[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}$
+        ModelCardVersion:
+          description: A version of the model card.
+          type: integer
+          minimum: 1
+        ModelCardName:
+          description: The unique name of the model card.
+          type: string
+          maxLength: 63
+          pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}$
+        SecurityConfig:
+          $ref: '#/components/schemas/SecurityConfig'
         ModelCardStatus:
-          description: The approval status of the model card within your organization.
+          description: The approval status of the model card within your organization. Different organizations might have different criteria for model card review and approval.
           type: string
           enum:
             - Draft
             - PendingReview
             - Approved
             - Archived
+        Content:
+          $ref: '#/components/schemas/Content'
+        CreationTime:
+          description: The date and time the model card was created.
+          type: string
+        CreatedBy:
+          description: Information about the user who created or modified an experiment, trial, trial component, lineage group, project, or model card.
+          $ref: '#/components/schemas/UserContext'
+        LastModifiedTime:
+          description: The date and time the model card was last modified.
+          type: string
+        LastModifiedBy:
+          description: Information about the user who created or modified an experiment, trial, trial component, lineage group, project, or model card.
+          $ref: '#/components/schemas/UserContext'
+        ModelCardProcessingStatus:
+          description: The processing status of model card deletion. The ModelCardProcessingStatus updates throughout the different deletion steps.
+          type: string
+          default: UnsetValue
+          enum:
+            - UnsetValue
+            - DeleteInProgress
+            - DeletePending
+            - ContentDeleted
+            - ExportJobsDeleted
+            - DeleteCompleted
+            - DeleteFailed
+        Tags:
+          type: array
+          minItems: 1
+          maxItems: 50
+          description: Key-value pairs used to manage metadata for model cards.
+          x-insertionOrder: true
+          items:
+            $ref: '#/components/schemas/ModelCard_Tag'
       required:
-        - ModelCardContent
+        - ModelCardName
+        - Content
         - ModelCardStatus
-    ModelExplainabilityBaselineConfig:
-      type: object
-      additionalProperties: false
-      description: Baseline configuration used to validate that the data conforms to the specified constraints and statistics.
-      properties:
-        BaseliningJobName:
-          $ref: '#/components/schemas/ProcessingJobName'
-        ConstraintsResource:
-          $ref: '#/components/schemas/ConstraintsResource'
-    ModelExplainabilityAppSpecification:
-      type: object
-      additionalProperties: false
-      description: Container image configuration object for the monitoring job.
-      properties:
-        ImageUri:
-          type: string
-          description: The container image to be run by the monitoring job.
-          pattern: .*
-          maxLength: 255
-        ConfigUri:
-          description: The S3 URI to an analysis configuration file
-          $ref: '#/components/schemas/S3Uri'
-        Environment:
-          type: object
-          additionalProperties: false
-          description: Sets the environment variables in the Docker container
-          x-patternProperties:
-            '[a-zA-Z_][a-zA-Z0-9_]*':
-              type: string
-              minLength: 1
-              maxLength: 256
-            '[\S\s]*':
-              type: string
+      x-stackql-resource-name: model_card
+      description: Resource Type definition for AWS::SageMaker::ModelCard.
+      x-type-name: AWS::SageMaker::ModelCard
+      x-stackql-primary-identifier:
+        - ModelCardName
+      x-create-only-properties:
+        - ModelCardName
+        - SecurityConfig
+      x-read-only-properties:
+        - ModelCardArn
+        - ModelCardVersion
+        - CreatedBy/DomainId
+        - CreatedBy/UserProfileArn
+        - CreatedBy/UserProfileName
+        - LastModifiedBy/DomainId
+        - LastModifiedBy/UserProfileArn
+        - LastModifiedBy/UserProfileName
+        - CreationTime
+        - LastModifiedTime
+        - ModelCardProcessingStatus
+      x-required-properties:
+        - ModelCardName
+        - Content
+        - ModelCardStatus
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: true
+        tagProperty: /properties/Tags
+        permissions:
+          - sagemaker:AddTags
+          - sagemaker:ListTags
+          - sagemaker:DeleteTags
+      x-required-permissions:
+        create:
+          - sagemaker:CreateModelCard
+          - sagemaker:DescribeModel
+          - kms:DescribeKey
+          - kms:GenerateDataKey
+          - kms:CreateGrant
+          - sagemaker:DescribeModelPackageGroup
+          - sagemaker:DescribeModelPackage
+          - sagemaker:AddTags
+        read:
+          - sagemaker:DescribeModelCard
+          - sagemaker:DescribeModelPackageGroup
+          - sagemaker:DescribeModelPackage
+          - kms:Decrypt
+          - sagemaker:ListTags
+        update:
+          - sagemaker:UpdateModelCard
+          - sagemaker:DescribeModelCard
+          - sagemaker:DescribeModel
+          - kms:GenerateDataKey
+          - kms:Decrypt
+          - sagemaker:DescribeModelPackageGroup
+          - sagemaker:DescribeModelPackage
+          - sagemaker:ListTags
+          - sagemaker:AddTags
+          - sagemaker:DeleteTags
+        delete:
+          - sagemaker:DescribeModelCard
+          - sagemaker:DeleteModelCard
+          - sagemaker:DescribeModelPackageGroup
+          - sagemaker:DescribeModelPackage
+          - kms:RetireGrant
+          - kms:Decrypt
+          - sagemaker:ListTags
+          - sagemaker:DeleteTags
+        list:
+          - sagemaker:ListModelCards
+          - sagemaker:ListModelCardVersions
+    ModelExplainabilityBaselineConfig:
+      type: object
+      additionalProperties: false
+      description: Baseline configuration used to validate that the data conforms to the specified constraints and statistics.
+      properties:
+        BaseliningJobName:
+          $ref: '#/components/schemas/ProcessingJobName'
+        ConstraintsResource:
+          $ref: '#/components/schemas/ConstraintsResource'
+    ModelExplainabilityAppSpecification:
+      type: object
+      additionalProperties: false
+      description: Container image configuration object for the monitoring job.
+      properties:
+        ImageUri:
+          type: string
+          description: The container image to be run by the monitoring job.
+          pattern: .*
+          maxLength: 255
+        ConfigUri:
+          description: The S3 URI to an analysis configuration file
+          $ref: '#/components/schemas/S3Uri'
+        Environment:
+          type: object
+          additionalProperties: false
+          description: Sets the environment variables in the Docker container
+          x-patternProperties:
+            '[a-zA-Z_][a-zA-Z0-9_]*':
+              type: string
+              minLength: 1
+              maxLength: 256
+            '[\S\s]*':
+              type: string
               maxLength: 256
       required:
         - ImageUri
@@ -5067,9 +5749,164 @@ components:
       description: The inputs for a monitoring job.
       properties:
         EndpointInput:
-          $ref: '#/components/schemas/EndpointInput'
+          $ref: '#/components/schemas/ModelExplainabilityJobDefinition_EndpointInput'
         BatchTransformInput:
-          $ref: '#/components/schemas/BatchTransformInput'
+          $ref: '#/components/schemas/ModelExplainabilityJobDefinition_BatchTransformInput'
+    ModelExplainabilityJobDefinition_EndpointInput:
+      type: object
+      additionalProperties: false
+      description: The endpoint for a monitoring job.
+      properties:
+        EndpointName:
+          $ref: '#/components/schemas/EndpointName'
+        LocalPath:
+          type: string
+          description: Path to the filesystem where the endpoint data is available to the container.
+          pattern: .*
+          maxLength: 256
+        S3DataDistributionType:
+          type: string
+          description: Whether input data distributed in Amazon S3 is fully replicated or sharded by an S3 key. Defauts to FullyReplicated
+          enum:
+            - FullyReplicated
+            - ShardedByS3Key
+        S3InputMode:
+          type: string
+          description: Whether the Pipe or File is used as the input mode for transfering data for the monitoring job. Pipe mode is recommended for large datasets. File mode is useful for small files that fit in memory. Defaults to File.
+          enum:
+            - Pipe
+            - File
+        FeaturesAttribute:
+          type: string
+          description: JSONpath to locate features in JSONlines dataset
+          maxLength: 256
+        InferenceAttribute:
+          type: string
+          description: Index or JSONpath to locate predicted label(s)
+          maxLength: 256
+        ProbabilityAttribute:
+          type: string
+          description: Index or JSONpath to locate probabilities
+          maxLength: 256
+      required:
+        - EndpointName
+        - LocalPath
+    ModelExplainabilityJobDefinition_BatchTransformInput:
+      type: object
+      additionalProperties: false
+      description: The batch transform input for a monitoring job.
+      properties:
+        DataCapturedDestinationS3Uri:
+          type: string
+          description: A URI that identifies the Amazon S3 storage location where Batch Transform Job captures data.
+          pattern: ^(https|s3)://([^/]+)/?(.*)$
+          maxLength: 512
+        DatasetFormat:
+          $ref: '#/components/schemas/ModelExplainabilityJobDefinition_DatasetFormat'
+        LocalPath:
+          type: string
+          description: Path to the filesystem where the endpoint data is available to the container.
+          pattern: .*
+          maxLength: 256
+        S3DataDistributionType:
+          type: string
+          description: Whether input data distributed in Amazon S3 is fully replicated or sharded by an S3 key. Defauts to FullyReplicated
+          enum:
+            - FullyReplicated
+            - ShardedByS3Key
+        S3InputMode:
+          type: string
+          description: Whether the Pipe or File is used as the input mode for transfering data for the monitoring job. Pipe mode is recommended for large datasets. File mode is useful for small files that fit in memory. Defaults to File.
+          enum:
+            - Pipe
+            - File
+        FeaturesAttribute:
+          type: string
+          description: JSONpath to locate features in JSONlines dataset
+          maxLength: 256
+        InferenceAttribute:
+          type: string
+          description: Index or JSONpath to locate predicted label(s)
+          maxLength: 256
+        ProbabilityAttribute:
+          type: string
+          description: Index or JSONpath to locate probabilities
+          maxLength: 256
+      required:
+        - DataCapturedDestinationS3Uri
+        - DatasetFormat
+        - LocalPath
+    ModelExplainabilityJobDefinition_NetworkConfig:
+      type: object
+      additionalProperties: false
+      description: Networking options for a job, such as network traffic encryption between containers, whether to allow inbound and outbound network calls to and from containers, and the VPC subnets and security groups to use for VPC-enabled jobs.
+      properties:
+        EnableInterContainerTrafficEncryption:
+          description: Whether to encrypt all communications between distributed processing jobs. Choose True to encrypt communications. Encryption provides greater security for distributed processing jobs, but the processing might take longer.
+          type: boolean
+        EnableNetworkIsolation:
+          description: Whether to allow inbound and outbound network calls to and from the containers used for the processing job.
+          type: boolean
+        VpcConfig:
+          $ref: '#/components/schemas/ModelExplainabilityJobDefinition_VpcConfig'
+    ModelExplainabilityJobDefinition_VpcConfig:
+      type: object
+      additionalProperties: false
+      description: Specifies a VPC that your training jobs and hosted models have access to. Control access to and from your training and model containers by configuring the VPC.
+      properties:
+        SecurityGroupIds:
+          description: The VPC security group IDs, in the form sg-xxxxxxxx. Specify the security groups for the VPC that is specified in the Subnets field.
+          type: array
+          minItems: 1
+          maxItems: 5
+          items:
+            type: string
+            maxLength: 32
+            pattern: '[-0-9a-zA-Z]+'
+        Subnets:
+          description: The ID of the subnets in the VPC to which you want to connect to your monitoring jobs.
+          type: array
+          minItems: 1
+          maxItems: 16
+          items:
+            type: string
+            maxLength: 32
+            pattern: '[-0-9a-zA-Z]+'
+      required:
+        - SecurityGroupIds
+        - Subnets
+    ModelExplainabilityJobDefinition_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          maxLength: 256
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+      required:
+        - Key
+        - Value
+    ModelExplainabilityJobDefinition_DatasetFormat:
+      description: The dataset format of the data to monitor
+      type: object
+      properties:
+        Csv:
+          $ref: '#/components/schemas/Csv'
+        Json:
+          $ref: '#/components/schemas/Json'
+        Parquet:
+          $ref: '#/components/schemas/ModelExplainabilityJobDefinition_Parquet'
+    ModelExplainabilityJobDefinition_Parquet:
+      description: A flag indicating if the dataset format is Parquet
+      type: boolean
     ModelExplainabilityJobDefinition:
       type: object
       properties:
@@ -5091,7 +5928,7 @@ components:
         JobResources:
           $ref: '#/components/schemas/MonitoringResources'
         NetworkConfig:
-          $ref: '#/components/schemas/NetworkConfig'
+          $ref: '#/components/schemas/ModelExplainabilityJobDefinition_NetworkConfig'
         EndpointName:
           $ref: '#/components/schemas/EndpointName'
         RoleArn:
@@ -5107,7 +5944,7 @@ components:
           maxItems: 50
           description: An array of key-value pairs to apply to this resource.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ModelExplainabilityJobDefinition_Tag'
         CreationTime:
           description: The time at which the job definition was created.
           type: string
@@ -5169,6 +6006,25 @@ components:
         list:
           - sagemaker:ListModelExplainabilityJobDefinitions
           - sagemaker:ListTags
+    ModelPackage_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          maxLength: 256
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     AdditionalInferenceSpecifications:
       type: array
       minItems: 1
@@ -5269,6 +6125,9 @@ components:
           minLength: 1
           maxLength: 256
       additionalProperties: false
+    ModelPackage_Domain:
+      description: The machine learning domain of the model package you specified.
+      type: string
     DriftCheckBaselines:
       description: Represents the drift check baselines that can be used when the model monitor is set using the model package.
       type: object
@@ -5365,41 +6224,85 @@ components:
           pattern: ^(https|s3)://([^/]+)/?(.*)$
       required:
         - S3Uri
-    Environment:
-      type: object
-      description: Sets the environment variables in the Docker container
-      x-patternProperties:
-        '[a-zA-Z_][a-zA-Z0-9_]*':
-          type: string
-          maxLength: 256
-        '[\S\s]*':
-          type: string
-          maxLength: 256
-      additionalProperties: false
-    ModelPackageContainerDefinition:
+    ModelPackage_InferenceSpecification:
+      description: Details about inference jobs that can be run with models based on this model package.
       type: object
       additionalProperties: false
-      description: Describes the Docker container for the model package.
       properties:
-        ContainerHostname:
-          type: string
-          description: The DNS host name for the Docker container.
-          pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}
-          maxLength: 63
-        Environment:
-          $ref: '#/components/schemas/Environment'
-        ModelInput:
-          type: object
-          additionalProperties: false
-          properties:
-            DataInputConfig:
-              type: string
-              description: The input configuration object for the model.
-              pattern: '[\S\s]+'
-              minLength: 1
-              maxLength: 1024
-          required:
-            - DataInputConfig
+        Containers:
+          description: The Amazon ECR registry path of the Docker image that contains the inference code.
+          type: array
+          uniqueItems: true
+          items:
+            $ref: '#/components/schemas/ModelPackageContainerDefinition'
+          minItems: 1
+          maxItems: 15
+          x-insertionOrder: true
+        SupportedContentTypes:
+          description: The supported MIME types for the input data.
+          type: array
+          items:
+            $ref: '#/components/schemas/ContentType'
+          x-insertionOrder: true
+        SupportedRealtimeInferenceInstanceTypes:
+          description: A list of the instance types that are used to generate inferences in real-time
+          type: array
+          items:
+            $ref: '#/components/schemas/InferenceInstanceType'
+          x-insertionOrder: true
+        SupportedResponseMIMETypes:
+          description: The supported MIME types for the output data.
+          type: array
+          items:
+            $ref: '#/components/schemas/ResponseMIMEType'
+          x-insertionOrder: true
+        SupportedTransformInstanceTypes:
+          description: A list of the instance types on which a transformation job can be run or on which an endpoint can be deployed.
+          type: array
+          minItems: 1
+          items:
+            $ref: '#/components/schemas/TransformInstanceType'
+          x-insertionOrder: true
+      required:
+        - Containers
+        - SupportedContentTypes
+        - SupportedResponseMIMETypes
+    Environment:
+      type: object
+      description: Sets the environment variables in the Docker container
+      maxProperties: 16
+      x-patternProperties:
+        '[a-zA-Z_][a-zA-Z0-9_]*':
+          type: string
+          maxLength: 1024
+        '[\S\s]*':
+          type: string
+          maxLength: 1024
+      additionalProperties: false
+    ModelPackageContainerDefinition:
+      type: object
+      additionalProperties: false
+      description: Describes the Docker container for the model package.
+      properties:
+        ContainerHostname:
+          type: string
+          description: The DNS host name for the Docker container.
+          pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}
+          maxLength: 63
+        Environment:
+          $ref: '#/components/schemas/Environment'
+        ModelInput:
+          type: object
+          additionalProperties: false
+          properties:
+            DataInputConfig:
+              type: string
+              description: The input configuration object for the model.
+              pattern: '[\S\s]+'
+              minLength: 1
+              maxLength: 1024
+          required:
+            - DataInputConfig
         Image:
           type: string
           description: The Amazon EC2 Container Registry (Amazon ECR) path where inference code is stored.
@@ -5527,8 +6430,9 @@ components:
     ModelPackageGroupName:
       type: string
       description: The name of the model package group.
-      pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9])*$
-      maxLength: 63
+      pattern: (arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]*:[0-9]{12}:[a-z\-]*\/)?([a-zA-Z0-9]([a-zA-Z0-9-]){0,62})(?<!-)$
+      minLength: 1
+      maxLength: 170
     ModelPackageName:
       type: string
       description: The name or arn of the model package.
@@ -5546,13 +6450,31 @@ components:
           description: A list of algorithms that were used to create a model package.
           type: array
           items:
-            $ref: '#/components/schemas/SourceAlgorithm'
+            $ref: '#/components/schemas/ModelPackage_SourceAlgorithm'
           minItems: 1
           maxItems: 1
           x-insertionOrder: true
       required:
         - SourceAlgorithms
       x-insertionOrder: true
+    ModelPackage_SourceAlgorithm:
+      description: Specifies an algorithm that was used to create the model package. The algorithm must be either an algorithm resource in your Amazon SageMaker account or an algorithm in AWS Marketplace that you are subscribed to.
+      type: object
+      additionalProperties: false
+      properties:
+        AlgorithmName:
+          description: The name of an algorithm that was used to create the model package. The algorithm must be either an algorithm resource in your Amazon SageMaker account or an algorithm in AWS Marketplace that you are subscribed to.
+          type: string
+          minLength: 1
+          maxLength: 170
+          pattern: (arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]*:[0-9]{12}:[a-z\-]*\/)?([a-zA-Z0-9]([a-zA-Z0-9-]){0,62})(?<!-)$
+        ModelDataUrl:
+          description: The Amazon S3 path where the model artifacts, which result from model training, are stored. This path must point to a single gzip compressed tar archive (.tar.gz suffix).
+          type: string
+          maxLength: 1024
+          pattern: ^(https|s3)://([^/]+)/?(.*)$
+      required:
+        - AlgorithmName
     ValidationSpecification:
       description: Specifies configurations for one or more transform jobs that Amazon SageMaker runs to test the model package.
       type: object
@@ -5846,6 +6768,40 @@ components:
       minLength: 0
       maxLength: 1024
       pattern: '[\p{L}\p{M}\p{Z}\p{N}\p{P}]{0,1024}'
+    ModelPackage_SecurityConfig:
+      description: An optional AWS Key Management Service key to encrypt, decrypt, and re-encrypt model package information for regulated workloads with highly sensitive data.
+      type: object
+      additionalProperties: false
+      properties:
+        KmsKeyId:
+          description: The AWS KMS Key ID (KMSKeyId) used for encryption of model package information.
+          type: string
+          maxLength: 2048
+          pattern: ^[a-zA-Z0-9:/_-]*$
+      required:
+        - KmsKeyId
+    ModelPackage_ModelCard:
+      description: The model card associated with the model package.
+      type: object
+      additionalProperties: false
+      properties:
+        ModelCardContent:
+          description: The content of the model card.
+          type: string
+          minLength: 0
+          maxLength: 100000
+          pattern: .*
+        ModelCardStatus:
+          description: The approval status of the model card within your organization.
+          type: string
+          enum:
+            - Draft
+            - PendingReview
+            - Approved
+            - Archived
+      required:
+        - ModelCardContent
+        - ModelCardStatus
     ModelPackage:
       type: object
       properties:
@@ -5854,7 +6810,7 @@ components:
           maxItems: 50
           description: An array of key-value pairs to apply to this resource.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ModelPackage_Tag'
         AdditionalInferenceSpecifications:
           $ref: '#/components/schemas/AdditionalInferenceSpecifications'
         CertifyForMarketplace:
@@ -5864,11 +6820,11 @@ components:
         CustomerMetadataProperties:
           $ref: '#/components/schemas/CustomerMetadataProperties'
         Domain:
-          $ref: '#/components/schemas/Domain'
+          $ref: '#/components/schemas/ModelPackage_Domain'
         DriftCheckBaselines:
           $ref: '#/components/schemas/DriftCheckBaselines'
         InferenceSpecification:
-          $ref: '#/components/schemas/InferenceSpecification'
+          $ref: '#/components/schemas/ModelPackage_InferenceSpecification'
         MetadataProperties:
           $ref: '#/components/schemas/MetadataProperties'
         ModelApprovalStatus:
@@ -5910,9 +6866,9 @@ components:
         SourceUri:
           $ref: '#/components/schemas/SourceUri'
         ModelCard:
-          $ref: '#/components/schemas/ModelCard'
+          $ref: '#/components/schemas/ModelPackage_ModelCard'
         SecurityConfig:
-          $ref: '#/components/schemas/SecurityConfig'
+          $ref: '#/components/schemas/ModelPackage_SecurityConfig'
       x-stackql-resource-name: model_package
       description: Resource Type definition for AWS::SageMaker::ModelPackage
       x-type-name: AWS::SageMaker::ModelPackage
@@ -5999,11 +6955,35 @@ components:
           - kms:Decrypt
         list:
           - sagemaker:ListModelPackages
+    ModelPackageGroup_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          maxLength: 256
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     ModelPackageGroupDescription:
       type: string
       description: The description of the model package group.
       pattern: '[\p{L}\p{M}\p{Z}\p{S}\p{N}\p{P}]*'
       maxLength: 1024
+    ModelPackageGroup_ModelPackageGroupName:
+      type: string
+      description: The name of the model package group.
+      pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9])*$
+      maxLength: 63
     ModelPackageGroupArn:
       description: The Amazon Resource Name (ARN) of the model package group.
       type: string
@@ -6018,11 +6998,11 @@ components:
           maxItems: 50
           description: An array of key-value pairs to apply to this resource.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ModelPackageGroup_Tag'
         ModelPackageGroupArn:
           $ref: '#/components/schemas/ModelPackageGroupArn'
         ModelPackageGroupName:
-          $ref: '#/components/schemas/ModelPackageGroupName'
+          $ref: '#/components/schemas/ModelPackageGroup_ModelPackageGroupName'
         ModelPackageGroupDescription:
           $ref: '#/components/schemas/ModelPackageGroupDescription'
         ModelPackageGroupPolicy:
@@ -6157,106 +7137,271 @@ components:
       description: The inputs for a monitoring job.
       properties:
         EndpointInput:
-          $ref: '#/components/schemas/EndpointInput'
+          $ref: '#/components/schemas/ModelQualityJobDefinition_EndpointInput'
         BatchTransformInput:
-          $ref: '#/components/schemas/BatchTransformInput'
+          $ref: '#/components/schemas/ModelQualityJobDefinition_BatchTransformInput'
         GroundTruthS3Input:
           $ref: '#/components/schemas/MonitoringGroundTruthS3Input'
       required:
         - GroundTruthS3Input
-    ProblemType:
-      description: The status of the monitoring job.
-      type: string
-      enum:
-        - BinaryClassification
-        - MulticlassClassification
-        - Regression
-    ModelQualityJobDefinition:
+    ModelQualityJobDefinition_EndpointInput:
       type: object
+      additionalProperties: false
+      description: The endpoint for a monitoring job.
       properties:
-        JobDefinitionArn:
-          description: The Amazon Resource Name (ARN) of job definition.
-          type: string
-          minLength: 1
-          maxLength: 256
-        JobDefinitionName:
-          $ref: '#/components/schemas/JobDefinitionName'
-        ModelQualityBaselineConfig:
-          $ref: '#/components/schemas/ModelQualityBaselineConfig'
-        ModelQualityAppSpecification:
-          $ref: '#/components/schemas/ModelQualityAppSpecification'
-        ModelQualityJobInput:
-          $ref: '#/components/schemas/ModelQualityJobInput'
-        ModelQualityJobOutputConfig:
-          $ref: '#/components/schemas/MonitoringOutputConfig'
-        JobResources:
-          $ref: '#/components/schemas/MonitoringResources'
-        NetworkConfig:
-          $ref: '#/components/schemas/NetworkConfig'
         EndpointName:
           $ref: '#/components/schemas/EndpointName'
-        RoleArn:
-          description: The Amazon Resource Name (ARN) of an IAM role that Amazon SageMaker can assume to perform tasks on your behalf.
+        LocalPath:
           type: string
-          pattern: ^arn:aws[a-z\-]*:iam::\d{12}:role/?[a-zA-Z_0-9+=,.@\-_/]+$
-          minLength: 20
-          maxLength: 2048
-        StoppingCondition:
-          $ref: '#/components/schemas/StoppingCondition'
-        Tags:
-          type: array
-          maxItems: 50
-          description: An array of key-value pairs to apply to this resource.
-          items:
-            $ref: '#/components/schemas/Tag'
-        CreationTime:
-          description: The time at which the job definition was created.
+          description: Path to the filesystem where the endpoint data is available to the container.
+          pattern: .*
+          maxLength: 256
+        S3DataDistributionType:
+          type: string
+          description: Whether input data distributed in Amazon S3 is fully replicated or sharded by an S3 key. Defauts to FullyReplicated
+          enum:
+            - FullyReplicated
+            - ShardedByS3Key
+        S3InputMode:
+          type: string
+          description: Whether the Pipe or File is used as the input mode for transfering data for the monitoring job. Pipe mode is recommended for large datasets. File mode is useful for small files that fit in memory. Defaults to File.
+          enum:
+            - Pipe
+            - File
+        StartTimeOffset:
+          description: Monitoring start time offset, e.g. -PT1H
+          $ref: '#/components/schemas/MonitoringTimeOffsetString'
+        EndTimeOffset:
+          description: Monitoring end time offset, e.g. PT0H
+          $ref: '#/components/schemas/MonitoringTimeOffsetString'
+        InferenceAttribute:
+          type: string
+          description: Index or JSONpath to locate predicted label(s)
+          maxLength: 256
+        ProbabilityAttribute:
           type: string
+          description: Index or JSONpath to locate probabilities
+          maxLength: 256
+        ProbabilityThresholdAttribute:
+          type: number
+          format: double
       required:
-        - ModelQualityAppSpecification
-        - ModelQualityJobInput
-        - ModelQualityJobOutputConfig
-        - JobResources
-        - RoleArn
-      x-stackql-resource-name: model_quality_job_definition
-      description: Resource Type definition for AWS::SageMaker::ModelQualityJobDefinition
-      x-type-name: AWS::SageMaker::ModelQualityJobDefinition
-      x-stackql-primary-identifier:
-        - JobDefinitionArn
-      x-create-only-properties:
-        - JobDefinitionName
-        - ModelQualityAppSpecification
-        - ModelQualityBaselineConfig
-        - ModelQualityJobInput
-        - ModelQualityJobOutputConfig
-        - JobResources
-        - NetworkConfig
-        - RoleArn
-        - StoppingCondition
-        - Tags
-        - EndpointName
-      x-write-only-properties:
         - EndpointName
-      x-read-only-properties:
-        - CreationTime
-        - JobDefinitionArn
-      x-required-properties:
-        - ModelQualityAppSpecification
-        - ModelQualityJobInput
-        - ModelQualityJobOutputConfig
-        - JobResources
-        - RoleArn
-      x-tagging:
-        taggable: true
-        tagOnCreate: true
-        tagUpdatable: false
-        cloudFormationSystemTags: true
-        tagProperty: /properties/Tags
-        permissions:
-          - sagemaker:AddTags
-          - sagemaker:ListTags
-      x-required-permissions:
-        create:
+        - LocalPath
+    ModelQualityJobDefinition_BatchTransformInput:
+      type: object
+      additionalProperties: false
+      description: The batch transform input for a monitoring job.
+      properties:
+        DataCapturedDestinationS3Uri:
+          type: string
+          description: A URI that identifies the Amazon S3 storage location where Batch Transform Job captures data.
+          pattern: ^(https|s3)://([^/]+)/?(.*)$
+          maxLength: 512
+        DatasetFormat:
+          $ref: '#/components/schemas/ModelQualityJobDefinition_DatasetFormat'
+        LocalPath:
+          type: string
+          description: Path to the filesystem where the endpoint data is available to the container.
+          pattern: .*
+          maxLength: 256
+        S3DataDistributionType:
+          type: string
+          description: Whether input data distributed in Amazon S3 is fully replicated or sharded by an S3 key. Defauts to FullyReplicated
+          enum:
+            - FullyReplicated
+            - ShardedByS3Key
+        S3InputMode:
+          type: string
+          description: Whether the Pipe or File is used as the input mode for transfering data for the monitoring job. Pipe mode is recommended for large datasets. File mode is useful for small files that fit in memory. Defaults to File.
+          enum:
+            - Pipe
+            - File
+        StartTimeOffset:
+          description: Monitoring start time offset, e.g. -PT1H
+          $ref: '#/components/schemas/MonitoringTimeOffsetString'
+        EndTimeOffset:
+          description: Monitoring end time offset, e.g. PT0H
+          $ref: '#/components/schemas/MonitoringTimeOffsetString'
+        InferenceAttribute:
+          type: string
+          description: Index or JSONpath to locate predicted label(s)
+          maxLength: 256
+        ProbabilityAttribute:
+          type: string
+          description: Index or JSONpath to locate probabilities
+          maxLength: 256
+        ProbabilityThresholdAttribute:
+          type: number
+          format: double
+      required:
+        - DataCapturedDestinationS3Uri
+        - DatasetFormat
+        - LocalPath
+    ModelQualityJobDefinition_NetworkConfig:
+      type: object
+      additionalProperties: false
+      description: Networking options for a job, such as network traffic encryption between containers, whether to allow inbound and outbound network calls to and from containers, and the VPC subnets and security groups to use for VPC-enabled jobs.
+      properties:
+        EnableInterContainerTrafficEncryption:
+          description: Whether to encrypt all communications between distributed processing jobs. Choose True to encrypt communications. Encryption provides greater security for distributed processing jobs, but the processing might take longer.
+          type: boolean
+        EnableNetworkIsolation:
+          description: Whether to allow inbound and outbound network calls to and from the containers used for the processing job.
+          type: boolean
+        VpcConfig:
+          $ref: '#/components/schemas/ModelQualityJobDefinition_VpcConfig'
+    ModelQualityJobDefinition_VpcConfig:
+      type: object
+      additionalProperties: false
+      description: Specifies a VPC that your training jobs and hosted models have access to. Control access to and from your training and model containers by configuring the VPC.
+      properties:
+        SecurityGroupIds:
+          description: The VPC security group IDs, in the form sg-xxxxxxxx. Specify the security groups for the VPC that is specified in the Subnets field.
+          type: array
+          minItems: 1
+          maxItems: 5
+          items:
+            type: string
+            maxLength: 32
+            pattern: '[-0-9a-zA-Z]+'
+        Subnets:
+          description: The ID of the subnets in the VPC to which you want to connect to your monitoring jobs.
+          type: array
+          minItems: 1
+          maxItems: 16
+          items:
+            type: string
+            maxLength: 32
+            pattern: '[-0-9a-zA-Z]+'
+      required:
+        - SecurityGroupIds
+        - Subnets
+    ModelQualityJobDefinition_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          maxLength: 256
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+      required:
+        - Key
+        - Value
+    ProblemType:
+      description: The status of the monitoring job.
+      type: string
+      enum:
+        - BinaryClassification
+        - MulticlassClassification
+        - Regression
+    ModelQualityJobDefinition_DatasetFormat:
+      description: The dataset format of the data to monitor
+      type: object
+      properties:
+        Csv:
+          $ref: '#/components/schemas/Csv'
+        Json:
+          $ref: '#/components/schemas/Json'
+        Parquet:
+          $ref: '#/components/schemas/ModelQualityJobDefinition_Parquet'
+    ModelQualityJobDefinition_Parquet:
+      description: A flag indicating if the dataset format is Parquet
+      type: boolean
+    ModelQualityJobDefinition:
+      type: object
+      properties:
+        JobDefinitionArn:
+          description: The Amazon Resource Name (ARN) of job definition.
+          type: string
+          minLength: 1
+          maxLength: 256
+        JobDefinitionName:
+          $ref: '#/components/schemas/JobDefinitionName'
+        ModelQualityBaselineConfig:
+          $ref: '#/components/schemas/ModelQualityBaselineConfig'
+        ModelQualityAppSpecification:
+          $ref: '#/components/schemas/ModelQualityAppSpecification'
+        ModelQualityJobInput:
+          $ref: '#/components/schemas/ModelQualityJobInput'
+        ModelQualityJobOutputConfig:
+          $ref: '#/components/schemas/MonitoringOutputConfig'
+        JobResources:
+          $ref: '#/components/schemas/MonitoringResources'
+        NetworkConfig:
+          $ref: '#/components/schemas/ModelQualityJobDefinition_NetworkConfig'
+        EndpointName:
+          $ref: '#/components/schemas/EndpointName'
+        RoleArn:
+          description: The Amazon Resource Name (ARN) of an IAM role that Amazon SageMaker can assume to perform tasks on your behalf.
+          type: string
+          pattern: ^arn:aws[a-z\-]*:iam::\d{12}:role/?[a-zA-Z_0-9+=,.@\-_/]+$
+          minLength: 20
+          maxLength: 2048
+        StoppingCondition:
+          $ref: '#/components/schemas/StoppingCondition'
+        Tags:
+          type: array
+          maxItems: 50
+          description: An array of key-value pairs to apply to this resource.
+          items:
+            $ref: '#/components/schemas/ModelQualityJobDefinition_Tag'
+        CreationTime:
+          description: The time at which the job definition was created.
+          type: string
+      required:
+        - ModelQualityAppSpecification
+        - ModelQualityJobInput
+        - ModelQualityJobOutputConfig
+        - JobResources
+        - RoleArn
+      x-stackql-resource-name: model_quality_job_definition
+      description: Resource Type definition for AWS::SageMaker::ModelQualityJobDefinition
+      x-type-name: AWS::SageMaker::ModelQualityJobDefinition
+      x-stackql-primary-identifier:
+        - JobDefinitionArn
+      x-create-only-properties:
+        - JobDefinitionName
+        - ModelQualityAppSpecification
+        - ModelQualityBaselineConfig
+        - ModelQualityJobInput
+        - ModelQualityJobOutputConfig
+        - JobResources
+        - NetworkConfig
+        - RoleArn
+        - StoppingCondition
+        - Tags
+        - EndpointName
+      x-write-only-properties:
+        - EndpointName
+      x-read-only-properties:
+        - CreationTime
+        - JobDefinitionArn
+      x-required-properties:
+        - ModelQualityAppSpecification
+        - ModelQualityJobInput
+        - ModelQualityJobOutputConfig
+        - JobResources
+        - RoleArn
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: false
+        cloudFormationSystemTags: true
+        tagProperty: /properties/Tags
+        permissions:
+          - sagemaker:AddTags
+          - sagemaker:ListTags
+      x-required-permissions:
+        create:
           - sagemaker:CreateModelQualityJobDefinition
           - sagemaker:DescribeModelQualityJobDefinition
           - sagemaker:AddTags
@@ -6322,7 +7467,7 @@ components:
         MonitoringResources:
           $ref: '#/components/schemas/MonitoringResources'
         NetworkConfig:
-          $ref: '#/components/schemas/NetworkConfig'
+          $ref: '#/components/schemas/MonitoringSchedule_NetworkConfig'
         RoleArn:
           description: The Amazon Resource Name (ARN) of an IAM role that Amazon SageMaker can assume to perform tasks on your behalf.
           type: string
@@ -6400,7 +7545,83 @@ components:
         EndpointInput:
           $ref: '#/components/schemas/EndpointInput'
         BatchTransformInput:
-          $ref: '#/components/schemas/BatchTransformInput'
+          $ref: '#/components/schemas/MonitoringSchedule_BatchTransformInput'
+    MonitoringSchedule_BatchTransformInput:
+      type: object
+      additionalProperties: false
+      description: The batch transform input for a monitoring job.
+      properties:
+        DataCapturedDestinationS3Uri:
+          type: string
+          description: A URI that identifies the Amazon S3 storage location where Batch Transform Job captures data.
+          pattern: ^(https|s3)://([^/]+)/?(.*)$
+          maxLength: 512
+        DatasetFormat:
+          $ref: '#/components/schemas/MonitoringSchedule_DatasetFormat'
+        LocalPath:
+          type: string
+          description: Path to the filesystem where the endpoint data is available to the container.
+          pattern: .*
+          maxLength: 256
+        S3DataDistributionType:
+          type: string
+          description: Whether input data distributed in Amazon S3 is fully replicated or sharded by an S3 key. Defauts to FullyReplicated
+          enum:
+            - FullyReplicated
+            - ShardedByS3Key
+        S3InputMode:
+          type: string
+          description: Whether the Pipe or File is used as the input mode for transfering data for the monitoring job. Pipe mode is recommended for large datasets. File mode is useful for small files that fit in memory. Defaults to File.
+          enum:
+            - Pipe
+            - File
+        ExcludeFeaturesAttribute:
+          type: string
+          description: Indexes or names of the features to be excluded from analysis
+          maxLength: 100
+      required:
+        - DataCapturedDestinationS3Uri
+        - DatasetFormat
+        - LocalPath
+    MonitoringSchedule_NetworkConfig:
+      type: object
+      additionalProperties: false
+      description: Networking options for a job, such as network traffic encryption between containers, whether to allow inbound and outbound network calls to and from containers, and the VPC subnets and security groups to use for VPC-enabled jobs.
+      properties:
+        EnableInterContainerTrafficEncryption:
+          description: Whether to encrypt all communications between distributed processing jobs. Choose True to encrypt communications. Encryption provides greater security for distributed processing jobs, but the processing might take longer.
+          type: boolean
+        EnableNetworkIsolation:
+          description: Whether to allow inbound and outbound network calls to and from the containers used for the processing job.
+          type: boolean
+        VpcConfig:
+          $ref: '#/components/schemas/MonitoringSchedule_VpcConfig'
+    MonitoringSchedule_VpcConfig:
+      type: object
+      additionalProperties: false
+      description: Specifies a VPC that your training jobs and hosted models have access to. Control access to and from your training and model containers by configuring the VPC.
+      properties:
+        SecurityGroupIds:
+          description: The VPC security group IDs, in the form sg-xxxxxxxx. Specify the security groups for the VPC that is specified in the Subnets field.
+          type: array
+          minItems: 1
+          maxItems: 5
+          items:
+            type: string
+            maxLength: 32
+            pattern: '[-0-9a-zA-Z]+'
+        Subnets:
+          description: The ID of the subnets in the VPC to which you want to connect to your monitoring jobs.
+          type: array
+          minItems: 1
+          maxItems: 16
+          items:
+            type: string
+            maxLength: 32
+            pattern: '[-0-9a-zA-Z]+'
+      required:
+        - SecurityGroupIds
+        - Subnets
     ScheduleConfig:
       type: object
       additionalProperties: false
@@ -6425,11 +7646,29 @@ components:
       pattern: ^.?P.*
       minLength: 1
       maxLength: 15
-    MonitoringExecutionSummary:
-      description: Summary of information about monitoring job
+    MonitoringSchedule_Tag:
+      description: A key-value pair to associate with a resource.
       type: object
       properties:
-        CreationTime:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          maxLength: 256
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+      required:
+        - Key
+        - Value
+    MonitoringExecutionSummary:
+      description: Summary of information about monitoring job
+      type: object
+      properties:
+        CreationTime:
           description: The time at which the monitoring job was created.
           type: string
         EndpointName:
@@ -6473,6 +7712,19 @@ components:
       description: The name of the monitoring schedule.
       pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9])*$
       maxLength: 63
+    MonitoringSchedule_DatasetFormat:
+      description: The dataset format of the data to monitor
+      type: object
+      properties:
+        Csv:
+          $ref: '#/components/schemas/Csv'
+        Json:
+          $ref: '#/components/schemas/Json'
+        Parquet:
+          $ref: '#/components/schemas/MonitoringSchedule_Parquet'
+    MonitoringSchedule_Parquet:
+      description: A flag indicating if the dataset format is Parquet
+      type: boolean
     MonitoringSchedule:
       type: object
       properties:
@@ -6490,7 +7742,7 @@ components:
           maxItems: 50
           description: An array of key-value pairs to apply to this resource.
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/MonitoringSchedule_Tag'
         CreationTime:
           description: The time at which the schedule was created.
           type: string
@@ -6746,6 +7998,17 @@ components:
       required:
         - Bucket
         - Key
+    Pipeline_Tag:
+      type: object
+      additionalProperties: false
+      properties:
+        Value:
+          type: string
+        Key:
+          type: string
+      required:
+        - Value
+        - Key
     Pipeline:
       type: object
       properties:
@@ -6792,7 +8055,7 @@ components:
           type: array
           uniqueItems: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Pipeline_Tag'
         ParallelismConfiguration:
           type: object
           additionalProperties: false
@@ -6888,6 +8151,17 @@ components:
           pattern: .*
       required:
         - ImageUri
+    ProcessingJob_Environment:
+      type: object
+      description: Sets the environment variables in the Docker container
+      x-patternProperties:
+        '[a-zA-Z_][a-zA-Z0-9_]*':
+          type: string
+          maxLength: 256
+        '[\S\s]*':
+          type: string
+          maxLength: 256
+      additionalProperties: false
     ExperimentConfig:
       type: object
       description: Associates a SageMaker job as a trial component with an experiment and trial.
@@ -6913,6 +8187,51 @@ components:
           type: string
           maxLength: 120
           pattern: '[a-zA-Z0-9](-*[a-zA-Z0-9]){0,119}'
+    ProcessingJob_VpcConfig:
+      description: Specifies an Amazon Virtual Private Cloud (VPC) that your SageMaker jobs, hosted models, and compute resources have access to. You can control access to and from your resources by configuring a VPC. For more information, see https://docs.aws.amazon.com/sagemaker/latest/dg/infrastructure-give-access.html
+      type: object
+      additionalProperties: false
+      properties:
+        SecurityGroupIds:
+          description: The VPC security group IDs, in the form 'sg-xxxxxxxx'. Specify the security groups for the VPC that is specified in the 'Subnets' field.
+          type: array
+          uniqueItems: false
+          x-insertionOrder: false
+          minItems: 0
+          maxItems: 5
+          items:
+            type: string
+            minLength: 0
+            maxLength: 32
+            pattern: '[-0-9a-zA-Z]+'
+        Subnets:
+          description: The ID of the subnets in the VPC to which you want to connect your training job or model. For information about the availability of specific instance types, see https://docs.aws.amazon.com/sagemaker/latest/dg/regions-quotas.html
+          type: array
+          uniqueItems: false
+          x-insertionOrder: false
+          minItems: 0
+          maxItems: 16
+          items:
+            type: string
+            minLength: 0
+            maxLength: 32
+            pattern: '[-0-9a-zA-Z]+'
+      required:
+        - SecurityGroupIds
+        - Subnets
+    ProcessingJob_NetworkConfig:
+      description: Networking options for a job, such as network traffic encryption between containers, whether to allow inbound and outbound network calls to and from containers, and the VPC subnets and security groups to use for VPC-enabled jobs.
+      type: object
+      additionalProperties: false
+      properties:
+        EnableInterContainerTrafficEncryption:
+          description: Whether to encrypt all communications between distributed processing jobs. Choose True to encrypt communications. Encryption provides greater security for distributed processing jobs, but the processing might take longer.
+          type: boolean
+        EnableNetworkIsolation:
+          description: Whether to allow inbound and outbound network calls to and from the containers used for the processing job.
+          type: boolean
+        VpcConfig:
+          $ref: '#/components/schemas/ProcessingJob_VpcConfig'
     S3Input:
       description: Configuration for downloading input data from Amazon S3 into the processing container.
       type: object
@@ -7137,6 +8456,32 @@ components:
           pattern: '[a-zA-Z0-9]([_-]*[a-zA-Z0-9]){0,63}'
       required:
         - FeatureGroupName
+    ProcessingJob_S3Output:
+      description: Configuration for uploading output data to Amazon S3 from the processing container.
+      type: object
+      additionalProperties: false
+      properties:
+        LocalPath:
+          description: The local path of a directory where you want Amazon SageMaker to upload its contents to Amazon S3. LocalPath is an absolute path to a directory containing output files. This directory will be created by the platform and exist when your container's entrypoint is invoked.
+          type: string
+          minLength: 0
+          maxLength: 256
+          pattern: .*
+        S3UploadMode:
+          description: Whether to upload the results of the processing job continuously or after the job completes.
+          type: string
+          enum:
+            - Continuous
+            - EndOfJob
+        S3Uri:
+          description: A URI that identifies the Amazon S3 bucket where you want Amazon SageMaker to save the results of a processing job.
+          type: string
+          minLength: 0
+          maxLength: 1024
+          pattern: (https|s3)://([^/]+)/?(.*)
+      required:
+        - S3Uri
+        - S3UploadMode
     ProcessingOutputsObject:
       description: Describes the results of a processing job. The processing output must specify exactly one of either S3Output or FeatureStoreOutput types.
       type: object
@@ -7149,7 +8494,7 @@ components:
           description: When True, output operations such as data upload are managed natively by the processing job application. When False (default), output operations are managed by Amazon SageMaker.
           type: boolean
         S3Output:
-          $ref: '#/components/schemas/S3Output'
+          $ref: '#/components/schemas/ProcessingJob_S3Output'
         FeatureStoreOutput:
           $ref: '#/components/schemas/FeatureStoreOutput'
       required:
@@ -7173,153 +8518,601 @@ components:
             $ref: '#/components/schemas/ProcessingOutputsObject'
       required:
         - Outputs
-    ProcessingResources:
-      description: Identifies the resources, ML compute instances, and ML storage volumes to deploy for a processing job. In distributed training, you specify more than one instance.
+    ProcessingJob_ClusterConfig:
+      description: Configuration for the cluster used to run a processing job.
       type: object
       additionalProperties: false
       properties:
-        ClusterConfig:
-          $ref: '#/components/schemas/ClusterConfig'
-      required:
-        - ClusterConfig
-    ProcessingJob:
-      type: object
-      properties:
-        AppSpecification:
-          $ref: '#/components/schemas/AppSpecification'
-        Environment:
-          $ref: '#/components/schemas/Environment'
-        ExperimentConfig:
-          $ref: '#/components/schemas/ExperimentConfig'
-        NetworkConfig:
-          $ref: '#/components/schemas/NetworkConfig'
-        ProcessingInputs:
-          description: An array of inputs configuring the data to download into the processing container.
-          type: array
-          uniqueItems: false
-          x-insertionOrder: false
-          minItems: 0
-          maxItems: 10
-          items:
-            $ref: '#/components/schemas/ProcessingInputsObject'
-        ProcessingJobName:
-          description: The name of the processing job. The name must be unique within an AWS Region in the AWS account.
-          type: string
-          minLength: 1
-          maxLength: 63
-          pattern: '[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}'
-        ProcessingOutputConfig:
-          $ref: '#/components/schemas/ProcessingOutputConfig'
-        ProcessingResources:
-          $ref: '#/components/schemas/ProcessingResources'
-        RoleArn:
-          description: The Amazon Resource Name (ARN) of an IAM role that Amazon SageMaker can assume to perform tasks on your behalf.
-          type: string
-          minLength: 20
-          maxLength: 2048
-          pattern: arn:aws[a-z\-]*:iam::\d{12}:role/?[a-zA-Z_0-9+=,.@\-_/]+
-        StoppingCondition:
-          $ref: '#/components/schemas/StoppingCondition'
-        Tags:
-          description: (Optional) An array of key-value pairs. For more information, see Using Cost Allocation Tags(https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html#allocation-whatURL) in the AWS Billing and Cost Management User Guide.
-          type: array
-          uniqueItems: false
-          x-insertionOrder: false
-          maxItems: 50
-          items:
-            $ref: '#/components/schemas/Tag'
-        ProcessingJobArn:
-          description: The Amazon Resource Name (ARN) of the processing job.
-          type: string
-          minLength: 0
-          maxLength: 256
-          pattern: arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]*:[0-9]{12}:processing-job/.*
-        AutoMLJobArn:
-          description: The ARN of an AutoML job associated with this processing job.
-          type: string
-          maxLength: 256
-        ExitMessage:
-          description: An optional string, up to one KB in size, that contains metadata from the processing container when the processing job exits.
-          type: string
-          maxLength: 1024
-          pattern: '[\S\s]*'
-        FailureReason:
-          description: A string, up to one KB in size, that contains the reason a processing job failed, if it failed.
-          type: string
-          maxLength: 1024
-        MonitoringScheduleArn:
-          description: The ARN of a monitoring schedule for an endpoint associated with this processing job.
-          type: string
-          maxLength: 256
-        TrainingJobArn:
-          description: The ARN of a training job associated with this processing job
-          type: string
-          maxLength: 256
-        ProcessingJobStatus:
-          description: Provides the status of a processing job.
+        InstanceCount:
+          description: The number of ML compute instances to use in the processing job. For distributed processing jobs, specify a value greater than 1. The default value is 1.
+          type: integer
+          minimum: 1
+          maximum: 100
+        InstanceType:
+          description: The ML compute instance type for the processing job.
           type: string
           enum:
-            - Completed
-            - InProgress
-            - Stopping
-            - Stopped
-            - Failed
-        CreationTime:
-          description: The time at which the processing job was created.
-          type: string
-        LastModifiedTime:
-          description: The time at which the processing job was last modified.
-          type: string
-        ProcessingStartTime:
-          description: The time at which the processing job started.
-          type: string
-        ProcessingEndTime:
-          description: The time at which the processing job completed.
-          type: string
-      required:
-        - AppSpecification
-        - ProcessingResources
-        - RoleArn
-      x-stackql-resource-name: processing_job
-      description: Resource Type definition for AWS::SageMaker::ProcessingJob
-      x-type-name: AWS::SageMaker::ProcessingJob
-      x-stackql-primary-identifier:
-        - ProcessingJobArn
-      x-stackql-additional-identifiers:
-        - - ProcessingJobName
-      x-create-only-properties:
-        - AppSpecification
-        - Environment
-        - ExperimentConfig
-        - NetworkConfig
-        - ProcessingInputs
-        - ProcessingJobName
-        - ProcessingOutputConfig
-        - ProcessingResources
-        - RoleArn
-        - StoppingCondition
-        - Tags
-      x-read-only-properties:
-        - ProcessingJobArn
-        - TrainingJobArn
-        - AutoMLJobArn
-        - ExitMessage
-        - FailureReason
-        - MonitoringScheduleArn
-        - ProcessingJobStatus
-        - CreationTime
-        - LastModifiedTime
-        - ProcessingStartTime
-        - ProcessingEndTime
+            - ml.t3.medium
+            - ml.t3.large
+            - ml.t3.xlarge
+            - ml.t3.2xlarge
+            - ml.m4.xlarge
+            - ml.m4.2xlarge
+            - ml.m4.4xlarge
+            - ml.m4.10xlarge
+            - ml.m4.16xlarge
+            - ml.c4.xlarge
+            - ml.c4.2xlarge
+            - ml.c4.4xlarge
+            - ml.c4.8xlarge
+            - ml.c5.xlarge
+            - ml.c5.2xlarge
+            - ml.c5.4xlarge
+            - ml.c5.9xlarge
+            - ml.c5.18xlarge
+            - ml.m5.large
+            - ml.m5.xlarge
+            - ml.m5.2xlarge
+            - ml.m5.4xlarge
+            - ml.m5.12xlarge
+            - ml.m5.24xlarge
+            - ml.r5.large
+            - ml.r5.xlarge
+            - ml.r5.2xlarge
+            - ml.r5.4xlarge
+            - ml.r5.8xlarge
+            - ml.r5.12xlarge
+            - ml.r5.16xlarge
+            - ml.r5.24xlarge
+            - ml.g4dn.xlarge
+            - ml.g4dn.2xlarge
+            - ml.g4dn.4xlarge
+            - ml.g4dn.8xlarge
+            - ml.g4dn.12xlarge
+            - ml.g4dn.16xlarge
+            - ml.g5.xlarge
+            - ml.g5.2xlarge
+            - ml.g5.4xlarge
+            - ml.g5.8xlarge
+            - ml.g5.16xlarge
+            - ml.g5.12xlarge
+            - ml.g5.24xlarge
+            - ml.g5.48xlarge
+            - ml.r5d.large
+            - ml.r5d.xlarge
+            - ml.r5d.2xlarge
+            - ml.r5d.4xlarge
+            - ml.r5d.8xlarge
+            - ml.r5d.12xlarge
+            - ml.r5d.16xlarge
+            - ml.r5d.24xlarge
+            - ml.g6.xlarge
+            - ml.g6.2xlarge
+            - ml.g6.4xlarge
+            - ml.g6.8xlarge
+            - ml.g6.12xlarge
+            - ml.g6.16xlarge
+            - ml.g6.24xlarge
+            - ml.g6.48xlarge
+            - ml.g6e.xlarge
+            - ml.g6e.2xlarge
+            - ml.g6e.4xlarge
+            - ml.g6e.8xlarge
+            - ml.g6e.12xlarge
+            - ml.g6e.16xlarge
+            - ml.g6e.24xlarge
+            - ml.g6e.48xlarge
+            - ml.m6i.large
+            - ml.m6i.xlarge
+            - ml.m6i.2xlarge
+            - ml.m6i.4xlarge
+            - ml.m6i.8xlarge
+            - ml.m6i.12xlarge
+            - ml.m6i.16xlarge
+            - ml.m6i.24xlarge
+            - ml.m6i.32xlarge
+            - ml.c6i.xlarge
+            - ml.c6i.2xlarge
+            - ml.c6i.4xlarge
+            - ml.c6i.8xlarge
+            - ml.c6i.12xlarge
+            - ml.c6i.16xlarge
+            - ml.c6i.24xlarge
+            - ml.c6i.32xlarge
+            - ml.m7i.large
+            - ml.m7i.xlarge
+            - ml.m7i.2xlarge
+            - ml.m7i.4xlarge
+            - ml.m7i.8xlarge
+            - ml.m7i.12xlarge
+            - ml.m7i.16xlarge
+            - ml.m7i.24xlarge
+            - ml.m7i.48xlarge
+            - ml.c7i.large
+            - ml.c7i.xlarge
+            - ml.c7i.2xlarge
+            - ml.c7i.4xlarge
+            - ml.c7i.8xlarge
+            - ml.c7i.12xlarge
+            - ml.c7i.16xlarge
+            - ml.c7i.24xlarge
+            - ml.c7i.48xlarge
+            - ml.r7i.large
+            - ml.r7i.xlarge
+            - ml.r7i.2xlarge
+            - ml.r7i.4xlarge
+            - ml.r7i.8xlarge
+            - ml.r7i.12xlarge
+            - ml.r7i.16xlarge
+            - ml.r7i.24xlarge
+            - ml.r7i.48xlarge
+        VolumeSizeInGB:
+          description: The size of the ML storage volume in gigabytes that you want to provision. You must specify sufficient ML storage for your scenario.
+          type: integer
+          minimum: 1
+          maximum: 16384
+        VolumeKmsKeyId:
+          description: The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt data on the storage volume attached to the ML compute instance(s) that run the processing job.
+          type: string
+          minLength: 0
+          maxLength: 2048
+          pattern: '[a-zA-Z0-9:/_-]*'
+      required:
+        - InstanceCount
+        - InstanceType
+        - VolumeSizeInGB
+    ProcessingResources:
+      description: Identifies the resources, ML compute instances, and ML storage volumes to deploy for a processing job. In distributed training, you specify more than one instance.
+      type: object
+      additionalProperties: false
+      properties:
+        ClusterConfig:
+          $ref: '#/components/schemas/ProcessingJob_ClusterConfig'
+      required:
+        - ClusterConfig
+    ProcessingJob_StoppingCondition:
+      description: Configures conditions under which the processing job should be stopped, such as how long the processing job has been running. After the condition is met, the processing job is stopped.
+      type: object
+      additionalProperties: false
+      properties:
+        MaxRuntimeInSeconds:
+          description: Specifies the maximum runtime in seconds.
+          type: integer
+          minimum: 1
+          maximum: 777600
+      required:
+        - MaxRuntimeInSeconds
+    ProcessingJob_Tag:
+      description: |-
+        A tag object that consists of a key and an optional value, used to manage metadata for SageMaker AWS resources.
+        You can add tags to notebook instances, training jobs, hyperparameter tuning jobs, batch transform jobs, models, labeling jobs, work teams, endpoint configurations, and endpoints. For more information on adding tags to SageMaker resources, see AddTags(https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_AddTags.html).
+        For more information on adding metadata to your AWS resources with tagging, see Tagging AWS resources(https://docs.aws.amazon.com/tag-editor/latest/userguide/tagging.html). For advice on best practices for managing AWS resources with tagging, see Tagging Best Practices: Implement an Effective AWS Resource Tagging Strategy(https://d1.awsstatic.com/whitepapers/aws-tagging-best-practices.pdf).
+      type: object
+      additionalProperties: false
+      properties:
+        Value:
+          description: The tag value.
+          type: string
+          maxLength: 256
+          pattern: ([\p{L}\p{Z}\p{N}_.:/=+\-@]*)
+        Key:
+          description: The tag key. Tag keys must be unique per resource.
+          type: string
+          maxLength: 128
+          pattern: ([\p{L}\p{Z}\p{N}_.:/=+\-@]*)
+      required:
+        - Value
+        - Key
+    ProcessingJob:
+      type: object
+      properties:
+        AppSpecification:
+          $ref: '#/components/schemas/AppSpecification'
+        Environment:
+          $ref: '#/components/schemas/ProcessingJob_Environment'
+        ExperimentConfig:
+          $ref: '#/components/schemas/ExperimentConfig'
+        NetworkConfig:
+          $ref: '#/components/schemas/ProcessingJob_NetworkConfig'
+        ProcessingInputs:
+          description: An array of inputs configuring the data to download into the processing container.
+          type: array
+          uniqueItems: false
+          x-insertionOrder: false
+          minItems: 0
+          maxItems: 10
+          items:
+            $ref: '#/components/schemas/ProcessingInputsObject'
+        ProcessingJobName:
+          description: The name of the processing job. The name must be unique within an AWS Region in the AWS account.
+          type: string
+          minLength: 1
+          maxLength: 63
+          pattern: '[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}'
+        ProcessingOutputConfig:
+          $ref: '#/components/schemas/ProcessingOutputConfig'
+        ProcessingResources:
+          $ref: '#/components/schemas/ProcessingResources'
+        RoleArn:
+          description: The Amazon Resource Name (ARN) of an IAM role that Amazon SageMaker can assume to perform tasks on your behalf.
+          type: string
+          minLength: 20
+          maxLength: 2048
+          pattern: arn:aws[a-z\-]*:iam::\d{12}:role/?[a-zA-Z_0-9+=,.@\-_/]+
+        StoppingCondition:
+          $ref: '#/components/schemas/ProcessingJob_StoppingCondition'
+        Tags:
+          description: (Optional) An array of key-value pairs. For more information, see Using Cost Allocation Tags(https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html#allocation-whatURL) in the AWS Billing and Cost Management User Guide.
+          type: array
+          uniqueItems: false
+          x-insertionOrder: false
+          maxItems: 50
+          items:
+            $ref: '#/components/schemas/ProcessingJob_Tag'
+        ProcessingJobArn:
+          description: The Amazon Resource Name (ARN) of the processing job.
+          type: string
+          minLength: 0
+          maxLength: 256
+          pattern: arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]*:[0-9]{12}:processing-job/.*
+        AutoMLJobArn:
+          description: The ARN of an AutoML job associated with this processing job.
+          type: string
+          maxLength: 256
+        ExitMessage:
+          description: An optional string, up to one KB in size, that contains metadata from the processing container when the processing job exits.
+          type: string
+          maxLength: 1024
+          pattern: '[\S\s]*'
+        FailureReason:
+          description: A string, up to one KB in size, that contains the reason a processing job failed, if it failed.
+          type: string
+          maxLength: 1024
+        MonitoringScheduleArn:
+          description: The ARN of a monitoring schedule for an endpoint associated with this processing job.
+          type: string
+          maxLength: 256
+        TrainingJobArn:
+          description: The ARN of a training job associated with this processing job
+          type: string
+          maxLength: 256
+        ProcessingJobStatus:
+          description: Provides the status of a processing job.
+          type: string
+          enum:
+            - Completed
+            - InProgress
+            - Stopping
+            - Stopped
+            - Failed
+        CreationTime:
+          description: The time at which the processing job was created.
+          type: string
+        LastModifiedTime:
+          description: The time at which the processing job was last modified.
+          type: string
+        ProcessingStartTime:
+          description: The time at which the processing job started.
+          type: string
+        ProcessingEndTime:
+          description: The time at which the processing job completed.
+          type: string
+      required:
+        - AppSpecification
+        - ProcessingResources
+        - RoleArn
+      x-stackql-resource-name: processing_job
+      description: Resource Type definition for AWS::SageMaker::ProcessingJob
+      x-type-name: AWS::SageMaker::ProcessingJob
+      x-stackql-primary-identifier:
+        - ProcessingJobArn
+      x-stackql-additional-identifiers:
+        - - ProcessingJobName
+      x-create-only-properties:
+        - AppSpecification
+        - Environment
+        - ExperimentConfig
+        - NetworkConfig
+        - ProcessingInputs
+        - ProcessingJobName
+        - ProcessingOutputConfig
+        - ProcessingResources
+        - RoleArn
+        - StoppingCondition
+        - Tags
+      x-read-only-properties:
+        - ProcessingJobArn
+        - TrainingJobArn
+        - AutoMLJobArn
+        - ExitMessage
+        - FailureReason
+        - MonitoringScheduleArn
+        - ProcessingJobStatus
+        - CreationTime
+        - LastModifiedTime
+        - ProcessingStartTime
+        - ProcessingEndTime
+      x-required-properties:
+        - AppSpecification
+        - ProcessingResources
+        - RoleArn
+      x-replacement-strategy: delete_then_create
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: false
+        cloudFormationSystemTags: false
+        tagProperty: /properties/Tags
+        permissions:
+          - sagemaker:AddTags
+          - sagemaker:ListTags
+          - sagemaker:DeleteTags
+      x-required-permissions:
+        create:
+          - ec2:CreateNetworkInterface
+          - ec2:CreateNetworkInterfacePermission
+          - ec2:DeleteNetworkInterface
+          - ec2:DeleteNetworkInterfacePermission
+          - ec2:DescribeNetworkInterfaces
+          - ec2:DescribeVpcs
+          - ec2:DescribeDhcpOptions
+          - ec2:DescribeSubnets
+          - ec2:DescribeSecurityGroups
+          - kms:CreateGrant
+          - kms:Decrypt
+          - kms:DescribeKey
+          - sagemaker:CreateProcessingJob
+          - sagemaker:DescribeProcessingJob
+          - sagemaker:AddTags
+          - sagemaker:ListTags
+          - iam:PassRole
+        read:
+          - sagemaker:DescribeProcessingJob
+          - sagemaker:ListTags
+        delete:
+          - ec2:DeleteNetworkInterface
+          - ec2:DeleteNetworkInterfacePermission
+          - ec2:DescribeNetworkInterfaces
+          - ec2:DescribeVpcs
+          - ec2:DescribeSubnets
+          - ec2:DescribeSecurityGroups
+          - sagemaker:StopProcessingJob
+          - sagemaker:DescribeProcessingJob
+          - sagemaker:ListTags
+          - sagemaker:DeleteTags
+        list:
+          - sagemaker:ListProcessingJobs
+          - sagemaker:DescribeProcessingJob
+          - sagemaker:ListTags
+    Project_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          maxLength: 256
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+      required:
+        - Key
+        - Value
+      additionalProperties: false
+    ProjectDescription:
+      type: string
+      description: The description of the project.
+      pattern: .*
+      maxLength: 1024
+    ProjectId:
+      type: string
+      description: Project Id.
+      pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9])*
+      maxLength: 20
+    ProvisionedProductStatusMessage:
+      type: string
+      description: Provisioned Product Status Message
+    ProjectName:
+      type: string
+      description: The name of the project.
+      pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9])*$
+      minLength: 1
+      maxLength: 32
+    ProjectArn:
+      description: The Amazon Resource Name (ARN) of the Project.
+      type: string
+      minLength: 1
+      maxLength: 2048
+      pattern: arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]*:[0-9]{12}:project.*
+    ProductId:
+      type: string
+      description: Service Catalog product identifier.
+      pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9])*$
+      maxLength: 100
+    ProvisioningArtifactId:
+      type: string
+      description: The identifier of the provisioning artifact (also known as a version).
+      pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9])*$
+      maxLength: 100
+    PathId:
+      type: string
+      description: The path identifier of the product.
+      pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9])*$
+      maxLength: 100
+    ProvisioningParameter:
+      description: Information about a parameter used to provision a product.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: The parameter key.
+          minLength: 1
+          maxLength: 1000
+          pattern: .*
+        Value:
+          type: string
+          description: The parameter value.
+          maxLength: 4096
+          pattern: .*
+      required:
+        - Key
+        - Value
+      additionalProperties: false
+    TemplateProviderDetail:
+      description: Details about the template provider for the SageMaker project.
+      type: object
+      additionalProperties: false
+      properties:
+        CfnTemplateProviderDetail:
+          $ref: '#/components/schemas/CfnTemplateProviderDetail'
+      oneOf:
+        - required:
+            - CfnTemplateProviderDetail
+    CfnTemplateProviderDetail:
+      description: CloudFormation template provider details for a SageMaker project.
+      type: object
+      additionalProperties: false
+      properties:
+        Parameters:
+          $ref: '#/components/schemas/CfnStackParameters'
+        RoleARN:
+          type: string
+          description: The Amazon Resource Name (ARN) of the IAM role used by the template provider.
+          minLength: 20
+          maxLength: 2048
+          pattern: arn:aws[a-z\-]*:iam::\d{12}:role/?[a-zA-Z_0-9+=,.@\-_/]+
+        TemplateName:
+          type: string
+          description: The name of the template used for the project.
+          minLength: 1
+          maxLength: 32
+          pattern: (?=.{1,32}$)[a-zA-Z0-9](-*[a-zA-Z0-9])*
+        TemplateURL:
+          type: string
+          description: The URL of the CloudFormation template.
+          minLength: 1
+          maxLength: 1024
+          pattern: (?=.{1,1024}$)(https)://([^/]+)/(.+)
+      required:
+        - TemplateName
+        - TemplateURL
+    CfnStackParameters:
+      type: array
+      description: A list of parameters used in the CloudFormation template.
+      minItems: 0
+      maxItems: 180
+      items:
+        $ref: '#/components/schemas/CfnStackParameter'
+    CfnStackParameter:
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: The key of the parameter.
+          minLength: 1
+          maxLength: 255
+        Value:
+          type: string
+          description: The value of the parameter.
+          maxLength: 4096
+      required:
+        - Key
+        - Value
+    Project:
+      type: object
+      properties:
+        Tags:
+          type: array
+          maxItems: 40
+          description: An array of key-value pairs to apply to this resource.
+          items:
+            $ref: '#/components/schemas/Project_Tag'
+        ProjectArn:
+          $ref: '#/components/schemas/ProjectArn'
+        ProjectId:
+          $ref: '#/components/schemas/ProjectId'
+        ProjectName:
+          $ref: '#/components/schemas/ProjectName'
+        ProjectDescription:
+          $ref: '#/components/schemas/ProjectDescription'
+        CreationTime:
+          description: The time at which the project was created.
+          type: string
+        ServiceCatalogProvisioningDetails:
+          description: Input ServiceCatalog Provisioning Details
+          type: object
+          properties:
+            ProductId:
+              $ref: '#/components/schemas/ProductId'
+            ProvisioningArtifactId:
+              $ref: '#/components/schemas/ProvisioningArtifactId'
+            PathId:
+              $ref: '#/components/schemas/PathId'
+            ProvisioningParameters:
+              type: array
+              description: Parameters specified by the administrator that are required for provisioning the product.
+              items:
+                $ref: '#/components/schemas/ProvisioningParameter'
+          required:
+            - ProductId
+          additionalProperties: false
+        ServiceCatalogProvisionedProductDetails:
+          description: Provisioned ServiceCatalog  Details
+          type: object
+          properties:
+            ProvisionedProductId:
+              $ref: '#/components/schemas/ProvisioningArtifactId'
+            ProvisionedProductStatusMessage:
+              $ref: '#/components/schemas/ProvisionedProductStatusMessage'
+          additionalProperties: false
+        TemplateProviderDetails:
+          type: array
+          minItems: 1
+          maxItems: 1
+          description: An array of template providers associated with the project.
+          items:
+            $ref: '#/components/schemas/TemplateProviderDetail'
+          x-insertionOrder: true
+        ProjectStatus:
+          description: The status of a project.
+          type: string
+          enum:
+            - Pending
+            - CreateInProgress
+            - CreateCompleted
+            - CreateFailed
+            - DeleteInProgress
+            - DeleteFailed
+            - DeleteCompleted
+      required:
+        - ProjectName
+      x-stackql-resource-name: project
+      description: Resource Type definition for AWS::SageMaker::Project
+      x-type-name: AWS::SageMaker::Project
+      x-stackql-primary-identifier:
+        - ProjectArn
+      x-create-only-properties:
+        - ProjectName
+        - ProjectDescription
+        - ServiceCatalogProvisioningDetails
+        - TemplateProviderDetails
+        - Tags
+      x-read-only-properties:
+        - ProjectArn
+        - CreationTime
+        - ProjectId
+        - ProjectStatus
       x-required-properties:
-        - AppSpecification
-        - ProcessingResources
-        - RoleArn
-      x-replacement-strategy: delete_then_create
+        - ProjectName
       x-tagging:
         taggable: true
         tagOnCreate: true
-        tagUpdatable: false
+        tagUpdatable: true
         cloudFormationSystemTags: false
         tagProperty: /properties/Tags
         permissions:
@@ -7328,247 +9121,409 @@ components:
           - sagemaker:DeleteTags
       x-required-permissions:
         create:
-          - ec2:CreateNetworkInterface
-          - ec2:CreateNetworkInterfacePermission
-          - ec2:DeleteNetworkInterface
-          - ec2:DeleteNetworkInterfacePermission
-          - ec2:DescribeNetworkInterfaces
-          - ec2:DescribeVpcs
-          - ec2:DescribeDhcpOptions
-          - ec2:DescribeSubnets
-          - ec2:DescribeSecurityGroups
-          - kms:CreateGrant
-          - kms:Decrypt
-          - kms:DescribeKey
-          - sagemaker:CreateProcessingJob
-          - sagemaker:DescribeProcessingJob
           - sagemaker:AddTags
+          - sagemaker:CreateProject
+          - sagemaker:DescribeProject
           - sagemaker:ListTags
+          - servicecatalog:DescribeProduct
+          - servicecatalog:DescribeProvisioningArtifact
+          - servicecatalog:ProvisionProduct
+          - servicecatalog:DescribeProvisionedProduct
+          - servicecatalog:TerminateProvisionedProduct
+          - cloudformation:DescribeStacks
+          - cloudformation:CreateStack
           - iam:PassRole
+          - s3:GetObject
         read:
-          - sagemaker:DescribeProcessingJob
+          - sagemaker:DescribeProject
           - sagemaker:ListTags
-        delete:
-          - ec2:DeleteNetworkInterface
-          - ec2:DeleteNetworkInterfacePermission
-          - ec2:DescribeNetworkInterfaces
-          - ec2:DescribeVpcs
-          - ec2:DescribeSubnets
-          - ec2:DescribeSecurityGroups
-          - sagemaker:StopProcessingJob
-          - sagemaker:DescribeProcessingJob
+        update:
+          - sagemaker:DescribeProject
           - sagemaker:ListTags
+          - sagemaker:AddTags
           - sagemaker:DeleteTags
+        delete:
+          - sagemaker:DeleteProject
+          - sagemaker:DescribeProject
+          - servicecatalog:TerminateProvisionedProduct
+          - servicecatalog:DescribeRecord
+          - cloudformation:DescribeStacks
+          - cloudformation:DeleteStack
         list:
-          - sagemaker:ListProcessingJobs
-          - sagemaker:DescribeProcessingJob
-          - sagemaker:ListTags
-    ProjectDescription:
-      type: string
-      description: The description of the project.
-      pattern: .*
-      maxLength: 1024
-    ProjectId:
-      type: string
-      description: Project Id.
-      pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9])*
-      maxLength: 20
-    ProvisionedProductStatusMessage:
-      type: string
-      description: Provisioned Product Status Message
-    ProjectName:
-      type: string
-      description: The name of the project.
-      pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9])*$
-      minLength: 1
-      maxLength: 32
-    ProjectArn:
-      description: The Amazon Resource Name (ARN) of the Project.
-      type: string
-      minLength: 1
-      maxLength: 2048
-      pattern: arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]*:[0-9]{12}:project.*
-    ProductId:
-      type: string
-      description: Service Catalog product identifier.
-      pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9])*$
-      maxLength: 100
-    ProvisioningArtifactId:
-      type: string
-      description: The identifier of the provisioning artifact (also known as a version).
-      pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9])*$
-      maxLength: 100
-    PathId:
+          - sagemaker:ListProjects
+    SpaceSharingSettings:
+      type: object
+      additionalProperties: false
+      properties:
+        SharingType:
+          type: string
+          enum:
+            - Private
+            - Shared
+      required:
+        - SharingType
+    OwnershipSettings:
+      type: object
+      additionalProperties: false
+      properties:
+        OwnerUserProfileName:
+          type: string
+          maxLength: 63
+          pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}
+      required:
+        - OwnerUserProfileName
+    SpaceSettings:
+      type: object
+      description: A collection of settings that apply to spaces of Amazon SageMaker Studio. These settings are specified when the CreateSpace API is called.
+      additionalProperties: false
+      properties:
+        JupyterServerAppSettings:
+          $ref: '#/components/schemas/Space_JupyterServerAppSettings'
+          description: The Jupyter server's app settings.
+        KernelGatewayAppSettings:
+          $ref: '#/components/schemas/Space_KernelGatewayAppSettings'
+          description: The kernel gateway app settings.
+        JupyterLabAppSettings:
+          $ref: '#/components/schemas/SpaceJupyterLabAppSettings'
+          description: The JupyterLab app settings.
+        CodeEditorAppSettings:
+          $ref: '#/components/schemas/SpaceCodeEditorAppSettings'
+          description: The CodeEditor app settings.
+        SpaceStorageSettings:
+          $ref: '#/components/schemas/SpaceStorageSettings'
+          description: Default storage settings for a space.
+        SpaceManagedResources:
+          $ref: '#/components/schemas/SpaceManagedResources'
+          description: This is a flag used to indicate if space managed resources needs to be created.
+        RemoteAccess:
+          $ref: '#/components/schemas/RemoteAccess'
+          description: This is a flag used to indicate if remote access is enabled.
+        AppType:
+          $ref: '#/components/schemas/Space_AppType'
+        CustomFileSystems:
+          $ref: '#/components/schemas/CustomFileSystems'
+    Space_AppType:
       type: string
-      description: The path identifier of the product.
-      pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9])*$
-      maxLength: 100
-    ProvisioningParameter:
-      description: Information about a parameter used to provision a product.
+      enum:
+        - JupyterServer
+        - KernelGateway
+        - TensorBoard
+        - RStudioServerPro
+        - RSessionGateway
+        - JupyterLab
+        - CodeEditor
+    CustomFileSystems:
+      type: array
+      uniqueItems: true
+      minItems: 0
+      maxItems: 1
+      items:
+        $ref: '#/components/schemas/CustomFileSystem'
+    CustomFileSystem:
+      type: object
+      additionalProperties: false
+      properties:
+        EFSFileSystem:
+          $ref: '#/components/schemas/EFSFileSystem'
+        FSxLustreFileSystem:
+          $ref: '#/components/schemas/FSxLustreFileSystem'
+        S3FileSystem:
+          $ref: '#/components/schemas/S3FileSystem'
+    EFSFileSystem:
       type: object
+      additionalProperties: false
       properties:
-        Key:
+        FileSystemId:
           type: string
-          description: The parameter key.
-          minLength: 1
-          maxLength: 1000
-          pattern: .*
-        Value:
+          minLength: 11
+          maxLength: 21
+          pattern: ^(fs-[0-9a-f]{8,})$
+      required:
+        - FileSystemId
+    FSxLustreFileSystem:
+      type: object
+      additionalProperties: false
+      properties:
+        FileSystemId:
           type: string
-          description: The parameter value.
-          maxLength: 4096
-          pattern: .*
+          minLength: 11
+          maxLength: 21
+          pattern: ^(fs-[0-9a-f]{8,})$
       required:
-        - Key
-        - Value
+        - FileSystemId
+    S3FileSystem:
+      type: object
       additionalProperties: false
-    TemplateProviderDetail:
-      description: Details about the template provider for the SageMaker project.
+      properties:
+        S3Uri:
+          type: string
+          pattern: (s3)://([^/]+)/?(.*)
+          minLength: 0
+          maxLength: 1024
+    SpaceJupyterLabAppSettings:
       type: object
+      description: The JupyterServer app settings.
       additionalProperties: false
       properties:
-        CfnTemplateProviderDetail:
-          $ref: '#/components/schemas/CfnTemplateProviderDetail'
-      oneOf:
-        - required:
-            - CfnTemplateProviderDetail
-    CfnTemplateProviderDetail:
-      description: CloudFormation template provider details for a SageMaker project.
+        DefaultResourceSpec:
+          $ref: '#/components/schemas/Space_ResourceSpec'
+        AppLifecycleManagement:
+          $ref: '#/components/schemas/SpaceAppLifecycleManagement'
+        CodeRepositories:
+          type: array
+          description: A list of CodeRepositories available for use with JupyterLab apps.
+          uniqueItems: false
+          minItems: 0
+          maxItems: 30
+          items:
+            $ref: '#/components/schemas/CodeRepository'
+    SpaceAppLifecycleManagement:
       type: object
       additionalProperties: false
       properties:
-        Parameters:
-          $ref: '#/components/schemas/CfnStackParameters'
-        RoleARN:
+        IdleSettings:
+          $ref: '#/components/schemas/SpaceIdleSettings'
+    SpaceIdleSettings:
+      type: object
+      additionalProperties: false
+      properties:
+        IdleTimeoutInMinutes:
+          type: integer
+          description: The space idle timeout value set in minutes
+          minimum: 60
+          maximum: 525600
+    SpaceCodeEditorAppSettings:
+      type: object
+      description: The CodeEditor app settings.
+      additionalProperties: false
+      properties:
+        DefaultResourceSpec:
+          $ref: '#/components/schemas/Space_ResourceSpec'
+        AppLifecycleManagement:
+          $ref: '#/components/schemas/SpaceAppLifecycleManagement'
+    Space_JupyterServerAppSettings:
+      type: object
+      description: The JupyterServer app settings.
+      additionalProperties: false
+      properties:
+        DefaultResourceSpec:
+          $ref: '#/components/schemas/Space_ResourceSpec'
+        LifecycleConfigArns:
+          type: array
+          description: A list of LifecycleConfigArns available for use with JupyterServer apps.
+          uniqueItems: false
+          minItems: 0
+          maxItems: 30
+          items:
+            $ref: '#/components/schemas/Space_StudioLifecycleConfigArn'
+    SpaceStorageSettings:
+      type: object
+      additionalProperties: false
+      properties:
+        EbsStorageSettings:
+          $ref: '#/components/schemas/EbsStorageSettings'
+    SpaceManagedResources:
+      type: string
+      description: The flag to enable/disable creation of space managed resources.
+      enum:
+        - ENABLED
+        - DISABLED
+    RemoteAccess:
+      type: string
+      description: The flag to enable/disable remote access for a space.
+      enum:
+        - ENABLED
+        - DISABLED
+    EbsStorageSettings:
+      type: object
+      description: Properties related to the space's Amazon Elastic Block Store volume.
+      additionalProperties: false
+      properties:
+        EbsVolumeSizeInGb:
+          description: Size of the Amazon EBS volume in Gb
+          $ref: '#/components/schemas/SpaceEbsVolumeSizeInGb'
+      required:
+        - EbsVolumeSizeInGb
+    Space_ResourceSpec:
+      type: object
+      additionalProperties: false
+      properties:
+        InstanceType:
           type: string
-          description: The Amazon Resource Name (ARN) of the IAM role used by the template provider.
-          minLength: 20
-          maxLength: 2048
-          pattern: arn:aws[a-z\-]*:iam::\d{12}:role/?[a-zA-Z_0-9+=,.@\-_/]+
-        TemplateName:
+          description: The instance type that the image version runs on.
+          enum:
+            - system
+            - ml.t3.micro
+            - ml.t3.small
+            - ml.t3.medium
+            - ml.t3.large
+            - ml.t3.xlarge
+            - ml.t3.2xlarge
+            - ml.m5.large
+            - ml.m5.xlarge
+            - ml.m5.2xlarge
+            - ml.m5.4xlarge
+            - ml.m5.8xlarge
+            - ml.m5.12xlarge
+            - ml.m5.16xlarge
+            - ml.m5.24xlarge
+            - ml.c5.large
+            - ml.c5.xlarge
+            - ml.c5.2xlarge
+            - ml.c5.4xlarge
+            - ml.c5.9xlarge
+            - ml.c5.12xlarge
+            - ml.c5.18xlarge
+            - ml.c5.24xlarge
+            - ml.p3.2xlarge
+            - ml.p3.8xlarge
+            - ml.p3.16xlarge
+            - ml.g4dn.xlarge
+            - ml.g4dn.2xlarge
+            - ml.g4dn.4xlarge
+            - ml.g4dn.8xlarge
+            - ml.g4dn.12xlarge
+            - ml.g4dn.16xlarge
+            - ml.r5.large
+            - ml.r5.xlarge
+            - ml.r5.2xlarge
+            - ml.r5.4xlarge
+            - ml.r5.8xlarge
+            - ml.r5.12xlarge
+            - ml.r5.16xlarge
+            - ml.r5.24xlarge
+            - ml.p3dn.24xlarge
+            - ml.m5d.large
+            - ml.m5d.xlarge
+            - ml.m5d.2xlarge
+            - ml.m5d.4xlarge
+            - ml.m5d.8xlarge
+            - ml.m5d.12xlarge
+            - ml.m5d.16xlarge
+            - ml.m5d.24xlarge
+            - ml.g5.xlarge
+            - ml.g5.2xlarge
+            - ml.g5.4xlarge
+            - ml.g5.8xlarge
+            - ml.g5.12xlarge
+            - ml.g5.16xlarge
+            - ml.g5.24xlarge
+            - ml.g5.48xlarge
+            - ml.p4d.24xlarge
+            - ml.p4de.24xlarge
+            - ml.geospatial.interactive
+            - ml.trn1.2xlarge
+            - ml.trn1.32xlarge
+            - ml.trn1n.32xlarge
+        SageMakerImageArn:
           type: string
-          description: The name of the template used for the project.
-          minLength: 1
-          maxLength: 32
-          pattern: (?=.{1,32}$)[a-zA-Z0-9](-*[a-zA-Z0-9])*
-        TemplateURL:
+          description: The ARN of the SageMaker image that the image version belongs to.
+          maxLength: 256
+          pattern: ^arn:aws(-[\w]+)*:sagemaker:.+:[0-9]{12}:image/[a-z0-9]([-.]?[a-z0-9])*$
+        SageMakerImageVersionArn:
           type: string
-          description: The URL of the CloudFormation template.
-          minLength: 1
-          maxLength: 1024
-          pattern: (?=.{1,1024}$)(https)://([^/]+)/(.+)
-      required:
-        - TemplateName
-        - TemplateURL
-    CfnStackParameters:
-      type: array
-      description: A list of parameters used in the CloudFormation template.
-      minItems: 0
-      maxItems: 180
-      items:
-        $ref: '#/components/schemas/CfnStackParameter'
-    CfnStackParameter:
+          description: The ARN of the image version created on the instance.
+          maxLength: 256
+          pattern: ^arn:aws(-[\w]+)*:sagemaker:.+:[0-9]{12}:image-version/[a-z0-9]([-.]?[a-z0-9])*/[0-9]+$
+        LifecycleConfigArn:
+          type: string
+          description: The Amazon Resource Name (ARN) of the Lifecycle Configuration to attach to the Resource.
+          maxLength: 256
+          pattern: arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]*:[0-9]{12}:studio-lifecycle-config/.*
+    Space_KernelGatewayAppSettings:
+      type: object
+      description: The kernel gateway app settings.
+      additionalProperties: false
+      properties:
+        CustomImages:
+          type: array
+          description: A list of custom SageMaker images that are configured to run as a KernelGateway app.
+          uniqueItems: false
+          minItems: 0
+          maxItems: 30
+          items:
+            $ref: '#/components/schemas/CustomImage'
+        DefaultResourceSpec:
+          $ref: '#/components/schemas/Space_ResourceSpec'
+          description: The default instance type and the Amazon Resource Name (ARN) of the default SageMaker image used by the KernelGateway app.
+        LifecycleConfigArns:
+          type: array
+          description: A list of LifecycleConfigArns available for use with KernelGateway apps.
+          uniqueItems: false
+          minItems: 0
+          maxItems: 30
+          items:
+            $ref: '#/components/schemas/Space_StudioLifecycleConfigArn'
+    Space_StudioLifecycleConfigArn:
+      type: string
+      description: The Amazon Resource Name (ARN) of the Lifecycle Configuration to attach to the Resource.
+      maxLength: 256
+      pattern: arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]*:[0-9]{12}:studio-lifecycle-config/.*
+    Space:
       type: object
-      additionalProperties: false
       properties:
-        Key:
+        SpaceArn:
           type: string
-          description: The key of the parameter.
+          description: The space Amazon Resource Name (ARN).
+          maxLength: 256
+          pattern: arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]*:[0-9]{12}:space/.*
+        DomainId:
+          type: string
+          description: The ID of the associated Domain.
           minLength: 1
-          maxLength: 255
-        Value:
+          maxLength: 63
+        SpaceName:
           type: string
-          description: The value of the parameter.
-          maxLength: 4096
-      required:
-        - Key
-        - Value
-    Project:
-      type: object
-      properties:
+          description: A name for the Space.
+          minLength: 1
+          maxLength: 63
+        SpaceSettings:
+          $ref: '#/components/schemas/SpaceSettings'
+          description: A collection of settings.
+          uniqueItems: false
+          minItems: 0
+          maxItems: 50
         Tags:
           type: array
-          maxItems: 40
-          description: An array of key-value pairs to apply to this resource.
+          description: A list of tags to apply to the space.
+          uniqueItems: false
+          minItems: 0
+          maxItems: 50
           items:
             $ref: '#/components/schemas/Tag'
-        ProjectArn:
-          $ref: '#/components/schemas/ProjectArn'
-        ProjectId:
-          $ref: '#/components/schemas/ProjectId'
-        ProjectName:
-          $ref: '#/components/schemas/ProjectName'
-        ProjectDescription:
-          $ref: '#/components/schemas/ProjectDescription'
-        CreationTime:
-          description: The time at which the project was created.
+        OwnershipSettings:
+          $ref: '#/components/schemas/OwnershipSettings'
+        SpaceSharingSettings:
+          $ref: '#/components/schemas/SpaceSharingSettings'
+        SpaceDisplayName:
           type: string
-        ServiceCatalogProvisioningDetails:
-          description: Input ServiceCatalog Provisioning Details
-          type: object
-          properties:
-            ProductId:
-              $ref: '#/components/schemas/ProductId'
-            ProvisioningArtifactId:
-              $ref: '#/components/schemas/ProvisioningArtifactId'
-            PathId:
-              $ref: '#/components/schemas/PathId'
-            ProvisioningParameters:
-              type: array
-              description: Parameters specified by the administrator that are required for provisioning the product.
-              items:
-                $ref: '#/components/schemas/ProvisioningParameter'
-          required:
-            - ProductId
-          additionalProperties: false
-        ServiceCatalogProvisionedProductDetails:
-          description: Provisioned ServiceCatalog  Details
-          type: object
-          properties:
-            ProvisionedProductId:
-              $ref: '#/components/schemas/ProvisioningArtifactId'
-            ProvisionedProductStatusMessage:
-              $ref: '#/components/schemas/ProvisionedProductStatusMessage'
-          additionalProperties: false
-        TemplateProviderDetails:
-          type: array
-          minItems: 1
-          maxItems: 1
-          description: An array of template providers associated with the project.
-          items:
-            $ref: '#/components/schemas/TemplateProviderDetail'
-          x-insertionOrder: true
-        ProjectStatus:
-          description: The status of a project.
+          maxLength: 64
+          pattern: ^(?!\s*$).+
+        Url:
           type: string
-          enum:
-            - Pending
-            - CreateInProgress
-            - CreateCompleted
-            - CreateFailed
-            - DeleteInProgress
-            - DeleteFailed
-            - DeleteCompleted
+          maxLength: 1024
       required:
-        - ProjectName
-      x-stackql-resource-name: project
-      description: Resource Type definition for AWS::SageMaker::Project
-      x-type-name: AWS::SageMaker::Project
+        - DomainId
+        - SpaceName
+      x-stackql-resource-name: space
+      description: Resource Type definition for AWS::SageMaker::Space
+      x-type-name: AWS::SageMaker::Space
       x-stackql-primary-identifier:
-        - ProjectArn
+        - DomainId
+        - SpaceName
       x-create-only-properties:
-        - ProjectName
-        - ProjectDescription
-        - ServiceCatalogProvisioningDetails
-        - TemplateProviderDetails
-        - Tags
+        - DomainId
+        - SpaceName
+        - SpaceSharingSettings
+        - OwnershipSettings
+      x-write-only-properties:
+        - SpaceSettings
       x-read-only-properties:
-        - ProjectArn
-        - CreationTime
-        - ProjectId
-        - ProjectStatus
+        - SpaceArn
+        - Url
       x-required-properties:
-        - ProjectName
+        - DomainId
+        - SpaceName
       x-tagging:
         taggable: true
         tagOnCreate: true
@@ -7577,148 +9532,322 @@ components:
         tagProperty: /properties/Tags
         permissions:
           - sagemaker:AddTags
-          - sagemaker:ListTags
           - sagemaker:DeleteTags
+          - sagemaker:ListTags
       x-required-permissions:
         create:
-          - sagemaker:AddTags
-          - sagemaker:CreateProject
-          - sagemaker:DescribeProject
+          - sagemaker:CreateSpace
+          - sagemaker:DescribeSpace
           - sagemaker:ListTags
-          - servicecatalog:DescribeProduct
-          - servicecatalog:DescribeProvisioningArtifact
-          - servicecatalog:ProvisionProduct
-          - servicecatalog:DescribeProvisionedProduct
-          - servicecatalog:TerminateProvisionedProduct
-          - cloudformation:DescribeStacks
-          - cloudformation:CreateStack
-          - iam:PassRole
-          - s3:GetObject
+          - sagemaker:AddTags
         read:
-          - sagemaker:DescribeProject
+          - sagemaker:DescribeSpace
           - sagemaker:ListTags
         update:
-          - sagemaker:DescribeProject
+          - sagemaker:UpdateSpace
+          - sagemaker:DescribeSpace
+          - sagemaker:AddTags
+          - sagemaker:DeleteTags
+          - sagemaker:ListTags
+        delete:
+          - sagemaker:DeleteSpace
+          - sagemaker:DescribeSpace
+          - sagemaker:DeleteTags
+        list:
+          - sagemaker:ListSpaces
           - sagemaker:ListTags
+    StudioLifecycleConfig:
+      type: object
+      properties:
+        StudioLifecycleConfigArn:
+          type: string
+          description: The Amazon Resource Name (ARN) of the Lifecycle Configuration.
+          minLength: 1
+          maxLength: 256
+          pattern: arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]*:[0-9]{12}:studio-lifecycle-config/.*
+        StudioLifecycleConfigAppType:
+          type: string
+          description: The App type that the Lifecycle Configuration is attached to.
+          enum:
+            - JupyterServer
+            - KernelGateway
+            - CodeEditor
+            - JupyterLab
+        StudioLifecycleConfigContent:
+          type: string
+          description: The content of your Amazon SageMaker Studio Lifecycle Configuration script. This content must be base64 encoded.
+          minLength: 1
+          maxLength: 16384
+          pattern: '[\S\s]+'
+        StudioLifecycleConfigName:
+          type: string
+          description: The name of the Amazon SageMaker Studio Lifecycle Configuration.
+          minLength: 1
+          maxLength: 63
+          pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}
+        Tags:
+          type: array
+          description: Tags to be associated with the Lifecycle Configuration. Each tag consists of a key and an optional value. Tag keys must be unique per resource. Tags are searchable using the Search API.
+          uniqueItems: false
+          x-insertionOrder: false
+          items:
+            $ref: '#/components/schemas/Tag'
+          minItems: 0
+          maxItems: 50
+      required:
+        - StudioLifecycleConfigAppType
+        - StudioLifecycleConfigContent
+        - StudioLifecycleConfigName
+      x-stackql-resource-name: studio_lifecycle_config
+      description: Resource Type definition for AWS::SageMaker::StudioLifecycleConfig
+      x-type-name: AWS::SageMaker::StudioLifecycleConfig
+      x-stackql-primary-identifier:
+        - StudioLifecycleConfigName
+      x-create-only-properties:
+        - StudioLifecycleConfigAppType
+        - StudioLifecycleConfigContent
+        - StudioLifecycleConfigName
+        - Tags
+      x-read-only-properties:
+        - StudioLifecycleConfigArn
+      x-required-properties:
+        - StudioLifecycleConfigAppType
+        - StudioLifecycleConfigContent
+        - StudioLifecycleConfigName
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: false
+        cloudFormationSystemTags: false
+        tagProperty: /properties/Tags
+        permissions:
           - sagemaker:AddTags
+          - sagemaker:ListTags
           - sagemaker:DeleteTags
+      x-required-permissions:
+        create:
+          - sagemaker:CreateStudioLifecycleConfig
+          - sagemaker:DescribeStudioLifecycleConfig
+          - sagemaker:AddTags
+          - sagemaker:ListTags
+        read:
+          - sagemaker:DescribeStudioLifecycleConfig
+          - sagemaker:ListTags
         delete:
-          - sagemaker:DeleteProject
-          - sagemaker:DescribeProject
-          - servicecatalog:TerminateProvisionedProduct
-          - servicecatalog:DescribeRecord
-          - cloudformation:DescribeStacks
-          - cloudformation:DeleteStack
+          - sagemaker:DeleteStudioLifecycleConfig
+          - sagemaker:DescribeStudioLifecycleConfig
+          - sagemaker:DeleteTags
+          - sagemaker:ListTags
         list:
-          - sagemaker:ListProjects
-    SpaceSharingSettings:
+          - sagemaker:ListStudioLifecycleConfigs
+          - sagemaker:ListTags
+    UserProfile_UserSettings:
       type: object
+      description: A collection of settings that apply to users of Amazon SageMaker Studio. These settings are specified when the CreateUserProfile API is called, and as DefaultUserSettings when the CreateDomain API is called.
       additionalProperties: false
       properties:
-        SharingType:
+        ExecutionRole:
           type: string
-          enum:
-            - Private
-            - Shared
-      required:
-        - SharingType
-    OwnershipSettings:
-      type: object
-      additionalProperties: false
-      properties:
-        OwnerUserProfileName:
+          description: The user profile Amazon Resource Name (ARN).
+          minLength: 20
+          maxLength: 2048
+          pattern: ^arn:aws[a-z\-]*:iam::\d{12}:role/?[a-zA-Z_0-9+=,.@\-_/]+$
+        AutoMountHomeEFS:
           type: string
-          maxLength: 63
-          pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}
-      required:
-        - OwnerUserProfileName
-    SpaceSettings:
-      type: object
-      description: A collection of settings that apply to spaces of Amazon SageMaker Studio. These settings are specified when the CreateSpace API is called.
-      additionalProperties: false
-      properties:
+          description: 'Indicates whether auto-mounting of an EFS volume is supported for the user profile. '
+          enum:
+            - Enabled
+            - Disabled
+            - DefaultAsDomain
         JupyterServerAppSettings:
-          $ref: '#/components/schemas/JupyterServerAppSettings'
+          $ref: '#/components/schemas/UserProfile_JupyterServerAppSettings'
           description: The Jupyter server's app settings.
         KernelGatewayAppSettings:
-          $ref: '#/components/schemas/KernelGatewayAppSettings'
+          $ref: '#/components/schemas/UserProfile_KernelGatewayAppSettings'
           description: The kernel gateway app settings.
+        RStudioServerProAppSettings:
+          $ref: '#/components/schemas/RStudioServerProAppSettings'
         JupyterLabAppSettings:
-          $ref: '#/components/schemas/SpaceJupyterLabAppSettings'
-          description: The JupyterLab app settings.
-        CodeEditorAppSettings:
-          $ref: '#/components/schemas/SpaceCodeEditorAppSettings'
-          description: The CodeEditor app settings.
+          $ref: '#/components/schemas/UserProfile_JupyterLabAppSettings'
         SpaceStorageSettings:
-          $ref: '#/components/schemas/SpaceStorageSettings'
-          description: Default storage settings for a space.
-        SpaceManagedResources:
-          $ref: '#/components/schemas/SpaceManagedResources'
-          description: This is a flag used to indicate if space managed resources needs to be created.
-        RemoteAccess:
-          $ref: '#/components/schemas/RemoteAccess'
-          description: This is a flag used to indicate if remote access is enabled.
-        AppType:
-          $ref: '#/components/schemas/AppType'
-        CustomFileSystems:
-          $ref: '#/components/schemas/CustomFileSystems'
-    CustomFileSystems:
-      type: array
-      uniqueItems: true
-      minItems: 0
-      maxItems: 1
-      items:
-        $ref: '#/components/schemas/CustomFileSystem'
-    CustomFileSystem:
+          $ref: '#/components/schemas/UserProfile_DefaultSpaceStorageSettings'
+        CodeEditorAppSettings:
+          $ref: '#/components/schemas/UserProfile_CodeEditorAppSettings'
+        StudioWebPortalSettings:
+          $ref: '#/components/schemas/StudioWebPortalSettings'
+        DefaultLandingUri:
+          type: string
+          description: Defines which Amazon SageMaker application users are directed to by default.
+          maxLength: 1023
+        StudioWebPortal:
+          type: string
+          description: Indicates whether the Studio experience is available to users. If not, users cannot access Studio.
+          enum:
+            - ENABLED
+            - DISABLED
+        CustomPosixUserConfig:
+          $ref: '#/components/schemas/CustomPosixUserConfig'
+        CustomFileSystemConfigs:
+          type: array
+          uniqueItems: true
+          minItems: 0
+          maxItems: 2
+          items:
+            $ref: '#/components/schemas/CustomFileSystemConfig'
+        SecurityGroups:
+          type: array
+          description: The security groups for the Amazon Virtual Private Cloud (VPC) that Studio uses for communication.
+          uniqueItems: false
+          minItems: 0
+          maxItems: 5
+          items:
+            type: string
+            maxLength: 32
+            pattern: '[-0-9a-zA-Z]+'
+        SharingSettings:
+          $ref: '#/components/schemas/SharingSettings'
+          description: The sharing settings.
+    UserProfile_JupyterServerAppSettings:
       type: object
+      description: The JupyterServer app settings.
       additionalProperties: false
       properties:
-        EFSFileSystem:
-          $ref: '#/components/schemas/EFSFileSystem'
-        FSxLustreFileSystem:
-          $ref: '#/components/schemas/FSxLustreFileSystem'
-        S3FileSystem:
-          $ref: '#/components/schemas/S3FileSystem'
-    EFSFileSystem:
+        DefaultResourceSpec:
+          $ref: '#/components/schemas/UserProfile_ResourceSpec'
+        LifecycleConfigArns:
+          type: array
+          description: A list of LifecycleConfigArns available for use with JupyterServer apps.
+          uniqueItems: false
+          minItems: 0
+          maxItems: 30
+          items:
+            $ref: '#/components/schemas/StudioLifecycleConfigArn'
+    UserProfile_ResourceSpec:
       type: object
       additionalProperties: false
       properties:
-        FileSystemId:
+        InstanceType:
           type: string
-          minLength: 11
-          maxLength: 21
-          pattern: ^(fs-[0-9a-f]{8,})$
-      required:
-        - FileSystemId
-    FSxLustreFileSystem:
-      type: object
-      additionalProperties: false
-      properties:
-        FileSystemId:
+          description: The instance type that the image version runs on.
+          enum:
+            - system
+            - ml.t3.micro
+            - ml.t3.small
+            - ml.t3.medium
+            - ml.t3.large
+            - ml.t3.xlarge
+            - ml.t3.2xlarge
+            - ml.m5.large
+            - ml.m5.xlarge
+            - ml.m5.2xlarge
+            - ml.m5.4xlarge
+            - ml.m5.8xlarge
+            - ml.m5.12xlarge
+            - ml.m5.16xlarge
+            - ml.m5.24xlarge
+            - ml.c5.large
+            - ml.c5.xlarge
+            - ml.c5.2xlarge
+            - ml.c5.4xlarge
+            - ml.c5.9xlarge
+            - ml.c5.12xlarge
+            - ml.c5.18xlarge
+            - ml.c5.24xlarge
+            - ml.p3.2xlarge
+            - ml.p3.8xlarge
+            - ml.p3.16xlarge
+            - ml.g4dn.xlarge
+            - ml.g4dn.2xlarge
+            - ml.g4dn.4xlarge
+            - ml.g4dn.8xlarge
+            - ml.g4dn.12xlarge
+            - ml.g4dn.16xlarge
+            - ml.r5.large
+            - ml.r5.xlarge
+            - ml.r5.2xlarge
+            - ml.r5.4xlarge
+            - ml.r5.8xlarge
+            - ml.r5.12xlarge
+            - ml.r5.16xlarge
+            - ml.r5.24xlarge
+            - ml.p3dn.24xlarge
+            - ml.m5d.large
+            - ml.m5d.xlarge
+            - ml.m5d.2xlarge
+            - ml.m5d.4xlarge
+            - ml.m5d.8xlarge
+            - ml.m5d.12xlarge
+            - ml.m5d.16xlarge
+            - ml.m5d.24xlarge
+            - ml.g5.xlarge
+            - ml.g5.2xlarge
+            - ml.g5.4xlarge
+            - ml.g5.8xlarge
+            - ml.g5.12xlarge
+            - ml.g5.16xlarge
+            - ml.g5.24xlarge
+            - ml.g5.48xlarge
+            - ml.p4d.24xlarge
+            - ml.p4de.24xlarge
+            - ml.geospatial.interactive
+            - ml.trn1.2xlarge
+            - ml.trn1.32xlarge
+            - ml.trn1n.32xlarge
+        SageMakerImageArn:
           type: string
-          minLength: 11
-          maxLength: 21
-          pattern: ^(fs-[0-9a-f]{8,})$
-      required:
-        - FileSystemId
-    S3FileSystem:
+          description: The ARN of the SageMaker image that the image version belongs to.
+          maxLength: 256
+          pattern: ^arn:aws(-[\w]+)*:sagemaker:.+:[0-9]{12}:image/[a-z0-9]([-.]?[a-z0-9])*$
+        SageMakerImageVersionArn:
+          type: string
+          description: The ARN of the image version created on the instance.
+          maxLength: 256
+          pattern: ^arn:aws(-[\w]+)*:sagemaker:.+:[0-9]{12}:image-version/[a-z0-9]([-.]?[a-z0-9])*/[0-9]+$
+        LifecycleConfigArn:
+          type: string
+          description: The Amazon Resource Name (ARN) of the Lifecycle Configuration to attach to the Resource.
+          maxLength: 256
+          pattern: ^(arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]*:[0-9]{12}:studio-lifecycle-config/.*|None)$
+    UserProfile_KernelGatewayAppSettings:
       type: object
+      description: The kernel gateway app settings.
       additionalProperties: false
       properties:
-        S3Uri:
-          type: string
-          pattern: (s3)://([^/]+)/?(.*)
-          minLength: 0
-          maxLength: 1024
-    SpaceJupyterLabAppSettings:
+        CustomImages:
+          type: array
+          description: A list of custom SageMaker images that are configured to run as a KernelGateway app.
+          uniqueItems: false
+          minItems: 0
+          maxItems: 30
+          items:
+            $ref: '#/components/schemas/CustomImage'
+        DefaultResourceSpec:
+          $ref: '#/components/schemas/UserProfile_ResourceSpec'
+          description: The default instance type and the Amazon Resource Name (ARN) of the default SageMaker image used by the KernelGateway app.
+        LifecycleConfigArns:
+          type: array
+          description: A list of LifecycleConfigArns available for use with KernelGateway apps.
+          uniqueItems: false
+          minItems: 0
+          maxItems: 30
+          items:
+            $ref: '#/components/schemas/StudioLifecycleConfigArn'
+    UserProfile_JupyterLabAppSettings:
       type: object
-      description: The JupyterServer app settings.
+      description: The JupyterLab app settings.
       additionalProperties: false
       properties:
         DefaultResourceSpec:
-          $ref: '#/components/schemas/ResourceSpec'
-        AppLifecycleManagement:
-          $ref: '#/components/schemas/SpaceAppLifecycleManagement'
+          $ref: '#/components/schemas/UserProfile_ResourceSpec'
+          description: The default instance type and the Amazon Resource Name (ARN) of the default SageMaker image used by the JupyterLab app.
+        LifecycleConfigArns:
+          type: array
+          description: A list of LifecycleConfigArns available for use with JupyterLab apps.
+          uniqueItems: false
+          minItems: 0
+          maxItems: 30
+          items:
+            $ref: '#/components/schemas/StudioLifecycleConfigArn'
         CodeRepositories:
           type: array
           description: A list of CodeRepositories available for use with JupyterLab apps.
@@ -7726,241 +9855,74 @@ components:
           minItems: 0
           maxItems: 30
           items:
-            $ref: '#/components/schemas/CodeRepository'
-    SpaceAppLifecycleManagement:
-      type: object
-      additionalProperties: false
-      properties:
-        IdleSettings:
-          $ref: '#/components/schemas/SpaceIdleSettings'
-    SpaceIdleSettings:
-      type: object
-      additionalProperties: false
-      properties:
-        IdleTimeoutInMinutes:
-          type: integer
-          description: The space idle timeout value set in minutes
-          minimum: 60
-          maximum: 525600
-    SpaceCodeEditorAppSettings:
-      type: object
-      description: The CodeEditor app settings.
-      additionalProperties: false
-      properties:
-        DefaultResourceSpec:
-          $ref: '#/components/schemas/ResourceSpec'
+            $ref: '#/components/schemas/CodeRepository'
+        CustomImages:
+          type: array
+          description: A list of custom images available for use for JupyterLab apps
+          uniqueItems: false
+          minItems: 0
+          maxItems: 200
+          items:
+            $ref: '#/components/schemas/CustomImage'
         AppLifecycleManagement:
-          $ref: '#/components/schemas/SpaceAppLifecycleManagement'
-    SpaceStorageSettings:
+          $ref: '#/components/schemas/AppLifecycleManagement'
+        BuiltInLifecycleConfigArn:
+          type: string
+          description: The lifecycle configuration that runs before the default lifecycle configuration.
+          maxLength: 256
+          pattern: ^(arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]*:[0-9]{12}:studio-lifecycle-config/.*|None)$
+    UserProfile_DefaultSpaceStorageSettings:
       type: object
+      description: Default storage settings for a space.
       additionalProperties: false
       properties:
-        EbsStorageSettings:
-          $ref: '#/components/schemas/EbsStorageSettings'
-    SpaceManagedResources:
-      type: string
-      description: The flag to enable/disable creation of space managed resources.
-      enum:
-        - ENABLED
-        - DISABLED
-    RemoteAccess:
-      type: string
-      description: The flag to enable/disable remote access for a space.
-      enum:
-        - ENABLED
-        - DISABLED
-    EbsStorageSettings:
+        DefaultEbsStorageSettings:
+          $ref: '#/components/schemas/UserProfile_DefaultEbsStorageSettings'
+    UserProfile_DefaultEbsStorageSettings:
       type: object
-      description: Properties related to the space's Amazon Elastic Block Store volume.
+      description: Properties related to the Amazon Elastic Block Store volume.
       additionalProperties: false
       properties:
-        EbsVolumeSizeInGb:
-          description: Size of the Amazon EBS volume in Gb
+        DefaultEbsVolumeSizeInGb:
+          description: Default size of the Amazon EBS volume in Gb
+          $ref: '#/components/schemas/SpaceEbsVolumeSizeInGb'
+        MaximumEbsVolumeSizeInGb:
+          description: Maximum size of the Amazon EBS volume in Gb. Must be greater than or equal to the DefaultEbsVolumeSizeInGb.
           $ref: '#/components/schemas/SpaceEbsVolumeSizeInGb'
       required:
-        - EbsVolumeSizeInGb
-    Space:
+        - DefaultEbsVolumeSizeInGb
+        - MaximumEbsVolumeSizeInGb
+    UserProfile_CodeEditorAppSettings:
       type: object
+      description: The CodeEditor app settings.
+      additionalProperties: false
       properties:
-        SpaceArn:
-          type: string
-          description: The space Amazon Resource Name (ARN).
-          maxLength: 256
-          pattern: arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]*:[0-9]{12}:space/.*
-        DomainId:
-          type: string
-          description: The ID of the associated Domain.
-          minLength: 1
-          maxLength: 63
-        SpaceName:
-          type: string
-          description: A name for the Space.
-          minLength: 1
-          maxLength: 63
-        SpaceSettings:
-          $ref: '#/components/schemas/SpaceSettings'
-          description: A collection of settings.
+        DefaultResourceSpec:
+          $ref: '#/components/schemas/UserProfile_ResourceSpec'
+          description: The default instance type and the Amazon Resource Name (ARN) of the default SageMaker image used by the CodeEditor app.
+        LifecycleConfigArns:
+          type: array
+          description: A list of LifecycleConfigArns available for use with CodeEditor apps.
           uniqueItems: false
           minItems: 0
-          maxItems: 50
-        Tags:
+          maxItems: 30
+          items:
+            $ref: '#/components/schemas/StudioLifecycleConfigArn'
+        CustomImages:
           type: array
-          description: A list of tags to apply to the space.
+          description: A list of custom images for use for CodeEditor apps.
           uniqueItems: false
           minItems: 0
-          maxItems: 50
+          maxItems: 200
           items:
-            $ref: '#/components/schemas/Tag'
-        OwnershipSettings:
-          $ref: '#/components/schemas/OwnershipSettings'
-        SpaceSharingSettings:
-          $ref: '#/components/schemas/SpaceSharingSettings'
-        SpaceDisplayName:
-          type: string
-          maxLength: 64
-          pattern: ^(?!\s*$).+
-        Url:
-          type: string
-          maxLength: 1024
-      required:
-        - DomainId
-        - SpaceName
-      x-stackql-resource-name: space
-      description: Resource Type definition for AWS::SageMaker::Space
-      x-type-name: AWS::SageMaker::Space
-      x-stackql-primary-identifier:
-        - DomainId
-        - SpaceName
-      x-create-only-properties:
-        - DomainId
-        - SpaceName
-        - SpaceSharingSettings
-        - OwnershipSettings
-      x-write-only-properties:
-        - SpaceSettings
-      x-read-only-properties:
-        - SpaceArn
-        - Url
-      x-required-properties:
-        - DomainId
-        - SpaceName
-      x-tagging:
-        taggable: true
-        tagOnCreate: true
-        tagUpdatable: true
-        cloudFormationSystemTags: false
-        tagProperty: /properties/Tags
-        permissions:
-          - sagemaker:AddTags
-          - sagemaker:DeleteTags
-          - sagemaker:ListTags
-      x-required-permissions:
-        create:
-          - sagemaker:CreateSpace
-          - sagemaker:DescribeSpace
-          - sagemaker:ListTags
-          - sagemaker:AddTags
-        read:
-          - sagemaker:DescribeSpace
-          - sagemaker:ListTags
-        update:
-          - sagemaker:UpdateSpace
-          - sagemaker:DescribeSpace
-          - sagemaker:AddTags
-          - sagemaker:DeleteTags
-          - sagemaker:ListTags
-        delete:
-          - sagemaker:DeleteSpace
-          - sagemaker:DescribeSpace
-          - sagemaker:DeleteTags
-        list:
-          - sagemaker:ListSpaces
-          - sagemaker:ListTags
-    StudioLifecycleConfig:
-      type: object
-      properties:
-        StudioLifecycleConfigArn:
+            $ref: '#/components/schemas/CustomImage'
+        AppLifecycleManagement:
+          $ref: '#/components/schemas/AppLifecycleManagement'
+        BuiltInLifecycleConfigArn:
           type: string
-          description: The Amazon Resource Name (ARN) of the Lifecycle Configuration.
-          minLength: 1
+          description: The lifecycle configuration that runs before the default lifecycle configuration.
           maxLength: 256
-          pattern: arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]*:[0-9]{12}:studio-lifecycle-config/.*
-        StudioLifecycleConfigAppType:
-          type: string
-          description: The App type that the Lifecycle Configuration is attached to.
-          enum:
-            - JupyterServer
-            - KernelGateway
-            - CodeEditor
-            - JupyterLab
-        StudioLifecycleConfigContent:
-          type: string
-          description: The content of your Amazon SageMaker Studio Lifecycle Configuration script. This content must be base64 encoded.
-          minLength: 1
-          maxLength: 16384
-          pattern: '[\S\s]+'
-        StudioLifecycleConfigName:
-          type: string
-          description: The name of the Amazon SageMaker Studio Lifecycle Configuration.
-          minLength: 1
-          maxLength: 63
-          pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}
-        Tags:
-          type: array
-          description: Tags to be associated with the Lifecycle Configuration. Each tag consists of a key and an optional value. Tag keys must be unique per resource. Tags are searchable using the Search API.
-          uniqueItems: false
-          x-insertionOrder: false
-          items:
-            $ref: '#/components/schemas/Tag'
-          minItems: 0
-          maxItems: 50
-      required:
-        - StudioLifecycleConfigAppType
-        - StudioLifecycleConfigContent
-        - StudioLifecycleConfigName
-      x-stackql-resource-name: studio_lifecycle_config
-      description: Resource Type definition for AWS::SageMaker::StudioLifecycleConfig
-      x-type-name: AWS::SageMaker::StudioLifecycleConfig
-      x-stackql-primary-identifier:
-        - StudioLifecycleConfigName
-      x-create-only-properties:
-        - StudioLifecycleConfigAppType
-        - StudioLifecycleConfigContent
-        - StudioLifecycleConfigName
-        - Tags
-      x-read-only-properties:
-        - StudioLifecycleConfigArn
-      x-required-properties:
-        - StudioLifecycleConfigAppType
-        - StudioLifecycleConfigContent
-        - StudioLifecycleConfigName
-      x-tagging:
-        taggable: true
-        tagOnCreate: true
-        tagUpdatable: false
-        cloudFormationSystemTags: false
-        tagProperty: /properties/Tags
-        permissions:
-          - sagemaker:AddTags
-          - sagemaker:ListTags
-          - sagemaker:DeleteTags
-      x-required-permissions:
-        create:
-          - sagemaker:CreateStudioLifecycleConfig
-          - sagemaker:DescribeStudioLifecycleConfig
-          - sagemaker:AddTags
-          - sagemaker:ListTags
-        read:
-          - sagemaker:DescribeStudioLifecycleConfig
-          - sagemaker:ListTags
-        delete:
-          - sagemaker:DeleteStudioLifecycleConfig
-          - sagemaker:DescribeStudioLifecycleConfig
-          - sagemaker:DeleteTags
-          - sagemaker:ListTags
-        list:
-          - sagemaker:ListStudioLifecycleConfigs
-          - sagemaker:ListTags
+          pattern: ^(arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]*:[0-9]{12}:studio-lifecycle-config/.*|None)$
     UserProfile:
       type: object
       properties:
@@ -7989,7 +9951,7 @@ components:
           minLength: 1
           maxLength: 63
         UserSettings:
-          $ref: '#/components/schemas/UserSettings'
+          $ref: '#/components/schemas/UserProfile_UserSettings'
           description: A collection of settings.
           uniqueItems: false
           minItems: 0
@@ -8235,7 +10197,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Cluster_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateClusterRequest
       type: object
@@ -8287,7 +10249,7 @@ components:
               maxItems: 50
               description: An array of key-value pairs to apply to this resource.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/DataQualityJobDefinition_Tag'
             CreationTime:
               description: The time at which the job definition was created.
               type: string
@@ -8316,12 +10278,12 @@ components:
               maxLength: 63
             Device:
               description: The Edge Device you want to register against a device fleet
-              $ref: '#/components/schemas/Device'
+              $ref: '#/components/schemas/Device_Device'
             Tags:
               description: Associate tags with the resource
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Device_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateDeviceRequest
       type: object
@@ -8364,11 +10326,126 @@ components:
               description: Associate tags with the resource
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/DeviceFleet_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateDeviceFleetRequest
       type: object
       required: []
+    CreateDomainRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            DomainArn:
+              type: string
+              description: The Amazon Resource Name (ARN) of the created domain.
+              maxLength: 256
+              pattern: arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]*:[0-9]{12}:domain/.*
+            Url:
+              type: string
+              description: The URL to the created domain.
+              maxLength: 1024
+            AppNetworkAccessType:
+              type: string
+              description: Specifies the VPC used for non-EFS traffic. The default value is PublicInternetOnly.
+              enum:
+                - PublicInternetOnly
+                - VpcOnly
+            AuthMode:
+              type: string
+              description: The mode of authentication that members use to access the domain.
+              enum:
+                - SSO
+                - IAM
+            DefaultUserSettings:
+              $ref: '#/components/schemas/UserSettings'
+              description: The default user settings.
+            DefaultSpaceSettings:
+              $ref: '#/components/schemas/DefaultSpaceSettings'
+              description: The default space settings.
+            DomainName:
+              type: string
+              description: A name for the domain.
+              maxLength: 63
+              pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}
+            KmsKeyId:
+              type: string
+              description: SageMaker uses AWS KMS to encrypt the EFS volume attached to the domain with an AWS managed customer master key (CMK) by default.
+              maxLength: 2048
+              pattern: .*
+            SubnetIds:
+              type: array
+              description: The VPC subnets that Studio uses for communication.
+              uniqueItems: false
+              x-insertionOrder: false
+              minItems: 1
+              maxItems: 16
+              items:
+                type: string
+                maxLength: 32
+                pattern: '[-0-9a-zA-Z]+'
+            Tags:
+              type: array
+              description: A list of tags to apply to the user profile.
+              uniqueItems: false
+              x-insertionOrder: false
+              minItems: 0
+              maxItems: 50
+              items:
+                $ref: '#/components/schemas/Tag'
+            VpcId:
+              type: string
+              description: The ID of the Amazon Virtual Private Cloud (VPC) that Studio uses for communication.
+              maxLength: 32
+              pattern: '[-0-9a-zA-Z]+'
+            DomainId:
+              type: string
+              description: The domain name.
+              maxLength: 63
+              pattern: ^d-(-*[a-z0-9])+
+            HomeEfsFileSystemId:
+              type: string
+              description: The ID of the Amazon Elastic File System (EFS) managed by this Domain.
+              maxLength: 32
+            SingleSignOnManagedApplicationInstanceId:
+              type: string
+              description: The SSO managed application instance ID.
+              maxLength: 256
+            SingleSignOnApplicationArn:
+              type: string
+              description: The ARN of the application managed by SageMaker in IAM Identity Center. This value is only returned for domains created after October 1, 2023.
+              pattern: ^arn:(aws|aws-us-gov|aws-cn|aws-iso|aws-iso-b):sso::[0-9]+:application/[a-zA-Z0-9-_.]+/apl-[a-zA-Z0-9]+$
+            DomainSettings:
+              $ref: '#/components/schemas/DomainSettings'
+            AppSecurityGroupManagement:
+              type: string
+              description: The entity that creates and manages the required security groups for inter-app communication in VPCOnly mode. Required when CreateDomain.AppNetworkAccessType is VPCOnly and DomainSettings.RStudioServerProDomainSettings.DomainExecutionRoleArn is provided.
+              enum:
+                - Service
+                - Customer
+            SecurityGroupIdForDomainBoundary:
+              type: string
+              description: The ID of the security group that authorizes traffic between the RSessionGateway apps and the RStudioServerPro app.
+              maxLength: 32
+              pattern: '[-0-9a-zA-Z]+'
+            TagPropagation:
+              type: string
+              description: Indicates whether the tags added to Domain, User Profile and Space entity is propagated to all SageMaker resources.
+              enum:
+                - ENABLED
+                - DISABLED
+          x-stackQL-stringOnly: true
+      x-title: CreateDomainRequest
+      type: object
+      required: []
     CreateEndpointRequest:
       properties:
         ClientToken:
@@ -8383,7 +10460,7 @@ components:
           type: object
           properties:
             DeploymentConfig:
-              $ref: '#/components/schemas/DeploymentConfig'
+              $ref: '#/components/schemas/Endpoint_DeploymentConfig'
               description: Specifies deployment configuration for updating the SageMaker endpoint. Includes rollback and update policies.
             EndpointArn:
               type: string
@@ -8410,7 +10487,7 @@ components:
               type: array
               uniqueItems: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Endpoint_Tag'
               description: An array of key-value pairs to apply to this resource.
           x-stackQL-stringOnly: true
       x-title: CreateEndpointRequest
@@ -8507,7 +10584,7 @@ components:
               x-insertionOrder: false
               maxItems: 50
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/FeatureGroup_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateFeatureGroupRequest
       type: object
@@ -8540,7 +10617,7 @@ components:
               maxItems: 50
               description: An array of key-value pairs to apply to this resource.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Image_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateImageRequest
       type: object
@@ -8559,9 +10636,9 @@ components:
           type: object
           properties:
             ImageName:
-              $ref: '#/components/schemas/ImageName'
+              $ref: '#/components/schemas/ImageVersion_ImageName'
             ImageArn:
-              $ref: '#/components/schemas/ImageArn'
+              $ref: '#/components/schemas/ImageVersion_ImageArn'
             ImageVersionArn:
               $ref: '#/components/schemas/ImageVersionArn'
             BaseImage:
@@ -8612,7 +10689,7 @@ components:
             EndpointArn:
               $ref: '#/components/schemas/EndpointArn'
             EndpointName:
-              $ref: '#/components/schemas/EndpointName'
+              $ref: '#/components/schemas/InferenceComponent_EndpointName'
             VariantName:
               $ref: '#/components/schemas/VariantName'
             FailureReason:
@@ -8677,7 +10754,7 @@ components:
               minLength: 20
               maxLength: 2048
             EndpointName:
-              $ref: '#/components/schemas/EndpointName'
+              $ref: '#/components/schemas/InferenceExperiment_EndpointName'
             EndpointMetadata:
               $ref: '#/components/schemas/EndpointMetadata'
             Schedule:
@@ -8702,7 +10779,7 @@ components:
               type: array
               maxItems: 50
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/InferenceExperiment_Tag'
             CreationTime:
               description: The timestamp at which you created the inference experiment.
               type: string
@@ -8802,7 +10879,7 @@ components:
               description: An array of key-value pairs to apply to this resource.
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/MlflowTrackingServer_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateMlflowTrackingServerRequest
       type: object
@@ -8838,7 +10915,7 @@ components:
             JobResources:
               $ref: '#/components/schemas/MonitoringResources'
             NetworkConfig:
-              $ref: '#/components/schemas/NetworkConfig'
+              $ref: '#/components/schemas/ModelBiasJobDefinition_NetworkConfig'
             EndpointName:
               $ref: '#/components/schemas/EndpointName'
             RoleArn:
@@ -8854,7 +10931,7 @@ components:
               maxItems: 50
               description: An array of key-value pairs to apply to this resource.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ModelBiasJobDefinition_Tag'
             CreationTime:
               description: The time at which the job definition was created.
               type: string
@@ -8862,6 +10939,82 @@ components:
       x-title: CreateModelBiasJobDefinitionRequest
       type: object
       required: []
+    CreateModelCardRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            ModelCardArn:
+              description: The Amazon Resource Name (ARN) of the successfully created model card.
+              type: string
+              minLength: 1
+              maxLength: 256
+              pattern: ^arn:aws[a-z\-]*:sagemaker:[a-z0-9\-]{9,16}:[0-9]{12}:model-card/[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}$
+            ModelCardVersion:
+              description: A version of the model card.
+              type: integer
+              minimum: 1
+            ModelCardName:
+              description: The unique name of the model card.
+              type: string
+              maxLength: 63
+              pattern: ^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}$
+            SecurityConfig:
+              $ref: '#/components/schemas/SecurityConfig'
+            ModelCardStatus:
+              description: The approval status of the model card within your organization. Different organizations might have different criteria for model card review and approval.
+              type: string
+              enum:
+                - Draft
+                - PendingReview
+                - Approved
+                - Archived
+            Content:
+              $ref: '#/components/schemas/Content'
+            CreationTime:
+              description: The date and time the model card was created.
+              type: string
+            CreatedBy:
+              description: Information about the user who created or modified an experiment, trial, trial component, lineage group, project, or model card.
+              $ref: '#/components/schemas/UserContext'
+            LastModifiedTime:
+              description: The date and time the model card was last modified.
+              type: string
+            LastModifiedBy:
+              description: Information about the user who created or modified an experiment, trial, trial component, lineage group, project, or model card.
+              $ref: '#/components/schemas/UserContext'
+            ModelCardProcessingStatus:
+              description: The processing status of model card deletion. The ModelCardProcessingStatus updates throughout the different deletion steps.
+              type: string
+              default: UnsetValue
+              enum:
+                - UnsetValue
+                - DeleteInProgress
+                - DeletePending
+                - ContentDeleted
+                - ExportJobsDeleted
+                - DeleteCompleted
+                - DeleteFailed
+            Tags:
+              type: array
+              minItems: 1
+              maxItems: 50
+              description: Key-value pairs used to manage metadata for model cards.
+              x-insertionOrder: true
+              items:
+                $ref: '#/components/schemas/ModelCard_Tag'
+          x-stackQL-stringOnly: true
+      x-title: CreateModelCardRequest
+      type: object
+      required: []
     CreateModelExplainabilityJobDefinitionRequest:
       properties:
         ClientToken:
@@ -8893,7 +11046,7 @@ components:
             JobResources:
               $ref: '#/components/schemas/MonitoringResources'
             NetworkConfig:
-              $ref: '#/components/schemas/NetworkConfig'
+              $ref: '#/components/schemas/ModelExplainabilityJobDefinition_NetworkConfig'
             EndpointName:
               $ref: '#/components/schemas/EndpointName'
             RoleArn:
@@ -8909,7 +11062,7 @@ components:
               maxItems: 50
               description: An array of key-value pairs to apply to this resource.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ModelExplainabilityJobDefinition_Tag'
             CreationTime:
               description: The time at which the job definition was created.
               type: string
@@ -8935,7 +11088,7 @@ components:
               maxItems: 50
               description: An array of key-value pairs to apply to this resource.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ModelPackage_Tag'
             AdditionalInferenceSpecifications:
               $ref: '#/components/schemas/AdditionalInferenceSpecifications'
             CertifyForMarketplace:
@@ -8945,11 +11098,11 @@ components:
             CustomerMetadataProperties:
               $ref: '#/components/schemas/CustomerMetadataProperties'
             Domain:
-              $ref: '#/components/schemas/Domain'
+              $ref: '#/components/schemas/ModelPackage_Domain'
             DriftCheckBaselines:
               $ref: '#/components/schemas/DriftCheckBaselines'
             InferenceSpecification:
-              $ref: '#/components/schemas/InferenceSpecification'
+              $ref: '#/components/schemas/ModelPackage_InferenceSpecification'
             MetadataProperties:
               $ref: '#/components/schemas/MetadataProperties'
             ModelApprovalStatus:
@@ -8991,9 +11144,9 @@ components:
             SourceUri:
               $ref: '#/components/schemas/SourceUri'
             ModelCard:
-              $ref: '#/components/schemas/ModelCard'
+              $ref: '#/components/schemas/ModelPackage_ModelCard'
             SecurityConfig:
-              $ref: '#/components/schemas/SecurityConfig'
+              $ref: '#/components/schemas/ModelPackage_SecurityConfig'
           x-stackQL-stringOnly: true
       x-title: CreateModelPackageRequest
       type: object
@@ -9016,11 +11169,11 @@ components:
               maxItems: 50
               description: An array of key-value pairs to apply to this resource.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ModelPackageGroup_Tag'
             ModelPackageGroupArn:
               $ref: '#/components/schemas/ModelPackageGroupArn'
             ModelPackageGroupName:
-              $ref: '#/components/schemas/ModelPackageGroupName'
+              $ref: '#/components/schemas/ModelPackageGroup_ModelPackageGroupName'
             ModelPackageGroupDescription:
               $ref: '#/components/schemas/ModelPackageGroupDescription'
             ModelPackageGroupPolicy:
@@ -9073,7 +11226,7 @@ components:
             JobResources:
               $ref: '#/components/schemas/MonitoringResources'
             NetworkConfig:
-              $ref: '#/components/schemas/NetworkConfig'
+              $ref: '#/components/schemas/ModelQualityJobDefinition_NetworkConfig'
             EndpointName:
               $ref: '#/components/schemas/EndpointName'
             RoleArn:
@@ -9089,7 +11242,7 @@ components:
               maxItems: 50
               description: An array of key-value pairs to apply to this resource.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ModelQualityJobDefinition_Tag'
             CreationTime:
               description: The time at which the job definition was created.
               type: string
@@ -9124,7 +11277,7 @@ components:
               maxItems: 50
               description: An array of key-value pairs to apply to this resource.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/MonitoringSchedule_Tag'
             CreationTime:
               description: The time at which the schedule was created.
               type: string
@@ -9295,7 +11448,7 @@ components:
               type: array
               uniqueItems: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Pipeline_Tag'
             ParallelismConfiguration:
               type: object
               additionalProperties: false
@@ -9326,11 +11479,11 @@ components:
             AppSpecification:
               $ref: '#/components/schemas/AppSpecification'
             Environment:
-              $ref: '#/components/schemas/Environment'
+              $ref: '#/components/schemas/ProcessingJob_Environment'
             ExperimentConfig:
               $ref: '#/components/schemas/ExperimentConfig'
             NetworkConfig:
-              $ref: '#/components/schemas/NetworkConfig'
+              $ref: '#/components/schemas/ProcessingJob_NetworkConfig'
             ProcessingInputs:
               description: An array of inputs configuring the data to download into the processing container.
               type: array
@@ -9357,7 +11510,7 @@ components:
               maxLength: 2048
               pattern: arn:aws[a-z\-]*:iam::\d{12}:role/?[a-zA-Z_0-9+=,.@\-_/]+
             StoppingCondition:
-              $ref: '#/components/schemas/StoppingCondition'
+              $ref: '#/components/schemas/ProcessingJob_StoppingCondition'
             Tags:
               description: (Optional) An array of key-value pairs. For more information, see Using Cost Allocation Tags(https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html#allocation-whatURL) in the AWS Billing and Cost Management User Guide.
               type: array
@@ -9365,7 +11518,7 @@ components:
               x-insertionOrder: false
               maxItems: 50
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ProcessingJob_Tag'
             ProcessingJobArn:
               description: The Amazon Resource Name (ARN) of the processing job.
               type: string
@@ -9436,7 +11589,7 @@ components:
               maxItems: 40
               description: An array of key-value pairs to apply to this resource.
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Project_Tag'
             ProjectArn:
               $ref: '#/components/schemas/ProjectArn'
             ProjectId:
@@ -9645,7 +11798,7 @@ components:
               minLength: 1
               maxLength: 63
             UserSettings:
-              $ref: '#/components/schemas/UserSettings'
+              $ref: '#/components/schemas/UserProfile_UserSettings'
               description: A collection of settings.
               uniqueItems: false
               minItems: 0
@@ -9675,7 +11828,7 @@ components:
       id: awscc.sagemaker.apps
       x-cfn-schema-name: App
       x-cfn-type-name: AWS::SageMaker::App
-      x-identifiers:
+      x-identifiers: &ref_0
         - AppName
         - AppType
         - DomainId
@@ -9780,11 +11933,7 @@ components:
       id: awscc.sagemaker.apps_list_only
       x-cfn-schema-name: App
       x-cfn-type-name: AWS::SageMaker::App
-      x-identifiers:
-        - AppName
-        - AppType
-        - DomainId
-        - UserProfileName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -9820,7 +11969,7 @@ components:
       id: awscc.sagemaker.app_image_configs
       x-cfn-schema-name: AppImageConfig
       x-cfn-type-name: AWS::SageMaker::AppImageConfig
-      x-identifiers:
+      x-identifiers: &ref_1
         - AppImageConfigName
       x-type: cloud_control
       methods:
@@ -9916,8 +12065,7 @@ components:
       id: awscc.sagemaker.app_image_configs_list_only
       x-cfn-schema-name: AppImageConfig
       x-cfn-type-name: AWS::SageMaker::AppImageConfig
-      x-identifiers:
-        - AppImageConfigName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -9947,7 +12095,7 @@ components:
       id: awscc.sagemaker.clusters
       x-cfn-schema-name: Cluster
       x-cfn-type-name: AWS::SageMaker::Cluster
-      x-identifiers:
+      x-identifiers: &ref_2
         - ClusterArn
       x-type: cloud_control
       methods:
@@ -10059,8 +12207,7 @@ components:
       id: awscc.sagemaker.clusters_list_only
       x-cfn-schema-name: Cluster
       x-cfn-type-name: AWS::SageMaker::Cluster
-      x-identifiers:
-        - ClusterArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -10090,7 +12237,7 @@ components:
       id: awscc.sagemaker.data_quality_job_definitions
       x-cfn-schema-name: DataQualityJobDefinition
       x-cfn-type-name: AWS::SageMaker::DataQualityJobDefinition
-      x-identifiers:
+      x-identifiers: &ref_3
         - JobDefinitionArn
       x-type: cloud_control
       methods:
@@ -10183,8 +12330,7 @@ components:
       id: awscc.sagemaker.data_quality_job_definitions_list_only
       x-cfn-schema-name: DataQualityJobDefinition
       x-cfn-type-name: AWS::SageMaker::DataQualityJobDefinition
-      x-identifiers:
-        - JobDefinitionArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -10366,39 +12512,191 @@ components:
       config:
         views:
           select:
-            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.Description') as description,
+              JSON_EXTRACT(Properties, '$.DeviceFleetName') as device_fleet_name,
+              JSON_EXTRACT(Properties, '$.OutputConfig') as output_config,
+              JSON_EXTRACT(Properties, '$.RoleArn') as role_arn,
+              JSON_EXTRACT(Properties, '$.Tags') as tags
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::SageMaker::DeviceFleet'
+              AND Identifier = '<DeviceFleetName>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'Description') as description,
+                json_extract_path_text(Properties, 'DeviceFleetName') as device_fleet_name,
+                json_extract_path_text(Properties, 'OutputConfig') as output_config,
+                json_extract_path_text(Properties, 'RoleArn') as role_arn,
+                json_extract_path_text(Properties, 'Tags') as tags
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::SageMaker::DeviceFleet'
+                AND Identifier = '<DeviceFleetName>'
+                AND region = 'us-east-1'
+    domains:
+      name: domains
+      id: awscc.sagemaker.domains
+      x-cfn-schema-name: Domain
+      x-cfn-type-name: AWS::SageMaker::Domain
+      x-identifiers: &ref_4
+        - DomainId
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Domain&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::SageMaker::Domain"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::SageMaker::Domain"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::SageMaker::Domain"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/domains/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/domains/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/domains/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.DomainArn') as domain_arn,
+              JSON_EXTRACT(Properties, '$.Url') as url,
+              JSON_EXTRACT(Properties, '$.AppNetworkAccessType') as app_network_access_type,
+              JSON_EXTRACT(Properties, '$.AuthMode') as auth_mode,
+              JSON_EXTRACT(Properties, '$.DefaultUserSettings') as default_user_settings,
+              JSON_EXTRACT(Properties, '$.DefaultSpaceSettings') as default_space_settings,
+              JSON_EXTRACT(Properties, '$.DomainName') as domain_name,
+              JSON_EXTRACT(Properties, '$.KmsKeyId') as kms_key_id,
+              JSON_EXTRACT(Properties, '$.SubnetIds') as subnet_ids,
+              JSON_EXTRACT(Properties, '$.Tags') as tags,
+              JSON_EXTRACT(Properties, '$.VpcId') as vpc_id,
+              JSON_EXTRACT(Properties, '$.DomainId') as domain_id,
+              JSON_EXTRACT(Properties, '$.HomeEfsFileSystemId') as home_efs_file_system_id,
+              JSON_EXTRACT(Properties, '$.SingleSignOnManagedApplicationInstanceId') as single_sign_on_managed_application_instance_id,
+              JSON_EXTRACT(Properties, '$.SingleSignOnApplicationArn') as single_sign_on_application_arn,
+              JSON_EXTRACT(Properties, '$.DomainSettings') as domain_settings,
+              JSON_EXTRACT(Properties, '$.AppSecurityGroupManagement') as app_security_group_management,
+              JSON_EXTRACT(Properties, '$.SecurityGroupIdForDomainBoundary') as security_group_id_for_domain_boundary,
+              JSON_EXTRACT(Properties, '$.TagPropagation') as tag_propagation
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::SageMaker::Domain'
+              AND Identifier = '<DomainId>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'DomainArn') as domain_arn,
+                json_extract_path_text(Properties, 'Url') as url,
+                json_extract_path_text(Properties, 'AppNetworkAccessType') as app_network_access_type,
+                json_extract_path_text(Properties, 'AuthMode') as auth_mode,
+                json_extract_path_text(Properties, 'DefaultUserSettings') as default_user_settings,
+                json_extract_path_text(Properties, 'DefaultSpaceSettings') as default_space_settings,
+                json_extract_path_text(Properties, 'DomainName') as domain_name,
+                json_extract_path_text(Properties, 'KmsKeyId') as kms_key_id,
+                json_extract_path_text(Properties, 'SubnetIds') as subnet_ids,
+                json_extract_path_text(Properties, 'Tags') as tags,
+                json_extract_path_text(Properties, 'VpcId') as vpc_id,
+                json_extract_path_text(Properties, 'DomainId') as domain_id,
+                json_extract_path_text(Properties, 'HomeEfsFileSystemId') as home_efs_file_system_id,
+                json_extract_path_text(Properties, 'SingleSignOnManagedApplicationInstanceId') as single_sign_on_managed_application_instance_id,
+                json_extract_path_text(Properties, 'SingleSignOnApplicationArn') as single_sign_on_application_arn,
+                json_extract_path_text(Properties, 'DomainSettings') as domain_settings,
+                json_extract_path_text(Properties, 'AppSecurityGroupManagement') as app_security_group_management,
+                json_extract_path_text(Properties, 'SecurityGroupIdForDomainBoundary') as security_group_id_for_domain_boundary,
+                json_extract_path_text(Properties, 'TagPropagation') as tag_propagation
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::SageMaker::Domain'
+                AND Identifier = '<DomainId>'
+                AND region = 'us-east-1'
+    domains_list_only:
+      name: domains_list_only
+      id: awscc.sagemaker.domains_list_only
+      x-cfn-schema-name: Domain
+      x-cfn-type-name: AWS::SageMaker::Domain
+      x-identifiers: *ref_4
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
             ddl: |-
               SELECT
               region,
-              Identifier,
-              JSON_EXTRACT(Properties, '$.Description') as description,
-              JSON_EXTRACT(Properties, '$.DeviceFleetName') as device_fleet_name,
-              JSON_EXTRACT(Properties, '$.OutputConfig') as output_config,
-              JSON_EXTRACT(Properties, '$.RoleArn') as role_arn,
-              JSON_EXTRACT(Properties, '$.Tags') as tags
-              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::SageMaker::DeviceFleet'
-              AND Identifier = '<DeviceFleetName>'
+              JSON_EXTRACT(Properties, '$.DomainId') as domain_id
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::SageMaker::Domain'
               AND region = 'us-east-1'
             fallback:
-              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              predicate: sqlDialect == "postgres"
               ddl: |-
                 SELECT
                 region,
-                Identifier,
-                json_extract_path_text(Properties, 'Description') as description,
-                json_extract_path_text(Properties, 'DeviceFleetName') as device_fleet_name,
-                json_extract_path_text(Properties, 'OutputConfig') as output_config,
-                json_extract_path_text(Properties, 'RoleArn') as role_arn,
-                json_extract_path_text(Properties, 'Tags') as tags
-                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::SageMaker::DeviceFleet'
-                AND Identifier = '<DeviceFleetName>'
+                json_extract_path_text(Properties, 'DomainId') as domain_id
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::SageMaker::Domain'
                 AND region = 'us-east-1'
     endpoints:
       name: endpoints
       id: awscc.sagemaker.endpoints
       x-cfn-schema-name: Endpoint
       x-cfn-type-name: AWS::SageMaker::Endpoint
-      x-identifiers:
+      x-identifiers: &ref_5
         - EndpointArn
       x-type: cloud_control
       methods:
@@ -10498,8 +12796,7 @@ components:
       id: awscc.sagemaker.endpoints_list_only
       x-cfn-schema-name: Endpoint
       x-cfn-type-name: AWS::SageMaker::Endpoint
-      x-identifiers:
-        - EndpointArn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -10529,7 +12826,7 @@ components:
       id: awscc.sagemaker.feature_groups
       x-cfn-schema-name: FeatureGroup
       x-cfn-type-name: AWS::SageMaker::FeatureGroup
-      x-identifiers:
+      x-identifiers: &ref_6
         - FeatureGroupName
       x-type: cloud_control
       methods:
@@ -10637,8 +12934,7 @@ components:
       id: awscc.sagemaker.feature_groups_list_only
       x-cfn-schema-name: FeatureGroup
       x-cfn-type-name: AWS::SageMaker::FeatureGroup
-      x-identifiers:
-        - FeatureGroupName
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -10668,7 +12964,7 @@ components:
       id: awscc.sagemaker.images
       x-cfn-schema-name: Image
       x-cfn-type-name: AWS::SageMaker::Image
-      x-identifiers:
+      x-identifiers: &ref_7
         - ImageArn
       x-type: cloud_control
       methods:
@@ -10764,8 +13060,7 @@ components:
       id: awscc.sagemaker.images_list_only
       x-cfn-schema-name: Image
       x-cfn-type-name: AWS::SageMaker::Image
-      x-identifiers:
-        - ImageArn
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -10795,7 +13090,7 @@ components:
       id: awscc.sagemaker.image_versions
       x-cfn-schema-name: ImageVersion
       x-cfn-type-name: AWS::SageMaker::ImageVersion
-      x-identifiers:
+      x-identifiers: &ref_8
         - ImageVersionArn
       x-type: cloud_control
       methods:
@@ -10909,8 +13204,7 @@ components:
       id: awscc.sagemaker.image_versions_list_only
       x-cfn-schema-name: ImageVersion
       x-cfn-type-name: AWS::SageMaker::ImageVersion
-      x-identifiers:
-        - ImageVersionArn
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -10940,7 +13234,7 @@ components:
       id: awscc.sagemaker.inference_components
       x-cfn-schema-name: InferenceComponent
       x-cfn-type-name: AWS::SageMaker::InferenceComponent
-      x-identifiers:
+      x-identifiers: &ref_9
         - InferenceComponentArn
       x-type: cloud_control
       methods:
@@ -11050,8 +13344,7 @@ components:
       id: awscc.sagemaker.inference_components_list_only
       x-cfn-schema-name: InferenceComponent
       x-cfn-type-name: AWS::SageMaker::InferenceComponent
-      x-identifiers:
-        - InferenceComponentArn
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -11081,7 +13374,7 @@ components:
       id: awscc.sagemaker.inference_experiments
       x-cfn-schema-name: InferenceExperiment
       x-cfn-type-name: AWS::SageMaker::InferenceExperiment
-      x-identifiers:
+      x-identifiers: &ref_10
         - Name
       x-type: cloud_control
       methods:
@@ -11201,8 +13494,7 @@ components:
       id: awscc.sagemaker.inference_experiments_list_only
       x-cfn-schema-name: InferenceExperiment
       x-cfn-type-name: AWS::SageMaker::InferenceExperiment
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -11232,7 +13524,7 @@ components:
       id: awscc.sagemaker.mlflow_tracking_servers
       x-cfn-schema-name: MlflowTrackingServer
       x-cfn-type-name: AWS::SageMaker::MlflowTrackingServer
-      x-identifiers:
+      x-identifiers: &ref_11
         - TrackingServerName
       x-type: cloud_control
       methods:
@@ -11334,8 +13626,7 @@ components:
       id: awscc.sagemaker.mlflow_tracking_servers_list_only
       x-cfn-schema-name: MlflowTrackingServer
       x-cfn-type-name: AWS::SageMaker::MlflowTrackingServer
-      x-identifiers:
-        - TrackingServerName
+      x-identifiers: *ref_11
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -11365,7 +13656,7 @@ components:
       id: awscc.sagemaker.model_bias_job_definitions
       x-cfn-schema-name: ModelBiasJobDefinition
       x-cfn-type-name: AWS::SageMaker::ModelBiasJobDefinition
-      x-identifiers:
+      x-identifiers: &ref_12
         - JobDefinitionArn
       x-type: cloud_control
       methods:
@@ -11458,8 +13749,7 @@ components:
       id: awscc.sagemaker.model_bias_job_definitions_list_only
       x-cfn-schema-name: ModelBiasJobDefinition
       x-cfn-type-name: AWS::SageMaker::ModelBiasJobDefinition
-      x-identifiers:
-        - JobDefinitionArn
+      x-identifiers: *ref_12
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -11484,12 +13774,150 @@ components:
                 json_extract_path_text(Properties, 'JobDefinitionArn') as job_definition_arn
                 FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::SageMaker::ModelBiasJobDefinition'
                 AND region = 'us-east-1'
+    model_cards:
+      name: model_cards
+      id: awscc.sagemaker.model_cards
+      x-cfn-schema-name: ModelCard
+      x-cfn-type-name: AWS::SageMaker::ModelCard
+      x-identifiers: &ref_13
+        - ModelCardName
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__ModelCard&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::SageMaker::ModelCard"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::SageMaker::ModelCard"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::SageMaker::ModelCard"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/model_cards/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/model_cards/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/model_cards/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.ModelCardArn') as model_card_arn,
+              JSON_EXTRACT(Properties, '$.ModelCardVersion') as model_card_version,
+              JSON_EXTRACT(Properties, '$.ModelCardName') as model_card_name,
+              JSON_EXTRACT(Properties, '$.SecurityConfig') as security_config,
+              JSON_EXTRACT(Properties, '$.ModelCardStatus') as model_card_status,
+              JSON_EXTRACT(Properties, '$.Content') as content,
+              JSON_EXTRACT(Properties, '$.CreationTime') as creation_time,
+              JSON_EXTRACT(Properties, '$.CreatedBy') as created_by,
+              JSON_EXTRACT(Properties, '$.LastModifiedTime') as last_modified_time,
+              JSON_EXTRACT(Properties, '$.LastModifiedBy') as last_modified_by,
+              JSON_EXTRACT(Properties, '$.ModelCardProcessingStatus') as model_card_processing_status,
+              JSON_EXTRACT(Properties, '$.Tags') as tags
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::SageMaker::ModelCard'
+              AND Identifier = '<ModelCardName>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'ModelCardArn') as model_card_arn,
+                json_extract_path_text(Properties, 'ModelCardVersion') as model_card_version,
+                json_extract_path_text(Properties, 'ModelCardName') as model_card_name,
+                json_extract_path_text(Properties, 'SecurityConfig') as security_config,
+                json_extract_path_text(Properties, 'ModelCardStatus') as model_card_status,
+                json_extract_path_text(Properties, 'Content') as content,
+                json_extract_path_text(Properties, 'CreationTime') as creation_time,
+                json_extract_path_text(Properties, 'CreatedBy') as created_by,
+                json_extract_path_text(Properties, 'LastModifiedTime') as last_modified_time,
+                json_extract_path_text(Properties, 'LastModifiedBy') as last_modified_by,
+                json_extract_path_text(Properties, 'ModelCardProcessingStatus') as model_card_processing_status,
+                json_extract_path_text(Properties, 'Tags') as tags
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::SageMaker::ModelCard'
+                AND Identifier = '<ModelCardName>'
+                AND region = 'us-east-1'
+    model_cards_list_only:
+      name: model_cards_list_only
+      id: awscc.sagemaker.model_cards_list_only
+      x-cfn-schema-name: ModelCard
+      x-cfn-type-name: AWS::SageMaker::ModelCard
+      x-identifiers: *ref_13
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.ModelCardName') as model_card_name
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::SageMaker::ModelCard'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'ModelCardName') as model_card_name
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::SageMaker::ModelCard'
+                AND region = 'us-east-1'
     model_explainability_job_definitions:
       name: model_explainability_job_definitions
       id: awscc.sagemaker.model_explainability_job_definitions
       x-cfn-schema-name: ModelExplainabilityJobDefinition
       x-cfn-type-name: AWS::SageMaker::ModelExplainabilityJobDefinition
-      x-identifiers:
+      x-identifiers: &ref_14
         - JobDefinitionArn
       x-type: cloud_control
       methods:
@@ -11582,8 +14010,7 @@ components:
       id: awscc.sagemaker.model_explainability_job_definitions_list_only
       x-cfn-schema-name: ModelExplainabilityJobDefinition
       x-cfn-type-name: AWS::SageMaker::ModelExplainabilityJobDefinition
-      x-identifiers:
-        - JobDefinitionArn
+      x-identifiers: *ref_14
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -11613,7 +14040,7 @@ components:
       id: awscc.sagemaker.model_packages
       x-cfn-schema-name: ModelPackage
       x-cfn-type-name: AWS::SageMaker::ModelPackage
-      x-identifiers:
+      x-identifiers: &ref_15
         - ModelPackageArn
       x-type: cloud_control
       methods:
@@ -11757,8 +14184,7 @@ components:
       id: awscc.sagemaker.model_packages_list_only
       x-cfn-schema-name: ModelPackage
       x-cfn-type-name: AWS::SageMaker::ModelPackage
-      x-identifiers:
-        - ModelPackageArn
+      x-identifiers: *ref_15
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -11788,7 +14214,7 @@ components:
       id: awscc.sagemaker.model_package_groups
       x-cfn-schema-name: ModelPackageGroup
       x-cfn-type-name: AWS::SageMaker::ModelPackageGroup
-      x-identifiers:
+      x-identifiers: &ref_16
         - ModelPackageGroupArn
       x-type: cloud_control
       methods:
@@ -11886,8 +14312,7 @@ components:
       id: awscc.sagemaker.model_package_groups_list_only
       x-cfn-schema-name: ModelPackageGroup
       x-cfn-type-name: AWS::SageMaker::ModelPackageGroup
-      x-identifiers:
-        - ModelPackageGroupArn
+      x-identifiers: *ref_16
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -11917,7 +14342,7 @@ components:
       id: awscc.sagemaker.model_quality_job_definitions
       x-cfn-schema-name: ModelQualityJobDefinition
       x-cfn-type-name: AWS::SageMaker::ModelQualityJobDefinition
-      x-identifiers:
+      x-identifiers: &ref_17
         - JobDefinitionArn
       x-type: cloud_control
       methods:
@@ -12010,8 +14435,7 @@ components:
       id: awscc.sagemaker.model_quality_job_definitions_list_only
       x-cfn-schema-name: ModelQualityJobDefinition
       x-cfn-type-name: AWS::SageMaker::ModelQualityJobDefinition
-      x-identifiers:
-        - JobDefinitionArn
+      x-identifiers: *ref_17
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -12041,7 +14465,7 @@ components:
       id: awscc.sagemaker.monitoring_schedules
       x-cfn-schema-name: MonitoringSchedule
       x-cfn-type-name: AWS::SageMaker::MonitoringSchedule
-      x-identifiers:
+      x-identifiers: &ref_18
         - MonitoringScheduleArn
       x-type: cloud_control
       methods:
@@ -12145,8 +14569,7 @@ components:
       id: awscc.sagemaker.monitoring_schedules_list_only
       x-cfn-schema-name: MonitoringSchedule
       x-cfn-type-name: AWS::SageMaker::MonitoringSchedule
-      x-identifiers:
-        - MonitoringScheduleArn
+      x-identifiers: *ref_18
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -12176,7 +14599,7 @@ components:
       id: awscc.sagemaker.partner_apps
       x-cfn-schema-name: PartnerApp
       x-cfn-type-name: AWS::SageMaker::PartnerApp
-      x-identifiers:
+      x-identifiers: &ref_19
         - Arn
       x-type: cloud_control
       methods:
@@ -12286,8 +14709,7 @@ components:
       id: awscc.sagemaker.partner_apps_list_only
       x-cfn-schema-name: PartnerApp
       x-cfn-type-name: AWS::SageMaker::PartnerApp
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_19
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -12317,7 +14739,7 @@ components:
       id: awscc.sagemaker.pipelines
       x-cfn-schema-name: Pipeline
       x-cfn-type-name: AWS::SageMaker::Pipeline
-      x-identifiers:
+      x-identifiers: &ref_20
         - PipelineName
       x-type: cloud_control
       methods:
@@ -12415,8 +14837,7 @@ components:
       id: awscc.sagemaker.pipelines_list_only
       x-cfn-schema-name: Pipeline
       x-cfn-type-name: AWS::SageMaker::Pipeline
-      x-identifiers:
-        - PipelineName
+      x-identifiers: *ref_20
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -12446,7 +14867,7 @@ components:
       id: awscc.sagemaker.processing_jobs
       x-cfn-schema-name: ProcessingJob
       x-cfn-type-name: AWS::SageMaker::ProcessingJob
-      x-identifiers:
+      x-identifiers: &ref_21
         - ProcessingJobArn
       x-type: cloud_control
       methods:
@@ -12557,8 +14978,7 @@ components:
       id: awscc.sagemaker.processing_jobs_list_only
       x-cfn-schema-name: ProcessingJob
       x-cfn-type-name: AWS::SageMaker::ProcessingJob
-      x-identifiers:
-        - ProcessingJobArn
+      x-identifiers: *ref_21
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -12588,7 +15008,7 @@ components:
       id: awscc.sagemaker.projects
       x-cfn-schema-name: Project
       x-cfn-type-name: AWS::SageMaker::Project
-      x-identifiers:
+      x-identifiers: &ref_22
         - ProjectArn
       x-type: cloud_control
       methods:
@@ -12692,8 +15112,7 @@ components:
       id: awscc.sagemaker.projects_list_only
       x-cfn-schema-name: Project
       x-cfn-type-name: AWS::SageMaker::Project
-      x-identifiers:
-        - ProjectArn
+      x-identifiers: *ref_22
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -12723,7 +15142,7 @@ components:
       id: awscc.sagemaker.spaces
       x-cfn-schema-name: Space
       x-cfn-type-name: AWS::SageMaker::Space
-      x-identifiers:
+      x-identifiers: &ref_23
         - DomainId
         - SpaceName
       x-type: cloud_control
@@ -12826,9 +15245,7 @@ components:
       id: awscc.sagemaker.spaces_list_only
       x-cfn-schema-name: Space
       x-cfn-type-name: AWS::SageMaker::Space
-      x-identifiers:
-        - DomainId
-        - SpaceName
+      x-identifiers: *ref_23
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -12860,7 +15277,7 @@ components:
       id: awscc.sagemaker.studio_lifecycle_configs
       x-cfn-schema-name: StudioLifecycleConfig
       x-cfn-type-name: AWS::SageMaker::StudioLifecycleConfig
-      x-identifiers:
+      x-identifiers: &ref_24
         - StudioLifecycleConfigName
       x-type: cloud_control
       methods:
@@ -12937,8 +15354,7 @@ components:
       id: awscc.sagemaker.studio_lifecycle_configs_list_only
       x-cfn-schema-name: StudioLifecycleConfig
       x-cfn-type-name: AWS::SageMaker::StudioLifecycleConfig
-      x-identifiers:
-        - StudioLifecycleConfigName
+      x-identifiers: *ref_24
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -12968,7 +15384,7 @@ components:
       id: awscc.sagemaker.user_profiles
       x-cfn-schema-name: UserProfile
       x-cfn-type-name: AWS::SageMaker::UserProfile
-      x-identifiers:
+      x-identifiers: &ref_25
         - UserProfileName
         - DomainId
       x-type: cloud_control
@@ -13067,9 +15483,7 @@ components:
       id: awscc.sagemaker.user_profiles_list_only
       x-cfn-schema-name: UserProfile
       x-cfn-type-name: AWS::SageMaker::UserProfile
-      x-identifiers:
-        - UserProfileName
-        - DomainId
+      x-identifiers: *ref_25
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -13492,6 +15906,48 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
+  /?Action=CreateResource&Version=2021-09-30&__Domain&__detailTransformed=true:
+    parameters:
+      - $ref: '#/components/parameters/X-Amz-Content-Sha256'
+      - $ref: '#/components/parameters/X-Amz-Date'
+      - $ref: '#/components/parameters/X-Amz-Algorithm'
+      - $ref: '#/components/parameters/X-Amz-Credential'
+      - $ref: '#/components/parameters/X-Amz-Security-Token'
+      - $ref: '#/components/parameters/X-Amz-Signature'
+      - $ref: '#/components/parameters/X-Amz-SignedHeaders'
+    post:
+      operationId: CreateDomain
+      parameters:
+        - description: Action Header
+          in: header
+          name: X-Amz-Target
+          required: false
+          schema:
+            default: CloudApiService.CreateResource
+            enum:
+              - CloudApiService.CreateResource
+            type: string
+        - in: header
+          name: Content-Type
+          required: false
+          schema:
+            default: application/x-amz-json-1.0
+            enum:
+              - application/x-amz-json-1.0
+            type: string
+      requestBody:
+        content:
+          application/x-amz-json-1.0:
+            schema:
+              $ref: '#/components/schemas/CreateDomainRequest'
+        required: true
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
+          description: Success
   /?Action=CreateResource&Version=2021-09-30&__Endpoint&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
@@ -13828,6 +16284,48 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
+  /?Action=CreateResource&Version=2021-09-30&__ModelCard&__detailTransformed=true:
+    parameters:
+      - $ref: '#/components/parameters/X-Amz-Content-Sha256'
+      - $ref: '#/components/parameters/X-Amz-Date'
+      - $ref: '#/components/parameters/X-Amz-Algorithm'
+      - $ref: '#/components/parameters/X-Amz-Credential'
+      - $ref: '#/components/parameters/X-Amz-Security-Token'
+      - $ref: '#/components/parameters/X-Amz-Signature'
+      - $ref: '#/components/parameters/X-Amz-SignedHeaders'
+    post:
+      operationId: CreateModelCard
+      parameters:
+        - description: Action Header
+          in: header
+          name: X-Amz-Target
+          required: false
+          schema:
+            default: CloudApiService.CreateResource
+            enum:
+              - CloudApiService.CreateResource
+            type: string
+        - in: header
+          name: Content-Type
+          required: false
+          schema:
+            default: application/x-amz-json-1.0
+            enum:
+              - application/x-amz-json-1.0
+            type: string
+      requestBody:
+        content:
+          application/x-amz-json-1.0:
+            schema:
+              $ref: '#/components/schemas/CreateModelCardRequest'
+        required: true
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
+          description: Success
   /?Action=CreateResource&Version=2021-09-30&__ModelExplainabilityJobDefinition&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
diff --git a/openapi/src/awscc/v00.00.00000/services/scheduler.yaml b/openapi/src/awscc/v00.00.00000/services/scheduler.yaml
index d9f38aa60..41ceda75d 100644
--- a/openapi/src/awscc/v00.00.00000/services/scheduler.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/scheduler.yaml
@@ -1068,7 +1068,7 @@ components:
       id: awscc.scheduler.schedules
       x-cfn-schema-name: Schedule
       x-cfn-type-name: AWS::Scheduler::Schedule
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -1176,8 +1176,7 @@ components:
       id: awscc.scheduler.schedules_list_only
       x-cfn-schema-name: Schedule
       x-cfn-type-name: AWS::Scheduler::Schedule
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1207,7 +1206,7 @@ components:
       id: awscc.scheduler.schedule_groups
       x-cfn-schema-name: ScheduleGroup
       x-cfn-type-name: AWS::Scheduler::ScheduleGroup
-      x-identifiers:
+      x-identifiers: &ref_1
         - Name
       x-type: cloud_control
       methods:
@@ -1303,8 +1302,7 @@ components:
       id: awscc.scheduler.schedule_groups_list_only
       x-cfn-schema-name: ScheduleGroup
       x-cfn-type-name: AWS::Scheduler::ScheduleGroup
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/secretsmanager.yaml b/openapi/src/awscc/v00.00.00000/services/secretsmanager.yaml
index ffe70f6b3..24de717cf 100644
--- a/openapi/src/awscc/v00.00.00000/services/secretsmanager.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/secretsmanager.yaml
@@ -966,7 +966,7 @@ components:
       id: awscc.secretsmanager.resource_policies
       x-cfn-schema-name: ResourcePolicy
       x-cfn-type-name: AWS::SecretsManager::ResourcePolicy
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
       x-type: cloud_control
       methods:
@@ -1058,8 +1058,7 @@ components:
       id: awscc.secretsmanager.resource_policies_list_only
       x-cfn-schema-name: ResourcePolicy
       x-cfn-type-name: AWS::SecretsManager::ResourcePolicy
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1089,7 +1088,7 @@ components:
       id: awscc.secretsmanager.rotation_schedules
       x-cfn-schema-name: RotationSchedule
       x-cfn-type-name: AWS::SecretsManager::RotationSchedule
-      x-identifiers:
+      x-identifiers: &ref_1
         - Id
       x-type: cloud_control
       methods:
@@ -1185,8 +1184,7 @@ components:
       id: awscc.secretsmanager.rotation_schedules_list_only
       x-cfn-schema-name: RotationSchedule
       x-cfn-type-name: AWS::SecretsManager::RotationSchedule
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1216,7 +1214,7 @@ components:
       id: awscc.secretsmanager.secrets
       x-cfn-schema-name: Secret
       x-cfn-type-name: AWS::SecretsManager::Secret
-      x-identifiers:
+      x-identifiers: &ref_2
         - Id
       x-type: cloud_control
       methods:
@@ -1316,8 +1314,7 @@ components:
       id: awscc.secretsmanager.secrets_list_only
       x-cfn-schema-name: Secret
       x-cfn-type-name: AWS::SecretsManager::Secret
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1347,7 +1344,7 @@ components:
       id: awscc.secretsmanager.secret_target_attachments
       x-cfn-schema-name: SecretTargetAttachment
       x-cfn-type-name: AWS::SecretsManager::SecretTargetAttachment
-      x-identifiers:
+      x-identifiers: &ref_3
         - Id
       x-type: cloud_control
       methods:
@@ -1439,8 +1436,7 @@ components:
       id: awscc.secretsmanager.secret_target_attachments_list_only
       x-cfn-schema-name: SecretTargetAttachment
       x-cfn-type-name: AWS::SecretsManager::SecretTargetAttachment
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/securityhub.yaml b/openapi/src/awscc/v00.00.00000/services/securityhub.yaml
index 213937206..2052dd6fa 100644
--- a/openapi/src/awscc/v00.00.00000/services/securityhub.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/securityhub.yaml
@@ -394,12 +394,12 @@ components:
       type: string
       pattern: ^[a-zA-Z0-9-]{1,32}$
     Tags:
-      description: 'A key-value pair to associate with the Security Hub V2 resource. You can specify a key that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+      description: A key-value pair to associate with the Security Hub V2 resource.
       type: object
       x-patternProperties:
-        ^(?!aws:)[a-zA-Z+-=._:/]{1,128}$:
+        ^(?!aws:)[a-zA-Z+-=._:/]+$:
           type: string
-          description: The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length.
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
           minLength: 0
           maxLength: 256
       additionalProperties: false
@@ -474,19 +474,44 @@ components:
         list:
           - securityhub:ListAggregatorsV2
           - securityhub:ListTagsForResource
+    AutomationRule_Tags:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      x-patternProperties:
+        ^[a-zA-Z0-9]{1,128}$:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
     NonEmptyString:
       type: string
-      pattern: .*\S.*
+      minLength: 1
     DateFilter:
       description: A date filter for querying findings.
       properties:
         DateRange:
           $ref: '#/components/schemas/DateRange'
+          description: A date range for the date filter.
         End:
           $ref: '#/components/schemas/ISO8601DateString'
+          description: |-
+            A timestamp that provides the end date for the date filter.
+             For more information about the validation and formatting of timestamp fields in ASHlong, see [Timestamps](https://docs.aws.amazon.com/securityhub/1.0/APIReference/Welcome.html#timestamps).
         Start:
           $ref: '#/components/schemas/ISO8601DateString'
+          description: |-
+            A timestamp that provides the start date for the date filter.
+             For more information about the validation and formatting of timestamp fields in ASHlong, see [Timestamps](https://docs.aws.amazon.com/securityhub/1.0/APIReference/Welcome.html#timestamps).
       type: object
+      oneOf:
+        - required:
+            - DateRange
+        - allOf:
+            - required:
+                - Start
+            - required:
+                - End
       additionalProperties: false
     DateRange:
       description: A date range for the date filter.
@@ -505,7 +530,7 @@ components:
       type: object
       additionalProperties: false
     BooleanFilter:
-      description: Boolean filter for querying findings.
+      description: ''
       properties:
         Value:
           description: The value of the boolean.
@@ -515,18 +540,36 @@ components:
       type: object
       additionalProperties: false
     MapFilter:
-      description: A map filter for filtering AWS Security Hub findings.
+      description: A map filter for filtering ASHlong findings. Each map filter provides the field to check for, the value to check for, and the comparison operator.
       properties:
         Comparison:
-          description: The condition to apply to the key value when filtering Security Hub findings with a map filter.
+          description: |-
+            The condition to apply to the key value when filtering Security Hub findings with a map filter.
+             To search for values that have the filter value, use one of the following comparison operators:
+              +  To search for values that include the filter value, use ``CONTAINS``. For example, for the ``ResourceTags`` field, the filter ``Department CONTAINS Security`` matches findings that include the value ``Security`` for the ``Department`` tag. In the same example, a finding with a value of ``Security team`` for the ``Department`` tag is a match.
+              +  To search for values that exactly match the filter value, use ``EQUALS``. For example, for the ``ResourceTags`` field, the filter ``Department EQUALS Security`` matches findings that have the value ``Security`` for the ``Department`` tag.
+              
+             ``CONTAINS`` and ``EQUALS`` filters on the same field are joined by ``OR``. A finding matches if it matches any one of those filters. For example, the filters ``Department CONTAINS Security OR Department CONTAINS Finance`` match a finding that includes either ``Security``, ``Finance``, or both values.
+             To search for values that don't have the filter value, use one of the following comparison operators:
+              +  To search for values that exclude the filter value, use ``NOT_CONTAINS``. For example, for the ``ResourceTags`` field, the filter ``Department NOT_CONTAINS Finance`` matches findings that exclude the value ``Finance`` for the ``Department`` tag.
+              +  To search for values other than the filter value, use ``NOT_EQUALS``. For example, for the ``ResourceTags`` field, the filter ``Department NOT_EQUALS Finance`` matches findings that don’t have the value ``Finance`` for the ``Department`` tag.
+              
+             ``NOT_CONTAINS`` and ``NOT_EQUALS`` filters on the same field are joined by ``AND``. A finding matches only if it matches all of those filters. For example, the filters ``Department NOT_CONTAINS Security AND Department NOT_CONTAINS Finance`` match a finding that excludes both the ``Security`` and ``Finance`` values.
+             ``CONTAINS`` filters can only be used with other ``CONTAINS`` filters. ``NOT_CONTAINS`` filters can only be used with other ``NOT_CONTAINS`` filters.
+             You can’t have both a ``CONTAINS`` filter and a ``NOT_CONTAINS`` filter on the same field. Similarly, you can’t have both an ``EQUALS`` filter and a ``NOT_EQUALS`` filter on the same field. Combining filters in this way returns an error. 
+             ``CONTAINS`` and ``NOT_CONTAINS`` operators can be used only with automation rules. For more information, see [Automation rules](https://docs.aws.amazon.com/securityhub/latest/userguide/automation-rules.html) in the *User Guide*.
           enum:
             - EQUALS
             - NOT_EQUALS
+            - CONTAINS
+            - NOT_CONTAINS
           type: string
         Key:
-          $ref: '#/components/schemas/NonEmptyString'
+          description: The key of the map filter. For example, for ``ResourceTags``, ``Key`` identifies the name of the tag. For ``UserDefinedFields``, ``Key`` is the name of the field.
+          type: string
         Value:
-          $ref: '#/components/schemas/NonEmptyString'
+          description: The value for the key in the map filter. Filter values are case sensitive. For example, one of the values for a tag called ``Department`` might be ``Security``. If you provide ``security`` as the filter value, then there's no match.
+          type: string
       required:
         - Comparison
         - Key
@@ -545,15 +588,47 @@ components:
         Lte:
           description: The less-than-equal condition to be applied to a single field when querying for findings.
           type: number
+      oneOf:
+        - required:
+            - Eq
+        - anyOf:
+            - required:
+                - Gte
+            - required:
+                - Lte
       type: object
       additionalProperties: false
     StringFilter:
-      description: A string filter for filtering AWS Security Hub findings.
+      description: A string filter for filtering ASHlong findings.
       properties:
         Comparison:
           $ref: '#/components/schemas/StringFilterComparison'
+          description: |-
+            The condition to apply to a string value when filtering Security Hub findings.
+             To search for values that have the filter value, use one of the following comparison operators:
+              +  To search for values that include the filter value, use ``CONTAINS``. For example, the filter ``Title CONTAINS CloudFront`` matches findings that have a ``Title`` that includes the string CloudFront.
+              +  To search for values that exactly match the filter value, use ``EQUALS``. For example, the filter ``AwsAccountId EQUALS 123456789012`` only matches findings that have an account ID of ``123456789012``.
+              +  To search for values that start with the filter value, use ``PREFIX``. For example, the filter ``ResourceRegion PREFIX us`` matches findings that have a ``ResourceRegion`` that starts with ``us``. A ``ResourceRegion`` that starts with a different value, such as ``af``, ``ap``, or ``ca``, doesn't match.
+              
+             ``CONTAINS``, ``EQUALS``, and ``PREFIX`` filters on the same field are joined by ``OR``. A finding matches if it matches any one of those filters. For example, the filters ``Title CONTAINS CloudFront OR Title CONTAINS CloudWatch`` match a finding that includes either ``CloudFront``, ``CloudWatch``, or both strings in the title.
+             To search for values that don’t have the filter value, use one of the following comparison operators:
+              +  To search for values that exclude the filter value, use ``NOT_CONTAINS``. For example, the filter ``Title NOT_CONTAINS CloudFront`` matches findings that have a ``Title`` that excludes the string CloudFront.
+              +  To search for values other than the filter value, use ``NOT_EQUALS``. For example, the filter ``AwsAccountId NOT_EQUALS 123456789012`` only matches findings that have an account ID other than ``123456789012``.
+              +  To search for values that don't start with the filter value, use ``PREFIX_NOT_EQUALS``. For example, the filter ``ResourceRegion PREFIX_NOT_EQUALS us`` matches findings with a ``ResourceRegion`` that starts with a value other than ``us``.
+              
+             ``NOT_CONTAINS``, ``NOT_EQUALS``, and ``PREFIX_NOT_EQUALS`` filters on the same field are joined by ``AND``. A finding matches only if it matches all of those filters. For example, the filters ``Title NOT_CONTAINS CloudFront AND Title NOT_CONTAINS CloudWatch`` match a finding that excludes both ``CloudFront`` and ``CloudWatch`` in the title.
+             You can’t have both a ``CONTAINS`` filter and a ``NOT_CONTAINS`` filter on the same field. Similarly, you can't provide both an ``EQUALS`` filter and a ``NOT_EQUALS`` or ``PREFIX_NOT_EQUALS`` filter on the same field. Combining filters in this way returns an error. ``CONTAINS`` filters can only be used with other ``CONTAINS`` filters. ``NOT_CONTAINS`` filters can only be used with other ``NOT_CONTAINS`` filters. 
+             You can combine ``PREFIX`` filters with ``NOT_EQUALS`` or ``PREFIX_NOT_EQUALS`` filters for the same field. Security Hub first processes the ``PREFIX`` filters, and then the ``NOT_EQUALS`` or ``PREFIX_NOT_EQUALS`` filters.
+             For example, for the following filters, Security Hub first identifies findings that have resource types that start with either ``AwsIam`` or ``AwsEc2``. It then excludes findings that have a resource type of ``AwsIamPolicy`` and findings that have a resource type of ``AwsEc2NetworkInterface``.
+              +   ``ResourceType PREFIX AwsIam`` 
+              +   ``ResourceType PREFIX AwsEc2`` 
+              +   ``ResourceType NOT_EQUALS AwsIamPolicy`` 
+              +   ``ResourceType NOT_EQUALS AwsEc2NetworkInterface`` 
+              
+             ``CONTAINS`` and ``NOT_CONTAINS`` operators can be used only with automation rules V1. ``CONTAINS_WORD`` operator is only supported in ``GetFindingsV2``, ``GetFindingStatisticsV2``, ``GetResourcesV2``, and ``GetResourceStatisticsV2`` APIs. For more information, see [Automation rules](https://docs.aws.amazon.com/securityhub/latest/userguide/automation-rules.html) in the *User Guide*.
         Value:
-          $ref: '#/components/schemas/NonEmptyString'
+          description: The string filter value. Filter values are case sensitive. For example, the product name for control-based findings is ``Security Hub``. If you provide ``security hub`` as the filter value, there's no match.
+          type: string
       required:
         - Comparison
         - Value
@@ -566,11 +641,13 @@ components:
         - PREFIX
         - NOT_EQUALS
         - PREFIX_NOT_EQUALS
+        - CONTAINS
+        - NOT_CONTAINS
       type: string
     ISO8601DateString:
       description: The date and time, in UTC and ISO 8601 format.
       type: string
-      pattern: ^([\+-]?\d{4}(?!\d{2}))((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([tT]((([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?$
+      pattern: ^(\d\d\d\d)-([0][1-9]|[1][0-2])-([0][1-9]|[1-2](\d)|[3][0-1])[T](?:([0-1](\d)|[2][0-3]):[0-5](\d):[0-5](\d)|23:59:60)(?:\.(\d)+)?([Z]|[+-](\d\d)(:?(\d\d))?)$
     arn:
       description: The Amazon Resource Name (ARN) of the automation rule.
       type: string
@@ -1104,7 +1181,7 @@ components:
           $ref: '#/components/schemas/AutomationRulesFindingFilters'
         Tags:
           description: User-defined tags associated with an automation rule.
-          $ref: '#/components/schemas/Tags'
+          $ref: '#/components/schemas/AutomationRule_Tags'
       required:
         - RuleOrder
         - RuleName
@@ -1157,6 +1234,16 @@ components:
         list:
           - securityhub:ListAutomationRules
           - securityhub:ListTagsForResource
+    AutomationRuleV2_Tags:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      x-patternProperties:
+        ^(?!aws:)[a-zA-Z+-=._:/]{1,128}$:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
     OcsfFindingFilters:
       description: The filtering conditions that align with OCSF standards
       type: object
@@ -1229,7 +1316,7 @@ components:
         FieldName:
           $ref: '#/components/schemas/OcsfStringField'
         Filter:
-          $ref: '#/components/schemas/StringFilter'
+          $ref: '#/components/schemas/AutomationRuleV2_StringFilter'
       required:
         - FieldName
         - Filter
@@ -1247,7 +1334,7 @@ components:
             - finding_info.last_seen_time_dt
             - finding_info.modified_time_dt
         Filter:
-          $ref: '#/components/schemas/DateFilter'
+          $ref: '#/components/schemas/AutomationRuleV2_DateFilter'
       required:
         - FieldName
         - Filter
@@ -1264,7 +1351,7 @@ components:
             - vulnerabilities.is_exploit_available
             - vulnerabilities.is_fix_available
         Filter:
-          $ref: '#/components/schemas/BooleanFilter'
+          $ref: '#/components/schemas/AutomationRuleV2_BooleanFilter'
       required:
         - FieldName
         - Filter
@@ -1284,7 +1371,7 @@ components:
             - status_id
             - finding_info.related_events_count
         Filter:
-          $ref: '#/components/schemas/NumberFilter'
+          $ref: '#/components/schemas/AutomationRuleV2_NumberFilter'
       required:
         - FieldName
         - Filter
@@ -1297,12 +1384,110 @@ components:
             - resources.tags
           type: string
         Filter:
-          $ref: '#/components/schemas/MapFilter'
+          $ref: '#/components/schemas/AutomationRuleV2_MapFilter'
       required:
         - FieldName
         - Filter
       type: object
       additionalProperties: false
+    AutomationRuleV2_StringFilter:
+      description: A string filter for filtering findings
+      type: object
+      additionalProperties: false
+      properties:
+        Value:
+          description: The string filter value
+          type: string
+          minLength: 1
+          maxLength: 4096
+        Comparison:
+          description: The condition to apply to a string value when filtering findings
+          type: string
+          enum:
+            - EQUALS
+            - PREFIX
+            - NOT_EQUALS
+            - PREFIX_NOT_EQUALS
+            - CONTAINS
+      required:
+        - Value
+        - Comparison
+    AutomationRuleV2_DateFilter:
+      description: A date filter for querying findings
+      type: object
+      additionalProperties: false
+      properties:
+        DateRange:
+          $ref: '#/components/schemas/AutomationRuleV2_DateRange'
+        End:
+          $ref: '#/components/schemas/AutomationRuleV2_ISO8601DateString'
+        Start:
+          $ref: '#/components/schemas/AutomationRuleV2_ISO8601DateString'
+    AutomationRuleV2_DateRange:
+      description: A date range for the date filter
+      properties:
+        Unit:
+          description: A date range unit for the date filter
+          enum:
+            - DAYS
+          type: string
+        Value:
+          description: A date range value for the date filter
+          type: number
+      required:
+        - Unit
+        - Value
+      type: object
+      additionalProperties: false
+    AutomationRuleV2_BooleanFilter:
+      description: Boolean filter for querying findings
+      type: object
+      additionalProperties: false
+      properties:
+        Value:
+          description: The value of the boolean
+          type: boolean
+      required:
+        - Value
+    AutomationRuleV2_NumberFilter:
+      type: object
+      description: A number filter for querying findings
+      additionalProperties: false
+      properties:
+        Eq:
+          description: The equal-to condition to be applied to a single field when querying for findings
+          type: number
+        Gte:
+          description: The greater-than-equal condition to be applied to a single field when querying for findings
+          type: number
+        Lte:
+          description: The less-than-equal condition to be applied to a single field when querying for findings
+          type: number
+    AutomationRuleV2_MapFilter:
+      description: A map filter for filtering findings
+      properties:
+        Comparison:
+          description: The condition to apply to the key value when filtering findings with a map filter
+          enum:
+            - EQUALS
+            - NOT_EQUALS
+          type: string
+        Key:
+          description: The key of the map filter
+          type: string
+          minLength: 1
+          maxLength: 4096
+        Value:
+          description: The value for the key in the map filter
+          type: string
+          minLength: 1
+          maxLength: 4096
+      required:
+        - Comparison
+        - Key
+        - Value
+      type: object
+      additionalProperties: false
     OcsfStringField:
       description: The name of the field
       type: string
@@ -1348,6 +1533,10 @@ components:
       enum:
         - AND
         - OR
+    AutomationRuleV2_ISO8601DateString:
+      description: The timestamp formatted in ISO8601
+      type: string
+      pattern: ^(\d\d\d\d)-([0][1-9]|[1][0-2])-([0][1-9]|[1-2](\d)|[3][0-1])[T](?:([0-1](\d)|[2][0-3]):[0-5](\d):[0-5](\d)|23:59:60)(?:\.(\d)+)?([Z]|[+-](\d\d)(:?(\d\d))?)$
     Criteria:
       type: object
       description: Defines the parameters and conditions used to evaluate and filter security findings
@@ -1434,7 +1623,7 @@ components:
           minItems: 1
           maxItems: 1
         Tags:
-          $ref: '#/components/schemas/Tags'
+          $ref: '#/components/schemas/AutomationRuleV2_Tags'
         RuleArn:
           description: The ARN of the automation rule
           type: string
@@ -1444,9 +1633,9 @@ components:
           type: string
           pattern: ^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$
         CreatedAt:
-          $ref: '#/components/schemas/ISO8601DateString'
+          $ref: '#/components/schemas/AutomationRuleV2_ISO8601DateString'
         UpdatedAt:
-          $ref: '#/components/schemas/ISO8601DateString'
+          $ref: '#/components/schemas/AutomationRuleV2_ISO8601DateString'
       required:
         - RuleName
         - Description
@@ -1500,62 +1689,79 @@ components:
         list:
           - securityhub:ListAutomationRulesV2
           - securityhub:ListTagsForResource
+    ConfigurationPolicy_Tags:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      x-patternProperties:
+        ^(?!aws:)[a-zA-Z+-=._:/]{1,128}$:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
     ParameterValue:
       type: object
+      additionalProperties: false
+      description: An object that includes the data type of a security control parameter and its current value.
+      maxProperties: 1
+      minProperties: 1
       properties:
         Boolean:
-          description: A control parameter that is a boolean.
           type: boolean
+          description: A control parameter that is a boolean.
         Double:
-          description: A control parameter that is a double.
           type: number
+          description: A control parameter that is a double.
         Enum:
-          description: A control parameter that is a enum.
-          $ref: '#/components/schemas/NonEmptyString'
+          type: string
+          description: A control parameter that is an enum.
+          maxLength: 2048
         EnumList:
+          type: array
           description: A control parameter that is a list of enums.
-          $ref: '#/components/schemas/NonEmptyStringList'
+          maxItems: 100
+          x-insertionOrder: true
+          uniqueItems: true
+          items:
+            type: string
+            maxLength: 2048
         Integer:
-          description: A control parameter that is a integer.
           type: integer
+          description: A control parameter that is an integer.
         IntegerList:
+          type: array
           description: A control parameter that is a list of integers.
-          $ref: '#/components/schemas/IntegerList'
+          maxItems: 100
+          x-insertionOrder: true
+          uniqueItems: true
+          items:
+            type: integer
         String:
+          type: string
           description: A control parameter that is a string.
-          $ref: '#/components/schemas/NonEmptyString'
+          maxLength: 2048
         StringList:
+          type: array
           description: A control parameter that is a list of strings.
-          $ref: '#/components/schemas/NonEmptyStringList'
-      oneOf:
-        - required:
-            - Boolean
-        - required:
-            - Double
-        - required:
-            - Enum
-        - required:
-            - EnumList
-        - required:
-            - Integer
-        - required:
-            - IntegerList
-        - required:
-            - String
-        - required:
-            - StringList
-      additionalProperties: false
+          maxItems: 100
+          x-insertionOrder: true
+          uniqueItems: true
+          items:
+            type: string
+            maxLength: 2048
     ParameterConfiguration:
       type: object
+      additionalProperties: false
+      description: An object that provides the current value of a security control parameter and identifies whether it has been customized.
       properties:
         ValueType:
           type: string
+          description: Identifies whether a control parameter uses a custom user-defined value or subscribes to the default AWS Security Hub behavior.
           enum:
             - DEFAULT
             - CUSTOM
         Value:
           $ref: '#/components/schemas/ParameterValue'
-      additionalProperties: false
       required:
         - ValueType
     SecurityControlCustomParameter:
@@ -1665,7 +1871,7 @@ components:
           type: boolean
           description: Indicates whether the service that the configuration policy applies to is enabled in the policy.
         Tags:
-          $ref: '#/components/schemas/Tags'
+          $ref: '#/components/schemas/ConfigurationPolicy_Tags'
       required:
         - ConfigurationPolicy
         - Name
@@ -1832,6 +2038,16 @@ components:
           - securityhub:DeleteFindingAggregator
         list:
           - securityhub:ListFindingAggregators
+    Hub_Tags:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      x-patternProperties:
+        ^(?!aws:)[a-zA-Z+-=._:/]+$:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
     Hub:
       type: object
       properties:
@@ -1850,7 +2066,7 @@ components:
           description: Whether to automatically enable new controls when they are added to standards that are enabled
           type: boolean
         Tags:
-          $ref: '#/components/schemas/Tags'
+          $ref: '#/components/schemas/Hub_Tags'
         SubscribedAt:
           description: The date and time when Security Hub was enabled in the account.
           type: string
@@ -1896,6 +2112,20 @@ components:
         list:
           - securityhub:DescribeHub
           - securityhub:ListTagsForResource
+    HubV2_Tags:
+      description: 'A key-value pair to associate with the Security Hub V2 resource. You can specify a key that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+      type: object
+      x-patternProperties:
+        ^(?!aws:)[a-zA-Z+-=._:/]{1,128}$:
+          type: string
+          description: The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length.
+          minLength: 0
+          maxLength: 256
+      additionalProperties: false
+      maxProperties: 50
+    HubV2_ISO8601DateString:
+      type: string
+      pattern: ^(\d\d\d\d)-([0][1-9]|[1][0-2])-([0][1-9]|[1-2](\d)|[3][0-1])[T](?:([0-1](\d)|[2][0-3]):[0-5](\d):[0-5](\d)|23:59:60)(?:\.(\d)+)?([Z]|[+-](\d\d)(:?(\d\d))?)$
     HubV2:
       type: object
       properties:
@@ -1904,9 +2134,9 @@ components:
           type: string
           pattern: arn:aws(?:-[a-z]+)*:securityhub:[a-z0-9-]+:\d{12}:hubv2/[^/](.{0,1022}[^/:])?$
         SubscribedAt:
-          $ref: '#/components/schemas/ISO8601DateString'
+          $ref: '#/components/schemas/HubV2_ISO8601DateString'
         Tags:
-          $ref: '#/components/schemas/Tags'
+          $ref: '#/components/schemas/HubV2_Tags'
       x-stackql-resource-name: hub_v2
       description: The AWS::SecurityHub::HubV2 resource represents the implementation of the AWS Security Hub V2 service in your account. Only one hubv2 resource can created in each region in which you enable Security Hub V2.
       x-type-name: AWS::SecurityHub::HubV2
@@ -1946,12 +2176,84 @@ components:
         list:
           - securityhub:DescribeSecurityHubV2
           - securityhub:ListTagsForResource
+    Insight_NonEmptyString:
+      description: Non-empty string definition.
+      type: string
+      minLength: 1
+    Insight_DateFilter:
+      description: A date filter for querying findings.
+      properties:
+        DateRange:
+          $ref: '#/components/schemas/DateRange'
+        End:
+          $ref: '#/components/schemas/Insight_ISO8601DateString'
+        Start:
+          $ref: '#/components/schemas/Insight_ISO8601DateString'
+      type: object
+      additionalProperties: false
+    Insight_ISO8601DateString:
+      description: The date and time, in UTC and ISO 8601 format.
+      type: string
+      pattern: ^([\+-]?\d{4}(?!\d{2}))((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([tT]((([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?$
+    Insight_NumberFilter:
+      description: A number filter for querying findings.
+      properties:
+        Eq:
+          description: The equal-to condition to be applied to a single field when querying for findings.
+          type: number
+        Gte:
+          description: The greater-than-equal condition to be applied to a single field when querying for findings.
+          type: number
+        Lte:
+          description: The less-than-equal condition to be applied to a single field when querying for findings.
+          type: number
+      type: object
+      additionalProperties: false
+    Insight_StringFilter:
+      description: A string filter for filtering AWS Security Hub findings.
+      properties:
+        Comparison:
+          $ref: '#/components/schemas/Insight_StringFilterComparison'
+        Value:
+          $ref: '#/components/schemas/Insight_NonEmptyString'
+      required:
+        - Comparison
+        - Value
+      type: object
+      additionalProperties: false
+    Insight_StringFilterComparison:
+      description: The condition to apply to a string value when filtering Security Hub findings.
+      enum:
+        - EQUALS
+        - PREFIX
+        - NOT_EQUALS
+        - PREFIX_NOT_EQUALS
+      type: string
+    Insight_MapFilter:
+      description: A map filter for filtering AWS Security Hub findings.
+      properties:
+        Comparison:
+          description: The condition to apply to the key value when filtering Security Hub findings with a map filter.
+          enum:
+            - EQUALS
+            - NOT_EQUALS
+          type: string
+        Key:
+          $ref: '#/components/schemas/Insight_NonEmptyString'
+        Value:
+          $ref: '#/components/schemas/Insight_NonEmptyString'
+      required:
+        - Comparison
+        - Key
+        - Value
+      type: object
+      additionalProperties: false
     IpFilter:
       description: The IP filter for querying findings.
       properties:
         Cidr:
           description: A finding's CIDR value.
-          $ref: '#/components/schemas/NonEmptyString'
+          $ref: '#/components/schemas/Insight_NonEmptyString'
       required:
         - Cidr
       type: object
@@ -1961,7 +2263,17 @@ components:
       properties:
         Value:
           description: A value for the keyword.
-          $ref: '#/components/schemas/NonEmptyString'
+          $ref: '#/components/schemas/Insight_NonEmptyString'
+      required:
+        - Value
+      type: object
+      additionalProperties: false
+    Insight_BooleanFilter:
+      description: Boolean filter for querying findings.
+      properties:
+        Value:
+          description: The value of the boolean.
+          type: boolean
       required:
         - Value
       type: object
@@ -1974,7 +2286,7 @@ components:
         ProductArn:
           description: The ARN generated by Security Hub that uniquely identifies a third-party company (security findings provider) after this provider's product (solution that generates findings) is registered with Security Hub.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -1982,7 +2294,7 @@ components:
         AwsAccountId:
           description: The AWS account ID in which a finding is generated.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -1990,7 +2302,7 @@ components:
         AwsAccountName:
           description: The name of the AWS account in which a finding is generated.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -1998,7 +2310,7 @@ components:
         Id:
           description: The security findings provider-specific identifier for a finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2006,7 +2318,7 @@ components:
         GeneratorId:
           description: The identifier for the solution-specific component (a discrete unit of logic) that generated a finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2014,7 +2326,7 @@ components:
         Type:
           description: A finding type in the format of namespace/category/classifier that classifies a finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2022,7 +2334,7 @@ components:
         Region:
           description: The Region from which the finding was generated.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2030,7 +2342,7 @@ components:
         FirstObservedAt:
           description: An ISO8601-formatted timestamp that indicates when the security findings provider first observed the potential security issue that a finding captured.
           items:
-            $ref: '#/components/schemas/DateFilter'
+            $ref: '#/components/schemas/Insight_DateFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2038,7 +2350,7 @@ components:
         LastObservedAt:
           description: An ISO8601-formatted timestamp that indicates when the security findings provider most recently observed the potential security issue that a finding captured.
           items:
-            $ref: '#/components/schemas/DateFilter'
+            $ref: '#/components/schemas/Insight_DateFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2046,7 +2358,7 @@ components:
         CreatedAt:
           description: An ISO8601-formatted timestamp that indicates when the security findings provider captured the potential security issue that a finding captured.
           items:
-            $ref: '#/components/schemas/DateFilter'
+            $ref: '#/components/schemas/Insight_DateFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2054,7 +2366,7 @@ components:
         UpdatedAt:
           description: An ISO8601-formatted timestamp that indicates when the security findings provider last updated the finding record.
           items:
-            $ref: '#/components/schemas/DateFilter'
+            $ref: '#/components/schemas/Insight_DateFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2062,7 +2374,7 @@ components:
         SeverityLabel:
           description: The label of a finding's severity.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2070,7 +2382,7 @@ components:
         Confidence:
           description: A finding's confidence.
           items:
-            $ref: '#/components/schemas/NumberFilter'
+            $ref: '#/components/schemas/Insight_NumberFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2078,7 +2390,7 @@ components:
         Criticality:
           description: The level of importance assigned to the resources associated with the finding.
           items:
-            $ref: '#/components/schemas/NumberFilter'
+            $ref: '#/components/schemas/Insight_NumberFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2086,7 +2398,7 @@ components:
         Title:
           description: A finding's title.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2094,7 +2406,7 @@ components:
         Description:
           description: A finding's description.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2102,7 +2414,7 @@ components:
         RecommendationText:
           description: The recommendation of what to do about the issue described in a finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2110,7 +2422,7 @@ components:
         SourceUrl:
           description: A URL that links to a page about the current finding in the security findings provider's solution.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2118,7 +2430,7 @@ components:
         ProductFields:
           description: A data type where security findings providers can include additional solution-specific details that aren't part of the defined AwsSecurityFinding format.
           items:
-            $ref: '#/components/schemas/MapFilter'
+            $ref: '#/components/schemas/Insight_MapFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2126,7 +2438,7 @@ components:
         ProductName:
           description: The name of the solution (product) that generates findings.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2134,7 +2446,7 @@ components:
         CompanyName:
           description: The name of the findings provider (company) that owns the solution (product) that generates findings.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2142,7 +2454,7 @@ components:
         UserDefinedFields:
           description: A list of name/value string pairs associated with the finding.
           items:
-            $ref: '#/components/schemas/MapFilter'
+            $ref: '#/components/schemas/Insight_MapFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2150,7 +2462,7 @@ components:
         MalwareName:
           description: The name of the malware that was observed.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2158,7 +2470,7 @@ components:
         MalwareType:
           description: The type of the malware that was observed.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2166,7 +2478,7 @@ components:
         MalwarePath:
           description: The filesystem path of the malware that was observed.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2174,7 +2486,7 @@ components:
         MalwareState:
           description: The state of the malware that was observed.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2182,7 +2494,7 @@ components:
         NetworkDirection:
           description: Indicates the direction of network traffic associated with a finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2190,7 +2502,7 @@ components:
         NetworkProtocol:
           description: The protocol of network-related information about a finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2214,7 +2526,7 @@ components:
         NetworkSourcePort:
           description: The source port of network-related information about a finding.
           items:
-            $ref: '#/components/schemas/NumberFilter'
+            $ref: '#/components/schemas/Insight_NumberFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2222,7 +2534,7 @@ components:
         NetworkSourceDomain:
           description: The source domain of network-related information about a finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2230,7 +2542,7 @@ components:
         NetworkSourceMac:
           description: The source media access control (MAC) address of network-related information about a finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2254,7 +2566,7 @@ components:
         NetworkDestinationPort:
           description: The destination port of network-related information about a finding.
           items:
-            $ref: '#/components/schemas/NumberFilter'
+            $ref: '#/components/schemas/Insight_NumberFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2262,7 +2574,7 @@ components:
         NetworkDestinationDomain:
           description: The destination domain of network-related information about a finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2270,7 +2582,7 @@ components:
         ProcessName:
           description: The name of the process.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2278,7 +2590,7 @@ components:
         ProcessPath:
           description: The path to the process executable.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2286,7 +2598,7 @@ components:
         ProcessPid:
           description: The process ID.
           items:
-            $ref: '#/components/schemas/NumberFilter'
+            $ref: '#/components/schemas/Insight_NumberFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2294,7 +2606,7 @@ components:
         ProcessParentPid:
           description: The parent process ID.
           items:
-            $ref: '#/components/schemas/NumberFilter'
+            $ref: '#/components/schemas/Insight_NumberFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2302,7 +2614,7 @@ components:
         ProcessLaunchedAt:
           description: A timestamp that identifies when the process was launched.
           items:
-            $ref: '#/components/schemas/DateFilter'
+            $ref: '#/components/schemas/Insight_DateFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2310,7 +2622,7 @@ components:
         ProcessTerminatedAt:
           description: A timestamp that identifies when the process was terminated.
           items:
-            $ref: '#/components/schemas/DateFilter'
+            $ref: '#/components/schemas/Insight_DateFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2318,7 +2630,7 @@ components:
         ThreatIntelIndicatorType:
           description: The type of a threat intelligence indicator.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2326,7 +2638,7 @@ components:
         ThreatIntelIndicatorValue:
           description: The value of a threat intelligence indicator.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2334,7 +2646,7 @@ components:
         ThreatIntelIndicatorCategory:
           description: The category of a threat intelligence indicator.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2342,7 +2654,7 @@ components:
         ThreatIntelIndicatorLastObservedAt:
           description: A timestamp that identifies the last observation of a threat intelligence indicator.
           items:
-            $ref: '#/components/schemas/DateFilter'
+            $ref: '#/components/schemas/Insight_DateFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2350,7 +2662,7 @@ components:
         ThreatIntelIndicatorSource:
           description: The source of the threat intelligence.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2358,7 +2670,7 @@ components:
         ThreatIntelIndicatorSourceUrl:
           description: The URL for more details from the source of the threat intelligence.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2366,7 +2678,7 @@ components:
         ResourceType:
           description: Specifies the type of the resource that details are provided for.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2374,7 +2686,7 @@ components:
         ResourceId:
           description: The canonical identifier for the given resource type.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2382,7 +2694,7 @@ components:
         ResourcePartition:
           description: The canonical AWS partition name that the Region is assigned to.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2390,7 +2702,7 @@ components:
         ResourceRegion:
           description: The canonical AWS external Region name where this resource is located.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2398,7 +2710,7 @@ components:
         ResourceTags:
           description: A list of AWS tags associated with a resource at the time the finding was processed.
           items:
-            $ref: '#/components/schemas/MapFilter'
+            $ref: '#/components/schemas/Insight_MapFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2406,7 +2718,7 @@ components:
         ResourceAwsEc2InstanceType:
           description: The instance type of the instance.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2414,7 +2726,7 @@ components:
         ResourceAwsEc2InstanceImageId:
           description: The Amazon Machine Image (AMI) ID of the instance.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2438,7 +2750,7 @@ components:
         ResourceAwsEc2InstanceKeyName:
           description: The key name associated with the instance.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2446,7 +2758,7 @@ components:
         ResourceAwsEc2InstanceIamInstanceProfileArn:
           description: The IAM profile ARN of the instance.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2454,7 +2766,7 @@ components:
         ResourceAwsEc2InstanceVpcId:
           description: The identifier of the VPC that the instance was launched in.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2462,7 +2774,7 @@ components:
         ResourceAwsEc2InstanceSubnetId:
           description: The identifier of the subnet that the instance was launched in.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2470,7 +2782,7 @@ components:
         ResourceAwsEc2InstanceLaunchedAt:
           description: The date and time the instance was launched.
           items:
-            $ref: '#/components/schemas/DateFilter'
+            $ref: '#/components/schemas/Insight_DateFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2478,7 +2790,7 @@ components:
         ResourceAwsS3BucketOwnerId:
           description: The canonical user ID of the owner of the S3 bucket.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2486,7 +2798,7 @@ components:
         ResourceAwsS3BucketOwnerName:
           description: The display name of the owner of the S3 bucket.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2494,7 +2806,7 @@ components:
         ResourceAwsIamAccessKeyStatus:
           description: The status of the IAM access key related to a finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2502,7 +2814,7 @@ components:
         ResourceAwsIamAccessKeyCreatedAt:
           description: The creation date/time of the IAM access key related to a finding.
           items:
-            $ref: '#/components/schemas/DateFilter'
+            $ref: '#/components/schemas/Insight_DateFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2510,7 +2822,7 @@ components:
         ResourceContainerName:
           description: The name of the container related to a finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2518,7 +2830,7 @@ components:
         ResourceContainerImageId:
           description: The identifier of the image related to a finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2526,7 +2838,7 @@ components:
         ResourceContainerImageName:
           description: The name of the image related to a finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2534,7 +2846,7 @@ components:
         ResourceContainerLaunchedAt:
           description: A timestamp that identifies when the container was started.
           items:
-            $ref: '#/components/schemas/DateFilter'
+            $ref: '#/components/schemas/Insight_DateFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2542,7 +2854,7 @@ components:
         ResourceDetailsOther:
           description: The details of a resource that doesn't have a specific subfield for the resource type defined.
           items:
-            $ref: '#/components/schemas/MapFilter'
+            $ref: '#/components/schemas/Insight_MapFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2550,7 +2862,7 @@ components:
         ComplianceStatus:
           description: Exclusive to findings that are generated as the result of a check run against a specific rule in a supported standard.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2558,7 +2870,7 @@ components:
         VerificationState:
           description: The veracity of a finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2566,7 +2878,7 @@ components:
         WorkflowState:
           description: The workflow state of a finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2574,7 +2886,7 @@ components:
         WorkflowStatus:
           description: The status of the investigation into a finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2582,7 +2894,7 @@ components:
         RecordState:
           description: The updated record state for the finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2590,7 +2902,7 @@ components:
         RelatedFindingsProductArn:
           description: The ARN of the solution that generated a related finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2598,7 +2910,7 @@ components:
         RelatedFindingsId:
           description: The solution-generated identifier for a related finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2606,7 +2918,7 @@ components:
         ResourceApplicationArn:
           description: The ARN of the application that is related to a finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2614,7 +2926,7 @@ components:
         ResourceApplicationName:
           description: The name of the application that is related to a finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2622,7 +2934,7 @@ components:
         NoteText:
           description: The text of a note.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2630,7 +2942,7 @@ components:
         NoteUpdatedAt:
           description: The timestamp of when the note was updated.
           items:
-            $ref: '#/components/schemas/DateFilter'
+            $ref: '#/components/schemas/Insight_DateFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2638,7 +2950,7 @@ components:
         NoteUpdatedBy:
           description: The principal that created a note.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2646,7 +2958,7 @@ components:
         Sample:
           description: Indicates whether or not sample findings are included in the filter results.
           items:
-            $ref: '#/components/schemas/BooleanFilter'
+            $ref: '#/components/schemas/Insight_BooleanFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2654,7 +2966,7 @@ components:
         ComplianceAssociatedStandardsId:
           description: The unique identifier of a standard in which a control is enabled.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2662,7 +2974,7 @@ components:
         ComplianceSecurityControlId:
           description: The unique identifier of a control across standards.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2670,7 +2982,7 @@ components:
         ComplianceSecurityControlParametersName:
           description: The name of a security control parameter.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2678,7 +2990,7 @@ components:
         ComplianceSecurityControlParametersValue:
           description: The current value of a security control parameter.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2686,7 +2998,7 @@ components:
         FindingProviderFieldsConfidence:
           description: The finding provider value for the finding confidence.
           items:
-            $ref: '#/components/schemas/NumberFilter'
+            $ref: '#/components/schemas/Insight_NumberFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2694,7 +3006,7 @@ components:
         FindingProviderFieldsCriticality:
           description: The finding provider value for the level of importance assigned to the resources associated with the findings.
           items:
-            $ref: '#/components/schemas/NumberFilter'
+            $ref: '#/components/schemas/Insight_NumberFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2702,7 +3014,7 @@ components:
         FindingProviderFieldsRelatedFindingsId:
           description: The finding identifier of a related finding that is identified by the finding provider.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2710,7 +3022,7 @@ components:
         FindingProviderFieldsRelatedFindingsProductArn:
           description: The ARN of the solution that generated a related finding that is identified by the finding provider.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2718,7 +3030,7 @@ components:
         FindingProviderFieldsSeverityLabel:
           description: The finding provider value for the severity label.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2726,7 +3038,7 @@ components:
         FindingProviderFieldsSeverityOriginal:
           description: The finding provider's original value for the severity.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2734,7 +3046,7 @@ components:
         FindingProviderFieldsTypes:
           description: One or more finding types that the finding provider assigned to the finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2742,7 +3054,7 @@ components:
         ResourceAwsIamAccessKeyPrincipalName:
           description: The name of the principal that is associated with an IAM access key.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2750,7 +3062,7 @@ components:
         ResourceAwsIamUserUserName:
           description: The name of an IAM user.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2758,7 +3070,7 @@ components:
         VulnerabilitiesExploitAvailable:
           description: Indicates whether a software vulnerability in your environment has a known exploit.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2766,7 +3078,7 @@ components:
         VulnerabilitiesFixAvailable:
           description: Indicates whether a vulnerability is fixed in a newer version of the affected software packages.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2782,7 +3094,7 @@ components:
         ResourceAwsIamAccessKeyUserName:
           description: The user associated with the IAM access key related to a finding.
           items:
-            $ref: '#/components/schemas/StringFilter'
+            $ref: '#/components/schemas/Insight_StringFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2790,7 +3102,7 @@ components:
         SeverityNormalized:
           description: The normalized severity of a finding.
           items:
-            $ref: '#/components/schemas/NumberFilter'
+            $ref: '#/components/schemas/Insight_NumberFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2798,7 +3110,7 @@ components:
         SeverityProduct:
           description: The native severity as defined by the security findings provider's solution that generated the finding.
           items:
-            $ref: '#/components/schemas/NumberFilter'
+            $ref: '#/components/schemas/Insight_NumberFilter'
           type: array
           x-insertionOrder: true
           uniqueItems: true
@@ -2821,7 +3133,7 @@ components:
           maxProperties: 10
         GroupByAttribute:
           description: The grouping attribute for the insight's findings
-          $ref: '#/components/schemas/NonEmptyString'
+          $ref: '#/components/schemas/Insight_NonEmptyString'
       required:
         - Filters
         - Name
@@ -3038,9 +3350,12 @@ components:
           - securityhub:DisableImportFindingsForProduct
         list:
           - securityhub:ListEnabledProductsForImport
+    SecurityControl_NonEmptyString:
+      type: string
+      pattern: .*\S.*
     NonEmptyStringList:
       items:
-        $ref: '#/components/schemas/NonEmptyString'
+        $ref: '#/components/schemas/SecurityControl_NonEmptyString'
       type: array
     IntegerList:
       items:
@@ -3050,17 +3365,75 @@ components:
       type: object
       x-patternProperties:
         .*\S.*:
-          $ref: '#/components/schemas/ParameterConfiguration'
+          $ref: '#/components/schemas/SecurityControl_ParameterConfiguration'
+      additionalProperties: false
+    SecurityControl_ParameterConfiguration:
+      type: object
+      properties:
+        ValueType:
+          type: string
+          enum:
+            - DEFAULT
+            - CUSTOM
+        Value:
+          $ref: '#/components/schemas/SecurityControl_ParameterValue'
+      additionalProperties: false
+      required:
+        - ValueType
+    SecurityControl_ParameterValue:
+      type: object
+      properties:
+        Boolean:
+          description: A control parameter that is a boolean.
+          type: boolean
+        Double:
+          description: A control parameter that is a double.
+          type: number
+        Enum:
+          description: A control parameter that is a enum.
+          $ref: '#/components/schemas/SecurityControl_NonEmptyString'
+        EnumList:
+          description: A control parameter that is a list of enums.
+          $ref: '#/components/schemas/NonEmptyStringList'
+        Integer:
+          description: A control parameter that is a integer.
+          type: integer
+        IntegerList:
+          description: A control parameter that is a list of integers.
+          $ref: '#/components/schemas/IntegerList'
+        String:
+          description: A control parameter that is a string.
+          $ref: '#/components/schemas/SecurityControl_NonEmptyString'
+        StringList:
+          description: A control parameter that is a list of strings.
+          $ref: '#/components/schemas/NonEmptyStringList'
+      oneOf:
+        - required:
+            - Boolean
+        - required:
+            - Double
+        - required:
+            - Enum
+        - required:
+            - EnumList
+        - required:
+            - Integer
+        - required:
+            - IntegerList
+        - required:
+            - String
+        - required:
+            - StringList
       additionalProperties: false
     SecurityControl:
       type: object
       properties:
         SecurityControlId:
           description: The unique identifier of a security control across standards. Values for this field typically consist of an AWS service name and a number, such as APIGateway.3.
-          $ref: '#/components/schemas/NonEmptyString'
+          $ref: '#/components/schemas/SecurityControl_NonEmptyString'
         SecurityControlArn:
           description: The Amazon Resource Name (ARN) for a security control across standards, such as `arn:aws:securityhub:eu-central-1:123456789012:security-control/S3.1`. This parameter doesn't mention a specific standard.
-          $ref: '#/components/schemas/NonEmptyString'
+          $ref: '#/components/schemas/SecurityControl_NonEmptyString'
         LastUpdateReason:
           description: The most recent reason for updating the customizable properties of a security control. This differs from the UpdateReason field of the BatchUpdateStandardsControlAssociations API, which tracks the reason for updating the enablement status of a control. This field accepts alphanumeric characters in addition to white spaces, dashes, and underscores.
           type: string
@@ -3286,7 +3659,7 @@ components:
               $ref: '#/components/schemas/AutomationRulesFindingFilters'
             Tags:
               description: User-defined tags associated with an automation rule.
-              $ref: '#/components/schemas/Tags'
+              $ref: '#/components/schemas/AutomationRule_Tags'
           x-stackQL-stringOnly: true
       x-title: CreateAutomationRuleRequest
       type: object
@@ -3339,7 +3712,7 @@ components:
               minItems: 1
               maxItems: 1
             Tags:
-              $ref: '#/components/schemas/Tags'
+              $ref: '#/components/schemas/AutomationRuleV2_Tags'
             RuleArn:
               description: The ARN of the automation rule
               type: string
@@ -3349,9 +3722,9 @@ components:
               type: string
               pattern: ^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$
             CreatedAt:
-              $ref: '#/components/schemas/ISO8601DateString'
+              $ref: '#/components/schemas/AutomationRuleV2_ISO8601DateString'
             UpdatedAt:
-              $ref: '#/components/schemas/ISO8601DateString'
+              $ref: '#/components/schemas/AutomationRuleV2_ISO8601DateString'
           x-stackQL-stringOnly: true
       x-title: CreateAutomationRuleV2Request
       type: object
@@ -3399,7 +3772,7 @@ components:
               type: boolean
               description: Indicates whether the service that the configuration policy applies to is enabled in the policy.
             Tags:
-              $ref: '#/components/schemas/Tags'
+              $ref: '#/components/schemas/ConfigurationPolicy_Tags'
           x-stackQL-stringOnly: true
       x-title: CreateConfigurationPolicyRequest
       type: object
@@ -3511,7 +3884,7 @@ components:
               description: Whether to automatically enable new controls when they are added to standards that are enabled
               type: boolean
             Tags:
-              $ref: '#/components/schemas/Tags'
+              $ref: '#/components/schemas/Hub_Tags'
             SubscribedAt:
               description: The date and time when Security Hub was enabled in the account.
               type: string
@@ -3537,9 +3910,9 @@ components:
               type: string
               pattern: arn:aws(?:-[a-z]+)*:securityhub:[a-z0-9-]+:\d{12}:hubv2/[^/](.{0,1022}[^/:])?$
             SubscribedAt:
-              $ref: '#/components/schemas/ISO8601DateString'
+              $ref: '#/components/schemas/HubV2_ISO8601DateString'
             Tags:
-              $ref: '#/components/schemas/Tags'
+              $ref: '#/components/schemas/HubV2_Tags'
           x-stackQL-stringOnly: true
       x-title: CreateHubV2Request
       type: object
@@ -3572,7 +3945,7 @@ components:
               maxProperties: 10
             GroupByAttribute:
               description: The grouping attribute for the insight's findings
-              $ref: '#/components/schemas/NonEmptyString'
+              $ref: '#/components/schemas/Insight_NonEmptyString'
           x-stackQL-stringOnly: true
       x-title: CreateInsightRequest
       type: object
@@ -3719,10 +4092,10 @@ components:
           properties:
             SecurityControlId:
               description: The unique identifier of a security control across standards. Values for this field typically consist of an AWS service name and a number, such as APIGateway.3.
-              $ref: '#/components/schemas/NonEmptyString'
+              $ref: '#/components/schemas/SecurityControl_NonEmptyString'
             SecurityControlArn:
               description: The Amazon Resource Name (ARN) for a security control across standards, such as `arn:aws:securityhub:eu-central-1:123456789012:security-control/S3.1`. This parameter doesn't mention a specific standard.
-              $ref: '#/components/schemas/NonEmptyString'
+              $ref: '#/components/schemas/SecurityControl_NonEmptyString'
             LastUpdateReason:
               description: The most recent reason for updating the customizable properties of a security control. This differs from the UpdateReason field of the BatchUpdateStandardsControlAssociations API, which tracks the reason for updating the enablement status of a control. This field accepts alphanumeric characters in addition to white spaces, dashes, and underscores.
               type: string
@@ -3783,7 +4156,7 @@ components:
       id: awscc.securityhub.aggregator_v2s
       x-cfn-schema-name: AggregatorV2
       x-cfn-type-name: AWS::SecurityHub::AggregatorV2
-      x-identifiers:
+      x-identifiers: &ref_0
         - AggregatorV2Arn
       x-type: cloud_control
       methods:
@@ -3877,8 +4250,7 @@ components:
       id: awscc.securityhub.aggregator_v2s_list_only
       x-cfn-schema-name: AggregatorV2
       x-cfn-type-name: AWS::SecurityHub::AggregatorV2
-      x-identifiers:
-        - AggregatorV2Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3908,7 +4280,7 @@ components:
       id: awscc.securityhub.automation_rules
       x-cfn-schema-name: AutomationRule
       x-cfn-type-name: AWS::SecurityHub::AutomationRule
-      x-identifiers:
+      x-identifiers: &ref_1
         - RuleArn
       x-type: cloud_control
       methods:
@@ -4016,8 +4388,7 @@ components:
       id: awscc.securityhub.automation_rules_list_only
       x-cfn-schema-name: AutomationRule
       x-cfn-type-name: AWS::SecurityHub::AutomationRule
-      x-identifiers:
-        - RuleArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4047,7 +4418,7 @@ components:
       id: awscc.securityhub.automation_rule_v2s
       x-cfn-schema-name: AutomationRuleV2
       x-cfn-type-name: AWS::SecurityHub::AutomationRuleV2
-      x-identifiers:
+      x-identifiers: &ref_2
         - RuleArn
       x-type: cloud_control
       methods:
@@ -4153,8 +4524,7 @@ components:
       id: awscc.securityhub.automation_rule_v2s_list_only
       x-cfn-schema-name: AutomationRuleV2
       x-cfn-type-name: AWS::SecurityHub::AutomationRuleV2
-      x-identifiers:
-        - RuleArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4184,7 +4554,7 @@ components:
       id: awscc.securityhub.configuration_policies
       x-cfn-schema-name: ConfigurationPolicy
       x-cfn-type-name: AWS::SecurityHub::ConfigurationPolicy
-      x-identifiers:
+      x-identifiers: &ref_3
         - Arn
       x-type: cloud_control
       methods:
@@ -4286,8 +4656,7 @@ components:
       id: awscc.securityhub.configuration_policies_list_only
       x-cfn-schema-name: ConfigurationPolicy
       x-cfn-type-name: AWS::SecurityHub::ConfigurationPolicy
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4317,7 +4686,7 @@ components:
       id: awscc.securityhub.delegated_admins
       x-cfn-schema-name: DelegatedAdmin
       x-cfn-type-name: AWS::SecurityHub::DelegatedAdmin
-      x-identifiers:
+      x-identifiers: &ref_4
         - DelegatedAdminIdentifier
       x-type: cloud_control
       methods:
@@ -4390,8 +4759,7 @@ components:
       id: awscc.securityhub.delegated_admins_list_only
       x-cfn-schema-name: DelegatedAdmin
       x-cfn-type-name: AWS::SecurityHub::DelegatedAdmin
-      x-identifiers:
-        - DelegatedAdminIdentifier
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4421,7 +4789,7 @@ components:
       id: awscc.securityhub.finding_aggregators
       x-cfn-schema-name: FindingAggregator
       x-cfn-type-name: AWS::SecurityHub::FindingAggregator
-      x-identifiers:
+      x-identifiers: &ref_5
         - FindingAggregatorArn
       x-type: cloud_control
       methods:
@@ -4513,8 +4881,7 @@ components:
       id: awscc.securityhub.finding_aggregators_list_only
       x-cfn-schema-name: FindingAggregator
       x-cfn-type-name: AWS::SecurityHub::FindingAggregator
-      x-identifiers:
-        - FindingAggregatorArn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4544,7 +4911,7 @@ components:
       id: awscc.securityhub.hubs
       x-cfn-schema-name: Hub
       x-cfn-type-name: AWS::SecurityHub::Hub
-      x-identifiers:
+      x-identifiers: &ref_6
         - ARN
       x-type: cloud_control
       methods:
@@ -4640,8 +5007,7 @@ components:
       id: awscc.securityhub.hubs_list_only
       x-cfn-schema-name: Hub
       x-cfn-type-name: AWS::SecurityHub::Hub
-      x-identifiers:
-        - ARN
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4671,7 +5037,7 @@ components:
       id: awscc.securityhub.hub_v2s
       x-cfn-schema-name: HubV2
       x-cfn-type-name: AWS::SecurityHub::HubV2
-      x-identifiers:
+      x-identifiers: &ref_7
         - HubV2Arn
       x-type: cloud_control
       methods:
@@ -4761,8 +5127,7 @@ components:
       id: awscc.securityhub.hub_v2s_list_only
       x-cfn-schema-name: HubV2
       x-cfn-type-name: AWS::SecurityHub::HubV2
-      x-identifiers:
-        - HubV2Arn
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4792,7 +5157,7 @@ components:
       id: awscc.securityhub.insights
       x-cfn-schema-name: Insight
       x-cfn-type-name: AWS::SecurityHub::Insight
-      x-identifiers:
+      x-identifiers: &ref_8
         - InsightArn
       x-type: cloud_control
       methods:
@@ -4884,8 +5249,7 @@ components:
       id: awscc.securityhub.insights_list_only
       x-cfn-schema-name: Insight
       x-cfn-type-name: AWS::SecurityHub::Insight
-      x-identifiers:
-        - InsightArn
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4915,7 +5279,7 @@ components:
       id: awscc.securityhub.organization_configurations
       x-cfn-schema-name: OrganizationConfiguration
       x-cfn-type-name: AWS::SecurityHub::OrganizationConfiguration
-      x-identifiers:
+      x-identifiers: &ref_9
         - OrganizationConfigurationIdentifier
       x-type: cloud_control
       methods:
@@ -5013,8 +5377,7 @@ components:
       id: awscc.securityhub.organization_configurations_list_only
       x-cfn-schema-name: OrganizationConfiguration
       x-cfn-type-name: AWS::SecurityHub::OrganizationConfiguration
-      x-identifiers:
-        - OrganizationConfigurationIdentifier
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5044,7 +5407,7 @@ components:
       id: awscc.securityhub.policy_associations
       x-cfn-schema-name: PolicyAssociation
       x-cfn-type-name: AWS::SecurityHub::PolicyAssociation
-      x-identifiers:
+      x-identifiers: &ref_10
         - AssociationIdentifier
       x-type: cloud_control
       methods:
@@ -5144,8 +5507,7 @@ components:
       id: awscc.securityhub.policy_associations_list_only
       x-cfn-schema-name: PolicyAssociation
       x-cfn-type-name: AWS::SecurityHub::PolicyAssociation
-      x-identifiers:
-        - AssociationIdentifier
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5175,7 +5537,7 @@ components:
       id: awscc.securityhub.product_subscriptions
       x-cfn-schema-name: ProductSubscription
       x-cfn-type-name: AWS::SecurityHub::ProductSubscription
-      x-identifiers:
+      x-identifiers: &ref_11
         - ProductSubscriptionArn
       x-type: cloud_control
       methods:
@@ -5246,8 +5608,7 @@ components:
       id: awscc.securityhub.product_subscriptions_list_only
       x-cfn-schema-name: ProductSubscription
       x-cfn-type-name: AWS::SecurityHub::ProductSubscription
-      x-identifiers:
-        - ProductSubscriptionArn
+      x-identifiers: *ref_11
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5277,7 +5638,7 @@ components:
       id: awscc.securityhub.security_controls
       x-cfn-schema-name: SecurityControl
       x-cfn-type-name: AWS::SecurityHub::SecurityControl
-      x-identifiers:
+      x-identifiers: &ref_12
         - SecurityControlId
       x-type: cloud_control
       methods:
@@ -5369,8 +5730,7 @@ components:
       id: awscc.securityhub.security_controls_list_only
       x-cfn-schema-name: SecurityControl
       x-cfn-type-name: AWS::SecurityHub::SecurityControl
-      x-identifiers:
-        - SecurityControlId
+      x-identifiers: *ref_12
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -5400,7 +5760,7 @@ components:
       id: awscc.securityhub.standards
       x-cfn-schema-name: Standard
       x-cfn-type-name: AWS::SecurityHub::Standard
-      x-identifiers:
+      x-identifiers: &ref_13
         - StandardsSubscriptionArn
       x-type: cloud_control
       methods:
@@ -5490,8 +5850,7 @@ components:
       id: awscc.securityhub.standards_list_only
       x-cfn-schema-name: Standard
       x-cfn-type-name: AWS::SecurityHub::Standard
-      x-identifiers:
-        - StandardsSubscriptionArn
+      x-identifiers: *ref_13
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/securitylake.yaml b/openapi/src/awscc/v00.00.00000/services/securitylake.yaml
index ada8dca06..2415d0609 100644
--- a/openapi/src/awscc/v00.00.00000/services/securitylake.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/securitylake.yaml
@@ -393,15 +393,76 @@ components:
     AwsLogSource:
       type: object
       properties:
-        SourceName:
+        Accounts:
+          description: AWS account where you want to collect logs from.
+          type: array
+          uniqueItems: true
+          x-insertionOrder: false
+          items:
+            type: string
+            pattern: ^[0-9]{12}$
+        DataLakeArn:
+          description: The ARN for the data lake.
           type: string
+          minLength: 1
+          maxLength: 256
+        SourceName:
           description: The name for a AWS source. This must be a Regionally unique value.
+          type: string
         SourceVersion:
+          description: The version for a AWS source. This must be a Regionally unique value.
           type: string
           pattern: ^(latest|[0-9]\.[0-9])$
-          description: The version for a AWS source. This must be a Regionally unique value.
-      description: Amazon Security Lake supports log and event collection for natively supported AWS services.
-      additionalProperties: false
+      required:
+        - DataLakeArn
+        - SourceVersion
+        - SourceName
+      x-stackql-resource-name: aws_log_source
+      description: Resource Type definition for AWS::SecurityLake::AwsLogSource
+      x-type-name: AWS::SecurityLake::AwsLogSource
+      x-stackql-primary-identifier:
+        - SourceName
+        - SourceVersion
+      x-create-only-properties:
+        - DataLakeArn
+        - SourceName
+        - SourceVersion
+      x-required-properties:
+        - DataLakeArn
+        - SourceVersion
+        - SourceName
+      x-replacement-strategy: delete_then_create
+      x-tagging:
+        taggable: false
+      x-required-permissions:
+        create:
+          - glue:CreateDatabase
+          - glue:CreateTable
+          - glue:GetDatabase
+          - glue:GetTable
+          - iam:CreateServiceLinkedRole
+          - kms:CreateGrant
+          - kms:DescribeKey
+          - securitylake:CreateDataLake
+          - securitylake:CreateAwsLogSource
+          - securitylake:ListLogSources
+        read:
+          - securitylake:ListLogSources
+        list:
+          - securitylake:ListLogSources
+        delete:
+          - securitylake:DeleteAwsLogSource
+          - securitylake:ListLogSources
+        update:
+          - securitylake:CreateAwsLogSource
+          - securitylake:DeleteAwsLogSource
+          - glue:CreateDatabase
+          - glue:CreateTable
+          - glue:GetDatabase
+          - glue:GetTable
+          - iam:CreateServiceLinkedRole
+          - kms:CreateGrant
+          - kms:DescribeKey
     EncryptionConfiguration:
       description: Provides encryption details of Amazon Security Lake object.
       type: object
@@ -466,22 +527,19 @@ components:
         type: string
         pattern: ^(us(-gov)?|af|ap|ca|eu|me|sa)-(central|north|(north(?:east|west))|south|south(?:east|west)|east|west)-\d+$
     Tag:
+      description: A key-value pair to associate with a resource.
       type: object
+      additionalProperties: false
       properties:
         Key:
           type: string
-          minLength: 1
-          maxLength: 128
-          description: The name of the tag. This is a general label that acts as a category for a more specific tag value (value).
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, `_`, `.`, `/`, `=`, `+`, and `-`.'
         Value:
           type: string
-          minLength: 0
-          maxLength: 256
-          description: The value that is associated with the specified tag key (key). This value acts as a descriptor for the tag key. A tag value cannot be null, but it can be an empty string.
+          description: The value for the tag. You can specify a value that is 0 to 256 characters in length.
       required:
         - Key
         - Value
-      additionalProperties: false
     DataLake:
       type: object
       properties:
@@ -586,6 +644,18 @@ components:
       minItems: 1
       uniqueItems: true
       description: The Amazon S3 or AWS Lake Formation access type.
+    Subscriber_AwsLogSource:
+      type: object
+      properties:
+        SourceName:
+          type: string
+          description: The name for a AWS source. This must be a Regionally unique value.
+        SourceVersion:
+          type: string
+          pattern: ^(latest|[0-9]\.[0-9])$
+          description: The version for a AWS source. This must be a Regionally unique value.
+      description: Amazon Security Lake supports log and event collection for natively supported AWS services.
+      additionalProperties: false
     CustomLogSource:
       type: object
       properties:
@@ -605,7 +675,7 @@ components:
     Source:
       properties:
         AwsLogSource:
-          $ref: '#/components/schemas/AwsLogSource'
+          $ref: '#/components/schemas/Subscriber_AwsLogSource'
         CustomLogSource:
           $ref: '#/components/schemas/CustomLogSource'
       additionalProperties: false
@@ -614,6 +684,23 @@ components:
             - AwsLogSource
         - required:
             - CustomLogSource
+    Subscriber_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+          description: The name of the tag. This is a general label that acts as a category for a more specific tag value (value).
+        Value:
+          type: string
+          minLength: 0
+          maxLength: 256
+          description: The value that is associated with the specified tag key (key). This value acts as a descriptor for the tag key. A tag value cannot be null, but it can be an empty string.
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     Subscriber:
       type: object
       properties:
@@ -655,7 +742,7 @@ components:
           type: array
           x-insertionOrder: true
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Subscriber_Tag'
           description: An array of objects, one for each tag to associate with the subscriber. For each tag, you must specify both a tag key and a tag value. A tag value cannot be null, but it can be an empty string.
         Sources:
           type: array
@@ -953,6 +1040,43 @@ components:
           - sqs:DeleteQueue
         list:
           - securitylake:ListSubscribers
+    CreateAwsLogSourceRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            Accounts:
+              description: AWS account where you want to collect logs from.
+              type: array
+              uniqueItems: true
+              x-insertionOrder: false
+              items:
+                type: string
+                pattern: ^[0-9]{12}$
+            DataLakeArn:
+              description: The ARN for the data lake.
+              type: string
+              minLength: 1
+              maxLength: 256
+            SourceName:
+              description: The name for a AWS source. This must be a Regionally unique value.
+              type: string
+            SourceVersion:
+              description: The version for a AWS source. This must be a Regionally unique value.
+              type: string
+              pattern: ^(latest|[0-9]\.[0-9])$
+          x-stackQL-stringOnly: true
+      x-title: CreateAwsLogSourceRequest
+      type: object
+      required: []
     CreateDataLakeRequest:
       properties:
         ClientToken:
@@ -1045,7 +1169,7 @@ components:
               type: array
               x-insertionOrder: true
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Subscriber_Tag'
               description: An array of objects, one for each tag to associate with the subscriber. For each tag, you must specify both a tag key and a tag value. A tag value cannot be null, but it can be an empty string.
             Sources:
               type: array
@@ -1101,12 +1225,137 @@ components:
       description: Amazon Signature authorization v4
       x-amazon-apigateway-authtype: awsSigv4
   x-stackQL-resources:
+    aws_log_sources:
+      name: aws_log_sources
+      id: awscc.securitylake.aws_log_sources
+      x-cfn-schema-name: AwsLogSource
+      x-cfn-type-name: AWS::SecurityLake::AwsLogSource
+      x-identifiers: &ref_0
+        - SourceName
+        - SourceVersion
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__AwsLogSource&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::SecurityLake::AwsLogSource"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::SecurityLake::AwsLogSource"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::SecurityLake::AwsLogSource"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/aws_log_sources/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/aws_log_sources/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/aws_log_sources/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.Accounts') as accounts,
+              JSON_EXTRACT(Properties, '$.DataLakeArn') as data_lake_arn,
+              JSON_EXTRACT(Properties, '$.SourceName') as source_name,
+              JSON_EXTRACT(Properties, '$.SourceVersion') as source_version
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::SecurityLake::AwsLogSource'
+              AND Identifier = '<SourceName>|<SourceVersion>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'Accounts') as accounts,
+                json_extract_path_text(Properties, 'DataLakeArn') as data_lake_arn,
+                json_extract_path_text(Properties, 'SourceName') as source_name,
+                json_extract_path_text(Properties, 'SourceVersion') as source_version
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::SecurityLake::AwsLogSource'
+                AND Identifier = '<SourceName>|<SourceVersion>'
+                AND region = 'us-east-1'
+    aws_log_sources_list_only:
+      name: aws_log_sources_list_only
+      id: awscc.securitylake.aws_log_sources_list_only
+      x-cfn-schema-name: AwsLogSource
+      x-cfn-type-name: AWS::SecurityLake::AwsLogSource
+      x-identifiers: *ref_0
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.SourceName') as source_name,
+              JSON_EXTRACT(Properties, '$.SourceVersion') as source_version
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::SecurityLake::AwsLogSource'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'SourceName') as source_name,
+                json_extract_path_text(Properties, 'SourceVersion') as source_version
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::SecurityLake::AwsLogSource'
+                AND region = 'us-east-1'
     data_lakes:
       name: data_lakes
       id: awscc.securitylake.data_lakes
       x-cfn-schema-name: DataLake
       x-cfn-type-name: AWS::SecurityLake::DataLake
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -1204,8 +1453,7 @@ components:
       id: awscc.securitylake.data_lakes_list_only
       x-cfn-schema-name: DataLake
       x-cfn-type-name: AWS::SecurityLake::DataLake
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1235,7 +1483,7 @@ components:
       id: awscc.securitylake.subscribers
       x-cfn-schema-name: Subscriber
       x-cfn-type-name: AWS::SecurityLake::Subscriber
-      x-identifiers:
+      x-identifiers: &ref_2
         - SubscriberArn
       x-type: cloud_control
       methods:
@@ -1343,8 +1591,7 @@ components:
       id: awscc.securitylake.subscribers_list_only
       x-cfn-schema-name: Subscriber
       x-cfn-type-name: AWS::SecurityLake::Subscriber
-      x-identifiers:
-        - SubscriberArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1374,7 +1621,7 @@ components:
       id: awscc.securitylake.subscriber_notifications
       x-cfn-schema-name: SubscriberNotification
       x-cfn-type-name: AWS::SecurityLake::SubscriberNotification
-      x-identifiers:
+      x-identifiers: &ref_3
         - SubscriberArn
       x-type: cloud_control
       methods:
@@ -1464,8 +1711,7 @@ components:
       id: awscc.securitylake.subscriber_notifications_list_only
       x-cfn-schema-name: SubscriberNotification
       x-cfn-type-name: AWS::SecurityLake::SubscriberNotification
-      x-identifiers:
-        - SubscriberArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1634,6 +1880,48 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
+  /?Action=CreateResource&Version=2021-09-30&__AwsLogSource&__detailTransformed=true:
+    parameters:
+      - $ref: '#/components/parameters/X-Amz-Content-Sha256'
+      - $ref: '#/components/parameters/X-Amz-Date'
+      - $ref: '#/components/parameters/X-Amz-Algorithm'
+      - $ref: '#/components/parameters/X-Amz-Credential'
+      - $ref: '#/components/parameters/X-Amz-Security-Token'
+      - $ref: '#/components/parameters/X-Amz-Signature'
+      - $ref: '#/components/parameters/X-Amz-SignedHeaders'
+    post:
+      operationId: CreateAwsLogSource
+      parameters:
+        - description: Action Header
+          in: header
+          name: X-Amz-Target
+          required: false
+          schema:
+            default: CloudApiService.CreateResource
+            enum:
+              - CloudApiService.CreateResource
+            type: string
+        - in: header
+          name: Content-Type
+          required: false
+          schema:
+            default: application/x-amz-json-1.0
+            enum:
+              - application/x-amz-json-1.0
+            type: string
+      requestBody:
+        content:
+          application/x-amz-json-1.0:
+            schema:
+              $ref: '#/components/schemas/CreateAwsLogSourceRequest'
+        required: true
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
+          description: Success
   /?Action=CreateResource&Version=2021-09-30&__DataLake&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
diff --git a/openapi/src/awscc/v00.00.00000/services/servicecatalog.yaml b/openapi/src/awscc/v00.00.00000/services/servicecatalog.yaml
index 013795603..792db084b 100644
--- a/openapi/src/awscc/v00.00.00000/services/servicecatalog.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/servicecatalog.yaml
@@ -1263,7 +1263,7 @@ components:
       id: awscc.servicecatalog.service_actions
       x-cfn-schema-name: ServiceAction
       x-cfn-type-name: AWS::ServiceCatalog::ServiceAction
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
       x-type: cloud_control
       methods:
@@ -1359,8 +1359,7 @@ components:
       id: awscc.servicecatalog.service_actions_list_only
       x-cfn-schema-name: ServiceAction
       x-cfn-type-name: AWS::ServiceCatalog::ServiceAction
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1390,7 +1389,7 @@ components:
       id: awscc.servicecatalog.service_action_associations
       x-cfn-schema-name: ServiceActionAssociation
       x-cfn-type-name: AWS::ServiceCatalog::ServiceActionAssociation
-      x-identifiers:
+      x-identifiers: &ref_1
         - ProductId
         - ProvisioningArtifactId
         - ServiceActionId
@@ -1465,10 +1464,7 @@ components:
       id: awscc.servicecatalog.service_action_associations_list_only
       x-cfn-schema-name: ServiceActionAssociation
       x-cfn-type-name: AWS::ServiceCatalog::ServiceActionAssociation
-      x-identifiers:
-        - ProductId
-        - ProvisioningArtifactId
-        - ServiceActionId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1502,7 +1498,7 @@ components:
       id: awscc.servicecatalog.tag_options
       x-cfn-schema-name: TagOption
       x-cfn-type-name: AWS::ServiceCatalog::TagOption
-      x-identifiers:
+      x-identifiers: &ref_2
         - Id
       x-type: cloud_control
       methods:
@@ -1594,8 +1590,7 @@ components:
       id: awscc.servicecatalog.tag_options_list_only
       x-cfn-schema-name: TagOption
       x-cfn-type-name: AWS::ServiceCatalog::TagOption
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/servicecatalogappregistry.yaml b/openapi/src/awscc/v00.00.00000/services/servicecatalogappregistry.yaml
index dd0a30041..b8b88d97b 100644
--- a/openapi/src/awscc/v00.00.00000/services/servicecatalogappregistry.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/servicecatalogappregistry.yaml
@@ -837,7 +837,7 @@ components:
       id: awscc.servicecatalogappregistry.applications
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::ServiceCatalogAppRegistry::Application
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
       x-type: cloud_control
       methods:
@@ -937,8 +937,7 @@ components:
       id: awscc.servicecatalogappregistry.applications_list_only
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::ServiceCatalogAppRegistry::Application
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -968,7 +967,7 @@ components:
       id: awscc.servicecatalogappregistry.attribute_groups
       x-cfn-schema-name: AttributeGroup
       x-cfn-type-name: AWS::ServiceCatalogAppRegistry::AttributeGroup
-      x-identifiers:
+      x-identifiers: &ref_1
         - Id
       x-type: cloud_control
       methods:
@@ -1064,8 +1063,7 @@ components:
       id: awscc.servicecatalogappregistry.attribute_groups_list_only
       x-cfn-schema-name: AttributeGroup
       x-cfn-type-name: AWS::ServiceCatalogAppRegistry::AttributeGroup
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1095,7 +1093,7 @@ components:
       id: awscc.servicecatalogappregistry.attribute_group_associations
       x-cfn-schema-name: AttributeGroupAssociation
       x-cfn-type-name: AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation
-      x-identifiers:
+      x-identifiers: &ref_2
         - ApplicationArn
         - AttributeGroupArn
       x-type: cloud_control
@@ -1171,9 +1169,7 @@ components:
       id: awscc.servicecatalogappregistry.attribute_group_associations_list_only
       x-cfn-schema-name: AttributeGroupAssociation
       x-cfn-type-name: AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation
-      x-identifiers:
-        - ApplicationArn
-        - AttributeGroupArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1205,7 +1201,7 @@ components:
       id: awscc.servicecatalogappregistry.resource_associations
       x-cfn-schema-name: ResourceAssociation
       x-cfn-type-name: AWS::ServiceCatalogAppRegistry::ResourceAssociation
-      x-identifiers:
+      x-identifiers: &ref_3
         - ApplicationArn
         - ResourceArn
         - ResourceType
@@ -1284,10 +1280,7 @@ components:
       id: awscc.servicecatalogappregistry.resource_associations_list_only
       x-cfn-schema-name: ResourceAssociation
       x-cfn-type-name: AWS::ServiceCatalogAppRegistry::ResourceAssociation
-      x-identifiers:
-        - ApplicationArn
-        - ResourceArn
-        - ResourceType
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/ses.yaml b/openapi/src/awscc/v00.00.00000/services/ses.yaml
index 5a1dfc0bf..8dfbf66bd 100644
--- a/openapi/src/awscc/v00.00.00000/services/ses.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/ses.yaml
@@ -395,14 +395,12 @@ components:
       properties:
         Key:
           type: string
-          maxLength: 128
           minLength: 1
-          pattern: ^[a-zA-Z0-9/_\+=\.:@\-]+$
+          maxLength: 128
         Value:
           type: string
-          maxLength: 256
           minLength: 0
-          pattern: ^[a-zA-Z0-9/_\+=\.:@\-]*$
+          maxLength: 256
       required:
         - Key
         - Value
@@ -1003,6 +1001,23 @@ components:
           - ses:DeleteEmailIdentity
         list:
           - ses:ListEmailIdentities
+    MailManagerAddonInstance_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          maxLength: 128
+          minLength: 1
+          pattern: ^[a-zA-Z0-9/_\+=\.:@\-]+$
+        Value:
+          type: string
+          maxLength: 256
+          minLength: 0
+          pattern: ^[a-zA-Z0-9/_\+=\.:@\-]*$
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     MailManagerAddonInstance:
       type: object
       properties:
@@ -1023,7 +1038,7 @@ components:
         Tags:
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/MailManagerAddonInstance_Tag'
           maxItems: 200
           minItems: 0
       required:
@@ -1069,6 +1084,23 @@ components:
           - ses:DeleteAddonInstance
         list:
           - ses:ListAddonInstances
+    MailManagerAddonSubscription_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          maxLength: 128
+          minLength: 1
+          pattern: ^[a-zA-Z0-9/_\+=\.:@\-]+$
+        Value:
+          type: string
+          maxLength: 256
+          minLength: 0
+          pattern: ^[a-zA-Z0-9/_\+=\.:@\-]*$
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     MailManagerAddonSubscription:
       type: object
       properties:
@@ -1084,7 +1116,7 @@ components:
         Tags:
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/MailManagerAddonSubscription_Tag'
           maxItems: 200
           minItems: 0
       required:
@@ -1129,6 +1161,23 @@ components:
           - ses:DeleteAddonSubscription
         list:
           - ses:ListAddonSubscriptions
+    MailManagerAddressList_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          maxLength: 128
+          minLength: 1
+          pattern: ^[a-zA-Z0-9/_\+=\.:@\-]+$
+        Value:
+          type: string
+          maxLength: 256
+          minLength: 0
+          pattern: ^[a-zA-Z0-9/_\+=\.:@\-]*$
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     MailManagerAddressList:
       type: object
       properties:
@@ -1147,7 +1196,7 @@ components:
         Tags:
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/MailManagerAddressList_Tag'
           maxItems: 200
           minItems: 0
       x-stackql-resource-name: mail_manager_address_list
@@ -1222,6 +1271,23 @@ components:
         - NINE_YEARS
         - TEN_YEARS
         - PERMANENT
+    MailManagerArchive_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          maxLength: 128
+          minLength: 1
+          pattern: ^[a-zA-Z0-9/_\+=\.:@\-]+$
+        Value:
+          type: string
+          maxLength: 256
+          minLength: 0
+          pattern: ^[a-zA-Z0-9/_\+=\.:@\-]*$
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     MailManagerArchive:
       type: object
       properties:
@@ -1246,7 +1312,7 @@ components:
         Tags:
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/MailManagerArchive_Tag'
           maxItems: 200
           minItems: 0
       x-stackql-resource-name: mail_manager_archive
@@ -1375,6 +1441,23 @@ components:
       required:
         - IpType
       additionalProperties: false
+    MailManagerIngressPoint_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          maxLength: 128
+          minLength: 1
+          pattern: ^[a-zA-Z0-9/_\+=\.:@\-]+$
+        Value:
+          type: string
+          maxLength: 256
+          minLength: 0
+          pattern: ^[a-zA-Z0-9/_\+=\.:@\-]*$
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     MailManagerIngressPoint:
       type: object
       properties:
@@ -1410,7 +1493,7 @@ components:
         Tags:
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/MailManagerIngressPoint_Tag'
           maxItems: 200
           minItems: 0
         Type:
@@ -1491,6 +1574,23 @@ components:
           required:
             - NoAuthentication
           additionalProperties: false
+    MailManagerRelay_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          maxLength: 128
+          minLength: 1
+          pattern: ^[a-zA-Z0-9/_\+=\.:@\-]+$
+        Value:
+          type: string
+          maxLength: 256
+          minLength: 0
+          pattern: ^[a-zA-Z0-9/_\+=\.:@\-]*$
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     MailManagerRelay:
       type: object
       properties:
@@ -1520,7 +1620,7 @@ components:
         Tags:
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/MailManagerRelay_Tag'
           maxItems: 200
           minItems: 0
       required:
@@ -2229,6 +2329,23 @@ components:
       required:
         - RoleArn
       additionalProperties: false
+    MailManagerRuleSet_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          maxLength: 128
+          minLength: 1
+          pattern: ^[a-zA-Z0-9/_\+=\.:@\-]+$
+        Value:
+          type: string
+          maxLength: 256
+          minLength: 0
+          pattern: ^[a-zA-Z0-9/_\+=\.:@\-]*$
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     MailManagerRuleSet:
       type: object
       properties:
@@ -2252,7 +2369,7 @@ components:
         Tags:
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/MailManagerRuleSet_Tag'
           maxItems: 200
           minItems: 0
       required:
@@ -2578,6 +2695,23 @@ components:
         - Action
         - Conditions
       additionalProperties: false
+    MailManagerTrafficPolicy_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          maxLength: 128
+          minLength: 1
+          pattern: ^[a-zA-Z0-9/_\+=\.:@\-]+$
+        Value:
+          type: string
+          maxLength: 256
+          minLength: 0
+          pattern: ^[a-zA-Z0-9/_\+=\.:@\-]*$
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     MailManagerTrafficPolicy:
       type: object
       properties:
@@ -2593,7 +2727,7 @@ components:
         Tags:
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/MailManagerTrafficPolicy_Tag'
           maxItems: 200
           minItems: 0
         TrafficPolicyArn:
@@ -2650,13 +2784,35 @@ components:
           - ses:DeleteTrafficPolicy
         list:
           - ses:ListTrafficPolicies
+    Template_Template:
+      type: object
+      additionalProperties: false
+      description: The content of the email, composed of a subject line, an HTML part, and a text-only part
+      properties:
+        TemplateName:
+          description: The name of the template.
+          type: string
+          pattern: ^[a-zA-Z0-9_-]{1,64}$
+          maxLength: 64
+          minLength: 1
+        SubjectPart:
+          description: The subject line of the email.
+          type: string
+        TextPart:
+          description: The email body that is visible to recipients whose email clients do not display HTML content.
+          type: string
+        HtmlPart:
+          description: The HTML body of the email.
+          type: string
+      required:
+        - SubjectPart
     Template:
       type: object
       properties:
         Id:
           type: string
         Template:
-          $ref: '#/components/schemas/Template'
+          $ref: '#/components/schemas/Template_Template'
       x-stackql-resource-name: template
       description: Resource Type definition for AWS::SES::Template
       x-type-name: AWS::SES::Template
@@ -2960,7 +3116,7 @@ components:
             Tags:
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/MailManagerAddonInstance_Tag'
               maxItems: 200
               minItems: 0
           x-stackQL-stringOnly: true
@@ -2992,7 +3148,7 @@ components:
             Tags:
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/MailManagerAddonSubscription_Tag'
               maxItems: 200
               minItems: 0
           x-stackQL-stringOnly: true
@@ -3027,7 +3183,7 @@ components:
             Tags:
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/MailManagerAddressList_Tag'
               maxItems: 200
               minItems: 0
           x-stackQL-stringOnly: true
@@ -3068,7 +3224,7 @@ components:
             Tags:
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/MailManagerArchive_Tag'
               maxItems: 200
               minItems: 0
           x-stackQL-stringOnly: true
@@ -3120,7 +3276,7 @@ components:
             Tags:
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/MailManagerIngressPoint_Tag'
               maxItems: 200
               minItems: 0
             Type:
@@ -3168,7 +3324,7 @@ components:
             Tags:
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/MailManagerRelay_Tag'
               maxItems: 200
               minItems: 0
           x-stackQL-stringOnly: true
@@ -3208,7 +3364,7 @@ components:
             Tags:
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/MailManagerRuleSet_Tag'
               maxItems: 200
               minItems: 0
           x-stackQL-stringOnly: true
@@ -3240,7 +3396,7 @@ components:
             Tags:
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/MailManagerTrafficPolicy_Tag'
               maxItems: 200
               minItems: 0
             TrafficPolicyArn:
@@ -3274,7 +3430,7 @@ components:
             Id:
               type: string
             Template:
-              $ref: '#/components/schemas/Template'
+              $ref: '#/components/schemas/Template_Template'
           x-stackQL-stringOnly: true
       x-title: CreateTemplateRequest
       type: object
@@ -3316,7 +3472,7 @@ components:
       id: awscc.ses.configuration_sets
       x-cfn-schema-name: ConfigurationSet
       x-cfn-type-name: AWS::SES::ConfigurationSet
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -3416,8 +3572,7 @@ components:
       id: awscc.ses.configuration_sets_list_only
       x-cfn-schema-name: ConfigurationSet
       x-cfn-type-name: AWS::SES::ConfigurationSet
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3447,7 +3602,7 @@ components:
       id: awscc.ses.configuration_set_event_destinations
       x-cfn-schema-name: ConfigurationSetEventDestination
       x-cfn-type-name: AWS::SES::ConfigurationSetEventDestination
-      x-identifiers:
+      x-identifiers: &ref_1
         - Id
       x-type: cloud_control
       methods:
@@ -3537,8 +3692,7 @@ components:
       id: awscc.ses.configuration_set_event_destinations_list_only
       x-cfn-schema-name: ConfigurationSetEventDestination
       x-cfn-type-name: AWS::SES::ConfigurationSetEventDestination
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3568,7 +3722,7 @@ components:
       id: awscc.ses.contact_lists
       x-cfn-schema-name: ContactList
       x-cfn-type-name: AWS::SES::ContactList
-      x-identifiers:
+      x-identifiers: &ref_2
         - ContactListName
       x-type: cloud_control
       methods:
@@ -3660,8 +3814,7 @@ components:
       id: awscc.ses.contact_lists_list_only
       x-cfn-schema-name: ContactList
       x-cfn-type-name: AWS::SES::ContactList
-      x-identifiers:
-        - ContactListName
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3691,7 +3844,7 @@ components:
       id: awscc.ses.dedicated_ip_pools
       x-cfn-schema-name: DedicatedIpPool
       x-cfn-type-name: AWS::SES::DedicatedIpPool
-      x-identifiers:
+      x-identifiers: &ref_3
         - PoolName
       x-type: cloud_control
       methods:
@@ -3781,8 +3934,7 @@ components:
       id: awscc.ses.dedicated_ip_pools_list_only
       x-cfn-schema-name: DedicatedIpPool
       x-cfn-type-name: AWS::SES::DedicatedIpPool
-      x-identifiers:
-        - PoolName
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3812,7 +3964,7 @@ components:
       id: awscc.ses.email_identities
       x-cfn-schema-name: EmailIdentity
       x-cfn-type-name: AWS::SES::EmailIdentity
-      x-identifiers:
+      x-identifiers: &ref_4
         - EmailIdentity
       x-type: cloud_control
       methods:
@@ -3922,8 +4074,7 @@ components:
       id: awscc.ses.email_identities_list_only
       x-cfn-schema-name: EmailIdentity
       x-cfn-type-name: AWS::SES::EmailIdentity
-      x-identifiers:
-        - EmailIdentity
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3953,7 +4104,7 @@ components:
       id: awscc.ses.mail_manager_addon_instances
       x-cfn-schema-name: MailManagerAddonInstance
       x-cfn-type-name: AWS::SES::MailManagerAddonInstance
-      x-identifiers:
+      x-identifiers: &ref_5
         - AddonInstanceId
       x-type: cloud_control
       methods:
@@ -4047,8 +4198,7 @@ components:
       id: awscc.ses.mail_manager_addon_instances_list_only
       x-cfn-schema-name: MailManagerAddonInstance
       x-cfn-type-name: AWS::SES::MailManagerAddonInstance
-      x-identifiers:
-        - AddonInstanceId
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4078,7 +4228,7 @@ components:
       id: awscc.ses.mail_manager_addon_subscriptions
       x-cfn-schema-name: MailManagerAddonSubscription
       x-cfn-type-name: AWS::SES::MailManagerAddonSubscription
-      x-identifiers:
+      x-identifiers: &ref_6
         - AddonSubscriptionId
       x-type: cloud_control
       methods:
@@ -4170,8 +4320,7 @@ components:
       id: awscc.ses.mail_manager_addon_subscriptions_list_only
       x-cfn-schema-name: MailManagerAddonSubscription
       x-cfn-type-name: AWS::SES::MailManagerAddonSubscription
-      x-identifiers:
-        - AddonSubscriptionId
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4201,7 +4350,7 @@ components:
       id: awscc.ses.mail_manager_address_lists
       x-cfn-schema-name: MailManagerAddressList
       x-cfn-type-name: AWS::SES::MailManagerAddressList
-      x-identifiers:
+      x-identifiers: &ref_7
         - AddressListId
       x-type: cloud_control
       methods:
@@ -4293,8 +4442,7 @@ components:
       id: awscc.ses.mail_manager_address_lists_list_only
       x-cfn-schema-name: MailManagerAddressList
       x-cfn-type-name: AWS::SES::MailManagerAddressList
-      x-identifiers:
-        - AddressListId
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4324,7 +4472,7 @@ components:
       id: awscc.ses.mail_manager_archives
       x-cfn-schema-name: MailManagerArchive
       x-cfn-type-name: AWS::SES::MailManagerArchive
-      x-identifiers:
+      x-identifiers: &ref_8
         - ArchiveId
       x-type: cloud_control
       methods:
@@ -4422,8 +4570,7 @@ components:
       id: awscc.ses.mail_manager_archives_list_only
       x-cfn-schema-name: MailManagerArchive
       x-cfn-type-name: AWS::SES::MailManagerArchive
-      x-identifiers:
-        - ArchiveId
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4453,7 +4600,7 @@ components:
       id: awscc.ses.mail_manager_ingress_points
       x-cfn-schema-name: MailManagerIngressPoint
       x-cfn-type-name: AWS::SES::MailManagerIngressPoint
-      x-identifiers:
+      x-identifiers: &ref_9
         - IngressPointId
       x-type: cloud_control
       methods:
@@ -4561,8 +4708,7 @@ components:
       id: awscc.ses.mail_manager_ingress_points_list_only
       x-cfn-schema-name: MailManagerIngressPoint
       x-cfn-type-name: AWS::SES::MailManagerIngressPoint
-      x-identifiers:
-        - IngressPointId
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4592,7 +4738,7 @@ components:
       id: awscc.ses.mail_manager_relays
       x-cfn-schema-name: MailManagerRelay
       x-cfn-type-name: AWS::SES::MailManagerRelay
-      x-identifiers:
+      x-identifiers: &ref_10
         - RelayId
       x-type: cloud_control
       methods:
@@ -4690,8 +4836,7 @@ components:
       id: awscc.ses.mail_manager_relays_list_only
       x-cfn-schema-name: MailManagerRelay
       x-cfn-type-name: AWS::SES::MailManagerRelay
-      x-identifiers:
-        - RelayId
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4721,7 +4866,7 @@ components:
       id: awscc.ses.mail_manager_rule_sets
       x-cfn-schema-name: MailManagerRuleSet
       x-cfn-type-name: AWS::SES::MailManagerRuleSet
-      x-identifiers:
+      x-identifiers: &ref_11
         - RuleSetId
       x-type: cloud_control
       methods:
@@ -4815,8 +4960,7 @@ components:
       id: awscc.ses.mail_manager_rule_sets_list_only
       x-cfn-schema-name: MailManagerRuleSet
       x-cfn-type-name: AWS::SES::MailManagerRuleSet
-      x-identifiers:
-        - RuleSetId
+      x-identifiers: *ref_11
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4846,7 +4990,7 @@ components:
       id: awscc.ses.mail_manager_traffic_policies
       x-cfn-schema-name: MailManagerTrafficPolicy
       x-cfn-type-name: AWS::SES::MailManagerTrafficPolicy
-      x-identifiers:
+      x-identifiers: &ref_12
         - TrafficPolicyId
       x-type: cloud_control
       methods:
@@ -4944,8 +5088,7 @@ components:
       id: awscc.ses.mail_manager_traffic_policies_list_only
       x-cfn-schema-name: MailManagerTrafficPolicy
       x-cfn-type-name: AWS::SES::MailManagerTrafficPolicy
-      x-identifiers:
-        - TrafficPolicyId
+      x-identifiers: *ref_12
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4975,7 +5118,7 @@ components:
       id: awscc.ses.templates
       x-cfn-schema-name: Template
       x-cfn-type-name: AWS::SES::Template
-      x-identifiers:
+      x-identifiers: &ref_13
         - Id
       x-type: cloud_control
       methods:
@@ -5063,8 +5206,7 @@ components:
       id: awscc.ses.templates_list_only
       x-cfn-schema-name: Template
       x-cfn-type-name: AWS::SES::Template
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_13
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/shield.yaml b/openapi/src/awscc/v00.00.00000/services/shield.yaml
index 2ea3a3214..117ccdda9 100644
--- a/openapi/src/awscc/v00.00.00000/services/shield.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/shield.yaml
@@ -1012,7 +1012,7 @@ components:
       id: awscc.shield.drt_accesses
       x-cfn-schema-name: DRTAccess
       x-cfn-type-name: AWS::Shield::DRTAccess
-      x-identifiers:
+      x-identifiers: &ref_0
         - AccountId
       x-type: cloud_control
       methods:
@@ -1102,8 +1102,7 @@ components:
       id: awscc.shield.drt_accesses_list_only
       x-cfn-schema-name: DRTAccess
       x-cfn-type-name: AWS::Shield::DRTAccess
-      x-identifiers:
-        - AccountId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1133,7 +1132,7 @@ components:
       id: awscc.shield.proactive_engagements
       x-cfn-schema-name: ProactiveEngagement
       x-cfn-type-name: AWS::Shield::ProactiveEngagement
-      x-identifiers:
+      x-identifiers: &ref_1
         - AccountId
       x-type: cloud_control
       methods:
@@ -1223,8 +1222,7 @@ components:
       id: awscc.shield.proactive_engagements_list_only
       x-cfn-schema-name: ProactiveEngagement
       x-cfn-type-name: AWS::Shield::ProactiveEngagement
-      x-identifiers:
-        - AccountId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1254,7 +1252,7 @@ components:
       id: awscc.shield.protections
       x-cfn-schema-name: Protection
       x-cfn-type-name: AWS::Shield::Protection
-      x-identifiers:
+      x-identifiers: &ref_2
         - ProtectionArn
       x-type: cloud_control
       methods:
@@ -1352,8 +1350,7 @@ components:
       id: awscc.shield.protections_list_only
       x-cfn-schema-name: Protection
       x-cfn-type-name: AWS::Shield::Protection
-      x-identifiers:
-        - ProtectionArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1383,7 +1380,7 @@ components:
       id: awscc.shield.protection_groups
       x-cfn-schema-name: ProtectionGroup
       x-cfn-type-name: AWS::Shield::ProtectionGroup
-      x-identifiers:
+      x-identifiers: &ref_3
         - ProtectionGroupArn
       x-type: cloud_control
       methods:
@@ -1481,8 +1478,7 @@ components:
       id: awscc.shield.protection_groups_list_only
       x-cfn-schema-name: ProtectionGroup
       x-cfn-type-name: AWS::Shield::ProtectionGroup
-      x-identifiers:
-        - ProtectionGroupArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/signer.yaml b/openapi/src/awscc/v00.00.00000/services/signer.yaml
index f196e4ca6..07c2db0d4 100644
--- a/openapi/src/awscc/v00.00.00000/services/signer.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/signer.yaml
@@ -639,7 +639,7 @@ components:
       id: awscc.signer.profile_permissions
       x-cfn-schema-name: ProfilePermission
       x-cfn-type-name: AWS::Signer::ProfilePermission
-      x-identifiers:
+      x-identifiers: &ref_0
         - StatementId
         - ProfileName
       x-type: cloud_control
@@ -717,9 +717,7 @@ components:
       id: awscc.signer.profile_permissions_list_only
       x-cfn-schema-name: ProfilePermission
       x-cfn-type-name: AWS::Signer::ProfilePermission
-      x-identifiers:
-        - StatementId
-        - ProfileName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -751,7 +749,7 @@ components:
       id: awscc.signer.signing_profiles
       x-cfn-schema-name: SigningProfile
       x-cfn-type-name: AWS::Signer::SigningProfile
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -849,8 +847,7 @@ components:
       id: awscc.signer.signing_profiles_list_only
       x-cfn-schema-name: SigningProfile
       x-cfn-type-name: AWS::Signer::SigningProfile
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/simspaceweaver.yaml b/openapi/src/awscc/v00.00.00000/services/simspaceweaver.yaml
index 85719dc41..19c5dfa0a 100644
--- a/openapi/src/awscc/v00.00.00000/services/simspaceweaver.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/simspaceweaver.yaml
@@ -526,7 +526,7 @@ components:
       id: awscc.simspaceweaver.simulations
       x-cfn-schema-name: Simulation
       x-cfn-type-name: AWS::SimSpaceWeaver::Simulation
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -622,8 +622,7 @@ components:
       id: awscc.simspaceweaver.simulations_list_only
       x-cfn-schema-name: Simulation
       x-cfn-type-name: AWS::SimSpaceWeaver::Simulation
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/sns.yaml b/openapi/src/awscc/v00.00.00000/services/sns.yaml
index 21e6e1229..9f6deb5f7 100644
--- a/openapi/src/awscc/v00.00.00000/services/sns.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/sns.yaml
@@ -392,20 +392,85 @@ components:
   schemas:
     Subscription:
       type: object
-      additionalProperties: false
       properties:
+        Arn:
+          type: string
+          description: Arn of the subscription
+        ReplayPolicy:
+          type: object
+          description: Specifies whether Amazon SNS resends the notification to the subscription when a message's attribute changes.
+        RawMessageDelivery:
+          type: boolean
+          description: When set to true, enables raw message delivery. Raw messages don't contain any JSON formatting and can be sent to Amazon SQS and HTTP/S endpoints.
         Endpoint:
           type: string
-          description: The endpoint that receives notifications from the SNS topic. The endpoint value depends on the protocol that you specify. For more information, see the ``Endpoint`` parameter of the ``Subscribe`` action in the *API Reference*.
+          description: 'The subscription''s endpoint. The endpoint value depends on the protocol that you specify. '
+        FilterPolicy:
+          type: object
+          description: The filter policy JSON assigned to the subscription. Enables the subscriber to filter out unwanted messages.
+        TopicArn:
+          type: string
+          description: The ARN of the topic to subscribe to.
+        RedrivePolicy:
+          type: object
+          description: When specified, sends undeliverable messages to the specified Amazon SQS dead-letter queue. Messages that can't be delivered due to client errors are held in the dead-letter queue for further analysis or reprocessing.
+        DeliveryPolicy:
+          type: object
+          description: The delivery policy JSON assigned to the subscription. Enables the subscriber to define the message delivery retry strategy in the case of an HTTP/S endpoint subscribed to the topic.
+        Region:
+          type: string
+          description: For cross-region subscriptions, the region in which the topic resides.If no region is specified, AWS CloudFormation uses the region of the caller as the default.
+        SubscriptionRoleArn:
+          type: string
+          description: This property applies only to Amazon Data Firehose delivery stream subscriptions.
+        FilterPolicyScope:
+          type: string
+          description: 'This attribute lets you choose the filtering scope by using one of the following string value types: MessageAttributes (default) and MessageBody.'
         Protocol:
           type: string
-          description: The subscription's protocol. For more information, see the ``Protocol`` parameter of the ``Subscribe`` action in the *API Reference*.
+          description: The subscription's protocol.
       required:
+        - TopicArn
+        - Protocol
+      x-stackql-resource-name: subscription
+      description: Resource Type definition for AWS::SNS::Subscription
+      x-type-name: AWS::SNS::Subscription
+      x-stackql-primary-identifier:
+        - Arn
+      x-create-only-properties:
         - Endpoint
         - Protocol
-      description: |-
-        ``Subscription`` is an embedded property that describes the subscription endpoints of an SNS topic.
-          For full control over subscription behavior (for example, delivery policy, filtering, raw message delivery, and cross-region subscriptions), use the [AWS::SNS::Subscription](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html) resource.
+        - TopicArn
+      x-conditional-create-only-properties:
+        - Region
+      x-write-only-properties:
+        - Region
+      x-read-only-properties:
+        - Arn
+      x-required-properties:
+        - TopicArn
+        - Protocol
+      x-tagging:
+        taggable: false
+        tagOnCreate: false
+        tagUpdatable: false
+        cloudFormationSystemTags: false
+      x-required-permissions:
+        create:
+          - iam:GetRole
+          - iam:PassRole
+          - sns:Subscribe
+        read:
+          - sns:GetSubscriptionAttributes
+        update:
+          - iam:GetRole
+          - iam:PassRole
+          - sns:SetSubscriptionAttributes
+        delete:
+          - sns:Unsubscribe
+          - sns:GetSubscriptionAttributes
+        list:
+          - sns:ListSubscriptions
     Tag:
       type: object
       additionalProperties: false
@@ -420,6 +485,22 @@ components:
         - Value
         - Key
       description: The list of tags to be added to the specified topic.
+    Topic_Subscription:
+      type: object
+      additionalProperties: false
+      properties:
+        Endpoint:
+          type: string
+          description: The endpoint that receives notifications from the SNS topic. The endpoint value depends on the protocol that you specify. For more information, see the ``Endpoint`` parameter of the ``Subscribe`` action in the *API Reference*.
+        Protocol:
+          type: string
+          description: The subscription's protocol. For more information, see the ``Protocol`` parameter of the ``Subscribe`` action in the *API Reference*.
+      required:
+        - Endpoint
+        - Protocol
+      description: |-
+        ``Subscription`` is an embedded property that describes the subscription endpoints of an SNS topic.
+          For full control over subscription behavior (for example, delivery policy, filtering, raw message delivery, and cross-region subscriptions), use the [AWS::SNS::Subscription](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html) resource.
     LoggingConfig:
       type: object
       additionalProperties: false
@@ -473,7 +554,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Subscription'
+            $ref: '#/components/schemas/Topic_Subscription'
         FifoTopic:
           description: Set to true to create a FIFO topic.
           type: boolean
@@ -623,6 +704,59 @@ components:
         update:
           - sns:SetTopicAttributes
           - sns:GetTopicAttributes
+    CreateSubscriptionRequest:
+      properties:
+        ClientToken:
+          type: string
+        RoleArn:
+          type: string
+        TypeName:
+          type: string
+        TypeVersionId:
+          type: string
+        DesiredState:
+          type: object
+          properties:
+            Arn:
+              type: string
+              description: Arn of the subscription
+            ReplayPolicy:
+              type: object
+              description: Specifies whether Amazon SNS resends the notification to the subscription when a message's attribute changes.
+            RawMessageDelivery:
+              type: boolean
+              description: When set to true, enables raw message delivery. Raw messages don't contain any JSON formatting and can be sent to Amazon SQS and HTTP/S endpoints.
+            Endpoint:
+              type: string
+              description: 'The subscription''s endpoint. The endpoint value depends on the protocol that you specify. '
+            FilterPolicy:
+              type: object
+              description: The filter policy JSON assigned to the subscription. Enables the subscriber to filter out unwanted messages.
+            TopicArn:
+              type: string
+              description: The ARN of the topic to subscribe to.
+            RedrivePolicy:
+              type: object
+              description: When specified, sends undeliverable messages to the specified Amazon SQS dead-letter queue. Messages that can't be delivered due to client errors are held in the dead-letter queue for further analysis or reprocessing.
+            DeliveryPolicy:
+              type: object
+              description: The delivery policy JSON assigned to the subscription. Enables the subscriber to define the message delivery retry strategy in the case of an HTTP/S endpoint subscribed to the topic.
+            Region:
+              type: string
+              description: For cross-region subscriptions, the region in which the topic resides.If no region is specified, AWS CloudFormation uses the region of the caller as the default.
+            SubscriptionRoleArn:
+              type: string
+              description: This property applies only to Amazon Data Firehose delivery stream subscriptions.
+            FilterPolicyScope:
+              type: string
+              description: 'This attribute lets you choose the filtering scope by using one of the following string value types: MessageAttributes (default) and MessageBody.'
+            Protocol:
+              type: string
+              description: The subscription's protocol.
+          x-stackQL-stringOnly: true
+      x-title: CreateSubscriptionRequest
+      type: object
+      required: []
     CreateTopicRequest:
       properties:
         ClientToken:
@@ -659,7 +793,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Subscription'
+                $ref: '#/components/schemas/Topic_Subscription'
             FifoTopic:
               description: Set to true to create a FIFO topic.
               type: boolean
@@ -750,12 +884,150 @@ components:
       description: Amazon Signature authorization v4
       x-amazon-apigateway-authtype: awsSigv4
   x-stackQL-resources:
+    subscriptions:
+      name: subscriptions
+      id: awscc.sns.subscriptions
+      x-cfn-schema-name: Subscription
+      x-cfn-type-name: AWS::SNS::Subscription
+      x-identifiers: &ref_0
+        - Arn
+      x-type: cloud_control
+      methods:
+        create_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive_DesiredState
+          operation:
+            $ref: '#/paths/~1?Action=CreateResource&Version=2021-09-30&__Subscription&__detailTransformed=true/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::SNS::Subscription"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        update_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=UpdateResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::SNS::Subscription"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+        delete_resource:
+          config:
+            requestBodyTranslate:
+              algorithm: naive
+          operation:
+            $ref: '#/paths/~1?Action=DeleteResource&Version=2021-09-30/post'
+          request:
+            mediaType: application/x-amz-json-1.0
+            base: |-
+              {
+                "TypeName": "AWS::SNS::Subscription"
+              }
+          response:
+            mediaType: application/json
+            openAPIDocKey: '200'
+            objectKey: $.ProgressEvent
+      sqlVerbs:
+        insert:
+          - $ref: '#/components/x-stackQL-resources/subscriptions/methods/create_resource'
+        delete:
+          - $ref: '#/components/x-stackQL-resources/subscriptions/methods/delete_resource'
+        update:
+          - $ref: '#/components/x-stackQL-resources/subscriptions/methods/update_resource'
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3" && requiredParams == [ Identifier ]
+            ddl: |-
+              SELECT
+              region,
+              Identifier,
+              JSON_EXTRACT(Properties, '$.Arn') as arn,
+              JSON_EXTRACT(Properties, '$.ReplayPolicy') as replay_policy,
+              JSON_EXTRACT(Properties, '$.RawMessageDelivery') as raw_message_delivery,
+              JSON_EXTRACT(Properties, '$.Endpoint') as endpoint,
+              JSON_EXTRACT(Properties, '$.FilterPolicy') as filter_policy,
+              JSON_EXTRACT(Properties, '$.TopicArn') as topic_arn,
+              JSON_EXTRACT(Properties, '$.RedrivePolicy') as redrive_policy,
+              JSON_EXTRACT(Properties, '$.DeliveryPolicy') as delivery_policy,
+              JSON_EXTRACT(Properties, '$.Region') as region,
+              JSON_EXTRACT(Properties, '$.SubscriptionRoleArn') as subscription_role_arn,
+              JSON_EXTRACT(Properties, '$.FilterPolicyScope') as filter_policy_scope,
+              JSON_EXTRACT(Properties, '$.Protocol') as protocol
+              FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::SNS::Subscription'
+              AND Identifier = '<Arn>'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres" && requiredParams == [ Identifier ]
+              ddl: |-
+                SELECT
+                region,
+                Identifier,
+                json_extract_path_text(Properties, 'Arn') as arn,
+                json_extract_path_text(Properties, 'ReplayPolicy') as replay_policy,
+                json_extract_path_text(Properties, 'RawMessageDelivery') as raw_message_delivery,
+                json_extract_path_text(Properties, 'Endpoint') as endpoint,
+                json_extract_path_text(Properties, 'FilterPolicy') as filter_policy,
+                json_extract_path_text(Properties, 'TopicArn') as topic_arn,
+                json_extract_path_text(Properties, 'RedrivePolicy') as redrive_policy,
+                json_extract_path_text(Properties, 'DeliveryPolicy') as delivery_policy,
+                json_extract_path_text(Properties, 'Region') as region,
+                json_extract_path_text(Properties, 'SubscriptionRoleArn') as subscription_role_arn,
+                json_extract_path_text(Properties, 'FilterPolicyScope') as filter_policy_scope,
+                json_extract_path_text(Properties, 'Protocol') as protocol
+                FROM awscc.cloud_control.resource WHERE TypeName = 'AWS::SNS::Subscription'
+                AND Identifier = '<Arn>'
+                AND region = 'us-east-1'
+    subscriptions_list_only:
+      name: subscriptions_list_only
+      id: awscc.sns.subscriptions_list_only
+      x-cfn-schema-name: Subscription
+      x-cfn-type-name: AWS::SNS::Subscription
+      x-identifiers: *ref_0
+      x-type: cloud_control_view
+      methods: {}
+      sqlVerbs:
+        insert: []
+        delete: []
+        update: []
+      config:
+        views:
+          select:
+            predicate: sqlDialect == "sqlite3"
+            ddl: |-
+              SELECT
+              region,
+              JSON_EXTRACT(Properties, '$.Arn') as arn
+              FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::SNS::Subscription'
+              AND region = 'us-east-1'
+            fallback:
+              predicate: sqlDialect == "postgres"
+              ddl: |-
+                SELECT
+                region,
+                json_extract_path_text(Properties, 'Arn') as arn
+                FROM awscc.cloud_control.resources WHERE TypeName = 'AWS::SNS::Subscription'
+                AND region = 'us-east-1'
     topics:
       name: topics
       id: awscc.sns.topics
       x-cfn-schema-name: Topic
       x-cfn-type-name: AWS::SNS::Topic
-      x-identifiers:
+      x-identifiers: &ref_1
         - TopicArn
       x-type: cloud_control
       methods:
@@ -867,8 +1139,7 @@ components:
       id: awscc.sns.topics_list_only
       x-cfn-schema-name: Topic
       x-cfn-type-name: AWS::SNS::Topic
-      x-identifiers:
-        - TopicArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1125,6 +1396,48 @@ paths:
               schema:
                 $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
           description: Success
+  /?Action=CreateResource&Version=2021-09-30&__Subscription&__detailTransformed=true:
+    parameters:
+      - $ref: '#/components/parameters/X-Amz-Content-Sha256'
+      - $ref: '#/components/parameters/X-Amz-Date'
+      - $ref: '#/components/parameters/X-Amz-Algorithm'
+      - $ref: '#/components/parameters/X-Amz-Credential'
+      - $ref: '#/components/parameters/X-Amz-Security-Token'
+      - $ref: '#/components/parameters/X-Amz-Signature'
+      - $ref: '#/components/parameters/X-Amz-SignedHeaders'
+    post:
+      operationId: CreateSubscription
+      parameters:
+        - description: Action Header
+          in: header
+          name: X-Amz-Target
+          required: false
+          schema:
+            default: CloudApiService.CreateResource
+            enum:
+              - CloudApiService.CreateResource
+            type: string
+        - in: header
+          name: Content-Type
+          required: false
+          schema:
+            default: application/x-amz-json-1.0
+            enum:
+              - application/x-amz-json-1.0
+            type: string
+      requestBody:
+        content:
+          application/x-amz-json-1.0:
+            schema:
+              $ref: '#/components/schemas/CreateSubscriptionRequest'
+        required: true
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/x-cloud-control-schemas/ProgressEventResponse'
+          description: Success
   /?Action=CreateResource&Version=2021-09-30&__Topic&__detailTransformed=true:
     parameters:
       - $ref: '#/components/parameters/X-Amz-Content-Sha256'
diff --git a/openapi/src/awscc/v00.00.00000/services/sqs.yaml b/openapi/src/awscc/v00.00.00000/services/sqs.yaml
index 9b6f8a9b7..a56a90c9b 100644
--- a/openapi/src/awscc/v00.00.00000/services/sqs.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/sqs.yaml
@@ -743,7 +743,7 @@ components:
       id: awscc.sqs.queues
       x-cfn-schema-name: Queue
       x-cfn-type-name: AWS::SQS::Queue
-      x-identifiers:
+      x-identifiers: &ref_0
         - QueueUrl
       x-type: cloud_control
       methods:
@@ -863,8 +863,7 @@ components:
       id: awscc.sqs.queues_list_only
       x-cfn-schema-name: Queue
       x-cfn-type-name: AWS::SQS::Queue
-      x-identifiers:
-        - QueueUrl
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/ssm.yaml b/openapi/src/awscc/v00.00.00000/services/ssm.yaml
index 1d456f67a..0a6ac0152 100644
--- a/openapi/src/awscc/v00.00.00000/services/ssm.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/ssm.yaml
@@ -391,19 +391,25 @@ components:
       type: object
   schemas:
     Target:
-      type: object
       additionalProperties: false
+      type: object
       properties:
         Values:
+          minItems: 0
+          maxItems: 50
           type: array
-          uniqueItems: false
           items:
+            anyOf:
+              - relationshipRef:
+                  typeName: AWS::EC2::Instance
+                  propertyPath: /properties/Id
             type: string
         Key:
+          pattern: ^[\p{L}\p{Z}\p{N}_.:/=+\-@]{1,128}$|resource-groups:Name
           type: string
       required:
-        - Values
         - Key
+        - Values
     S3KeyPrefix:
       type: string
       maxLength: 1024
@@ -611,21 +617,21 @@ components:
           maxLength: 128
       additionalProperties: false
     Tag:
-      description: Metadata that you assign to your AWS resources.
       type: object
-      additionalProperties: false
       properties:
         Key:
+          description: The name of the tag.
           type: string
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
           minLength: 1
           maxLength: 128
         Value:
+          description: The value of the tag.
           type: string
+          pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
           minLength: 1
           maxLength: 256
-      required:
-        - Value
-        - Key
+      additionalProperties: false
     DocumentRequires:
       type: object
       properties:
@@ -835,6 +841,20 @@ components:
           $ref: '#/components/schemas/MaintenanceWindowLambdaParameters'
         MaintenanceWindowAutomationParameters:
           $ref: '#/components/schemas/MaintenanceWindowAutomationParameters'
+    MaintenanceWindowTask_Target:
+      type: object
+      additionalProperties: false
+      properties:
+        Values:
+          type: array
+          uniqueItems: false
+          items:
+            type: string
+        Key:
+          type: string
+      required:
+        - Values
+        - Key
     CloudWatchOutputConfig:
       type: object
       additionalProperties: false
@@ -940,7 +960,7 @@ components:
           type: array
           uniqueItems: false
           items:
-            $ref: '#/components/schemas/Target'
+            $ref: '#/components/schemas/MaintenanceWindowTask_Target'
         Name:
           type: string
         TaskArn:
@@ -1114,6 +1134,22 @@ components:
         Name:
           type: string
           pattern: ^[a-zA-Z0-9_\-.]{3,50}$
+    PatchBaseline_Tag:
+      description: Metadata that you assign to your AWS resources.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          minLength: 1
+          maxLength: 256
+      required:
+        - Value
+        - Key
     RuleGroup:
       description: A set of rules defining the approval rules for a patch baseline.
       type: object
@@ -1311,7 +1347,7 @@ components:
           type: array
           uniqueItems: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/PatchBaseline_Tag'
           minItems: 0
           maxItems: 1000
       required:
@@ -1954,7 +1990,7 @@ components:
               type: array
               uniqueItems: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/PatchBaseline_Tag'
               minItems: 0
               maxItems: 1000
           x-stackQL-stringOnly: true
@@ -2052,7 +2088,7 @@ components:
       id: awscc.ssm.associations
       x-cfn-schema-name: Association
       x-cfn-type-name: AWS::SSM::Association
-      x-identifiers:
+      x-identifiers: &ref_0
         - AssociationId
       x-type: cloud_control
       methods:
@@ -2172,8 +2208,7 @@ components:
       id: awscc.ssm.associations_list_only
       x-cfn-schema-name: Association
       x-cfn-type-name: AWS::SSM::Association
-      x-identifiers:
-        - AssociationId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2203,7 +2238,7 @@ components:
       id: awscc.ssm.documents
       x-cfn-schema-name: Document
       x-cfn-type-name: AWS::SSM::Document
-      x-identifiers:
+      x-identifiers: &ref_1
         - Name
       x-type: cloud_control
       methods:
@@ -2307,8 +2342,7 @@ components:
       id: awscc.ssm.documents_list_only
       x-cfn-schema-name: Document
       x-cfn-type-name: AWS::SSM::Document
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2338,7 +2372,7 @@ components:
       id: awscc.ssm.parameters
       x-cfn-schema-name: Parameter
       x-cfn-type-name: AWS::SSM::Parameter
-      x-identifiers:
+      x-identifiers: &ref_2
         - Name
       x-type: cloud_control
       methods:
@@ -2440,8 +2474,7 @@ components:
       id: awscc.ssm.parameters_list_only
       x-cfn-schema-name: Parameter
       x-cfn-type-name: AWS::SSM::Parameter
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2471,7 +2504,7 @@ components:
       id: awscc.ssm.patch_baselines
       x-cfn-schema-name: PatchBaseline
       x-cfn-type-name: AWS::SSM::PatchBaseline
-      x-identifiers:
+      x-identifiers: &ref_3
         - Id
       x-type: cloud_control
       methods:
@@ -2587,8 +2620,7 @@ components:
       id: awscc.ssm.patch_baselines_list_only
       x-cfn-schema-name: PatchBaseline
       x-cfn-type-name: AWS::SSM::PatchBaseline
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2618,7 +2650,7 @@ components:
       id: awscc.ssm.resource_data_syncs
       x-cfn-schema-name: ResourceDataSync
       x-cfn-type-name: AWS::SSM::ResourceDataSync
-      x-identifiers:
+      x-identifiers: &ref_4
         - SyncName
       x-type: cloud_control
       methods:
@@ -2720,8 +2752,7 @@ components:
       id: awscc.ssm.resource_data_syncs_list_only
       x-cfn-schema-name: ResourceDataSync
       x-cfn-type-name: AWS::SSM::ResourceDataSync
-      x-identifiers:
-        - SyncName
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2751,7 +2782,7 @@ components:
       id: awscc.ssm.resource_policies
       x-cfn-schema-name: ResourcePolicy
       x-cfn-type-name: AWS::SSM::ResourcePolicy
-      x-identifiers:
+      x-identifiers: &ref_5
         - PolicyId
         - ResourceArn
       x-type: cloud_control
@@ -2844,9 +2875,7 @@ components:
       id: awscc.ssm.resource_policies_list_only
       x-cfn-schema-name: ResourcePolicy
       x-cfn-type-name: AWS::SSM::ResourcePolicy
-      x-identifiers:
-        - PolicyId
-        - ResourceArn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/ssmcontacts.yaml b/openapi/src/awscc/v00.00.00000/services/ssmcontacts.yaml
index 5979e8a3d..580e00901 100644
--- a/openapi/src/awscc/v00.00.00000/services/ssmcontacts.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/ssmcontacts.yaml
@@ -445,12 +445,20 @@ components:
           type: integer
         Targets:
           type: array
-          x-insertionOrder: false
           description: The contacts or contact methods that the escalation plan or engagement plan is engaging.
           items:
             $ref: '#/components/schemas/Targets'
-      required:
-        - DurationInMinutes
+        RotationIds:
+          type: array
+          description: List of Rotation Ids to associate with Contact
+          x-insertionOrder: false
+          items:
+            type: string
+      oneOf:
+        - required:
+            - DurationInMinutes
+        - required:
+            - RotationIds
       additionalProperties: false
     Targets:
       description: The contacts or contact methods that the escalation plan or engagement plan is engaging.
@@ -618,6 +626,22 @@ components:
           - ssm-contacts:GetContactChannel
         list:
           - ssm-contacts:ListContactChannels
+    Plan_Stage:
+      description: A set amount of time that an escalation plan or engagement plan engages the specified contacts or contact methods.
+      type: object
+      properties:
+        DurationInMinutes:
+          description: The time to wait until beginning the next stage.
+          type: integer
+        Targets:
+          type: array
+          x-insertionOrder: false
+          description: The contacts or contact methods that the escalation plan or engagement plan is engaging.
+          items:
+            $ref: '#/components/schemas/Targets'
+      required:
+        - DurationInMinutes
+      additionalProperties: false
     Plan:
       type: object
       properties:
@@ -630,7 +654,7 @@ components:
           type: array
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Stage'
+            $ref: '#/components/schemas/Plan_Stage'
         RotationIds:
           description: Rotation Ids to associate with Oncall Contact for engagement.
           type: array
@@ -1002,7 +1026,7 @@ components:
               type: array
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Stage'
+                $ref: '#/components/schemas/Plan_Stage'
             RotationIds:
               description: Rotation Ids to associate with Oncall Contact for engagement.
               type: array
@@ -1074,7 +1098,7 @@ components:
       id: awscc.ssmcontacts.contacts
       x-cfn-schema-name: Contact
       x-cfn-type-name: AWS::SSMContacts::Contact
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -1170,8 +1194,7 @@ components:
       id: awscc.ssmcontacts.contacts_list_only
       x-cfn-schema-name: Contact
       x-cfn-type-name: AWS::SSMContacts::Contact
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1201,7 +1224,7 @@ components:
       id: awscc.ssmcontacts.contact_channels
       x-cfn-schema-name: ContactChannel
       x-cfn-type-name: AWS::SSMContacts::ContactChannel
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -1297,8 +1320,7 @@ components:
       id: awscc.ssmcontacts.contact_channels_list_only
       x-cfn-schema-name: ContactChannel
       x-cfn-type-name: AWS::SSMContacts::ContactChannel
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1420,7 +1442,7 @@ components:
       id: awscc.ssmcontacts.rotations
       x-cfn-schema-name: Rotation
       x-cfn-type-name: AWS::SSMContacts::Rotation
-      x-identifiers:
+      x-identifiers: &ref_2
         - Arn
       x-type: cloud_control
       methods:
@@ -1518,8 +1540,7 @@ components:
       id: awscc.ssmcontacts.rotations_list_only
       x-cfn-schema-name: Rotation
       x-cfn-type-name: AWS::SSMContacts::Rotation
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/ssmguiconnect.yaml b/openapi/src/awscc/v00.00.00000/services/ssmguiconnect.yaml
index 4e712105f..f031dd284 100644
--- a/openapi/src/awscc/v00.00.00000/services/ssmguiconnect.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/ssmguiconnect.yaml
@@ -523,7 +523,7 @@ components:
       id: awscc.ssmguiconnect.preferences
       x-cfn-schema-name: Preferences
       x-cfn-type-name: AWS::SSMGuiConnect::Preferences
-      x-identifiers:
+      x-identifiers: &ref_0
         - AccountId
       x-type: cloud_control
       methods:
@@ -611,8 +611,7 @@ components:
       id: awscc.ssmguiconnect.preferences_list_only
       x-cfn-schema-name: Preferences
       x-cfn-type-name: AWS::SSMGuiConnect::Preferences
-      x-identifiers:
-        - AccountId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/ssmincidents.yaml b/openapi/src/awscc/v00.00.00000/services/ssmincidents.yaml
index b5977dbe9..9f3dc6ea5 100644
--- a/openapi/src/awscc/v00.00.00000/services/ssmincidents.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/ssmincidents.yaml
@@ -975,7 +975,7 @@ components:
       id: awscc.ssmincidents.replication_sets
       x-cfn-schema-name: ReplicationSet
       x-cfn-type-name: AWS::SSMIncidents::ReplicationSet
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -1067,8 +1067,7 @@ components:
       id: awscc.ssmincidents.replication_sets_list_only
       x-cfn-schema-name: ReplicationSet
       x-cfn-type-name: AWS::SSMIncidents::ReplicationSet
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1098,7 +1097,7 @@ components:
       id: awscc.ssmincidents.response_plans
       x-cfn-schema-name: ResponsePlan
       x-cfn-type-name: AWS::SSMIncidents::ResponsePlan
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -1200,8 +1199,7 @@ components:
       id: awscc.ssmincidents.response_plans_list_only
       x-cfn-schema-name: ResponsePlan
       x-cfn-type-name: AWS::SSMIncidents::ResponsePlan
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/ssmquicksetup.yaml b/openapi/src/awscc/v00.00.00000/services/ssmquicksetup.yaml
index d5329d868..200b4f3ef 100644
--- a/openapi/src/awscc/v00.00.00000/services/ssmquicksetup.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/ssmquicksetup.yaml
@@ -705,7 +705,7 @@ components:
       id: awscc.ssmquicksetup.configuration_managers
       x-cfn-schema-name: ConfigurationManager
       x-cfn-type-name: AWS::SSMQuickSetup::ConfigurationManager
-      x-identifiers:
+      x-identifiers: &ref_0
         - ManagerArn
       x-type: cloud_control
       methods:
@@ -805,8 +805,7 @@ components:
       id: awscc.ssmquicksetup.configuration_managers_list_only
       x-cfn-schema-name: ConfigurationManager
       x-cfn-type-name: AWS::SSMQuickSetup::ConfigurationManager
-      x-identifiers:
-        - ManagerArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/sso.yaml b/openapi/src/awscc/v00.00.00000/services/sso.yaml
index 4aaa3f5de..31e321596 100644
--- a/openapi/src/awscc/v00.00.00000/services/sso.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/sso.yaml
@@ -391,17 +391,17 @@ components:
       type: object
   schemas:
     Tag:
-      description: The metadata that you apply to the permission set to help you categorize and organize them.
+      description: The metadata that you apply to the Identity Center (SSO) Application to help you categorize and organize them.
       type: object
       properties:
         Key:
           type: string
-          pattern: '[\w+=,.@-]+'
+          pattern: ^[\w+=,.@-]+$
           minLength: 1
           maxLength: 128
         Value:
           type: string
-          pattern: '[\w+=,.@-]+'
+          pattern: ^[\w+=,.@-]+$
           minLength: 0
           maxLength: 256
       required:
@@ -687,6 +687,24 @@ components:
         list:
           - sso:ListAccountAssignments
           - iam:ListRolePolicies
+    Instance_Tag:
+      description: The metadata that you apply to the Identity Center (SSO) Instance to help you categorize and organize them.
+      type: object
+      properties:
+        Key:
+          type: string
+          pattern: '[\w+=,.@-]+'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          pattern: '[\w+=,.@-]+'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     Instance:
       type: object
       properties:
@@ -726,7 +744,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Instance_Tag'
           maxItems: 75
       x-stackql-resource-name: instance
       description: Resource Type definition for Identity Center (SSO) Instance
@@ -860,6 +878,24 @@ components:
           - sso:DescribeInstanceAccessControlAttributeConfiguration
         list:
           - sso:DescribeInstanceAccessControlAttributeConfiguration
+    PermissionSet_Tag:
+      description: The metadata that you apply to the permission set to help you categorize and organize them.
+      type: object
+      properties:
+        Key:
+          type: string
+          pattern: '[\w+=,.@-]+'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          pattern: '[\w+=,.@-]+'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     ManagedPolicyArn:
       description: The managed policy to attach.
       type: string
@@ -942,7 +978,7 @@ components:
           type: array
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/PermissionSet_Tag'
           maxItems: 50
         CustomerManagedPolicyReferences:
           type: array
@@ -1221,7 +1257,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Instance_Tag'
               maxItems: 75
           x-stackQL-stringOnly: true
       x-title: CreateInstanceRequest
@@ -1324,7 +1360,7 @@ components:
               type: array
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/PermissionSet_Tag'
               maxItems: 50
             CustomerManagedPolicyReferences:
               type: array
@@ -1352,7 +1388,7 @@ components:
       id: awscc.sso.applications
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::SSO::Application
-      x-identifiers:
+      x-identifiers: &ref_0
         - ApplicationArn
       x-type: cloud_control
       methods:
@@ -1452,8 +1488,7 @@ components:
       id: awscc.sso.applications_list_only
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::SSO::Application
-      x-identifiers:
-        - ApplicationArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1483,7 +1518,7 @@ components:
       id: awscc.sso.application_assignments
       x-cfn-schema-name: ApplicationAssignment
       x-cfn-type-name: AWS::SSO::ApplicationAssignment
-      x-identifiers:
+      x-identifiers: &ref_1
         - ApplicationArn
         - PrincipalType
         - PrincipalId
@@ -1558,10 +1593,7 @@ components:
       id: awscc.sso.application_assignments_list_only
       x-cfn-schema-name: ApplicationAssignment
       x-cfn-type-name: AWS::SSO::ApplicationAssignment
-      x-identifiers:
-        - ApplicationArn
-        - PrincipalType
-        - PrincipalId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1595,7 +1627,7 @@ components:
       id: awscc.sso.assignments
       x-cfn-schema-name: Assignment
       x-cfn-type-name: AWS::SSO::Assignment
-      x-identifiers:
+      x-identifiers: &ref_2
         - InstanceArn
         - TargetId
         - TargetType
@@ -1679,13 +1711,7 @@ components:
       id: awscc.sso.assignments_list_only
       x-cfn-schema-name: Assignment
       x-cfn-type-name: AWS::SSO::Assignment
-      x-identifiers:
-        - InstanceArn
-        - TargetId
-        - TargetType
-        - PermissionSetArn
-        - PrincipalType
-        - PrincipalId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1725,7 +1751,7 @@ components:
       id: awscc.sso.instances
       x-cfn-schema-name: Instance
       x-cfn-type-name: AWS::SSO::Instance
-      x-identifiers:
+      x-identifiers: &ref_3
         - InstanceArn
       x-type: cloud_control
       methods:
@@ -1821,8 +1847,7 @@ components:
       id: awscc.sso.instances_list_only
       x-cfn-schema-name: Instance
       x-cfn-type-name: AWS::SSO::Instance
-      x-identifiers:
-        - InstanceArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1852,7 +1877,7 @@ components:
       id: awscc.sso.instance_access_control_attribute_configurations
       x-cfn-schema-name: InstanceAccessControlAttributeConfiguration
       x-cfn-type-name: AWS::SSO::InstanceAccessControlAttributeConfiguration
-      x-identifiers:
+      x-identifiers: &ref_4
         - InstanceArn
       x-type: cloud_control
       methods:
@@ -1942,8 +1967,7 @@ components:
       id: awscc.sso.instance_access_control_attribute_configurations_list_only
       x-cfn-schema-name: InstanceAccessControlAttributeConfiguration
       x-cfn-type-name: AWS::SSO::InstanceAccessControlAttributeConfiguration
-      x-identifiers:
-        - InstanceArn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1973,7 +1997,7 @@ components:
       id: awscc.sso.permission_sets
       x-cfn-schema-name: PermissionSet
       x-cfn-type-name: AWS::SSO::PermissionSet
-      x-identifiers:
+      x-identifiers: &ref_5
         - InstanceArn
         - PermissionSetArn
       x-type: cloud_control
@@ -2080,9 +2104,7 @@ components:
       id: awscc.sso.permission_sets_list_only
       x-cfn-schema-name: PermissionSet
       x-cfn-type-name: AWS::SSO::PermissionSet
-      x-identifiers:
-        - InstanceArn
-        - PermissionSetArn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/stepfunctions.yaml b/openapi/src/awscc/v00.00.00000/services/stepfunctions.yaml
index 3b3385500..43a910502 100644
--- a/openapi/src/awscc/v00.00.00000/services/stepfunctions.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/stepfunctions.yaml
@@ -1003,7 +1003,7 @@ components:
       id: awscc.stepfunctions.activities
       x-cfn-schema-name: Activity
       x-cfn-type-name: AWS::StepFunctions::Activity
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -1095,8 +1095,7 @@ components:
       id: awscc.stepfunctions.activities_list_only
       x-cfn-schema-name: Activity
       x-cfn-type-name: AWS::StepFunctions::Activity
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1126,7 +1125,7 @@ components:
       id: awscc.stepfunctions.state_machines
       x-cfn-schema-name: StateMachine
       x-cfn-type-name: AWS::StepFunctions::StateMachine
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -1238,8 +1237,7 @@ components:
       id: awscc.stepfunctions.state_machines_list_only
       x-cfn-schema-name: StateMachine
       x-cfn-type-name: AWS::StepFunctions::StateMachine
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1269,7 +1267,7 @@ components:
       id: awscc.stepfunctions.state_machine_aliases
       x-cfn-schema-name: StateMachineAlias
       x-cfn-type-name: AWS::StepFunctions::StateMachineAlias
-      x-identifiers:
+      x-identifiers: &ref_2
         - Arn
       x-type: cloud_control
       methods:
@@ -1363,8 +1361,7 @@ components:
       id: awscc.stepfunctions.state_machine_aliases_list_only
       x-cfn-schema-name: StateMachineAlias
       x-cfn-type-name: AWS::StepFunctions::StateMachineAlias
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1394,7 +1391,7 @@ components:
       id: awscc.stepfunctions.state_machine_versions
       x-cfn-schema-name: StateMachineVersion
       x-cfn-type-name: AWS::StepFunctions::StateMachineVersion
-      x-identifiers:
+      x-identifiers: &ref_3
         - Arn
       x-type: cloud_control
       methods:
@@ -1469,8 +1466,7 @@ components:
       id: awscc.stepfunctions.state_machine_versions_list_only
       x-cfn-schema-name: StateMachineVersion
       x-cfn-type-name: AWS::StepFunctions::StateMachineVersion
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/supportapp.yaml b/openapi/src/awscc/v00.00.00000/services/supportapp.yaml
index 0a1a8674a..d76ba7a8d 100644
--- a/openapi/src/awscc/v00.00.00000/services/supportapp.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/supportapp.yaml
@@ -678,7 +678,7 @@ components:
       id: awscc.supportapp.account_aliases
       x-cfn-schema-name: AccountAlias
       x-cfn-type-name: AWS::SupportApp::AccountAlias
-      x-identifiers:
+      x-identifiers: &ref_0
         - AccountAliasResourceId
       x-type: cloud_control
       methods:
@@ -766,8 +766,7 @@ components:
       id: awscc.supportapp.account_aliases_list_only
       x-cfn-schema-name: AccountAlias
       x-cfn-type-name: AWS::SupportApp::AccountAlias
-      x-identifiers:
-        - AccountAliasResourceId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -797,7 +796,7 @@ components:
       id: awscc.supportapp.slack_channel_configurations
       x-cfn-schema-name: SlackChannelConfiguration
       x-cfn-type-name: AWS::SupportApp::SlackChannelConfiguration
-      x-identifiers:
+      x-identifiers: &ref_1
         - TeamId
         - ChannelId
       x-type: cloud_control
@@ -898,9 +897,7 @@ components:
       id: awscc.supportapp.slack_channel_configurations_list_only
       x-cfn-schema-name: SlackChannelConfiguration
       x-cfn-type-name: AWS::SupportApp::SlackChannelConfiguration
-      x-identifiers:
-        - TeamId
-        - ChannelId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -932,7 +929,7 @@ components:
       id: awscc.supportapp.slack_workspace_configurations
       x-cfn-schema-name: SlackWorkspaceConfiguration
       x-cfn-type-name: AWS::SupportApp::SlackWorkspaceConfiguration
-      x-identifiers:
+      x-identifiers: &ref_2
         - TeamId
       x-type: cloud_control
       methods:
@@ -1020,8 +1017,7 @@ components:
       id: awscc.supportapp.slack_workspace_configurations_list_only
       x-cfn-schema-name: SlackWorkspaceConfiguration
       x-cfn-type-name: AWS::SupportApp::SlackWorkspaceConfiguration
-      x-identifiers:
-        - TeamId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/synthetics.yaml b/openapi/src/awscc/v00.00.00000/services/synthetics.yaml
index e0713fe14..860fe69ce 100644
--- a/openapi/src/awscc/v00.00.00000/services/synthetics.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/synthetics.yaml
@@ -460,13 +460,11 @@ components:
           description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
           minLength: 1
           maxLength: 128
-          pattern: ^(?!aws:)([a-zA-Z\d\s_.:/=+\-@]+)$
         Value:
           type: string
           description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
           minLength: 0
           maxLength: 256
-          pattern: ^([a-zA-Z\d\s_.:/=+\-@]*)$
       required:
         - Value
         - Key
@@ -789,6 +787,26 @@ components:
           - lambda:DeleteLayerVersion
         list:
           - synthetics:DescribeCanaries
+    Group_Tag:
+      description: A key-value pair to associate with a resource.
+      additionalProperties: false
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+          pattern: ^(?!aws:)([a-zA-Z\d\s_.:/=+\-@]+)$
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 0
+          maxLength: 256
+          pattern: ^([a-zA-Z\d\s_.:/=+\-@]*)$
+      required:
+        - Value
+        - Key
     ResourceArn:
       type: string
       description: Provide Canary Arn associated with the group.
@@ -807,7 +825,7 @@ components:
           type: array
           uniqueItems: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Group_Tag'
           minItems: 0
         ResourceArns:
           type: array
@@ -985,7 +1003,7 @@ components:
               type: array
               uniqueItems: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Group_Tag'
               minItems: 0
             ResourceArns:
               type: array
@@ -1010,7 +1028,7 @@ components:
       id: awscc.synthetics.canaries
       x-cfn-schema-name: Canary
       x-cfn-type-name: AWS::Synthetics::Canary
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
       x-type: cloud_control
       methods:
@@ -1138,8 +1156,7 @@ components:
       id: awscc.synthetics.canaries_list_only
       x-cfn-schema-name: Canary
       x-cfn-type-name: AWS::Synthetics::Canary
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1169,7 +1186,7 @@ components:
       id: awscc.synthetics.groups
       x-cfn-schema-name: Group
       x-cfn-type-name: AWS::Synthetics::Group
-      x-identifiers:
+      x-identifiers: &ref_1
         - Name
       x-type: cloud_control
       methods:
@@ -1261,8 +1278,7 @@ components:
       id: awscc.synthetics.groups_list_only
       x-cfn-schema-name: Group
       x-cfn-type-name: AWS::Synthetics::Group
-      x-identifiers:
-        - Name
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/systemsmanagersap.yaml b/openapi/src/awscc/v00.00.00000/services/systemsmanagersap.yaml
index 060835a2c..3b5efe456 100644
--- a/openapi/src/awscc/v00.00.00000/services/systemsmanagersap.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/systemsmanagersap.yaml
@@ -629,7 +629,7 @@ components:
       id: awscc.systemsmanagersap.applications
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::SystemsManagerSAP::Application
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -733,8 +733,7 @@ components:
       id: awscc.systemsmanagersap.applications_list_only
       x-cfn-schema-name: Application
       x-cfn-type-name: AWS::SystemsManagerSAP::Application
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/timestream.yaml b/openapi/src/awscc/v00.00.00000/services/timestream.yaml
index d5dcef657..49e507d6c 100644
--- a/openapi/src/awscc/v00.00.00000/services/timestream.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/timestream.yaml
@@ -467,6 +467,23 @@ components:
         list:
           - timestream:ListDatabases
           - timestream:DescribeEndpoints
+    InfluxDBInstance_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      additionalProperties: false
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. '
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
     InfluxDBInstance:
       type: object
       properties:
@@ -633,7 +650,7 @@ components:
           x-insertionOrder: false
           uniqueItems: true
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/InfluxDBInstance_Tag'
           minItems: 1
           maxItems: 200
           description: An arbitrary set of tags (key-value pairs) for this DB instance.
@@ -785,7 +802,7 @@ components:
       x-insertionOrder: false
       maxItems: 200
       items:
-        $ref: '#/components/schemas/Tag'
+        $ref: '#/components/schemas/ScheduledQuery_Tag'
     ScheduleExpression:
       description: An expression that denotes when to trigger the scheduled query run. This can be a cron expression or a rate expression.
       type: string
@@ -990,6 +1007,18 @@ components:
       enum:
         - SSE_S3
         - SSE_KMS
+    ScheduledQuery_Tag:
+      description: A key-value pair to label the scheduled query.
+      type: object
+      properties:
+        Key:
+          $ref: '#/components/schemas/Key'
+        Value:
+          $ref: '#/components/schemas/Value'
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     Key:
       type: string
       description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
@@ -1510,7 +1539,7 @@ components:
               x-insertionOrder: false
               uniqueItems: true
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/InfluxDBInstance_Tag'
               minItems: 1
               maxItems: 200
               description: An arbitrary set of tags (key-value pairs) for this DB instance.
@@ -1686,7 +1715,7 @@ components:
       id: awscc.timestream.databases
       x-cfn-schema-name: Database
       x-cfn-type-name: AWS::Timestream::Database
-      x-identifiers:
+      x-identifiers: &ref_0
         - DatabaseName
       x-type: cloud_control
       methods:
@@ -1778,8 +1807,7 @@ components:
       id: awscc.timestream.databases_list_only
       x-cfn-schema-name: Database
       x-cfn-type-name: AWS::Timestream::Database
-      x-identifiers:
-        - DatabaseName
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1809,7 +1837,7 @@ components:
       id: awscc.timestream.influxdb_instances
       x-cfn-schema-name: InfluxDBInstance
       x-cfn-type-name: AWS::Timestream::InfluxDBInstance
-      x-identifiers:
+      x-identifiers: &ref_1
         - Id
       x-type: cloud_control
       methods:
@@ -1941,8 +1969,7 @@ components:
       id: awscc.timestream.influxdb_instances_list_only
       x-cfn-schema-name: InfluxDBInstance
       x-cfn-type-name: AWS::Timestream::InfluxDBInstance
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1972,7 +1999,7 @@ components:
       id: awscc.timestream.scheduled_queries
       x-cfn-schema-name: ScheduledQuery
       x-cfn-type-name: AWS::Timestream::ScheduledQuery
-      x-identifiers:
+      x-identifiers: &ref_2
         - Arn
       x-type: cloud_control
       methods:
@@ -2094,8 +2121,7 @@ components:
       id: awscc.timestream.scheduled_queries_list_only
       x-cfn-schema-name: ScheduledQuery
       x-cfn-type-name: AWS::Timestream::ScheduledQuery
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2125,7 +2151,7 @@ components:
       id: awscc.timestream.tables
       x-cfn-schema-name: Table
       x-cfn-type-name: AWS::Timestream::Table
-      x-identifiers:
+      x-identifiers: &ref_3
         - DatabaseName
         - TableName
       x-type: cloud_control
@@ -2226,9 +2252,7 @@ components:
       id: awscc.timestream.tables_list_only
       x-cfn-schema-name: Table
       x-cfn-type-name: AWS::Timestream::Table
-      x-identifiers:
-        - DatabaseName
-        - TableName
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/transfer.yaml b/openapi/src/awscc/v00.00.00000/services/transfer.yaml
index a26a2d4c8..d08b51d86 100644
--- a/openapi/src/awscc/v00.00.00000/services/transfer.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/transfer.yaml
@@ -562,6 +562,24 @@ components:
           - transfer:DeleteAgreement
         list:
           - transfer:ListAgreements
+    Certificate_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.'
+          minLength: 0
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     Certificate:
       type: object
       properties:
@@ -609,7 +627,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Certificate_Tag'
         Arn:
           description: Specifies the unique Amazon Resource Name (ARN) for the agreement.
           type: string
@@ -1030,25 +1048,28 @@ components:
         - VPC_ENDPOINT
     IdentityProviderDetails:
       type: object
-      description: You can provide a structure that contains the details for the identity provider to use with your web app.
       properties:
-        ApplicationArn:
-          type: string
-          maxLength: 1224
-          minLength: 10
-          pattern: ^arn:[\w-]+:sso::\d{12}:application/(sso)?ins-[a-zA-Z0-9-.]{16}/apl-[a-zA-Z0-9]{16}$
-        InstanceArn:
+        Url:
           type: string
-          description: The Amazon Resource Name (ARN) for the IAM Identity Center used for the web app.
-          maxLength: 1224
-          minLength: 10
-          pattern: ^arn:[\w-]+:sso:::instance/(sso)?ins-[a-zA-Z0-9-.]{16}$
-        Role:
+          maxLength: 255
+          minLength: 0
+        InvocationRole:
           type: string
-          description: The IAM role in IAM Identity Center used for the web app.
           maxLength: 2048
           minLength: 20
-          pattern: ^arn:[a-z-]+:iam::[0-9]{12}:role[:/]\S+$
+          pattern: ^arn:.*role/\S+$
+        DirectoryId:
+          type: string
+          maxLength: 12
+          minLength: 12
+          pattern: ^d-[0-9a-f]{10}$
+        Function:
+          type: string
+          maxLength: 170
+          minLength: 1
+          pattern: ^arn:[a-z-]+:lambda:.*$
+        SftpAuthenticationMethods:
+          $ref: '#/components/schemas/SftpAuthenticationMethods'
       additionalProperties: false
     IdentityProviderType:
       type: string
@@ -1115,6 +1136,21 @@ components:
         - STOPPING
         - START_FAILED
         - STOP_FAILED
+    Server_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          maxLength: 128
+          minLength: 0
+        Value:
+          type: string
+          maxLength: 256
+          minLength: 0
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     TlsSessionResumptionMode:
       type: string
       enum:
@@ -1239,7 +1275,7 @@ components:
           type: array
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/Server_Tag'
           maxItems: 50
           minItems: 1
         WorkflowDetails:
@@ -1395,6 +1431,21 @@ components:
         - Gid
         - Uid
       additionalProperties: false
+    User_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          maxLength: 128
+          minLength: 0
+        Value:
+          type: string
+          maxLength: 256
+          minLength: 0
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     User:
       type: object
       properties:
@@ -1446,7 +1497,7 @@ components:
           type: array
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/User_Tag'
           maxItems: 50
           minItems: 1
         UserName:
@@ -1506,6 +1557,44 @@ components:
           - transfer:DeleteUser
         list:
           - transfer:ListUsers
+    WebApp_IdentityProviderDetails:
+      type: object
+      description: You can provide a structure that contains the details for the identity provider to use with your web app.
+      properties:
+        ApplicationArn:
+          type: string
+          maxLength: 1224
+          minLength: 10
+          pattern: ^arn:[\w-]+:sso::\d{12}:application/(sso)?ins-[a-zA-Z0-9-.]{16}/apl-[a-zA-Z0-9]{16}$
+        InstanceArn:
+          type: string
+          description: The Amazon Resource Name (ARN) for the IAM Identity Center used for the web app.
+          maxLength: 1224
+          minLength: 10
+          pattern: ^arn:[\w-]+:sso:::instance/(sso)?ins-[a-zA-Z0-9-.]{16}$
+        Role:
+          type: string
+          description: The IAM role in IAM Identity Center used for the web app.
+          maxLength: 2048
+          minLength: 20
+          pattern: ^arn:[a-z-]+:iam::[0-9]{12}:role[:/]\S+$
+      additionalProperties: false
+    WebApp_Tag:
+      type: object
+      description: Key-value pair that can be used to group and search for web apps.
+      properties:
+        Key:
+          type: string
+          maxLength: 128
+          minLength: 0
+        Value:
+          type: string
+          maxLength: 256
+          minLength: 0
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     WebAppCustomization:
       type: object
       properties:
@@ -1558,7 +1647,7 @@ components:
           minLength: 24
           maxLength: 24
         IdentityProviderDetails:
-          $ref: '#/components/schemas/IdentityProviderDetails'
+          $ref: '#/components/schemas/WebApp_IdentityProviderDetails'
         AccessEndpoint:
           description: The AccessEndpoint is the URL that you provide to your users for them to interact with the Transfer Family web app. You can specify a custom URL or use the default value.
           type: string
@@ -1576,7 +1665,7 @@ components:
           maxItems: 50
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/WebApp_Tag'
       required:
         - IdentityProviderDetails
       x-stackql-resource-name: web_app
@@ -2120,7 +2209,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Certificate_Tag'
             Arn:
               description: Specifies the unique Amazon Resource Name (ARN) for the agreement.
               type: string
@@ -2473,7 +2562,7 @@ components:
               type: array
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/Server_Tag'
               maxItems: 50
               minItems: 1
             WorkflowDetails:
@@ -2543,7 +2632,7 @@ components:
               type: array
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/User_Tag'
               maxItems: 50
               minItems: 1
             UserName:
@@ -2581,7 +2670,7 @@ components:
               minLength: 24
               maxLength: 24
             IdentityProviderDetails:
-              $ref: '#/components/schemas/IdentityProviderDetails'
+              $ref: '#/components/schemas/WebApp_IdentityProviderDetails'
             AccessEndpoint:
               description: The AccessEndpoint is the URL that you provide to your users for them to interact with the Transfer Family web app. You can specify a custom URL or use the default value.
               type: string
@@ -2599,7 +2688,7 @@ components:
               maxItems: 50
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/WebApp_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateWebAppRequest
       type: object
@@ -2676,7 +2765,7 @@ components:
       id: awscc.transfer.agreements
       x-cfn-schema-name: Agreement
       x-cfn-type-name: AWS::Transfer::Agreement
-      x-identifiers:
+      x-identifiers: &ref_0
         - AgreementId
         - ServerId
       x-type: cloud_control
@@ -2787,9 +2876,7 @@ components:
       id: awscc.transfer.agreements_list_only
       x-cfn-schema-name: Agreement
       x-cfn-type-name: AWS::Transfer::Agreement
-      x-identifiers:
-        - AgreementId
-        - ServerId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2821,7 +2908,7 @@ components:
       id: awscc.transfer.certificates
       x-cfn-schema-name: Certificate
       x-cfn-type-name: AWS::Transfer::Certificate
-      x-identifiers:
+      x-identifiers: &ref_1
         - CertificateId
       x-type: cloud_control
       methods:
@@ -2935,8 +3022,7 @@ components:
       id: awscc.transfer.certificates_list_only
       x-cfn-schema-name: Certificate
       x-cfn-type-name: AWS::Transfer::Certificate
-      x-identifiers:
-        - CertificateId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2966,7 +3052,7 @@ components:
       id: awscc.transfer.connectors
       x-cfn-schema-name: Connector
       x-cfn-type-name: AWS::Transfer::Connector
-      x-identifiers:
+      x-identifiers: &ref_2
         - ConnectorId
       x-type: cloud_control
       methods:
@@ -3070,8 +3156,7 @@ components:
       id: awscc.transfer.connectors_list_only
       x-cfn-schema-name: Connector
       x-cfn-type-name: AWS::Transfer::Connector
-      x-identifiers:
-        - ConnectorId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3101,7 +3186,7 @@ components:
       id: awscc.transfer.profiles
       x-cfn-schema-name: Profile
       x-cfn-type-name: AWS::Transfer::Profile
-      x-identifiers:
+      x-identifiers: &ref_3
         - ProfileId
       x-type: cloud_control
       methods:
@@ -3197,8 +3282,7 @@ components:
       id: awscc.transfer.profiles_list_only
       x-cfn-schema-name: Profile
       x-cfn-type-name: AWS::Transfer::Profile
-      x-identifiers:
-        - ProfileId
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3228,7 +3312,7 @@ components:
       id: awscc.transfer.servers
       x-cfn-schema-name: Server
       x-cfn-type-name: AWS::Transfer::Server
-      x-identifiers:
+      x-identifiers: &ref_4
         - Arn
       x-type: cloud_control
       methods:
@@ -3354,8 +3438,7 @@ components:
       id: awscc.transfer.servers_list_only
       x-cfn-schema-name: Server
       x-cfn-type-name: AWS::Transfer::Server
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3385,7 +3468,7 @@ components:
       id: awscc.transfer.users
       x-cfn-schema-name: User
       x-cfn-type-name: AWS::Transfer::User
-      x-identifiers:
+      x-identifiers: &ref_5
         - Arn
       x-type: cloud_control
       methods:
@@ -3491,8 +3574,7 @@ components:
       id: awscc.transfer.users_list_only
       x-cfn-schema-name: User
       x-cfn-type-name: AWS::Transfer::User
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3522,7 +3604,7 @@ components:
       id: awscc.transfer.web_apps
       x-cfn-schema-name: WebApp
       x-cfn-type-name: AWS::Transfer::WebApp
-      x-identifiers:
+      x-identifiers: &ref_6
         - Arn
       x-type: cloud_control
       methods:
@@ -3622,8 +3704,7 @@ components:
       id: awscc.transfer.web_apps_list_only
       x-cfn-schema-name: WebApp
       x-cfn-type-name: AWS::Transfer::WebApp
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3653,7 +3734,7 @@ components:
       id: awscc.transfer.workflows
       x-cfn-schema-name: Workflow
       x-cfn-type-name: AWS::Transfer::Workflow
-      x-identifiers:
+      x-identifiers: &ref_7
         - WorkflowId
       x-type: cloud_control
       methods:
@@ -3749,8 +3830,7 @@ components:
       id: awscc.transfer.workflows_list_only
       x-cfn-schema-name: Workflow
       x-cfn-type-name: AWS::Transfer::Workflow
-      x-identifiers:
-        - WorkflowId
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/verifiedpermissions.yaml b/openapi/src/awscc/v00.00.00000/services/verifiedpermissions.yaml
index ec6677247..10e009092 100644
--- a/openapi/src/awscc/v00.00.00000/services/verifiedpermissions.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/verifiedpermissions.yaml
@@ -1104,7 +1104,7 @@ components:
       id: awscc.verifiedpermissions.identity_sources
       x-cfn-schema-name: IdentitySource
       x-cfn-type-name: AWS::VerifiedPermissions::IdentitySource
-      x-identifiers:
+      x-identifiers: &ref_0
         - IdentitySourceId
         - PolicyStoreId
       x-type: cloud_control
@@ -1199,9 +1199,7 @@ components:
       id: awscc.verifiedpermissions.identity_sources_list_only
       x-cfn-schema-name: IdentitySource
       x-cfn-type-name: AWS::VerifiedPermissions::IdentitySource
-      x-identifiers:
-        - IdentitySourceId
-        - PolicyStoreId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1233,7 +1231,7 @@ components:
       id: awscc.verifiedpermissions.policies
       x-cfn-schema-name: Policy
       x-cfn-type-name: AWS::VerifiedPermissions::Policy
-      x-identifiers:
+      x-identifiers: &ref_1
         - PolicyId
         - PolicyStoreId
       x-type: cloud_control
@@ -1326,9 +1324,7 @@ components:
       id: awscc.verifiedpermissions.policies_list_only
       x-cfn-schema-name: Policy
       x-cfn-type-name: AWS::VerifiedPermissions::Policy
-      x-identifiers:
-        - PolicyId
-        - PolicyStoreId
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1360,7 +1356,7 @@ components:
       id: awscc.verifiedpermissions.policy_stores
       x-cfn-schema-name: PolicyStore
       x-cfn-type-name: AWS::VerifiedPermissions::PolicyStore
-      x-identifiers:
+      x-identifiers: &ref_2
         - PolicyStoreId
       x-type: cloud_control
       methods:
@@ -1458,8 +1454,7 @@ components:
       id: awscc.verifiedpermissions.policy_stores_list_only
       x-cfn-schema-name: PolicyStore
       x-cfn-type-name: AWS::VerifiedPermissions::PolicyStore
-      x-identifiers:
-        - PolicyStoreId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1489,7 +1484,7 @@ components:
       id: awscc.verifiedpermissions.policy_templates
       x-cfn-schema-name: PolicyTemplate
       x-cfn-type-name: AWS::VerifiedPermissions::PolicyTemplate
-      x-identifiers:
+      x-identifiers: &ref_3
         - PolicyStoreId
         - PolicyTemplateId
       x-type: cloud_control
@@ -1582,9 +1577,7 @@ components:
       id: awscc.verifiedpermissions.policy_templates_list_only
       x-cfn-schema-name: PolicyTemplate
       x-cfn-type-name: AWS::VerifiedPermissions::PolicyTemplate
-      x-identifiers:
-        - PolicyStoreId
-        - PolicyTemplateId
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/voiceid.yaml b/openapi/src/awscc/v00.00.00000/services/voiceid.yaml
index c647f06b6..43d1b2cf5 100644
--- a/openapi/src/awscc/v00.00.00000/services/voiceid.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/voiceid.yaml
@@ -549,7 +549,7 @@ components:
       id: awscc.voiceid.domains
       x-cfn-schema-name: Domain
       x-cfn-type-name: AWS::VoiceID::Domain
-      x-identifiers:
+      x-identifiers: &ref_0
         - DomainId
       x-type: cloud_control
       methods:
@@ -643,8 +643,7 @@ components:
       id: awscc.voiceid.domains_list_only
       x-cfn-schema-name: Domain
       x-cfn-type-name: AWS::VoiceID::Domain
-      x-identifiers:
-        - DomainId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/vpclattice.yaml b/openapi/src/awscc/v00.00.00000/services/vpclattice.yaml
index 2c869f2d4..95ce47251 100644
--- a/openapi/src/awscc/v00.00.00000/services/vpclattice.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/vpclattice.yaml
@@ -635,7 +635,7 @@ components:
         Weight:
           type: integer
           maximum: 999
-          minimum: 1
+          minimum: 0
       required:
         - TargetGroupIdentifier
       additionalProperties: false
@@ -778,6 +778,20 @@ components:
       pattern: ^arn.*
       type: string
       maxLength: 1224
+    ResourceConfiguration_Tag:
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          minLength: 1
+          type: string
+          maxLength: 256
+        Key:
+          minLength: 1
+          type: string
+          maxLength: 128
+      required:
+        - Key
     Id:
       minLength: 22
       pattern: ^rcfg-[0-9a-z]{17}$
@@ -854,7 +868,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ResourceConfiguration_Tag'
         Name:
           minLength: 3
           pattern: ^(?!rcfg-)(?![-])(?!.*[-]$)(?!.*[-]{2})[a-z0-9-]+$
@@ -917,6 +931,20 @@ components:
           - vpc-lattice:DeleteResourceConfiguration
           - vpc-lattice:GetResourceConfiguration
           - vpc-lattice:UntagResource
+    ResourceGateway_Tag:
+      additionalProperties: false
+      type: object
+      properties:
+        Value:
+          minLength: 1
+          type: string
+          maxLength: 256
+        Key:
+          minLength: 1
+          type: string
+          maxLength: 128
+      required:
+        - Key
     ResourceGateway:
       type: object
       properties:
@@ -977,7 +1005,7 @@ components:
           x-insertionOrder: false
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ResourceGateway_Tag'
         Name:
           minLength: 3
           pattern: ^(?!rgw-)(?![-])(?!.*[-]$)(?!.*[-]{2})[a-z0-9-]+$
@@ -1080,6 +1108,19 @@ components:
         delete:
           - vpc-lattice:GetResourcePolicy
           - vpc-lattice:DeleteResourcePolicy
+    Rule_Forward:
+      type: object
+      properties:
+        TargetGroups:
+          type: array
+          items:
+            $ref: '#/components/schemas/Rule_WeightedTargetGroup'
+          maxItems: 10
+          minItems: 1
+          x-insertionOrder: false
+      required:
+        - TargetGroups
+      additionalProperties: false
     HeaderMatch:
       type: object
       properties:
@@ -1165,7 +1206,7 @@ components:
       x-title: Forward
       properties:
         Forward:
-          $ref: '#/components/schemas/Forward'
+          $ref: '#/components/schemas/Rule_Forward'
         FixedResponse:
           $ref: '#/components/schemas/FixedResponse'
       required: []
@@ -1179,6 +1220,21 @@ components:
       required:
         - HttpMatch
       additionalProperties: false
+    Rule_WeightedTargetGroup:
+      type: object
+      properties:
+        TargetGroupIdentifier:
+          type: string
+          maxLength: 2048
+          minLength: 20
+          pattern: ^((tg-[0-9a-z]{17})|(arn:[a-z0-9\-]+:vpc-lattice:[a-zA-Z0-9\-]+:\d{12}:targetgroup/tg-[0-9a-z]{17}))$
+        Weight:
+          type: integer
+          maximum: 999
+          minimum: 1
+      required:
+        - TargetGroupIdentifier
+      additionalProperties: false
     Rule:
       type: object
       properties:
@@ -1487,6 +1543,22 @@ components:
           - vpc-lattice:UntagResource
         list:
           - vpc-lattice:ListServiceNetworks
+    ServiceNetworkResourceAssociation_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          minLength: 1
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     ServiceNetworkResourceAssociation:
       type: object
       properties:
@@ -1517,7 +1589,7 @@ components:
           minItems: 0
           maxItems: 50
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/ServiceNetworkResourceAssociation_Tag'
       x-stackql-resource-name: service_network_resource_association
       description: VpcLattice ServiceNetworkResourceAssociation CFN resource
       x-type-name: AWS::VpcLattice::ServiceNetworkResourceAssociation
@@ -2303,7 +2375,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ResourceConfiguration_Tag'
             Name:
               minLength: 3
               pattern: ^(?!rcfg-)(?![-])(?!.*[-]$)(?!.*[-]{2})[a-z0-9-]+$
@@ -2383,7 +2455,7 @@ components:
               x-insertionOrder: false
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ResourceGateway_Tag'
             Name:
               minLength: 3
               pattern: ^(?!rgw-)(?![-])(?!.*[-]$)(?!.*[-]{2})[a-z0-9-]+$
@@ -2635,7 +2707,7 @@ components:
               minItems: 0
               maxItems: 50
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/ServiceNetworkResourceAssociation_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateServiceNetworkResourceAssociationRequest
       type: object
@@ -2894,7 +2966,7 @@ components:
       id: awscc.vpclattice.access_log_subscriptions
       x-cfn-schema-name: AccessLogSubscription
       x-cfn-type-name: AWS::VpcLattice::AccessLogSubscription
-      x-identifiers:
+      x-identifiers: &ref_0
         - Arn
       x-type: cloud_control
       methods:
@@ -2994,8 +3066,7 @@ components:
       id: awscc.vpclattice.access_log_subscriptions_list_only
       x-cfn-schema-name: AccessLogSubscription
       x-cfn-type-name: AWS::VpcLattice::AccessLogSubscription
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3115,7 +3186,7 @@ components:
       id: awscc.vpclattice.listeners
       x-cfn-schema-name: Listener
       x-cfn-type-name: AWS::VpcLattice::Listener
-      x-identifiers:
+      x-identifiers: &ref_1
         - Arn
       x-type: cloud_control
       methods:
@@ -3219,8 +3290,7 @@ components:
       id: awscc.vpclattice.listeners_list_only
       x-cfn-schema-name: Listener
       x-cfn-type-name: AWS::VpcLattice::Listener
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3250,7 +3320,7 @@ components:
       id: awscc.vpclattice.resource_configurations
       x-cfn-schema-name: ResourceConfiguration
       x-cfn-type-name: AWS::VpcLattice::ResourceConfiguration
-      x-identifiers:
+      x-identifiers: &ref_2
         - Arn
       x-type: cloud_control
       methods:
@@ -3358,8 +3428,7 @@ components:
       id: awscc.vpclattice.resource_configurations_list_only
       x-cfn-schema-name: ResourceConfiguration
       x-cfn-type-name: AWS::VpcLattice::ResourceConfiguration
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3389,7 +3458,7 @@ components:
       id: awscc.vpclattice.resource_gateways
       x-cfn-schema-name: ResourceGateway
       x-cfn-type-name: AWS::VpcLattice::ResourceGateway
-      x-identifiers:
+      x-identifiers: &ref_3
         - Arn
       x-type: cloud_control
       methods:
@@ -3491,8 +3560,7 @@ components:
       id: awscc.vpclattice.resource_gateways_list_only
       x-cfn-schema-name: ResourceGateway
       x-cfn-type-name: AWS::VpcLattice::ResourceGateway
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3610,7 +3678,7 @@ components:
       id: awscc.vpclattice.rules
       x-cfn-schema-name: Rule
       x-cfn-type-name: AWS::VpcLattice::Rule
-      x-identifiers:
+      x-identifiers: &ref_4
         - Arn
       x-type: cloud_control
       methods:
@@ -3712,8 +3780,7 @@ components:
       id: awscc.vpclattice.rules_list_only
       x-cfn-schema-name: Rule
       x-cfn-type-name: AWS::VpcLattice::Rule
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3743,7 +3810,7 @@ components:
       id: awscc.vpclattice.services
       x-cfn-schema-name: Service
       x-cfn-type-name: AWS::VpcLattice::Service
-      x-identifiers:
+      x-identifiers: &ref_5
         - Arn
       x-type: cloud_control
       methods:
@@ -3849,8 +3916,7 @@ components:
       id: awscc.vpclattice.services_list_only
       x-cfn-schema-name: Service
       x-cfn-type-name: AWS::VpcLattice::Service
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3880,7 +3946,7 @@ components:
       id: awscc.vpclattice.service_networks
       x-cfn-schema-name: ServiceNetwork
       x-cfn-type-name: AWS::VpcLattice::ServiceNetwork
-      x-identifiers:
+      x-identifiers: &ref_6
         - Arn
       x-type: cloud_control
       methods:
@@ -3980,8 +4046,7 @@ components:
       id: awscc.vpclattice.service_networks_list_only
       x-cfn-schema-name: ServiceNetwork
       x-cfn-type-name: AWS::VpcLattice::ServiceNetwork
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4011,7 +4076,7 @@ components:
       id: awscc.vpclattice.service_network_resource_associations
       x-cfn-schema-name: ServiceNetworkResourceAssociation
       x-cfn-type-name: AWS::VpcLattice::ServiceNetworkResourceAssociation
-      x-identifiers:
+      x-identifiers: &ref_7
         - Arn
       x-type: cloud_control
       methods:
@@ -4105,8 +4170,7 @@ components:
       id: awscc.vpclattice.service_network_resource_associations_list_only
       x-cfn-schema-name: ServiceNetworkResourceAssociation
       x-cfn-type-name: AWS::VpcLattice::ServiceNetworkResourceAssociation
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4136,7 +4200,7 @@ components:
       id: awscc.vpclattice.service_network_service_associations
       x-cfn-schema-name: ServiceNetworkServiceAssociation
       x-cfn-type-name: AWS::VpcLattice::ServiceNetworkServiceAssociation
-      x-identifiers:
+      x-identifiers: &ref_8
         - Arn
       x-type: cloud_control
       methods:
@@ -4248,8 +4312,7 @@ components:
       id: awscc.vpclattice.service_network_service_associations_list_only
       x-cfn-schema-name: ServiceNetworkServiceAssociation
       x-cfn-type-name: AWS::VpcLattice::ServiceNetworkServiceAssociation
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4279,7 +4342,7 @@ components:
       id: awscc.vpclattice.service_network_vpc_associations
       x-cfn-schema-name: ServiceNetworkVpcAssociation
       x-cfn-type-name: AWS::VpcLattice::ServiceNetworkVpcAssociation
-      x-identifiers:
+      x-identifiers: &ref_9
         - Arn
       x-type: cloud_control
       methods:
@@ -4387,8 +4450,7 @@ components:
       id: awscc.vpclattice.service_network_vpc_associations_list_only
       x-cfn-schema-name: ServiceNetworkVpcAssociation
       x-cfn-type-name: AWS::VpcLattice::ServiceNetworkVpcAssociation
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4418,7 +4480,7 @@ components:
       id: awscc.vpclattice.target_groups
       x-cfn-schema-name: TargetGroup
       x-cfn-type-name: AWS::VpcLattice::TargetGroup
-      x-identifiers:
+      x-identifiers: &ref_10
         - Arn
       x-type: cloud_control
       methods:
@@ -4522,8 +4584,7 @@ components:
       id: awscc.vpclattice.target_groups_list_only
       x-cfn-schema-name: TargetGroup
       x-cfn-type-name: AWS::VpcLattice::TargetGroup
-      x-identifiers:
-        - Arn
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/wafv2.yaml b/openapi/src/awscc/v00.00.00000/services/wafv2.yaml
index 688e58117..5b6d94fb0 100644
--- a/openapi/src/awscc/v00.00.00000/services/wafv2.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/wafv2.yaml
@@ -391,7 +391,7 @@ components:
       type: object
   schemas:
     EntityName:
-      description: Name of the WebACL.
+      description: Name of the IPSet.
       type: string
       pattern: ^[0-9A-Za-z_-]{1,128}$
     EntityDescription:
@@ -399,11 +399,11 @@ components:
       type: string
       pattern: ^[a-zA-Z0-9=:#@/\-,.][a-zA-Z0-9+=:#@/\-,.\s]+[a-zA-Z0-9+=:#@/\-,.]{1,256}$
     EntityId:
-      description: Id of the WebACL
+      description: Id of the IPSet
       type: string
       pattern: ^[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$
     Scope:
-      description: Use CLOUDFRONT for CloudFront WebACL, use REGIONAL for Application Load Balancer and API Gateway.
+      description: Use CLOUDFRONT for CloudFront IPSet, use REGIONAL for Application Load Balancer and API Gateway.
       type: string
       enum:
         - CLOUDFRONT
@@ -420,9 +420,8 @@ components:
       maxLength: 50
       minLength: 1
     ResourceArn:
+      description: ARN of the WAF entity.
       type: string
-      minLength: 20
-      maxLength: 2048
     Tag:
       type: object
       properties:
@@ -570,53 +569,29 @@ components:
           required:
             - LabelName
     FieldToMatch:
-      description: Field of the request to match.
+      description: A key-value pair to associate with a resource.
       type: object
+      additionalProperties: false
       properties:
+        Method:
+          description: 'Inspect the HTTP method. The method indicates the type of operation that the request is asking the origin to perform. '
+          type: object
+        QueryString:
+          type: object
+          description: 'Inspect the query string. This is the part of a URL that appears after a ? character, if any. '
         SingleHeader:
+          description: Inspect a single header. Provide the name of the header to inspect, for example, User-Agent or Referer. This setting isn't case sensitive.
           type: object
-          properties:
-            Name:
-              type: string
-          required:
-            - Name
           additionalProperties: false
-        SingleQueryArgument:
-          description: One query argument in a web request, identified by name, for example UserName or SalesRegion. The name can be up to 30 characters long and isn't case sensitive.
-          type: object
           properties:
             Name:
+              description: The name of the query header to inspect.
               type: string
           required:
             - Name
-          additionalProperties: false
-        AllQueryArguments:
-          description: All query arguments of a web request.
-          type: object
         UriPath:
-          description: The path component of the URI of a web request. This is the part of a web request that identifies a resource, for example, /images/daily-ad.jpg.
-          type: object
-        QueryString:
-          description: The query string of a web request. This is the part of a URL that appears after a ? character, if any.
           type: object
-        Body:
-          $ref: '#/components/schemas/Body'
-        Method:
-          description: The HTTP method of a web request. The method indicates the type of operation that the request is asking the origin to perform.
-          type: object
-        JsonBody:
-          $ref: '#/components/schemas/JsonBody'
-        Headers:
-          $ref: '#/components/schemas/Headers'
-        Cookies:
-          $ref: '#/components/schemas/Cookies'
-        JA3Fingerprint:
-          $ref: '#/components/schemas/JA3Fingerprint'
-        JA4Fingerprint:
-          $ref: '#/components/schemas/JA4Fingerprint'
-        UriFragment:
-          $ref: '#/components/schemas/UriFragment'
-      additionalProperties: false
+          description: 'Inspect the request URI path. This is the part of a web request that identifies a resource, for example, /images/daily-ad.jpg. '
     LoggingConfiguration:
       type: object
       properties:
@@ -812,7 +787,7 @@ components:
         SearchStringBase64:
           $ref: '#/components/schemas/SearchStringBase64'
         FieldToMatch:
-          $ref: '#/components/schemas/FieldToMatch'
+          $ref: '#/components/schemas/RuleGroup_FieldToMatch'
         TextTransformations:
           type: array
           items:
@@ -824,6 +799,58 @@ components:
         - PositionalConstraint
         - TextTransformations
       additionalProperties: false
+    RuleGroup_EntityName:
+      description: Name of the RuleGroup.
+      type: string
+      pattern: ^[0-9A-Za-z_-]{1,128}$
+    RuleGroup_FieldToMatch:
+      description: Field of the request to match.
+      type: object
+      properties:
+        SingleHeader:
+          type: object
+          properties:
+            Name:
+              type: string
+          required:
+            - Name
+          additionalProperties: false
+        SingleQueryArgument:
+          description: One query argument in a web request, identified by name, for example UserName or SalesRegion. The name can be up to 30 characters long and isn't case sensitive.
+          type: object
+          properties:
+            Name:
+              type: string
+          required:
+            - Name
+          additionalProperties: false
+        AllQueryArguments:
+          description: All query arguments of a web request.
+          type: object
+        UriPath:
+          description: The path component of the URI of a web request. This is the part of a web request that identifies a resource, for example, /images/daily-ad.jpg.
+          type: object
+        QueryString:
+          description: The query string of a web request. This is the part of a URL that appears after a ? character, if any.
+          type: object
+        Body:
+          $ref: '#/components/schemas/Body'
+        Method:
+          description: The HTTP method of a web request. The method indicates the type of operation that the request is asking the origin to perform.
+          type: object
+        JsonBody:
+          $ref: '#/components/schemas/JsonBody'
+        Headers:
+          $ref: '#/components/schemas/Headers'
+        Cookies:
+          $ref: '#/components/schemas/Cookies'
+        JA3Fingerprint:
+          $ref: '#/components/schemas/JA3Fingerprint'
+        JA4Fingerprint:
+          $ref: '#/components/schemas/JA4Fingerprint'
+        UriFragment:
+          $ref: '#/components/schemas/UriFragment'
+      additionalProperties: false
     JsonBody:
       description: Inspect the request body as JSON. The request body immediately follows the request headers.
       type: object
@@ -882,11 +909,15 @@ components:
         ForwardedIPConfig:
           $ref: '#/components/schemas/ForwardedIPConfiguration'
       additionalProperties: false
+    RuleGroup_EntityId:
+      description: Id of the RuleGroup
+      type: string
+      pattern: ^[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$
     IPSetReferenceStatement:
       type: object
       properties:
         Arn:
-          $ref: '#/components/schemas/ResourceArn'
+          $ref: '#/components/schemas/RuleGroup_ResourceArn'
         IPSetForwardedIPConfig:
           $ref: '#/components/schemas/IPSetForwardedIPConfiguration'
       required:
@@ -929,9 +960,9 @@ components:
         AggregateKeyType:
           type: string
           enum:
-            - CONSTANT
             - IP
             - FORWARDED_IP
+            - CONSTANT
             - CUSTOM_KEYS
         CustomKeys:
           description: Specifies the aggregate keys to use in a rate-base rule.
@@ -1114,9 +1145,9 @@ components:
       type: object
       properties:
         Arn:
-          $ref: '#/components/schemas/ResourceArn'
+          $ref: '#/components/schemas/RuleGroup_ResourceArn'
         FieldToMatch:
-          $ref: '#/components/schemas/FieldToMatch'
+          $ref: '#/components/schemas/RuleGroup_FieldToMatch'
         TextTransformations:
           type: array
           items:
@@ -1126,6 +1157,11 @@ components:
         - FieldToMatch
         - TextTransformations
       additionalProperties: false
+    RuleGroup_ResourceArn:
+      description: ARN of the WAF entity.
+      type: string
+      minLength: 20
+      maxLength: 2048
     ForwardedIPConfiguration:
       type: object
       properties:
@@ -1164,19 +1200,17 @@ components:
         - Position
       additionalProperties: false
     Rule:
-      description: Rule of WebACL that contains condition and action.
+      description: Rule of RuleGroup that contains condition and action.
       type: object
       properties:
         Name:
-          $ref: '#/components/schemas/EntityName'
+          $ref: '#/components/schemas/RuleGroup_EntityName'
         Priority:
           $ref: '#/components/schemas/RulePriority'
         Statement:
           $ref: '#/components/schemas/Statement'
         Action:
           $ref: '#/components/schemas/RuleAction'
-        OverrideAction:
-          $ref: '#/components/schemas/OverrideAction'
         RuleLabels:
           description: Collection of Rule Labels.
           type: array
@@ -1224,7 +1258,7 @@ components:
           $ref: '#/components/schemas/CustomResponse'
       additionalProperties: false
     CountAction:
-      description: Allow traffic towards application.
+      description: Count traffic towards application.
       type: object
       properties:
         CustomRequestHandling:
@@ -1335,22 +1369,17 @@ components:
           $ref: '#/components/schemas/CustomResponseBody'
       minProperties: 1
       additionalProperties: false
-    RuleGroup:
+    RuleGroup_RuleGroup:
       type: object
       properties:
+        Name:
+          $ref: '#/components/schemas/RuleGroup_EntityName'
+        Id:
+          $ref: '#/components/schemas/RuleGroup_EntityId'
         Arn:
-          $ref: '#/components/schemas/ResourceArn'
-        Capacity:
-          type: integer
-          minimum: 0
+          $ref: '#/components/schemas/RuleGroup_ResourceArn'
         Description:
           $ref: '#/components/schemas/EntityDescription'
-        Name:
-          $ref: '#/components/schemas/EntityName'
-        Id:
-          $ref: '#/components/schemas/EntityId'
-        Scope:
-          $ref: '#/components/schemas/Scope'
         Rules:
           description: Collection of Rules.
           type: array
@@ -1358,86 +1387,20 @@ components:
             $ref: '#/components/schemas/Rule'
         VisibilityConfig:
           $ref: '#/components/schemas/VisibilityConfig'
-        Tags:
-          type: array
-          items:
-            $ref: '#/components/schemas/Tag'
-          minItems: 1
-        LabelNamespace:
-          $ref: '#/components/schemas/LabelName'
-        CustomResponseBodies:
-          $ref: '#/components/schemas/CustomResponseBodies'
-        AvailableLabels:
-          description: Collection of Available Labels.
-          type: array
-          items:
-            $ref: '#/components/schemas/LabelSummary'
-        ConsumedLabels:
-          description: Collection of Consumed Labels.
-          type: array
-          items:
-            $ref: '#/components/schemas/LabelSummary'
-      required:
-        - Capacity
-        - Scope
-        - VisibilityConfig
-      x-stackql-resource-name: rule_group
-      description: >-
-        Contains the Rules that identify the requests that you want to allow, block, or count. In a RuleGroup, you also specify a default action (ALLOW or BLOCK), and the action for each Rule that you add to a RuleGroup, for example, block requests from specified IP addresses or block requests from specified referrers. You also associate the RuleGroup with a CloudFront distribution to identify the requests that you want AWS WAF to filter. If you add more than one Rule to a RuleGroup, a request
-        needs to match only one of the specifications to be allowed, blocked, or counted.
-      x-type-name: AWS::WAFv2::RuleGroup
-      x-stackql-primary-identifier:
-        - Name
-        - Id
-        - Scope
-      x-create-only-properties:
-        - Name
-        - Scope
-      x-read-only-properties:
-        - Arn
-        - Id
-        - LabelNamespace
-        - AvailableLabels/*/Name
-        - ConsumedLabels/*/Name
-      x-required-properties:
-        - Capacity
-        - Scope
-        - VisibilityConfig
-      x-tagging:
-        cloudFormationSystemTags: true
-        tagOnCreate: true
-        tagUpdatable: true
-        taggable: true
-        tagProperty: /properties/Tags
-        permissions:
-          - wafv2:TagResource
-          - wafv2:UntagResource
-          - wafv2:ListTagsForResource
-      x-required-permissions:
-        create:
-          - wafv2:CreateRuleGroup
-          - wafv2:GetRuleGroup
-          - wafv2:TagResource
-          - wafv2:UntagResource
-          - wafv2:ListTagsForResource
-        delete:
-          - wafv2:DeleteRuleGroup
-          - wafv2:GetRuleGroup
-        read:
-          - wafv2:GetRuleGroup
-          - wafv2:ListTagsForResource
-        update:
-          - wafv2:TagResource
-          - wafv2:UntagResource
-          - wafv2:UpdateRuleGroup
-          - wafv2:GetRuleGroup
-          - wafv2:ListTagsForResource
-        list:
-          - wafv2:listRuleGroups
+        Capacity:
+          type: integer
+          minimum: 0
+      additionalProperties: false
     RulePriority:
       description: Priority of the Rule, Rules get evaluated from lower to higher priority.
       type: integer
       minimum: 0
+    RuleGroup_Scope:
+      description: Use CLOUDFRONT for CloudFront RuleGroup, use REGIONAL for Application Load Balancer and API Gateway.
+      type: string
+      enum:
+        - CLOUDFRONT
+        - REGIONAL
     SearchString:
       description: String that is searched to find a match.
       type: string
@@ -1449,7 +1412,7 @@ components:
       type: object
       properties:
         FieldToMatch:
-          $ref: '#/components/schemas/FieldToMatch'
+          $ref: '#/components/schemas/RuleGroup_FieldToMatch'
         ComparisonOperator:
           type: string
           enum:
@@ -1478,7 +1441,7 @@ components:
       type: object
       properties:
         FieldToMatch:
-          $ref: '#/components/schemas/FieldToMatch'
+          $ref: '#/components/schemas/RuleGroup_FieldToMatch'
         TextTransformations:
           type: array
           items:
@@ -1503,14 +1466,10 @@ components:
           $ref: '#/components/schemas/SizeConstraintStatement'
         GeoMatchStatement:
           $ref: '#/components/schemas/GeoMatchStatement'
-        RuleGroupReferenceStatement:
-          $ref: '#/components/schemas/RuleGroupReferenceStatement'
         IPSetReferenceStatement:
           $ref: '#/components/schemas/IPSetReferenceStatement'
         RegexPatternSetReferenceStatement:
           $ref: '#/components/schemas/RegexPatternSetReferenceStatement'
-        ManagedRuleGroupStatement:
-          $ref: '#/components/schemas/ManagedRuleGroupStatement'
         RateBasedStatement:
           $ref: '#/components/schemas/RateBasedStatement'
         AndStatement:
@@ -1568,7 +1527,7 @@ components:
         - URL_DECODE_UNI
         - UTF8_TO_UNICODE
     VisibilityConfig:
-      description: Visibility Metric of the WebACL.
+      description: Visibility Metric of the RuleGroup.
       type: object
       properties:
         SampledRequestsEnabled:
@@ -1589,7 +1548,7 @@ components:
       type: object
       properties:
         FieldToMatch:
-          $ref: '#/components/schemas/FieldToMatch'
+          $ref: '#/components/schemas/RuleGroup_FieldToMatch'
         TextTransformations:
           type: array
           items:
@@ -1643,7 +1602,7 @@ components:
           maxLength: 512
           minLength: 1
         FieldToMatch:
-          $ref: '#/components/schemas/FieldToMatch'
+          $ref: '#/components/schemas/RuleGroup_FieldToMatch'
         TextTransformations:
           type: array
           items:
@@ -1830,6 +1789,136 @@ components:
             - MATCH
             - NO_MATCH
       additionalProperties: false
+    RuleGroup:
+      type: object
+      properties:
+        Arn:
+          $ref: '#/components/schemas/RuleGroup_ResourceArn'
+        Capacity:
+          type: integer
+          minimum: 0
+        Description:
+          $ref: '#/components/schemas/EntityDescription'
+        Name:
+          $ref: '#/components/schemas/RuleGroup_EntityName'
+        Id:
+          $ref: '#/components/schemas/RuleGroup_EntityId'
+        Scope:
+          $ref: '#/components/schemas/RuleGroup_Scope'
+        Rules:
+          description: Collection of Rules.
+          type: array
+          items:
+            $ref: '#/components/schemas/Rule'
+        VisibilityConfig:
+          $ref: '#/components/schemas/VisibilityConfig'
+        Tags:
+          type: array
+          items:
+            $ref: '#/components/schemas/Tag'
+          minItems: 1
+        LabelNamespace:
+          $ref: '#/components/schemas/LabelName'
+        CustomResponseBodies:
+          $ref: '#/components/schemas/CustomResponseBodies'
+        AvailableLabels:
+          description: Collection of Available Labels.
+          type: array
+          items:
+            $ref: '#/components/schemas/LabelSummary'
+        ConsumedLabels:
+          description: Collection of Consumed Labels.
+          type: array
+          items:
+            $ref: '#/components/schemas/LabelSummary'
+      required:
+        - Capacity
+        - Scope
+        - VisibilityConfig
+      x-stackql-resource-name: rule_group
+      description: >-
+        Contains the Rules that identify the requests that you want to allow, block, or count. In a RuleGroup, you also specify a default action (ALLOW or BLOCK), and the action for each Rule that you add to a RuleGroup, for example, block requests from specified IP addresses or block requests from specified referrers. You also associate the RuleGroup with a CloudFront distribution to identify the requests that you want AWS WAF to filter. If you add more than one Rule to a RuleGroup, a request
+        needs to match only one of the specifications to be allowed, blocked, or counted.
+      x-type-name: AWS::WAFv2::RuleGroup
+      x-stackql-primary-identifier:
+        - Name
+        - Id
+        - Scope
+      x-create-only-properties:
+        - Name
+        - Scope
+      x-read-only-properties:
+        - Arn
+        - Id
+        - LabelNamespace
+        - AvailableLabels/*/Name
+        - ConsumedLabels/*/Name
+      x-required-properties:
+        - Capacity
+        - Scope
+        - VisibilityConfig
+      x-tagging:
+        cloudFormationSystemTags: true
+        tagOnCreate: true
+        tagUpdatable: true
+        taggable: true
+        tagProperty: /properties/Tags
+        permissions:
+          - wafv2:TagResource
+          - wafv2:UntagResource
+          - wafv2:ListTagsForResource
+      x-required-permissions:
+        create:
+          - wafv2:CreateRuleGroup
+          - wafv2:GetRuleGroup
+          - wafv2:TagResource
+          - wafv2:UntagResource
+          - wafv2:ListTagsForResource
+        delete:
+          - wafv2:DeleteRuleGroup
+          - wafv2:GetRuleGroup
+        read:
+          - wafv2:GetRuleGroup
+          - wafv2:ListTagsForResource
+        update:
+          - wafv2:TagResource
+          - wafv2:UntagResource
+          - wafv2:UpdateRuleGroup
+          - wafv2:GetRuleGroup
+          - wafv2:ListTagsForResource
+        list:
+          - wafv2:listRuleGroups
+    WebACL_AndStatement:
+      type: object
+      properties:
+        Statements:
+          type: array
+          items:
+            $ref: '#/components/schemas/WebACL_Statement'
+      required:
+        - Statements
+      additionalProperties: false
+    WebACL_ByteMatchStatement:
+      description: Byte Match statement.
+      type: object
+      properties:
+        SearchString:
+          $ref: '#/components/schemas/SearchString'
+        SearchStringBase64:
+          $ref: '#/components/schemas/SearchStringBase64'
+        FieldToMatch:
+          $ref: '#/components/schemas/WebACL_FieldToMatch'
+        TextTransformations:
+          type: array
+          items:
+            $ref: '#/components/schemas/TextTransformation'
+        PositionalConstraint:
+          $ref: '#/components/schemas/PositionalConstraint'
+      required:
+        - FieldToMatch
+        - PositionalConstraint
+        - TextTransformations
+      additionalProperties: false
     DefaultAction:
       description: Default Action WebACL will take against ingress traffic when there is no matching Rule.
       type: object
@@ -1839,12 +1928,16 @@ components:
         Block:
           $ref: '#/components/schemas/BlockAction'
       additionalProperties: false
+    WebACL_EntityName:
+      description: Name of the WebACL.
+      type: string
+      pattern: ^[0-9A-Za-z_-]{1,128}$
     ExcludedRule:
       description: Excluded Rule in the RuleGroup or ManagedRuleGroup will not be evaluated.
       type: object
       properties:
         Name:
-          $ref: '#/components/schemas/EntityName'
+          $ref: '#/components/schemas/WebACL_EntityName'
       required:
         - Name
       additionalProperties: false
@@ -1853,9 +1946,9 @@ components:
       type: object
       properties:
         Name:
-          $ref: '#/components/schemas/EntityName'
+          $ref: '#/components/schemas/WebACL_EntityName'
         ActionToUse:
-          $ref: '#/components/schemas/RuleAction'
+          $ref: '#/components/schemas/WebACL_RuleAction'
       required:
         - Name
         - ActionToUse
@@ -1864,11 +1957,73 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/ExcludedRule'
+    WebACL_FieldToMatch:
+      description: Field of the request to match.
+      type: object
+      properties:
+        SingleHeader:
+          type: object
+          properties:
+            Name:
+              type: string
+          required:
+            - Name
+          additionalProperties: false
+        SingleQueryArgument:
+          description: One query argument in a web request, identified by name, for example UserName or SalesRegion. The name can be up to 30 characters long and isn't case sensitive.
+          type: object
+          properties:
+            Name:
+              type: string
+          required:
+            - Name
+          additionalProperties: false
+        AllQueryArguments:
+          description: All query arguments of a web request.
+          type: object
+        UriPath:
+          description: The path component of the URI of a web request. This is the part of a web request that identifies a resource, for example, /images/daily-ad.jpg.
+          type: object
+        QueryString:
+          description: The query string of a web request. This is the part of a URL that appears after a ? character, if any.
+          type: object
+        Body:
+          $ref: '#/components/schemas/Body'
+        Method:
+          description: The HTTP method of a web request. The method indicates the type of operation that the request is asking the origin to perform.
+          type: object
+        JsonBody:
+          $ref: '#/components/schemas/JsonBody'
+        Headers:
+          $ref: '#/components/schemas/Headers'
+        Cookies:
+          $ref: '#/components/schemas/Cookies'
+        JA3Fingerprint:
+          $ref: '#/components/schemas/JA3Fingerprint'
+        JA4Fingerprint:
+          $ref: '#/components/schemas/JA4Fingerprint'
+        UriFragment:
+          $ref: '#/components/schemas/UriFragment'
+      additionalProperties: false
+    WebACL_EntityId:
+      description: Id of the WebACL
+      type: string
+      pattern: ^[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$
+    WebACL_IPSetReferenceStatement:
+      type: object
+      properties:
+        Arn:
+          $ref: '#/components/schemas/WebACL_ResourceArn'
+        IPSetForwardedIPConfig:
+          $ref: '#/components/schemas/IPSetForwardedIPConfiguration'
+      required:
+        - Arn
+      additionalProperties: false
     ManagedRuleGroupStatement:
       type: object
       properties:
         Name:
-          $ref: '#/components/schemas/EntityName'
+          $ref: '#/components/schemas/WebACL_EntityName'
         VendorName:
           type: string
         Version:
@@ -1881,7 +2036,7 @@ components:
           items:
             $ref: '#/components/schemas/ExcludedRule'
         ScopeDownStatement:
-          $ref: '#/components/schemas/Statement'
+          $ref: '#/components/schemas/WebACL_Statement'
         ManagedRuleGroupConfigs:
           description: Collection of ManagedRuleGroupConfig.
           type: array
@@ -1891,11 +2046,29 @@ components:
           description: Action overrides for rules in the rule group.
           type: array
           items:
-            $ref: '#/components/schemas/RuleActionOverride'
-          maxItems: 100
+            $ref: '#/components/schemas/RuleActionOverride'
+          maxItems: 100
+      required:
+        - VendorName
+        - Name
+      additionalProperties: false
+    WebACL_NotStatement:
+      type: object
+      properties:
+        Statement:
+          $ref: '#/components/schemas/WebACL_Statement'
+      required:
+        - Statement
+      additionalProperties: false
+    WebACL_OrStatement:
+      type: object
+      properties:
+        Statements:
+          type: array
+          items:
+            $ref: '#/components/schemas/WebACL_Statement'
       required:
-        - VendorName
-        - Name
+        - Statements
       additionalProperties: false
     OverrideAction:
       description: Override a RuleGroup or ManagedRuleGroup behavior. This can only be applied to Rule that has RuleGroupReferenceStatement or ManagedRuleGroupReferenceStatement.
@@ -1910,16 +2083,118 @@ components:
       additionalProperties: false
     QueryString:
       type: object
+    WebACL_RateBasedStatement:
+      type: object
+      properties:
+        Limit:
+          $ref: '#/components/schemas/RateLimit'
+        EvaluationWindowSec:
+          $ref: '#/components/schemas/EvaluationWindowSec'
+        AggregateKeyType:
+          type: string
+          enum:
+            - CONSTANT
+            - IP
+            - FORWARDED_IP
+            - CUSTOM_KEYS
+        CustomKeys:
+          description: Specifies the aggregate keys to use in a rate-base rule.
+          type: array
+          items:
+            $ref: '#/components/schemas/RateBasedStatementCustomKey'
+          maxItems: 5
+        ScopeDownStatement:
+          $ref: '#/components/schemas/WebACL_Statement'
+        ForwardedIPConfig:
+          $ref: '#/components/schemas/ForwardedIPConfiguration'
+      required:
+        - Limit
+        - AggregateKeyType
+      additionalProperties: false
+    WebACL_RegexPatternSetReferenceStatement:
+      type: object
+      properties:
+        Arn:
+          $ref: '#/components/schemas/WebACL_ResourceArn'
+        FieldToMatch:
+          $ref: '#/components/schemas/WebACL_FieldToMatch'
+        TextTransformations:
+          type: array
+          items:
+            $ref: '#/components/schemas/TextTransformation'
+      required:
+        - Arn
+        - FieldToMatch
+        - TextTransformations
+      additionalProperties: false
+    WebACL_ResourceArn:
+      description: ARN of the WAF entity.
+      type: string
+      minLength: 20
+      maxLength: 2048
+    WebACL_Rule:
+      description: Rule of WebACL that contains condition and action.
+      type: object
+      properties:
+        Name:
+          $ref: '#/components/schemas/WebACL_EntityName'
+        Priority:
+          $ref: '#/components/schemas/RulePriority'
+        Statement:
+          $ref: '#/components/schemas/WebACL_Statement'
+        Action:
+          $ref: '#/components/schemas/WebACL_RuleAction'
+        OverrideAction:
+          $ref: '#/components/schemas/OverrideAction'
+        RuleLabels:
+          description: Collection of Rule Labels.
+          type: array
+          items:
+            $ref: '#/components/schemas/Label'
+        VisibilityConfig:
+          $ref: '#/components/schemas/WebACL_VisibilityConfig'
+        CaptchaConfig:
+          $ref: '#/components/schemas/CaptchaConfig'
+        ChallengeConfig:
+          $ref: '#/components/schemas/ChallengeConfig'
+      required:
+        - Name
+        - Priority
+        - Statement
+        - VisibilityConfig
+      additionalProperties: false
     Rules:
       description: Collection of Rules.
       type: array
       items:
-        $ref: '#/components/schemas/Rule'
+        $ref: '#/components/schemas/WebACL_Rule'
+    WebACL_RuleAction:
+      description: Action taken when Rule matches its condition.
+      type: object
+      properties:
+        Allow:
+          $ref: '#/components/schemas/AllowAction'
+        Block:
+          $ref: '#/components/schemas/BlockAction'
+        Count:
+          $ref: '#/components/schemas/WebACL_CountAction'
+        Captcha:
+          $ref: '#/components/schemas/CaptchaAction'
+        Challenge:
+          $ref: '#/components/schemas/ChallengeAction'
+      additionalProperties: false
+    WebACL_CountAction:
+      description: Allow traffic towards application.
+      type: object
+      properties:
+        CustomRequestHandling:
+          $ref: '#/components/schemas/CustomRequestHandling'
+      additionalProperties: false
     RuleGroupReferenceStatement:
       type: object
       properties:
         Arn:
-          $ref: '#/components/schemas/ResourceArn'
+          $ref: '#/components/schemas/WebACL_ResourceArn'
         ExcludedRules:
           type: array
           items:
@@ -1933,6 +2208,12 @@ components:
       required:
         - Arn
       additionalProperties: false
+    WebACL_Scope:
+      description: Use CLOUDFRONT for CloudFront WebACL, use REGIONAL for Application Load Balancer and API Gateway.
+      type: string
+      enum:
+        - CLOUDFRONT
+        - REGIONAL
     SingleHeader:
       type: object
       properties:
@@ -1945,8 +2226,107 @@ components:
         Name:
           type: string
       additionalProperties: false
+    WebACL_SizeConstraintStatement:
+      description: Size Constraint statement.
+      type: object
+      properties:
+        FieldToMatch:
+          $ref: '#/components/schemas/WebACL_FieldToMatch'
+        ComparisonOperator:
+          type: string
+          enum:
+            - EQ
+            - NE
+            - LE
+            - LT
+            - GE
+            - GT
+        Size:
+          type: number
+          minimum: 0
+          maximum: 21474836480
+        TextTransformations:
+          type: array
+          items:
+            $ref: '#/components/schemas/TextTransformation'
+      required:
+        - FieldToMatch
+        - ComparisonOperator
+        - Size
+        - TextTransformations
+      additionalProperties: false
+    WebACL_SqliMatchStatement:
+      description: Sqli Match Statement.
+      type: object
+      properties:
+        FieldToMatch:
+          $ref: '#/components/schemas/WebACL_FieldToMatch'
+        TextTransformations:
+          type: array
+          items:
+            $ref: '#/components/schemas/TextTransformation'
+        SensitivityLevel:
+          $ref: '#/components/schemas/SensitivityLevel'
+      required:
+        - FieldToMatch
+        - TextTransformations
+      additionalProperties: false
+    WebACL_Statement:
+      description: First level statement that contains conditions, such as ByteMatch, SizeConstraint, etc
+      type: object
+      properties:
+        ByteMatchStatement:
+          $ref: '#/components/schemas/WebACL_ByteMatchStatement'
+        SqliMatchStatement:
+          $ref: '#/components/schemas/WebACL_SqliMatchStatement'
+        XssMatchStatement:
+          $ref: '#/components/schemas/WebACL_XssMatchStatement'
+        SizeConstraintStatement:
+          $ref: '#/components/schemas/WebACL_SizeConstraintStatement'
+        GeoMatchStatement:
+          $ref: '#/components/schemas/GeoMatchStatement'
+        RuleGroupReferenceStatement:
+          $ref: '#/components/schemas/RuleGroupReferenceStatement'
+        IPSetReferenceStatement:
+          $ref: '#/components/schemas/WebACL_IPSetReferenceStatement'
+        RegexPatternSetReferenceStatement:
+          $ref: '#/components/schemas/WebACL_RegexPatternSetReferenceStatement'
+        ManagedRuleGroupStatement:
+          $ref: '#/components/schemas/ManagedRuleGroupStatement'
+        RateBasedStatement:
+          $ref: '#/components/schemas/WebACL_RateBasedStatement'
+        AndStatement:
+          $ref: '#/components/schemas/WebACL_AndStatement'
+        OrStatement:
+          $ref: '#/components/schemas/WebACL_OrStatement'
+        NotStatement:
+          $ref: '#/components/schemas/WebACL_NotStatement'
+        LabelMatchStatement:
+          $ref: '#/components/schemas/LabelMatchStatement'
+        RegexMatchStatement:
+          $ref: '#/components/schemas/WebACL_RegexMatchStatement'
+        AsnMatchStatement:
+          $ref: '#/components/schemas/AsnMatchStatement'
+      additionalProperties: false
     UriPath:
       type: object
+    WebACL_VisibilityConfig:
+      description: Visibility Metric of the WebACL.
+      type: object
+      properties:
+        SampledRequestsEnabled:
+          type: boolean
+        CloudWatchMetricsEnabled:
+          type: boolean
+        MetricName:
+          type: string
+          maxLength: 128
+          minLength: 1
+      required:
+        - SampledRequestsEnabled
+        - CloudWatchMetricsEnabled
+        - MetricName
+      additionalProperties: false
     DataProtectionConfig:
       type: object
       properties:
@@ -2006,6 +2386,38 @@ components:
       type: string
       minLength: 1
       maxLength: 64
+    WebACL_XssMatchStatement:
+      description: Xss Match Statement.
+      type: object
+      properties:
+        FieldToMatch:
+          $ref: '#/components/schemas/WebACL_FieldToMatch'
+        TextTransformations:
+          type: array
+          items:
+            $ref: '#/components/schemas/TextTransformation'
+      required:
+        - FieldToMatch
+        - TextTransformations
+      additionalProperties: false
+    WebACL_RegexMatchStatement:
+      type: object
+      properties:
+        RegexString:
+          type: string
+          maxLength: 512
+          minLength: 1
+        FieldToMatch:
+          $ref: '#/components/schemas/WebACL_FieldToMatch'
+        TextTransformations:
+          type: array
+          items:
+            $ref: '#/components/schemas/TextTransformation'
+      required:
+        - RegexString
+        - FieldToMatch
+        - TextTransformations
+      additionalProperties: false
     ManagedRuleGroupConfig:
       description: ManagedRuleGroupConfig.
       type: object
@@ -2379,7 +2791,7 @@ components:
       type: object
       properties:
         Arn:
-          $ref: '#/components/schemas/ResourceArn'
+          $ref: '#/components/schemas/WebACL_ResourceArn'
         Capacity:
           type: integer
           minimum: 0
@@ -2388,18 +2800,18 @@ components:
         Description:
           $ref: '#/components/schemas/EntityDescription'
         Name:
-          $ref: '#/components/schemas/EntityName'
+          $ref: '#/components/schemas/WebACL_EntityName'
         Id:
-          $ref: '#/components/schemas/EntityId'
+          $ref: '#/components/schemas/WebACL_EntityId'
         Scope:
-          $ref: '#/components/schemas/Scope'
+          $ref: '#/components/schemas/WebACL_Scope'
         Rules:
           description: Collection of Rules.
           type: array
           items:
-            $ref: '#/components/schemas/Rule'
+            $ref: '#/components/schemas/WebACL_Rule'
         VisibilityConfig:
-          $ref: '#/components/schemas/VisibilityConfig'
+          $ref: '#/components/schemas/WebACL_VisibilityConfig'
         DataProtectionConfig:
           description: Collection of dataProtects.
           $ref: '#/components/schemas/DataProtectionConfig'
@@ -2478,13 +2890,17 @@ components:
           - wafv2:UntagResource
         list:
           - wafv2:listWebACLs
+    WebACLAssociation_ResourceArn:
+      type: string
+      minLength: 20
+      maxLength: 2048
     WebACLAssociation:
       type: object
       properties:
         ResourceArn:
-          $ref: '#/components/schemas/ResourceArn'
+          $ref: '#/components/schemas/WebACLAssociation_ResourceArn'
         WebACLArn:
-          $ref: '#/components/schemas/ResourceArn'
+          $ref: '#/components/schemas/WebACLAssociation_ResourceArn'
       required:
         - ResourceArn
         - WebACLArn
@@ -2740,18 +3156,18 @@ components:
           type: object
           properties:
             Arn:
-              $ref: '#/components/schemas/ResourceArn'
+              $ref: '#/components/schemas/RuleGroup_ResourceArn'
             Capacity:
               type: integer
               minimum: 0
             Description:
               $ref: '#/components/schemas/EntityDescription'
             Name:
-              $ref: '#/components/schemas/EntityName'
+              $ref: '#/components/schemas/RuleGroup_EntityName'
             Id:
-              $ref: '#/components/schemas/EntityId'
+              $ref: '#/components/schemas/RuleGroup_EntityId'
             Scope:
-              $ref: '#/components/schemas/Scope'
+              $ref: '#/components/schemas/RuleGroup_Scope'
             Rules:
               description: Collection of Rules.
               type: array
@@ -2796,7 +3212,7 @@ components:
           type: object
           properties:
             Arn:
-              $ref: '#/components/schemas/ResourceArn'
+              $ref: '#/components/schemas/WebACL_ResourceArn'
             Capacity:
               type: integer
               minimum: 0
@@ -2805,18 +3221,18 @@ components:
             Description:
               $ref: '#/components/schemas/EntityDescription'
             Name:
-              $ref: '#/components/schemas/EntityName'
+              $ref: '#/components/schemas/WebACL_EntityName'
             Id:
-              $ref: '#/components/schemas/EntityId'
+              $ref: '#/components/schemas/WebACL_EntityId'
             Scope:
-              $ref: '#/components/schemas/Scope'
+              $ref: '#/components/schemas/WebACL_Scope'
             Rules:
               description: Collection of Rules.
               type: array
               items:
-                $ref: '#/components/schemas/Rule'
+                $ref: '#/components/schemas/WebACL_Rule'
             VisibilityConfig:
-              $ref: '#/components/schemas/VisibilityConfig'
+              $ref: '#/components/schemas/WebACL_VisibilityConfig'
             DataProtectionConfig:
               description: Collection of dataProtects.
               $ref: '#/components/schemas/DataProtectionConfig'
@@ -2857,9 +3273,9 @@ components:
           type: object
           properties:
             ResourceArn:
-              $ref: '#/components/schemas/ResourceArn'
+              $ref: '#/components/schemas/WebACLAssociation_ResourceArn'
             WebACLArn:
-              $ref: '#/components/schemas/ResourceArn'
+              $ref: '#/components/schemas/WebACLAssociation_ResourceArn'
           x-stackQL-stringOnly: true
       x-title: CreateWebACLAssociationRequest
       type: object
@@ -2877,7 +3293,7 @@ components:
       id: awscc.wafv2.ip_sets
       x-cfn-schema-name: IPSet
       x-cfn-type-name: AWS::WAFv2::IPSet
-      x-identifiers:
+      x-identifiers: &ref_0
         - Name
         - Id
         - Scope
@@ -2979,10 +3395,7 @@ components:
       id: awscc.wafv2.ip_sets_list_only
       x-cfn-schema-name: IPSet
       x-cfn-type-name: AWS::WAFv2::IPSet
-      x-identifiers:
-        - Name
-        - Id
-        - Scope
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3016,7 +3429,7 @@ components:
       id: awscc.wafv2.logging_configurations
       x-cfn-schema-name: LoggingConfiguration
       x-cfn-type-name: AWS::WAFv2::LoggingConfiguration
-      x-identifiers:
+      x-identifiers: &ref_1
         - ResourceArn
       x-type: cloud_control
       methods:
@@ -3110,8 +3523,7 @@ components:
       id: awscc.wafv2.logging_configurations_list_only
       x-cfn-schema-name: LoggingConfiguration
       x-cfn-type-name: AWS::WAFv2::LoggingConfiguration
-      x-identifiers:
-        - ResourceArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3141,7 +3553,7 @@ components:
       id: awscc.wafv2.regex_pattern_sets
       x-cfn-schema-name: RegexPatternSet
       x-cfn-type-name: AWS::WAFv2::RegexPatternSet
-      x-identifiers:
+      x-identifiers: &ref_2
         - Name
         - Id
         - Scope
@@ -3241,10 +3653,7 @@ components:
       id: awscc.wafv2.regex_pattern_sets_list_only
       x-cfn-schema-name: RegexPatternSet
       x-cfn-type-name: AWS::WAFv2::RegexPatternSet
-      x-identifiers:
-        - Name
-        - Id
-        - Scope
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3278,7 +3687,7 @@ components:
       id: awscc.wafv2.rule_groups
       x-cfn-schema-name: RuleGroup
       x-cfn-type-name: AWS::WAFv2::RuleGroup
-      x-identifiers:
+      x-identifiers: &ref_3
         - Name
         - Id
         - Scope
@@ -3390,10 +3799,7 @@ components:
       id: awscc.wafv2.rule_groups_list_only
       x-cfn-schema-name: RuleGroup
       x-cfn-type-name: AWS::WAFv2::RuleGroup
-      x-identifiers:
-        - Name
-        - Id
-        - Scope
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3427,7 +3833,7 @@ components:
       id: awscc.wafv2.web_acls
       x-cfn-schema-name: WebACL
       x-cfn-type-name: AWS::WAFv2::WebACL
-      x-identifiers:
+      x-identifiers: &ref_4
         - Name
         - Id
         - Scope
@@ -3549,10 +3955,7 @@ components:
       id: awscc.wafv2.web_acls_list_only
       x-cfn-schema-name: WebACL
       x-cfn-type-name: AWS::WAFv2::WebACL
-      x-identifiers:
-        - Name
-        - Id
-        - Scope
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/wisdom.yaml b/openapi/src/awscc/v00.00.00000/services/wisdom.yaml
index cccc62e6a..7ab21e6d7 100644
--- a/openapi/src/awscc/v00.00.00000/services/wisdom.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/wisdom.yaml
@@ -1375,24 +1375,21 @@ components:
           minLength: 1
       additionalProperties: false
     Tag:
-      description: A key-value pair to associate with a resource.
-      type: object
+      additionalProperties: false
       properties:
         Key:
-          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -'
-          type: string
-          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
-          minLength: 1
           maxLength: 128
-        Value:
-          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -'
-          type: string
           minLength: 1
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+          type: string
+        Value:
           maxLength: 256
+          minLength: 1
+          type: string
       required:
         - Key
         - Value
-      additionalProperties: false
+      type: object
     Assistant:
       type: object
       properties:
@@ -2321,7 +2318,7 @@ components:
           maxLength: 32767
       additionalProperties: false
     GroupingConfiguration:
-      description: The configuration information of the user groups that the quick response is accessible to.
+      description: The configuration information of the user groups that the message template is accessible to.
       type: object
       properties:
         Criteria:
@@ -2369,6 +2366,25 @@ components:
       required:
         - AttachmentName
         - S3PresignedUrl
+    MessageTemplate_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -'
+          type: string
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+          minLength: 1
+          maxLength: 128
+        Value:
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -'
+          type: string
+          minLength: 1
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     MessageTemplate:
       type: object
       properties:
@@ -2425,7 +2441,7 @@ components:
           x-insertionOrder: false
           uniqueItems: true
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/MessageTemplate_Tag'
           type: array
       required:
         - KnowledgeBaseArn
@@ -2562,6 +2578,26 @@ components:
         PlainText:
           $ref: '#/components/schemas/QuickResponseContentProvider'
       additionalProperties: false
+    QuickResponse_GroupingConfiguration:
+      description: The configuration information of the user groups that the quick response is accessible to.
+      type: object
+      properties:
+        Criteria:
+          description: The criteria used for grouping Amazon Q in Connect users.
+          type: string
+          minLength: 1
+          maxLength: 100
+        Values:
+          description: The list of values that define different groups of Amazon Q in Connect users.
+          type: array
+          items:
+            $ref: '#/components/schemas/GroupingValue'
+          x-insertionOrder: true
+          uniqueItems: true
+      required:
+        - Criteria
+        - Values
+      additionalProperties: false
     Status:
       description: The status of the quick response data.
       type: string
@@ -2574,6 +2610,25 @@ components:
         - DELETED
         - UPDATE_IN_PROGRESS
         - UPDATE_FAILED
+    QuickResponse_Tag:
+      description: A key-value pair to associate with a resource.
+      type: object
+      properties:
+        Key:
+          description: 'The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -'
+          type: string
+          pattern: ^(?!aws:)[a-zA-Z+-=._:/]+$
+          minLength: 1
+          maxLength: 128
+        Value:
+          description: 'The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -'
+          type: string
+          minLength: 1
+          maxLength: 256
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     QuickResponse:
       type: object
       properties:
@@ -2616,7 +2671,7 @@ components:
           minLength: 1
           maxLength: 255
         GroupingConfiguration:
-          $ref: '#/components/schemas/GroupingConfiguration'
+          $ref: '#/components/schemas/QuickResponse_GroupingConfiguration'
         IsActive:
           description: Whether the quick response is active.
           type: boolean
@@ -2638,7 +2693,7 @@ components:
           uniqueItems: true
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/QuickResponse_Tag'
       required:
         - KnowledgeBaseArn
         - Content
@@ -3154,7 +3209,7 @@ components:
               x-insertionOrder: false
               uniqueItems: true
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/MessageTemplate_Tag'
               type: array
           x-stackQL-stringOnly: true
       x-title: CreateMessageTemplateRequest
@@ -3245,7 +3300,7 @@ components:
               minLength: 1
               maxLength: 255
             GroupingConfiguration:
-              $ref: '#/components/schemas/GroupingConfiguration'
+              $ref: '#/components/schemas/QuickResponse_GroupingConfiguration'
             IsActive:
               description: Whether the quick response is active.
               type: boolean
@@ -3267,7 +3322,7 @@ components:
               uniqueItems: true
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/QuickResponse_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateQuickResponseRequest
       type: object
@@ -3285,7 +3340,7 @@ components:
       id: awscc.wisdom.ai_agents
       x-cfn-schema-name: AIAgent
       x-cfn-type-name: AWS::Wisdom::AIAgent
-      x-identifiers:
+      x-identifiers: &ref_0
         - AIAgentId
         - AssistantId
       x-type: cloud_control
@@ -3390,9 +3445,7 @@ components:
       id: awscc.wisdom.ai_agents_list_only
       x-cfn-schema-name: AIAgent
       x-cfn-type-name: AWS::Wisdom::AIAgent
-      x-identifiers:
-        - AIAgentId
-        - AssistantId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3424,7 +3477,7 @@ components:
       id: awscc.wisdom.ai_agent_versions
       x-cfn-schema-name: AIAgentVersion
       x-cfn-type-name: AWS::Wisdom::AIAgentVersion
-      x-identifiers:
+      x-identifiers: &ref_1
         - AssistantId
         - AIAgentId
         - VersionNumber
@@ -3524,10 +3577,7 @@ components:
       id: awscc.wisdom.ai_agent_versions_list_only
       x-cfn-schema-name: AIAgentVersion
       x-cfn-type-name: AWS::Wisdom::AIAgentVersion
-      x-identifiers:
-        - AssistantId
-        - AIAgentId
-        - VersionNumber
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3561,7 +3611,7 @@ components:
       id: awscc.wisdom.ai_guardrails
       x-cfn-schema-name: AIGuardrail
       x-cfn-type-name: AWS::Wisdom::AIGuardrail
-      x-identifiers:
+      x-identifiers: &ref_2
         - AIGuardrailId
         - AssistantId
       x-type: cloud_control
@@ -3674,9 +3724,7 @@ components:
       id: awscc.wisdom.ai_guardrails_list_only
       x-cfn-schema-name: AIGuardrail
       x-cfn-type-name: AWS::Wisdom::AIGuardrail
-      x-identifiers:
-        - AIGuardrailId
-        - AssistantId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3708,7 +3756,7 @@ components:
       id: awscc.wisdom.ai_guardrail_versions
       x-cfn-schema-name: AIGuardrailVersion
       x-cfn-type-name: AWS::Wisdom::AIGuardrailVersion
-      x-identifiers:
+      x-identifiers: &ref_3
         - AssistantId
         - AIGuardrailId
         - VersionNumber
@@ -3808,10 +3856,7 @@ components:
       id: awscc.wisdom.ai_guardrail_versions_list_only
       x-cfn-schema-name: AIGuardrailVersion
       x-cfn-type-name: AWS::Wisdom::AIGuardrailVersion
-      x-identifiers:
-        - AssistantId
-        - AIGuardrailId
-        - VersionNumber
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3845,7 +3890,7 @@ components:
       id: awscc.wisdom.ai_prompts
       x-cfn-schema-name: AIPrompt
       x-cfn-type-name: AWS::Wisdom::AIPrompt
-      x-identifiers:
+      x-identifiers: &ref_4
         - AIPromptId
         - AssistantId
       x-type: cloud_control
@@ -3956,9 +4001,7 @@ components:
       id: awscc.wisdom.ai_prompts_list_only
       x-cfn-schema-name: AIPrompt
       x-cfn-type-name: AWS::Wisdom::AIPrompt
-      x-identifiers:
-        - AIPromptId
-        - AssistantId
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3990,7 +4033,7 @@ components:
       id: awscc.wisdom.ai_prompt_versions
       x-cfn-schema-name: AIPromptVersion
       x-cfn-type-name: AWS::Wisdom::AIPromptVersion
-      x-identifiers:
+      x-identifiers: &ref_5
         - AssistantId
         - AIPromptId
         - VersionNumber
@@ -4090,10 +4133,7 @@ components:
       id: awscc.wisdom.ai_prompt_versions_list_only
       x-cfn-schema-name: AIPromptVersion
       x-cfn-type-name: AWS::Wisdom::AIPromptVersion
-      x-identifiers:
-        - AssistantId
-        - AIPromptId
-        - VersionNumber
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4127,7 +4167,7 @@ components:
       id: awscc.wisdom.assistants
       x-cfn-schema-name: Assistant
       x-cfn-type-name: AWS::Wisdom::Assistant
-      x-identifiers:
+      x-identifiers: &ref_6
         - AssistantId
       x-type: cloud_control
       methods:
@@ -4225,8 +4265,7 @@ components:
       id: awscc.wisdom.assistants_list_only
       x-cfn-schema-name: Assistant
       x-cfn-type-name: AWS::Wisdom::Assistant
-      x-identifiers:
-        - AssistantId
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4256,7 +4295,7 @@ components:
       id: awscc.wisdom.assistant_associations
       x-cfn-schema-name: AssistantAssociation
       x-cfn-type-name: AWS::Wisdom::AssistantAssociation
-      x-identifiers:
+      x-identifiers: &ref_7
         - AssistantAssociationId
         - AssistantId
       x-type: cloud_control
@@ -4355,9 +4394,7 @@ components:
       id: awscc.wisdom.assistant_associations_list_only
       x-cfn-schema-name: AssistantAssociation
       x-cfn-type-name: AWS::Wisdom::AssistantAssociation
-      x-identifiers:
-        - AssistantAssociationId
-        - AssistantId
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4389,7 +4426,7 @@ components:
       id: awscc.wisdom.knowledge_bases
       x-cfn-schema-name: KnowledgeBase
       x-cfn-type-name: AWS::Wisdom::KnowledgeBase
-      x-identifiers:
+      x-identifiers: &ref_8
         - KnowledgeBaseId
       x-type: cloud_control
       methods:
@@ -4493,8 +4530,7 @@ components:
       id: awscc.wisdom.knowledge_bases_list_only
       x-cfn-schema-name: KnowledgeBase
       x-cfn-type-name: AWS::Wisdom::KnowledgeBase
-      x-identifiers:
-        - KnowledgeBaseId
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4524,7 +4560,7 @@ components:
       id: awscc.wisdom.message_templates
       x-cfn-schema-name: MessageTemplate
       x-cfn-type-name: AWS::Wisdom::MessageTemplate
-      x-identifiers:
+      x-identifiers: &ref_9
         - MessageTemplateArn
       x-type: cloud_control
       methods:
@@ -4634,8 +4670,7 @@ components:
       id: awscc.wisdom.message_templates_list_only
       x-cfn-schema-name: MessageTemplate
       x-cfn-type-name: AWS::Wisdom::MessageTemplate
-      x-identifiers:
-        - MessageTemplateArn
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4665,7 +4700,7 @@ components:
       id: awscc.wisdom.message_template_versions
       x-cfn-schema-name: MessageTemplateVersion
       x-cfn-type-name: AWS::Wisdom::MessageTemplateVersion
-      x-identifiers:
+      x-identifiers: &ref_10
         - MessageTemplateVersionArn
       x-type: cloud_control
       methods:
@@ -4757,8 +4792,7 @@ components:
       id: awscc.wisdom.message_template_versions_list_only
       x-cfn-schema-name: MessageTemplateVersion
       x-cfn-type-name: AWS::Wisdom::MessageTemplateVersion
-      x-identifiers:
-        - MessageTemplateVersionArn
+      x-identifiers: *ref_10
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -4788,7 +4822,7 @@ components:
       id: awscc.wisdom.quick_responses
       x-cfn-schema-name: QuickResponse
       x-cfn-type-name: AWS::Wisdom::QuickResponse
-      x-identifiers:
+      x-identifiers: &ref_11
         - QuickResponseArn
       x-type: cloud_control
       methods:
@@ -4902,8 +4936,7 @@ components:
       id: awscc.wisdom.quick_responses_list_only
       x-cfn-schema-name: QuickResponse
       x-cfn-type-name: AWS::Wisdom::QuickResponse
-      x-identifiers:
-        - QuickResponseArn
+      x-identifiers: *ref_11
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/workspaces.yaml b/openapi/src/awscc/v00.00.00000/services/workspaces.yaml
index cb250fd5a..fe35cc39f 100644
--- a/openapi/src/awscc/v00.00.00000/services/workspaces.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/workspaces.yaml
@@ -416,15 +416,15 @@ components:
           pattern: ^[a-zA-Z0-9]+$
     Tag:
       type: object
+      additionalProperties: false
       properties:
         Key:
           type: string
         Value:
           type: string
       required:
-        - Key
         - Value
-      additionalProperties: false
+        - Key
     ConnectionAlias:
       type: object
       properties:
@@ -496,6 +496,17 @@ components:
           - workspaces:DeleteTags
           - workspaces:DescribeTags
           - workspaces:DescribeConnectionAliases
+    WorkspacesPool_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+        Value:
+          type: string
+      required:
+        - Key
+        - Value
+      additionalProperties: false
     ApplicationSettingsStatus:
       type: string
       enum:
@@ -584,7 +595,7 @@ components:
           uniqueItems: false
           x-insertionOrder: false
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/WorkspacesPool_Tag'
       required:
         - PoolName
         - BundleId
@@ -733,7 +744,7 @@ components:
               uniqueItems: false
               x-insertionOrder: false
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/WorkspacesPool_Tag'
           x-stackQL-stringOnly: true
       x-title: CreateWorkspacesPoolRequest
       type: object
@@ -828,7 +839,7 @@ components:
       id: awscc.workspaces.workspaces_pools
       x-cfn-schema-name: WorkspacesPool
       x-cfn-type-name: AWS::WorkSpaces::WorkspacesPool
-      x-identifiers:
+      x-identifiers: &ref_0
         - PoolId
       x-type: cloud_control
       methods:
@@ -936,8 +947,7 @@ components:
       id: awscc.workspaces.workspaces_pools_list_only
       x-cfn-schema-name: WorkspacesPool
       x-cfn-type-name: AWS::WorkSpaces::WorkspacesPool
-      x-identifiers:
-        - PoolId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/workspacesinstances.yaml b/openapi/src/awscc/v00.00.00000/services/workspacesinstances.yaml
index b6f67396a..83958c261 100644
--- a/openapi/src/awscc/v00.00.00000/services/workspacesinstances.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/workspacesinstances.yaml
@@ -395,13 +395,16 @@ components:
       properties:
         Key:
           type: string
+          description: The key name of the tag
           minLength: 1
           maxLength: 128
         Value:
           type: string
+          description: The value for the tag
           maxLength: 256
       required:
         - Key
+        - Value
       additionalProperties: false
     TagSpecification:
       type: object
@@ -417,7 +420,7 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/Tag'
-          maxItems: 30
+          description: The tags to apply to the resource
       additionalProperties: false
     Volume:
       type: object
@@ -573,6 +576,19 @@ components:
         list:
           - ec2:DescribeVolumes
           - workspaces-instances:ListWorkspaceInstances
+    WorkspaceInstance_Tag:
+      type: object
+      properties:
+        Key:
+          type: string
+          minLength: 1
+          maxLength: 128
+        Value:
+          type: string
+          maxLength: 256
+      required:
+        - Key
+      additionalProperties: false
     BlockDeviceMapping:
       type: object
       properties:
@@ -886,6 +902,22 @@ components:
         InstanceId:
           type: string
       additionalProperties: false
+    WorkspaceInstance_TagSpecification:
+      type: object
+      properties:
+        ResourceType:
+          type: string
+          enum:
+            - instance
+            - volume
+            - spot-instances-request
+            - network-interface
+        Tags:
+          type: array
+          items:
+            $ref: '#/components/schemas/WorkspaceInstance_Tag'
+          maxItems: 30
+      additionalProperties: false
     WorkspaceInstance:
       type: object
       properties:
@@ -955,7 +987,7 @@ components:
               type: array
               maxItems: 30
               items:
-                $ref: '#/components/schemas/TagSpecification'
+                $ref: '#/components/schemas/WorkspaceInstance_TagSpecification'
             UserData:
               type: string
               maxLength: 16000
@@ -966,7 +998,7 @@ components:
         Tags:
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: '#/components/schemas/WorkspaceInstance_Tag'
           maxItems: 30
         WorkspaceInstanceId:
           type: string
@@ -1217,7 +1249,7 @@ components:
                   type: array
                   maxItems: 30
                   items:
-                    $ref: '#/components/schemas/TagSpecification'
+                    $ref: '#/components/schemas/WorkspaceInstance_TagSpecification'
                 UserData:
                   type: string
                   maxLength: 16000
@@ -1228,7 +1260,7 @@ components:
             Tags:
               type: array
               items:
-                $ref: '#/components/schemas/Tag'
+                $ref: '#/components/schemas/WorkspaceInstance_Tag'
               maxItems: 30
             WorkspaceInstanceId:
               type: string
@@ -1263,7 +1295,7 @@ components:
       id: awscc.workspacesinstances.volumes
       x-cfn-schema-name: Volume
       x-cfn-type-name: AWS::WorkspacesInstances::Volume
-      x-identifiers:
+      x-identifiers: &ref_0
         - VolumeId
       x-type: cloud_control
       methods:
@@ -1350,8 +1382,7 @@ components:
       id: awscc.workspacesinstances.volumes_list_only
       x-cfn-schema-name: Volume
       x-cfn-type-name: AWS::WorkspacesInstances::Volume
-      x-identifiers:
-        - VolumeId
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1381,7 +1412,7 @@ components:
       id: awscc.workspacesinstances.volume_associations
       x-cfn-schema-name: VolumeAssociation
       x-cfn-type-name: AWS::WorkspacesInstances::VolumeAssociation
-      x-identifiers:
+      x-identifiers: &ref_1
         - WorkspaceInstanceId
         - VolumeId
         - Device
@@ -1458,10 +1489,7 @@ components:
       id: awscc.workspacesinstances.volume_associations_list_only
       x-cfn-schema-name: VolumeAssociation
       x-cfn-type-name: AWS::WorkspacesInstances::VolumeAssociation
-      x-identifiers:
-        - WorkspaceInstanceId
-        - VolumeId
-        - Device
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1495,7 +1523,7 @@ components:
       id: awscc.workspacesinstances.workspace_instances
       x-cfn-schema-name: WorkspaceInstance
       x-cfn-type-name: AWS::WorkspacesInstances::WorkspaceInstance
-      x-identifiers:
+      x-identifiers: &ref_2
         - WorkspaceInstanceId
       x-type: cloud_control
       methods:
@@ -1589,8 +1617,7 @@ components:
       id: awscc.workspacesinstances.workspace_instances_list_only
       x-cfn-schema-name: WorkspaceInstance
       x-cfn-type-name: AWS::WorkspacesInstances::WorkspaceInstance
-      x-identifiers:
-        - WorkspaceInstanceId
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/workspacesthinclient.yaml b/openapi/src/awscc/v00.00.00000/services/workspacesthinclient.yaml
index 410bad0fb..c726a7934 100644
--- a/openapi/src/awscc/v00.00.00000/services/workspacesthinclient.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/workspacesthinclient.yaml
@@ -775,7 +775,7 @@ components:
       id: awscc.workspacesthinclient.environments
       x-cfn-schema-name: Environment
       x-cfn-type-name: AWS::WorkSpacesThinClient::Environment
-      x-identifiers:
+      x-identifiers: &ref_0
         - Id
       x-type: cloud_control
       methods:
@@ -899,8 +899,7 @@ components:
       id: awscc.workspacesthinclient.environments_list_only
       x-cfn-schema-name: Environment
       x-cfn-type-name: AWS::WorkSpacesThinClient::Environment
-      x-identifiers:
-        - Id
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/workspacesweb.yaml b/openapi/src/awscc/v00.00.00000/services/workspacesweb.yaml
index 5e4a7cac9..35e970354 100644
--- a/openapi/src/awscc/v00.00.00000/services/workspacesweb.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/workspacesweb.yaml
@@ -2470,7 +2470,7 @@ components:
       id: awscc.workspacesweb.browser_settings
       x-cfn-schema-name: BrowserSettings
       x-cfn-type-name: AWS::WorkSpacesWeb::BrowserSettings
-      x-identifiers:
+      x-identifiers: &ref_0
         - BrowserSettingsArn
       x-type: cloud_control
       methods:
@@ -2566,8 +2566,7 @@ components:
       id: awscc.workspacesweb.browser_settings_list_only
       x-cfn-schema-name: BrowserSettings
       x-cfn-type-name: AWS::WorkSpacesWeb::BrowserSettings
-      x-identifiers:
-        - BrowserSettingsArn
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2597,7 +2596,7 @@ components:
       id: awscc.workspacesweb.data_protection_settings
       x-cfn-schema-name: DataProtectionSettings
       x-cfn-type-name: AWS::WorkSpacesWeb::DataProtectionSettings
-      x-identifiers:
+      x-identifiers: &ref_1
         - DataProtectionSettingsArn
       x-type: cloud_control
       methods:
@@ -2699,8 +2698,7 @@ components:
       id: awscc.workspacesweb.data_protection_settings_list_only
       x-cfn-schema-name: DataProtectionSettings
       x-cfn-type-name: AWS::WorkSpacesWeb::DataProtectionSettings
-      x-identifiers:
-        - DataProtectionSettingsArn
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2730,7 +2728,7 @@ components:
       id: awscc.workspacesweb.identity_providers
       x-cfn-schema-name: IdentityProvider
       x-cfn-type-name: AWS::WorkSpacesWeb::IdentityProvider
-      x-identifiers:
+      x-identifiers: &ref_2
         - IdentityProviderArn
       x-type: cloud_control
       methods:
@@ -2826,8 +2824,7 @@ components:
       id: awscc.workspacesweb.identity_providers_list_only
       x-cfn-schema-name: IdentityProvider
       x-cfn-type-name: AWS::WorkSpacesWeb::IdentityProvider
-      x-identifiers:
-        - IdentityProviderArn
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2857,7 +2854,7 @@ components:
       id: awscc.workspacesweb.ip_access_settings
       x-cfn-schema-name: IpAccessSettings
       x-cfn-type-name: AWS::WorkSpacesWeb::IpAccessSettings
-      x-identifiers:
+      x-identifiers: &ref_3
         - IpAccessSettingsArn
       x-type: cloud_control
       methods:
@@ -2959,8 +2956,7 @@ components:
       id: awscc.workspacesweb.ip_access_settings_list_only
       x-cfn-schema-name: IpAccessSettings
       x-cfn-type-name: AWS::WorkSpacesWeb::IpAccessSettings
-      x-identifiers:
-        - IpAccessSettingsArn
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -2990,7 +2986,7 @@ components:
       id: awscc.workspacesweb.network_settings
       x-cfn-schema-name: NetworkSettings
       x-cfn-type-name: AWS::WorkSpacesWeb::NetworkSettings
-      x-identifiers:
+      x-identifiers: &ref_4
         - NetworkSettingsArn
       x-type: cloud_control
       methods:
@@ -3086,8 +3082,7 @@ components:
       id: awscc.workspacesweb.network_settings_list_only
       x-cfn-schema-name: NetworkSettings
       x-cfn-type-name: AWS::WorkSpacesWeb::NetworkSettings
-      x-identifiers:
-        - NetworkSettingsArn
+      x-identifiers: *ref_4
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3117,7 +3112,7 @@ components:
       id: awscc.workspacesweb.portals
       x-cfn-schema-name: Portal
       x-cfn-type-name: AWS::WorkSpacesWeb::Portal
-      x-identifiers:
+      x-identifiers: &ref_5
         - PortalArn
       x-type: cloud_control
       methods:
@@ -3247,8 +3242,7 @@ components:
       id: awscc.workspacesweb.portals_list_only
       x-cfn-schema-name: Portal
       x-cfn-type-name: AWS::WorkSpacesWeb::Portal
-      x-identifiers:
-        - PortalArn
+      x-identifiers: *ref_5
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3278,7 +3272,7 @@ components:
       id: awscc.workspacesweb.session_loggers
       x-cfn-schema-name: SessionLogger
       x-cfn-type-name: AWS::WorkSpacesWeb::SessionLogger
-      x-identifiers:
+      x-identifiers: &ref_6
         - SessionLoggerArn
       x-type: cloud_control
       methods:
@@ -3380,8 +3374,7 @@ components:
       id: awscc.workspacesweb.session_loggers_list_only
       x-cfn-schema-name: SessionLogger
       x-cfn-type-name: AWS::WorkSpacesWeb::SessionLogger
-      x-identifiers:
-        - SessionLoggerArn
+      x-identifiers: *ref_6
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3411,7 +3404,7 @@ components:
       id: awscc.workspacesweb.trust_stores
       x-cfn-schema-name: TrustStore
       x-cfn-type-name: AWS::WorkSpacesWeb::TrustStore
-      x-identifiers:
+      x-identifiers: &ref_7
         - TrustStoreArn
       x-type: cloud_control
       methods:
@@ -3503,8 +3496,7 @@ components:
       id: awscc.workspacesweb.trust_stores_list_only
       x-cfn-schema-name: TrustStore
       x-cfn-type-name: AWS::WorkSpacesWeb::TrustStore
-      x-identifiers:
-        - TrustStoreArn
+      x-identifiers: *ref_7
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3534,7 +3526,7 @@ components:
       id: awscc.workspacesweb.user_access_logging_settings
       x-cfn-schema-name: UserAccessLoggingSettings
       x-cfn-type-name: AWS::WorkSpacesWeb::UserAccessLoggingSettings
-      x-identifiers:
+      x-identifiers: &ref_8
         - UserAccessLoggingSettingsArn
       x-type: cloud_control
       methods:
@@ -3626,8 +3618,7 @@ components:
       id: awscc.workspacesweb.user_access_logging_settings_list_only
       x-cfn-schema-name: UserAccessLoggingSettings
       x-cfn-type-name: AWS::WorkSpacesWeb::UserAccessLoggingSettings
-      x-identifiers:
-        - UserAccessLoggingSettingsArn
+      x-identifiers: *ref_8
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -3657,7 +3648,7 @@ components:
       id: awscc.workspacesweb.user_settings
       x-cfn-schema-name: UserSettings
       x-cfn-type-name: AWS::WorkSpacesWeb::UserSettings
-      x-identifiers:
+      x-identifiers: &ref_9
         - UserSettingsArn
       x-type: cloud_control
       methods:
@@ -3771,8 +3762,7 @@ components:
       id: awscc.workspacesweb.user_settings_list_only
       x-cfn-schema-name: UserSettings
       x-cfn-type-name: AWS::WorkSpacesWeb::UserSettings
-      x-identifiers:
-        - UserSettingsArn
+      x-identifiers: *ref_9
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/openapi/src/awscc/v00.00.00000/services/xray.yaml b/openapi/src/awscc/v00.00.00000/services/xray.yaml
index 4123d667e..893102e85 100644
--- a/openapi/src/awscc/v00.00.00000/services/xray.yaml
+++ b/openapi/src/awscc/v00.00.00000/services/xray.yaml
@@ -526,58 +526,74 @@ components:
           - xray:DeleteResourcePolicy
         list:
           - xray:ListResourcePolicies
-    SamplingRule:
+    SamplingRule_SamplingRule:
       type: object
+      additionalProperties: false
       properties:
-        SamplingRule:
-          $ref: '#/components/schemas/SamplingRule'
-        SamplingRuleRecord:
-          $ref: '#/components/schemas/SamplingRuleRecord'
-        SamplingRuleUpdate:
-          $ref: '#/components/schemas/SamplingRuleUpdate'
+        Attributes:
+          x-$comment: String to string map
+          description: Matches attributes derived from the request.
+          type: object
+          x-patternProperties:
+            .{1,}:
+              type: string
+          additionalProperties: false
+        FixedRate:
+          description: The percentage of matching requests to instrument, after the reservoir is exhausted.
+          type: number
+          minimum: 0
+          maximum: 1
+        Host:
+          description: Matches the hostname from a request URL.
+          type: string
+          maxLength: 64
+        HTTPMethod:
+          description: Matches the HTTP method from a request URL.
+          type: string
+          maxLength: 10
+        Priority:
+          description: The priority of the sampling rule.
+          type: integer
+          minimum: 1
+          maximum: 9999
+        ReservoirSize:
+          description: A fixed number of matching requests to instrument per second, prior to applying the fixed rate. The reservoir is not used directly by services, but applies to all services using the rule collectively.
+          type: integer
+          minimum: 0
+        ResourceARN:
+          description: Matches the ARN of the AWS resource on which the service runs.
+          type: string
+          maxLength: 500
         RuleARN:
           $ref: '#/components/schemas/RuleARN'
         RuleName:
           $ref: '#/components/schemas/RuleName'
-        Tags:
-          $ref: '#/components/schemas/Tags'
-      x-stackql-resource-name: sampling_rule
-      description: This schema provides construct and validation rules for AWS-XRay SamplingRule resource parameters.
-      x-type-name: AWS::XRay::SamplingRule
-      x-stackql-primary-identifier:
-        - RuleARN
-      x-create-only-properties:
-        - SamplingRule/Version
-      x-read-only-properties:
-        - RuleARN
-      x-tagging:
-        taggable: true
-        tagOnCreate: true
-        tagUpdatable: true
-        cloudFormationSystemTags: true
-        tagProperty: /properties/Tags
-        permissions:
-          - xray:TagResource
-          - xray:UntagResource
-          - xray:ListTagsForResource
-      x-required-permissions:
-        create:
-          - xray:CreateSamplingRule
-          - xray:TagResource
-          - xray:ListTagsForResource
-        read:
-          - xray:GetSamplingRules
-          - xray:ListTagsForResource
-        update:
-          - xray:UpdateSamplingRule
-          - xray:TagResource
-          - xray:UntagResource
-          - xray:ListTagsForResource
-        delete:
-          - xray:DeleteSamplingRule
-        list:
-          - xray:GetSamplingRules
-          - xray:ListTagsForResource
+        ServiceName:
+          description: Matches the name that the service uses to identify itself in segments.
+          type: string
+          maxLength: 64
+        ServiceType:
+          description: Matches the origin that the service uses to identify its type in segments.
+          type: string
+          maxLength: 64
+        URLPath:
+          description: Matches the path from a request URL.
+          type: string
+          maxLength: 128
+        Version:
+          description: The version of the sampling rule format (1)
+          type: integer
+          minimum: 1
+      required:
+        - FixedRate
+        - Host
+        - HTTPMethod
+        - Priority
+        - ReservoirSize
+        - ResourceARN
+        - ServiceName
+        - ServiceType
+        - URLPath
     SamplingRuleRecord:
       type: object
       additionalProperties: false
@@ -589,7 +605,7 @@ components:
           description: When the rule was modified, in Unix time seconds.
           type: string
         SamplingRule:
-          $ref: '#/components/schemas/SamplingRule'
+          $ref: '#/components/schemas/SamplingRule_SamplingRule'
     SamplingRuleUpdate:
       type: object
       additionalProperties: false
@@ -652,6 +668,58 @@ components:
     RuleARN:
       description: The ARN of the sampling rule. Specify a rule by either name or ARN, but not both.
       type: string
+    SamplingRule:
+      type: object
+      properties:
+        SamplingRule:
+          $ref: '#/components/schemas/SamplingRule_SamplingRule'
+        SamplingRuleRecord:
+          $ref: '#/components/schemas/SamplingRuleRecord'
+        SamplingRuleUpdate:
+          $ref: '#/components/schemas/SamplingRuleUpdate'
+        RuleARN:
+          $ref: '#/components/schemas/RuleARN'
+        RuleName:
+          $ref: '#/components/schemas/RuleName'
+        Tags:
+          $ref: '#/components/schemas/Tags'
+      x-stackql-resource-name: sampling_rule
+      description: This schema provides construct and validation rules for AWS-XRay SamplingRule resource parameters.
+      x-type-name: AWS::XRay::SamplingRule
+      x-stackql-primary-identifier:
+        - RuleARN
+      x-create-only-properties:
+        - SamplingRule/Version
+      x-read-only-properties:
+        - RuleARN
+      x-tagging:
+        taggable: true
+        tagOnCreate: true
+        tagUpdatable: true
+        cloudFormationSystemTags: true
+        tagProperty: /properties/Tags
+        permissions:
+          - xray:TagResource
+          - xray:UntagResource
+          - xray:ListTagsForResource
+      x-required-permissions:
+        create:
+          - xray:CreateSamplingRule
+          - xray:TagResource
+          - xray:ListTagsForResource
+        read:
+          - xray:GetSamplingRules
+          - xray:ListTagsForResource
+        update:
+          - xray:UpdateSamplingRule
+          - xray:TagResource
+          - xray:UntagResource
+          - xray:ListTagsForResource
+        delete:
+          - xray:DeleteSamplingRule
+        list:
+          - xray:GetSamplingRules
+          - xray:ListTagsForResource
     AccountId:
       description: User account id, used as the primary identifier for the resource
       type: string
@@ -781,7 +849,7 @@ components:
           type: object
           properties:
             SamplingRule:
-              $ref: '#/components/schemas/SamplingRule'
+              $ref: '#/components/schemas/SamplingRule_SamplingRule'
             SamplingRuleRecord:
               $ref: '#/components/schemas/SamplingRuleRecord'
             SamplingRuleUpdate:
@@ -830,7 +898,7 @@ components:
       id: awscc.xray.groups
       x-cfn-schema-name: Group
       x-cfn-type-name: AWS::XRay::Group
-      x-identifiers:
+      x-identifiers: &ref_0
         - GroupARN
       x-type: cloud_control
       methods:
@@ -924,8 +992,7 @@ components:
       id: awscc.xray.groups_list_only
       x-cfn-schema-name: Group
       x-cfn-type-name: AWS::XRay::Group
-      x-identifiers:
-        - GroupARN
+      x-identifiers: *ref_0
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -955,7 +1022,7 @@ components:
       id: awscc.xray.resource_policies
       x-cfn-schema-name: ResourcePolicy
       x-cfn-type-name: AWS::XRay::ResourcePolicy
-      x-identifiers:
+      x-identifiers: &ref_1
         - PolicyName
       x-type: cloud_control
       methods:
@@ -1045,8 +1112,7 @@ components:
       id: awscc.xray.resource_policies_list_only
       x-cfn-schema-name: ResourcePolicy
       x-cfn-type-name: AWS::XRay::ResourcePolicy
-      x-identifiers:
-        - PolicyName
+      x-identifiers: *ref_1
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1076,7 +1142,7 @@ components:
       id: awscc.xray.sampling_rules
       x-cfn-schema-name: SamplingRule
       x-cfn-type-name: AWS::XRay::SamplingRule
-      x-identifiers:
+      x-identifiers: &ref_2
         - RuleARN
       x-type: cloud_control
       methods:
@@ -1172,8 +1238,7 @@ components:
       id: awscc.xray.sampling_rules_list_only
       x-cfn-schema-name: SamplingRule
       x-cfn-type-name: AWS::XRay::SamplingRule
-      x-identifiers:
-        - RuleARN
+      x-identifiers: *ref_2
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
@@ -1203,7 +1268,7 @@ components:
       id: awscc.xray.transaction_search_configs
       x-cfn-schema-name: TransactionSearchConfig
       x-cfn-type-name: AWS::XRay::TransactionSearchConfig
-      x-identifiers:
+      x-identifiers: &ref_3
         - AccountId
       x-type: cloud_control
       methods:
@@ -1291,8 +1356,7 @@ components:
       id: awscc.xray.transaction_search_configs_list_only
       x-cfn-schema-name: TransactionSearchConfig
       x-cfn-type-name: AWS::XRay::TransactionSearchConfig
-      x-identifiers:
-        - AccountId
+      x-identifiers: *ref_3
       x-type: cloud_control_view
       methods: {}
       sqlVerbs:
diff --git a/package.json b/package.json
index 4a98763ef..2d5728c71 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,8 @@
     "start-server": "bash ./bin/start-server.sh",
     "stop-server": "bash ./bin/stop-server.sh",
     "server-status": "bash ./bin/server-status.sh",
-    "test-meta-routes": "node ./bin/test-meta-routes.cjs"
+    "test-meta-routes": "node ./bin/test-meta-routes.cjs",
+    "test-resource-coverage": "node ./bin/test-resource-coverage.js"
   },
   "type": "module",
   "repository": {
diff --git a/smoke-test/run_smoke_test.sh b/smoke-test/run_smoke_test.sh
index 178163f1d..d7ddf5e4c 100644
--- a/smoke-test/run_smoke_test.sh
+++ b/smoke-test/run_smoke_test.sh
@@ -1,157 +1,157 @@
-#!/bin/bash
-##############################################################################
-# awscc provider smoke test: INSERT, UPDATE, DELETE via stackql
-#
-# Prerequisites:
-#   - stackql binary in the repo root (download: curl -L https://bit.ly/stackql-zip -O && unzip stackql-zip)
-#   - AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY env vars set
-#   - If running in a proxied environment, GLOBAL_AGENT_HTTP_PROXY env var set
-#
-# Usage:
-#   export AWS_ACCESS_KEY_ID=...
-#   export AWS_SECRET_ACCESS_KEY=...
-#   bash smoke-test/run_smoke_test.sh
-#
-# Resource tested: awscc.ssm.parameters (AWS::SSM::Parameter via Cloud Control API)
-# Region: us-east-1
-# Estimated cost: negligible (<$0.01)
-##############################################################################
-
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-REPO_ROOT="$(dirname "$SCRIPT_DIR")"
-STACKQL="$REPO_ROOT/stackql"
-PROVIDER_REGISTRY_ROOT_DIR="$REPO_ROOT"
-REG_STR="{\"url\": \"file://${PROVIDER_REGISTRY_ROOT_DIR}/openapi\", \"localDocRoot\": \"${PROVIDER_REGISTRY_ROOT_DIR}/openapi\", \"verifyConfig\": {\"nopVerify\": true}}"
-
-REGION="us-east-1"
-PARAM_NAME="/stackql/smoke-test/param1"
-PARAM_NAME2="/stackql/smoke-test/param2"
-
-# Validate prerequisites
-if [[ ! -x "$STACKQL" ]]; then
-  echo "ERROR: stackql binary not found at $STACKQL"
-  echo "Download with: curl -L https://bit.ly/stackql-zip -O && unzip stackql-zip"
-  exit 1
-fi
-
-if [[ -z "${AWS_ACCESS_KEY_ID:-}" || -z "${AWS_SECRET_ACCESS_KEY:-}" ]]; then
-  echo "ERROR: AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY must be set"
-  exit 1
-fi
-
-# Set up proxy args (if GLOBAL_AGENT_HTTP_PROXY is set, parse and use it)
-PROXY_ARGS=""
-if [[ -n "${GLOBAL_AGENT_HTTP_PROXY:-}" ]]; then
-  PROXY_HOST=$(python3 -c "import urllib.parse, os; p=urllib.parse.urlparse(os.environ['GLOBAL_AGENT_HTTP_PROXY']); print(p.hostname)")
-  PROXY_PORT=$(python3 -c "import urllib.parse, os; p=urllib.parse.urlparse(os.environ['GLOBAL_AGENT_HTTP_PROXY']); print(p.port)")
-  PROXY_USER=$(python3 -c "import urllib.parse, os; p=urllib.parse.urlparse(os.environ['GLOBAL_AGENT_HTTP_PROXY']); print(p.username)")
-  PROXY_PASS=$(python3 -c "import urllib.parse, os; p=urllib.parse.urlparse(os.environ['GLOBAL_AGENT_HTTP_PROXY']); print(p.password)")
-  PROXY_ARGS="--http.proxy.host=$PROXY_HOST --http.proxy.port=$PROXY_PORT --http.proxy.scheme=http --http.proxy.user=$PROXY_USER --http.proxy.password=$PROXY_PASS"
-fi
-
-run_stackql() {
-  local query="$1"
-  # shellcheck disable=SC2086
-  "$STACKQL" exec \
-    --registry="$REG_STR" \
-    $PROXY_ARGS \
-    "$query" 2>&1
-}
-
-run_stackql_file() {
-  local file="$1"
-  # shellcheck disable=SC2086
-  "$STACKQL" exec \
-    --registry="$REG_STR" \
-    $PROXY_ARGS \
-    --infile "$file" 2>&1
-}
-
-PASS=0
-FAIL=0
-
-check() {
-  local name="$1"
-  local result="$2"
-  local expected_pattern="$3"
-  if echo "$result" | grep -q "$expected_pattern"; then
-    echo "  PASS: $name"
-    PASS=$((PASS + 1))
-  else
-    echo "  FAIL: $name"
-    echo "    Output: $result"
-    FAIL=$((FAIL + 1))
-  fi
-}
-
-echo ""
-echo "============================================================"
-echo "  awscc local provider smoke test"
-echo "  stackql version: $($STACKQL --version 2>&1 | head -1)"
-echo "  region: $REGION"
-echo "============================================================"
-echo ""
-
-# ── SHOW SERVICES ────────────────────────────────────────────────
-echo "[1/8] SHOW SERVICES IN awscc"
-result=$(run_stackql "SHOW SERVICES IN awscc")
-check "SHOW SERVICES lists ssm" "$result" "ssm"
-check "SHOW SERVICES lists s3" "$result" "s3"
-
-# ── SHOW RESOURCES ───────────────────────────────────────────────
-echo "[2/8] SHOW RESOURCES IN awscc.ssm"
-result=$(run_stackql "SHOW RESOURCES IN awscc.ssm")
-check "SHOW RESOURCES lists parameters" "$result" "parameters"
-
-# ── INSERT (create param1) ───────────────────────────────────────
-echo "[3/8] INSERT awscc.ssm.parameters (param1)"
-result=$(run_stackql "/*+ create */ INSERT INTO awscc.ssm.parameters (Type, Value, Name, Description, region) SELECT 'String', 'hello-from-stackql-smoketest', '$PARAM_NAME', 'stackql awscc local provider smoke test', '$REGION'")
-check "INSERT param1 dispatched" "$result" "despatched successfully"
-
-# ── INSERT (create param2 for DELETE test) ───────────────────────
-echo "[4/8] INSERT awscc.ssm.parameters (param2)"
-result=$(run_stackql "/*+ create */ INSERT INTO awscc.ssm.parameters (Type, Value, Name, Description, region) SELECT 'String', 'delete-me-smoketest', '$PARAM_NAME2', 'to be deleted by stackql smoke test', '$REGION'")
-check "INSERT param2 dispatched" "$result" "despatched successfully"
-
-# ── SELECT (list) ────────────────────────────────────────────────
-echo "[5/8] SELECT awscc.ssm.parameters_list_only"
-result=$(run_stackql "SELECT name FROM awscc.ssm.parameters_list_only WHERE region = '$REGION'")
-check "SELECT lists param1" "$result" "smoke-test/param1"
-check "SELECT lists param2" "$result" "smoke-test/param2"
-
-# ── UPDATE ───────────────────────────────────────────────────────
-echo "[6/8] UPDATE awscc.ssm.parameters (param1)"
-UPDATE_SQL=$(mktemp /tmp/update_param.XXXXXX.sql)
-cat > "$UPDATE_SQL" << SQL
-UPDATE awscc.ssm.parameters
-SET PatchDocument = '[{"op":"replace","path":"/Value","value":"updated-by-stackql-smoketest"}]'
-WHERE Identifier = '$PARAM_NAME'
-AND region = '$REGION'
-SQL
-result=$(run_stackql_file "$UPDATE_SQL")
-rm -f "$UPDATE_SQL"
-check "UPDATE param1 dispatched" "$result" "despatched successfully"
-
-# ── DELETE (param2) ──────────────────────────────────────────────
-echo "[7/8] DELETE awscc.ssm.parameters (param2)"
-result=$(run_stackql "/*+ delete */ DELETE FROM awscc.ssm.parameters WHERE Identifier = '$PARAM_NAME2' AND region = '$REGION'")
-check "DELETE param2 dispatched" "$result" "despatched successfully"
-
-# ── DELETE (param1 cleanup) ──────────────────────────────────────
-echo "[8/8] DELETE awscc.ssm.parameters (param1 cleanup)"
-result=$(run_stackql "/*+ delete */ DELETE FROM awscc.ssm.parameters WHERE Identifier = '$PARAM_NAME' AND region = '$REGION'")
-check "DELETE param1 dispatched" "$result" "despatched successfully"
-
-# ── Summary ──────────────────────────────────────────────────────
-echo ""
-echo "============================================================"
-echo "  Results: $PASS passed, $FAIL failed"
-echo "============================================================"
-echo ""
-
-if [[ $FAIL -gt 0 ]]; then
-  exit 1
-fi
-exit 0
+#!/bin/bash
+##############################################################################
+# awscc provider smoke test: INSERT, UPDATE, DELETE via stackql
+#
+# Prerequisites:
+#   - stackql binary in the repo root (download: curl -L https://bit.ly/stackql-zip -O && unzip stackql-zip)
+#   - AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY env vars set
+#   - If running in a proxied environment, GLOBAL_AGENT_HTTP_PROXY env var set
+#
+# Usage:
+#   export AWS_ACCESS_KEY_ID=...
+#   export AWS_SECRET_ACCESS_KEY=...
+#   bash smoke-test/run_smoke_test.sh
+#
+# Resource tested: awscc.ssm.parameters (AWS::SSM::Parameter via Cloud Control API)
+# Region: us-east-1
+# Estimated cost: negligible (<$0.01)
+##############################################################################
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(dirname "$SCRIPT_DIR")"
+STACKQL="$REPO_ROOT/stackql"
+PROVIDER_REGISTRY_ROOT_DIR="$REPO_ROOT"
+REG_STR="{\"url\": \"file://${PROVIDER_REGISTRY_ROOT_DIR}/openapi\", \"localDocRoot\": \"${PROVIDER_REGISTRY_ROOT_DIR}/openapi\", \"verifyConfig\": {\"nopVerify\": true}}"
+
+REGION="us-east-1"
+PARAM_NAME="/stackql/smoke-test/param1"
+PARAM_NAME2="/stackql/smoke-test/param2"
+
+# Validate prerequisites
+if [[ ! -x "$STACKQL" ]]; then
+  echo "ERROR: stackql binary not found at $STACKQL"
+  echo "Download with: curl -L https://bit.ly/stackql-zip -O && unzip stackql-zip"
+  exit 1
+fi
+
+if [[ -z "${AWS_ACCESS_KEY_ID:-}" || -z "${AWS_SECRET_ACCESS_KEY:-}" ]]; then
+  echo "ERROR: AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY must be set"
+  exit 1
+fi
+
+# Set up proxy args (if GLOBAL_AGENT_HTTP_PROXY is set, parse and use it)
+PROXY_ARGS=""
+if [[ -n "${GLOBAL_AGENT_HTTP_PROXY:-}" ]]; then
+  PROXY_HOST=$(python3 -c "import urllib.parse, os; p=urllib.parse.urlparse(os.environ['GLOBAL_AGENT_HTTP_PROXY']); print(p.hostname)")
+  PROXY_PORT=$(python3 -c "import urllib.parse, os; p=urllib.parse.urlparse(os.environ['GLOBAL_AGENT_HTTP_PROXY']); print(p.port)")
+  PROXY_USER=$(python3 -c "import urllib.parse, os; p=urllib.parse.urlparse(os.environ['GLOBAL_AGENT_HTTP_PROXY']); print(p.username)")
+  PROXY_PASS=$(python3 -c "import urllib.parse, os; p=urllib.parse.urlparse(os.environ['GLOBAL_AGENT_HTTP_PROXY']); print(p.password)")
+  PROXY_ARGS="--http.proxy.host=$PROXY_HOST --http.proxy.port=$PROXY_PORT --http.proxy.scheme=http --http.proxy.user=$PROXY_USER --http.proxy.password=$PROXY_PASS"
+fi
+
+run_stackql() {
+  local query="$1"
+  # shellcheck disable=SC2086
+  "$STACKQL" exec \
+    --registry="$REG_STR" \
+    $PROXY_ARGS \
+    "$query" 2>&1
+}
+
+run_stackql_file() {
+  local file="$1"
+  # shellcheck disable=SC2086
+  "$STACKQL" exec \
+    --registry="$REG_STR" \
+    $PROXY_ARGS \
+    --infile "$file" 2>&1
+}
+
+PASS=0
+FAIL=0
+
+check() {
+  local name="$1"
+  local result="$2"
+  local expected_pattern="$3"
+  if echo "$result" | grep -q "$expected_pattern"; then
+    echo "  PASS: $name"
+    PASS=$((PASS + 1))
+  else
+    echo "  FAIL: $name"
+    echo "    Output: $result"
+    FAIL=$((FAIL + 1))
+  fi
+}
+
+echo ""
+echo "============================================================"
+echo "  awscc local provider smoke test"
+echo "  stackql version: $($STACKQL --version 2>&1 | head -1)"
+echo "  region: $REGION"
+echo "============================================================"
+echo ""
+
+# ── SHOW SERVICES ────────────────────────────────────────────────
+echo "[1/8] SHOW SERVICES IN awscc"
+result=$(run_stackql "SHOW SERVICES IN awscc")
+check "SHOW SERVICES lists ssm" "$result" "ssm"
+check "SHOW SERVICES lists s3" "$result" "s3"
+
+# ── SHOW RESOURCES ───────────────────────────────────────────────
+echo "[2/8] SHOW RESOURCES IN awscc.ssm"
+result=$(run_stackql "SHOW RESOURCES IN awscc.ssm")
+check "SHOW RESOURCES lists parameters" "$result" "parameters"
+
+# ── INSERT (create param1) ───────────────────────────────────────
+echo "[3/8] INSERT awscc.ssm.parameters (param1)"
+result=$(run_stackql "/*+ create */ INSERT INTO awscc.ssm.parameters (Type, Value, Name, Description, region) SELECT 'String', 'hello-from-stackql-smoketest', '$PARAM_NAME', 'stackql awscc local provider smoke test', '$REGION'")
+check "INSERT param1 dispatched" "$result" "despatched successfully"
+
+# ── INSERT (create param2 for DELETE test) ───────────────────────
+echo "[4/8] INSERT awscc.ssm.parameters (param2)"
+result=$(run_stackql "/*+ create */ INSERT INTO awscc.ssm.parameters (Type, Value, Name, Description, region) SELECT 'String', 'delete-me-smoketest', '$PARAM_NAME2', 'to be deleted by stackql smoke test', '$REGION'")
+check "INSERT param2 dispatched" "$result" "despatched successfully"
+
+# ── SELECT (list) ────────────────────────────────────────────────
+echo "[5/8] SELECT awscc.ssm.parameters_list_only"
+result=$(run_stackql "SELECT name FROM awscc.ssm.parameters_list_only WHERE region = '$REGION'")
+check "SELECT lists param1" "$result" "smoke-test/param1"
+check "SELECT lists param2" "$result" "smoke-test/param2"
+
+# ── UPDATE ───────────────────────────────────────────────────────
+echo "[6/8] UPDATE awscc.ssm.parameters (param1)"
+UPDATE_SQL=$(mktemp /tmp/update_param.XXXXXX.sql)
+cat > "$UPDATE_SQL" << SQL
+UPDATE awscc.ssm.parameters
+SET PatchDocument = '[{"op":"replace","path":"/Value","value":"updated-by-stackql-smoketest"}]'
+WHERE Identifier = '$PARAM_NAME'
+AND region = '$REGION'
+SQL
+result=$(run_stackql_file "$UPDATE_SQL")
+rm -f "$UPDATE_SQL"
+check "UPDATE param1 dispatched" "$result" "despatched successfully"
+
+# ── DELETE (param2) ──────────────────────────────────────────────
+echo "[7/8] DELETE awscc.ssm.parameters (param2)"
+result=$(run_stackql "/*+ delete */ DELETE FROM awscc.ssm.parameters WHERE Identifier = '$PARAM_NAME2' AND region = '$REGION'")
+check "DELETE param2 dispatched" "$result" "despatched successfully"
+
+# ── DELETE (param1 cleanup) ──────────────────────────────────────
+echo "[8/8] DELETE awscc.ssm.parameters (param1 cleanup)"
+result=$(run_stackql "/*+ delete */ DELETE FROM awscc.ssm.parameters WHERE Identifier = '$PARAM_NAME' AND region = '$REGION'")
+check "DELETE param1 dispatched" "$result" "despatched successfully"
+
+# ── Summary ──────────────────────────────────────────────────────
+echo ""
+echo "============================================================"
+echo "  Results: $PASS passed, $FAIL failed"
+echo "============================================================"
+echo ""
+
+if [[ $FAIL -gt 0 ]]; then
+  exit 1
+fi
+exit 0
diff --git a/website/docs/index.md b/website/docs/index.md
index d2fd20c27..ac0218507 100644
--- a/website/docs/index.md
+++ b/website/docs/index.md
@@ -1,28 +1,28 @@
----
-title: awscc
-hide_title: false
-hide_table_of_contents: false
-keywords:
-  - awscc
-  - aws
-  - stackql
-  - infrastructure-as-code
-  - configuration-as-data
-  - cloud inventory
-description: Query, deploy and manage AWS Cloud Control resources using SQL
-custom_edit_url: null
-image: /img/stackql-aws-provider-featured-image.png
-id: 'provider-intro'
----
-
-import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
-
-AWS Cloud Control API provider for StackQL.
-
-:::info
-
-For the native AWS provider see the [__`aws`__](https://aws-provider.stackql.io/) provider.
-
+---
+title: awscc
+hide_title: false
+hide_table_of_contents: false
+keywords:
+  - awscc
+  - aws
+  - stackql
+  - infrastructure-as-code
+  - configuration-as-data
+  - cloud inventory
+description: Query, deploy and manage AWS Cloud Control resources using SQL
+custom_edit_url: null
+image: /img/stackql-aws-provider-featured-image.png
+id: 'provider-intro'
+---
+
+import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
+
+AWS Cloud Control API provider for StackQL.  
+
+:::info
+
+For the native AWS provider see the [__`aws`__](https://aws-provider.stackql.io/) provider.
+
 :::
 
 :::info Provider Summary
@@ -30,25 +30,25 @@ For the native AWS provider see the [__`aws`__](https://aws-provider.stackql.io/
 <div class="row">
 <div class="providerDocColumn">
 <span>total services:&nbsp;<b>237</b></span><br />
-<span>total resources:&nbsp;<b>1222</b></span><br />
+<span>total resources:&nbsp;<b>1237</b></span><br />
 </div>
 </div>
 
 :::
 
-## Authentication
-
-This provider uses AWS credentials for authentication. Configure your credentials using one of the following methods:
-
-- Environment variables: `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`
-- AWS credentials file: `~/.aws/credentials`
-- IAM roles for EC2 instances
-- AWS STS temporary credentials
-
-For more information on AWS authentication, see the [AWS documentation](https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/credentials.html).
-
-## Regions
-
+## Authentication
+
+This provider uses AWS credentials for authentication. Configure your credentials using one of the following methods:
+
+- Environment variables: `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`
+- AWS credentials file: `~/.aws/credentials`
+- IAM roles for EC2 instances
+- AWS STS temporary credentials
+
+For more information on AWS authentication, see the [AWS documentation](https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/credentials.html).
+
+## Regions
+
 Resources are available in all AWS regions. Use the `region` parameter to specify the target region for your operations.
 
 ## Services
diff --git a/website/docs/services/acmpca/certificates/index.md b/website/docs/services/acmpca/certificates/index.md
index cc5b2e325..dfe234f08 100644
--- a/website/docs/services/acmpca/certificates/index.md
+++ b/website/docs/services/acmpca/certificates/index.md
@@ -87,47 +87,47 @@ Creates, updates, deletes or gets a <code>certificate</code> resource or lists <
               {
                 "name": "digital_signature",
                 "type": "boolean",
-                "description": ""
+                "description": "Key can be used for digital signing."
               },
               {
                 "name": "non_repudiation",
                 "type": "boolean",
-                "description": ""
+                "description": "Key can be used for non-repudiation."
               },
               {
                 "name": "key_encipherment",
                 "type": "boolean",
-                "description": ""
+                "description": "Key can be used to encipher data."
               },
               {
                 "name": "data_encipherment",
                 "type": "boolean",
-                "description": ""
+                "description": "Key can be used to decipher data."
               },
               {
                 "name": "key_agreement",
                 "type": "boolean",
-                "description": ""
+                "description": "Key can be used in a key-agreement protocol."
               },
               {
                 "name": "key_cert_sign",
                 "type": "boolean",
-                "description": ""
+                "description": "Key can be used to sign certificates."
               },
               {
                 "name": "c_rl_sign",
                 "type": "boolean",
-                "description": ""
+                "description": "Key can be used to sign CRLs."
               },
               {
                 "name": "encipher_only",
                 "type": "boolean",
-                "description": ""
+                "description": "Key can be used only to encipher data."
               },
               {
                 "name": "decipher_only",
                 "type": "boolean",
-                "description": ""
+                "description": "Key can be used only to decipher data."
               }
             ]
           },
@@ -139,42 +139,42 @@ Creates, updates, deletes or gets a <code>certificate</code> resource or lists <
               {
                 "name": "other_name",
                 "type": "object",
-                "description": "Structure that contains X.509 OtherName information."
+                "description": "Represents <code>GeneralName</code> using an <code>OtherName</code> object."
               },
               {
                 "name": "rfc822_name",
                 "type": "string",
-                "description": "String that contains X.509 Rfc822Name information."
+                "description": "Represents <code>GeneralName</code> as an <a href=\"https://docs.aws.amazon.com/https://datatracker.ietf.org/doc/html/rfc822\">RFC 822</a> email address."
               },
               {
                 "name": "dns_name",
                 "type": "string",
-                "description": "String that contains X.509 DnsName information."
+                "description": "Represents <code>GeneralName</code> as a DNS name."
               },
               {
                 "name": "directory_name",
                 "type": "object",
-                "description": "Structure that contains X.500 distinguished name information for your CA."
+                "description": "Contains information about the certificate subject. The certificate can be one issued by your private certificate authority (CA) or it can be your private CA certificate. The Subject field in the certificate identifies the entity that owns or controls the public key in the certificate. The entity can be a user, computer, device, or service. The Subject must contain an X.500 distinguished name (DN). A DN is a sequence of relative distinguished names (RDNs). The RDNs are separated by commas in the certificate. The DN must be unique for each entity, but your private CA can issue more than one certificate with the same DN to the same entity."
               },
               {
                 "name": "edi_party_name",
                 "type": "object",
-                "description": "Structure that contains X.509 EdiPartyName information."
+                "description": "Represents <code>GeneralName</code> as an <code>EdiPartyName</code> object."
               },
               {
                 "name": "uniform_resource_identifier",
                 "type": "string",
-                "description": "String that contains X.509 UniformResourceIdentifier information."
+                "description": "Represents <code>GeneralName</code> as a URI."
               },
               {
                 "name": "ip_address",
                 "type": "string",
-                "description": "String that contains X.509 IpAddress information."
+                "description": "Represents <code>GeneralName</code> as an IPv4 or IPv6 address."
               },
               {
                 "name": "registered_id",
                 "type": "string",
-                "description": "String that contains X.509 ObjectIdentifier information."
+                "description": "Represents <code>GeneralName</code> as an object identifier (OID)."
               }
             ]
           },
@@ -210,87 +210,87 @@ Creates, updates, deletes or gets a <code>certificate</code> resource or lists <
           {
             "name": "country",
             "type": "string",
-            "description": ""
+            "description": "Two-digit code that specifies the country in which the certificate subject located."
           },
           {
             "name": "organization",
             "type": "string",
-            "description": ""
+            "description": "Legal name of the organization with which the certificate subject is affiliated."
           },
           {
             "name": "organizational_unit",
             "type": "string",
-            "description": ""
+            "description": "A subdivision or unit of the organization (such as sales or finance) with which the certificate subject is affiliated."
           },
           {
             "name": "distinguished_name_qualifier",
             "type": "string",
-            "description": ""
+            "description": "Disambiguating information for the certificate subject."
           },
           {
             "name": "state",
             "type": "string",
-            "description": ""
+            "description": "State in which the subject of the certificate is located."
           },
           {
             "name": "common_name",
             "type": "string",
-            "description": ""
+            "description": "<details><summary>For CA and end-entity certificates in a private PKI, the common name (CN) can be any string within the length limit.</summary>Note: In publicly trusted certificates, the common name must be a fully qualified domain name (FQDN) associated with the certificate subject.</details>"
           },
           {
             "name": "serial_number",
             "type": "string",
-            "description": ""
+            "description": "The certificate serial number."
           },
           {
             "name": "locality",
             "type": "string",
-            "description": ""
+            "description": "The locality (such as a city or town) in which the certificate subject is located."
           },
           {
             "name": "title",
             "type": "string",
-            "description": ""
+            "description": "A title such as Mr. or Ms., which is pre-pended to the name to refer formally to the certificate subject."
           },
           {
             "name": "surname",
             "type": "string",
-            "description": ""
+            "description": "Family name. In the US and the UK, for example, the surname of an individual is ordered last. In Asian cultures the surname is typically ordered first."
           },
           {
             "name": "given_name",
             "type": "string",
-            "description": ""
+            "description": "First name."
           },
           {
             "name": "initials",
             "type": "string",
-            "description": ""
+            "description": "Concatenation that typically contains the first letter of the <i>GivenName</i>, the first letter of the middle name if one exists, and the first letter of the <i>Surname</i>."
           },
           {
             "name": "pseudonym",
             "type": "string",
-            "description": ""
+            "description": "Typically a shortened version of a longer <i>GivenName</i>. For example, Jonathan is often shortened to John. Elizabeth is often shortened to Beth, Liz, or Eliza."
           },
           {
             "name": "generation_qualifier",
             "type": "string",
-            "description": ""
+            "description": "Typically a qualifier appended to the name of an individual. Examples include Jr. for junior, Sr. for senior, and III for third."
           },
           {
             "name": "custom_attributes",
             "type": "array",
-            "description": "Array of X.500 attribute type and value. CustomAttributes cannot be used along with pre-defined attributes.",
+            "description": "<details><summary>Contains a sequence of one or more X.500 relative distinguished names (RDNs), each of which consists of an object identifier (OID) and a value. For more information, see NIST’s definition of <a href=\"https://docs.aws.amazon.com/https://csrc.nist.gov/glossary/term/Object_Identifier\">Object Identifier (OID)</a>.</summary>Custom attributes cannot be used in combination with standard attributes.</details>",
             "children": [
               {
                 "name": "object_identifier",
                 "type": "string",
-                "description": "String that contains X.509 ObjectIdentifier information."
+                "description": "Specifies the object identifier (OID) of the attribute type of the relative distinguished name (RDN)."
               },
               {
                 "name": "value",
                 "type": "string",
-                "description": ""
+                "description": "Specifies the attribute value of relative distinguished name (RDN)."
               }
             ]
           }
diff --git a/website/docs/services/apigateway/api_keys/index.md b/website/docs/services/apigateway/api_keys/index.md
index 6ef46f025..696348121 100644
--- a/website/docs/services/apigateway/api_keys/index.md
+++ b/website/docs/services/apigateway/api_keys/index.md
@@ -97,14 +97,14 @@ Creates, updates, deletes or gets an <code>api_key</code> resource or lists <cod
     "description": "",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -345,8 +345,8 @@ resources:
             stage_name: '{{ stage_name }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'
+          - key: '{{ key }}'
+            value: '{{ value }}'
       - name: value
         value: '{{ value }}'`}</CodeBlock>
 
diff --git a/website/docs/services/apigateway/client_certificates/index.md b/website/docs/services/apigateway/client_certificates/index.md
index cf01c7075..1479f9822 100644
--- a/website/docs/services/apigateway/client_certificates/index.md
+++ b/website/docs/services/apigateway/client_certificates/index.md
@@ -60,12 +60,12 @@ Creates, updates, deletes or gets a <code>client_certificate</code> resource or
     "description": "",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
         "description": ""
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
         "description": ""
       }
@@ -261,8 +261,8 @@ resources:
         value: '{{ description }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/apigateway/deployments/index.md b/website/docs/services/apigateway/deployments/index.md
index 908f3fc54..f52a59f62 100644
--- a/website/docs/services/apigateway/deployments/index.md
+++ b/website/docs/services/apigateway/deployments/index.md
@@ -80,8 +80,8 @@ Creates, updates, deletes or gets a <code>deployment</code> resource or lists <c
         "description": "Specifies settings for the canary deployment in this stage.",
         "children": [
           {
-            "name": "deployment_id",
-            "type": "string",
+            "name": "stage_variable_overrides",
+            "type": "object",
             "description": ""
           },
           {
@@ -89,11 +89,6 @@ Creates, updates, deletes or gets a <code>deployment</code> resource or lists <c
             "type": "number",
             "description": ""
           },
-          {
-            "name": "stage_variable_overrides",
-            "type": "object",
-            "description": ""
-          },
           {
             "name": "use_stage_cache",
             "type": "boolean",
@@ -152,17 +147,22 @@ Creates, updates, deletes or gets a <code>deployment</code> resource or lists <c
         "description": "Configures settings for all of the stage's methods.",
         "children": [
           {
-            "name": "cache_data_encrypted",
-            "type": "boolean",
+            "name": "cache_ttl_in_seconds",
+            "type": "integer",
             "description": ""
           },
           {
-            "name": "cache_ttl_in_seconds",
-            "type": "integer",
+            "name": "logging_level",
+            "type": "string",
             "description": ""
           },
           {
-            "name": "caching_enabled",
+            "name": "resource_path",
+            "type": "string",
+            "description": "The resource path for this method. Forward slashes (<code>/</code>) are encoded as <code>~1</code> and the initial slash must include a forward slash. For example, the path value <code>/resource/subresource</code> must be encoded as <code>/~1resource~1subresource</code>. To specify the root path, use only a slash (<code>/</code>)."
+          },
+          {
+            "name": "cache_data_encrypted",
             "type": "boolean",
             "description": ""
           },
@@ -172,13 +172,13 @@ Creates, updates, deletes or gets a <code>deployment</code> resource or lists <c
             "description": ""
           },
           {
-            "name": "http_method",
-            "type": "string",
-            "description": "The HTTP method. To apply settings to multiple resources and methods, specify an asterisk (<code><i></code>) for the <code>HttpMethod</code> and <code>/</i></code> for the <code>ResourcePath</code>. This parameter is required when you specify a <code>MethodSetting</code>."
+            "name": "throttling_burst_limit",
+            "type": "integer",
+            "description": ""
           },
           {
-            "name": "logging_level",
-            "type": "string",
+            "name": "caching_enabled",
+            "type": "boolean",
             "description": ""
           },
           {
@@ -187,14 +187,9 @@ Creates, updates, deletes or gets a <code>deployment</code> resource or lists <c
             "description": ""
           },
           {
-            "name": "resource_path",
+            "name": "http_method",
             "type": "string",
-            "description": "The resource path for this method. Forward slashes (<code>/</code>) are encoded as <code>~1</code> and the initial slash must include a forward slash. For example, the path value <code>/resource/subresource</code> must be encoded as <code>/~1resource~1subresource</code>. To specify the root path, use only a slash (<code>/</code>). To apply settings to multiple resources and methods, specify an asterisk (<code><i></code>) for the <code>HttpMethod</code> and <code>/</i></code> for the <code>ResourcePath</code>. This parameter is required when you specify a <code>MethodSetting</code>."
-          },
-          {
-            "name": "throttling_burst_limit",
-            "type": "integer",
-            "description": ""
+            "description": "The HTTP method."
           },
           {
             "name": "throttling_rate_limit",
@@ -209,14 +204,14 @@ Creates, updates, deletes or gets a <code>deployment</code> resource or lists <c
         "description": "Specifies settings for logging access in this stage.",
         "children": [
           {
-            "name": "destination_arn",
+            "name": "format",
             "type": "string",
-            "description": "The Amazon Resource Name (ARN) of the CloudWatch Logs log group or Kinesis Data Firehose delivery stream to receive access logs. If you specify a Kinesis Data Firehose delivery stream, the stream name must begin with <code>amazon-apigateway-</code>. This parameter is required to enable access logging."
+            "description": ""
           },
           {
-            "name": "format",
+            "name": "destination_arn",
             "type": "string",
-            "description": "A single line format of the access logs of data, as specified by selected <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-mapping-template-reference.html#context-variable-reference\">$context variables</a>. The format must include at least <code>$context.requestId</code>. This parameter is required to enable access logging."
+            "description": ""
           }
         ]
       },
@@ -238,12 +233,12 @@ Creates, updates, deletes or gets a <code>deployment</code> resource or lists <c
           {
             "name": "value",
             "type": "string",
-            "description": ""
+            "description": "The value for the tag"
           },
           {
             "name": "key",
             "type": "string",
-            "description": ""
+            "description": "The key name of the tag"
           }
         ]
       },
@@ -493,9 +488,8 @@ resources:
           description: '{{ description }}'
           logging_level: '{{ logging_level }}'
           canary_setting:
-            deployment_id: '{{ deployment_id }}'
-            percent_traffic: null
             stage_variable_overrides: {}
+            percent_traffic: null
             use_stage_cache: '{{ use_stage_cache }}'
           throttling_rate_limit: null
           client_certificate_id: '{{ client_certificate_id }}'
@@ -507,19 +501,19 @@ resources:
           caching_enabled: '{{ caching_enabled }}'
           tracing_enabled: '{{ tracing_enabled }}'
           method_settings:
-            - cache_data_encrypted: '{{ cache_data_encrypted }}'
-              cache_ttl_in_seconds: '{{ cache_ttl_in_seconds }}'
-              caching_enabled: '{{ caching_enabled }}'
-              data_trace_enabled: '{{ data_trace_enabled }}'
-              http_method: '{{ http_method }}'
+            - cache_ttl_in_seconds: '{{ cache_ttl_in_seconds }}'
               logging_level: '{{ logging_level }}'
-              metrics_enabled: '{{ metrics_enabled }}'
               resource_path: '{{ resource_path }}'
+              cache_data_encrypted: '{{ cache_data_encrypted }}'
+              data_trace_enabled: '{{ data_trace_enabled }}'
               throttling_burst_limit: '{{ throttling_burst_limit }}'
+              caching_enabled: '{{ caching_enabled }}'
+              metrics_enabled: '{{ metrics_enabled }}'
+              http_method: '{{ http_method }}'
               throttling_rate_limit: null
           access_log_setting:
-            destination_arn: '{{ destination_arn }}'
             format: '{{ format }}'
+            destination_arn: '{{ destination_arn }}'
           cache_cluster_size: '{{ cache_cluster_size }}'
           metrics_enabled: '{{ metrics_enabled }}'
           tags:
diff --git a/website/docs/services/apigateway/domain_name_v2s/index.md b/website/docs/services/apigateway/domain_name_v2s/index.md
index c52094690..cabebe87b 100644
--- a/website/docs/services/apigateway/domain_name_v2s/index.md
+++ b/website/docs/services/apigateway/domain_name_v2s/index.md
@@ -57,21 +57,16 @@ Creates, updates, deletes or gets a <code>domain_name_v2</code> resource or list
   {
     "name": "endpoint_configuration",
     "type": "object",
-    "description": "<details><summary>The <code>EndpointConfiguration</code> property type specifies the endpoint types of a REST API.</summary><code>EndpointConfiguration</code> is a property of the <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html\">AWS::ApiGateway::RestApi</a> resource.</details>",
+    "description": "",
     "children": [
-      {
-        "name": "ip_address_type",
-        "type": "string",
-        "description": ""
-      },
       {
         "name": "types",
         "type": "array",
         "description": ""
       },
       {
-        "name": "vpc_endpoint_ids",
-        "type": "array",
+        "name": "ip_address_type",
+        "type": "string",
         "description": ""
       }
     ]
@@ -107,12 +102,12 @@ Creates, updates, deletes or gets a <code>domain_name_v2</code> resource or list
     "description": "",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
         "description": ""
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
         "description": ""
       }
@@ -341,11 +336,9 @@ resources:
         value: '{{ domain_name }}'
       - name: endpoint_configuration
         value:
-          ip_address_type: '{{ ip_address_type }}'
           types:
             - '{{ types[0] }}'
-          vpc_endpoint_ids:
-            - '{{ vpc_endpoint_ids[0] }}'
+          ip_address_type: '{{ ip_address_type }}'
       - name: security_policy
         value: '{{ security_policy }}'
       - name: policy
@@ -354,8 +347,8 @@ resources:
         value: '{{ routing_mode }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/apigateway/domain_names/index.md b/website/docs/services/apigateway/domain_names/index.md
index 650edb554..b4e7ec48b 100644
--- a/website/docs/services/apigateway/domain_names/index.md
+++ b/website/docs/services/apigateway/domain_names/index.md
@@ -67,21 +67,16 @@ Creates, updates, deletes or gets a <code>domain_name</code> resource or lists <
   {
     "name": "endpoint_configuration",
     "type": "object",
-    "description": "<details><summary>The <code>EndpointConfiguration</code> property type specifies the endpoint types of a REST API.</summary><code>EndpointConfiguration</code> is a property of the <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html\">AWS::ApiGateway::RestApi</a> resource.</details>",
+    "description": "<details><summary>The <code>EndpointConfiguration</code> property type specifies the endpoint types of an Amazon API Gateway domain name.</summary><code>EndpointConfiguration</code> is a property of the <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainname.html\">AWS::ApiGateway::DomainName</a> resource.</details>",
     "children": [
-      {
-        "name": "ip_address_type",
-        "type": "string",
-        "description": ""
-      },
       {
         "name": "types",
         "type": "array",
         "description": ""
       },
       {
-        "name": "vpc_endpoint_ids",
-        "type": "array",
+        "name": "ip_address_type",
+        "type": "string",
         "description": ""
       }
     ]
@@ -144,12 +139,12 @@ Creates, updates, deletes or gets a <code>domain_name</code> resource or lists <
     "description": "",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
         "description": ""
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
         "description": ""
       }
@@ -384,11 +379,9 @@ resources:
         value: '{{ domain_name }}'
       - name: endpoint_configuration
         value:
-          ip_address_type: '{{ ip_address_type }}'
           types:
             - '{{ types[0] }}'
-          vpc_endpoint_ids:
-            - '{{ vpc_endpoint_ids[0] }}'
+          ip_address_type: '{{ ip_address_type }}'
       - name: mutual_tls_authentication
         value:
           truststore_uri: '{{ truststore_uri }}'
@@ -405,8 +398,8 @@ resources:
         value: '{{ routing_mode }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/apigateway/stages/index.md b/website/docs/services/apigateway/stages/index.md
index 5683f7ac3..849b3cfb8 100644
--- a/website/docs/services/apigateway/stages/index.md
+++ b/website/docs/services/apigateway/stages/index.md
@@ -191,14 +191,14 @@ Creates, updates, deletes or gets a <code>stage</code> resource or lists <code>s
     "description": "",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:."
       }
     ]
   },
@@ -477,8 +477,8 @@ resources:
         value: '{{ stage_name }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'
+          - key: '{{ key }}'
+            value: '{{ value }}'
       - name: tracing_enabled
         value: '{{ tracing_enabled }}'
       - name: variables
diff --git a/website/docs/services/apigateway/usage_plans/index.md b/website/docs/services/apigateway/usage_plans/index.md
index 6c27ac8a6..337c0acb6 100644
--- a/website/docs/services/apigateway/usage_plans/index.md
+++ b/website/docs/services/apigateway/usage_plans/index.md
@@ -104,14 +104,14 @@ Creates, updates, deletes or gets an <code>usage_plan</code> resource or lists <
     "description": "",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -357,8 +357,8 @@ resources:
           period: '{{ period }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'
+          - key: '{{ key }}'
+            value: '{{ value }}'
       - name: throttle
         value:
           burst_limit: '{{ burst_limit }}'
diff --git a/website/docs/services/appconfig/applications/index.md b/website/docs/services/appconfig/applications/index.md
index fa6cefe62..00476a4db 100644
--- a/website/docs/services/appconfig/applications/index.md
+++ b/website/docs/services/appconfig/applications/index.md
@@ -60,14 +60,14 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
     "description": "Metadata to assign to the application. Tags help organize and categorize your AWS AppConfig resources. Each tag consists of a key and an optional value, both of which you define.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value can be up to 256 characters."
+        "description": "The key-value string map. The valid character set is [a-zA-Z1-9 +-=._:/-]. The tag key can be up to 128 characters and must not start with aws:."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The key-value string map. The tag key can be up to 128 characters and must not start with aws:."
+        "description": "The tag value can be up to 256 characters."
       }
     ]
   },
@@ -267,8 +267,8 @@ resources:
         value: '{{ description }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'
+          - key: '{{ key }}'
+            value: '{{ value }}'
       - name: name
         value: '{{ name }}'`}</CodeBlock>
 
diff --git a/website/docs/services/appconfig/deployments/index.md b/website/docs/services/appconfig/deployments/index.md
index 41fdb5bc4..7709b32bf 100644
--- a/website/docs/services/appconfig/deployments/index.md
+++ b/website/docs/services/appconfig/deployments/index.md
@@ -117,14 +117,14 @@ Creates, updates, deletes or gets a <code>deployment</code> resource or lists <c
     "description": "An array of key-value pairs to apply to this resource.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The tag value can be up to 256 characters."
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key-value string map. The valid character set is [a-zA-Z1-9+-=._:/]. The tag key can be up to 128 characters and must not start with aws:."
       }
     ]
   },
@@ -369,8 +369,8 @@ resources:
             parameter_name: '{{ parameter_name }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/appconfig/environments/index.md b/website/docs/services/appconfig/environments/index.md
index e7df92564..8552c4c3b 100644
--- a/website/docs/services/appconfig/environments/index.md
+++ b/website/docs/services/appconfig/environments/index.md
@@ -87,14 +87,14 @@ Creates, updates, deletes or gets an <code>environment</code> resource or lists
     "description": "Metadata to assign to the environment. Tags help organize and categorize your AWS AppConfig resources. Each tag consists of a key and an optional value, both of which you define.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The tag value can be up to 256 characters."
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key-value string map. The valid character set is [a-zA-Z1-9+-=._:/]. The tag key can be up to 128 characters and must not start with aws:."
       }
     ]
   },
@@ -319,8 +319,8 @@ resources:
         value: '{{ application_id }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'
+          - value: '{{ value }}'
+            key: '{{ key }}'
       - name: name
         value: '{{ name }}'`}</CodeBlock>
 
diff --git a/website/docs/services/appstream/app_block_builders/index.md b/website/docs/services/appstream/app_block_builders/index.md
index e6136783c..6f3285aac 100644
--- a/website/docs/services/appstream/app_block_builders/index.md
+++ b/website/docs/services/appstream/app_block_builders/index.md
@@ -92,12 +92,12 @@ Creates, updates, deletes or gets an <code>app_block_builder</code> resource or
     "description": "",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
         "description": ""
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
         "description": ""
       }
@@ -377,8 +377,8 @@ resources:
             vpce_id: '{{ vpce_id }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'
+          - key: '{{ key }}'
+            value: '{{ value }}'
       - name: vpc_config
         value:
           security_group_ids:
diff --git a/website/docs/services/appstream/app_blocks/index.md b/website/docs/services/appstream/app_blocks/index.md
index 3cfeaa63b..d161436a0 100644
--- a/website/docs/services/appstream/app_blocks/index.md
+++ b/website/docs/services/appstream/app_blocks/index.md
@@ -97,19 +97,7 @@ Creates, updates, deletes or gets an <code>app_block</code> resource or lists <c
   {
     "name": "tags",
     "type": "array",
-    "description": "",
-    "children": [
-      {
-        "name": "value",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "key",
-        "type": "string",
-        "description": ""
-      }
-    ]
+    "description": ""
   },
   {
     "name": "created_time",
@@ -293,8 +281,7 @@ resources:
           timeout_in_seconds: '{{ timeout_in_seconds }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'
+          - null
       - name: packaging_type
         value: '{{ packaging_type }}'
       - name: post_setup_script_details
diff --git a/website/docs/services/appstream/applications/index.md b/website/docs/services/appstream/applications/index.md
index 997e420f9..41d601977 100644
--- a/website/docs/services/appstream/applications/index.md
+++ b/website/docs/services/appstream/applications/index.md
@@ -100,19 +100,7 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
   {
     "name": "tags",
     "type": "array",
-    "description": "",
-    "children": [
-      {
-        "name": "value",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "key",
-        "type": "string",
-        "description": ""
-      }
-    ]
+    "description": ""
   },
   {
     "name": "attributes_to_delete",
@@ -324,8 +312,7 @@ resources:
           - '{{ platforms[0] }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'
+          - null
       - name: attributes_to_delete
         value:
           - '{{ attributes_to_delete[0] }}'`}</CodeBlock>
diff --git a/website/docs/services/appsync/apis/index.md b/website/docs/services/appsync/apis/index.md
index ff51f7890..2c39e88c4 100644
--- a/website/docs/services/appsync/apis/index.md
+++ b/website/docs/services/appsync/apis/index.md
@@ -99,27 +99,27 @@ Creates, updates, deletes or gets an <code>api</code> resource or lists <code>ap
           {
             "name": "open_id_connect_config",
             "type": "object",
-            "description": "",
+            "description": "The OpenID Connect configuration.",
             "children": [
               {
                 "name": "client_id",
                 "type": "string",
-                "description": "The client identifier of the Relying party at the OpenID identity provider."
+                "description": ""
               },
               {
                 "name": "auth_ttl",
                 "type": "number",
-                "description": "The number of milliseconds that a token is valid after being authenticated."
+                "description": ""
               },
               {
                 "name": "issuer",
                 "type": "string",
-                "description": "The issuer for the OIDC configuration."
+                "description": ""
               },
               {
                 "name": "iat_ttl",
                 "type": "number",
-                "description": "The number of milliseconds that a token is valid after it's issued to a user."
+                "description": ""
               }
             ]
           },
@@ -148,22 +148,22 @@ Creates, updates, deletes or gets an <code>api</code> resource or lists <code>ap
           {
             "name": "lambda_authorizer_config",
             "type": "object",
-            "description": "",
+            "description": "A LambdaAuthorizerConfig holds configuration on how to authorize AWS AppSync API access when using the AWS_LAMBDA authorizer mode. Be aware that an AWS AppSync API may have only one Lambda authorizer configured at a time.",
             "children": [
               {
-                "name": "identity_validation_expression",
-                "type": "string",
-                "description": "A regular expression for validation of tokens before the Lambda function is called."
+                "name": "authorizer_result_ttl_in_seconds",
+                "type": "integer",
+                "description": ""
               },
               {
                 "name": "authorizer_uri",
                 "type": "string",
-                "description": "The ARN of the Lambda function to be called for authorization."
+                "description": ""
               },
               {
-                "name": "authorizer_result_ttl_in_seconds",
-                "type": "integer",
-                "description": "The number of seconds a response should be cached for."
+                "name": "identity_validation_expression",
+                "type": "string",
+                "description": ""
               }
             ]
           }
@@ -172,7 +172,7 @@ Creates, updates, deletes or gets an <code>api</code> resource or lists <code>ap
       {
         "name": "connection_auth_modes",
         "type": "array",
-        "description": "",
+        "description": "A list of auth modes for the AppSync API.",
         "children": [
           {
             "name": "auth_type",
@@ -203,17 +203,17 @@ Creates, updates, deletes or gets an <code>api</code> resource or lists <code>ap
   {
     "name": "tags",
     "type": "array",
-    "description": "An arbitrary set of tags (key-value pairs) for this Domain Name.",
+    "description": "An arbitrary set of tags (key-value pairs) for this AppSync API.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "A string used to identify this tag. You can specify a maximum of 128 characters for a tag key."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "A string containing the value for this tag. You can specify a maximum of 256 characters for a tag value."
       }
     ]
   },
@@ -427,9 +427,9 @@ resources:
                 user_pool_id: '{{ user_pool_id }}'
                 aws_region: '{{ aws_region }}'
               lambda_authorizer_config:
-                identity_validation_expression: '{{ identity_validation_expression }}'
-                authorizer_uri: '{{ authorizer_uri }}'
                 authorizer_result_ttl_in_seconds: '{{ authorizer_result_ttl_in_seconds }}'
+                authorizer_uri: '{{ authorizer_uri }}'
+                identity_validation_expression: '{{ identity_validation_expression }}'
           connection_auth_modes:
             - auth_type: null
           default_publish_auth_modes: null
@@ -439,8 +439,8 @@ resources:
             cloud_watch_logs_role_arn: '{{ cloud_watch_logs_role_arn }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/appsync/channel_namespaces/index.md b/website/docs/services/appsync/channel_namespaces/index.md
index 5bb12527d..f9a8f7948 100644
--- a/website/docs/services/appsync/channel_namespaces/index.md
+++ b/website/docs/services/appsync/channel_namespaces/index.md
@@ -84,17 +84,17 @@ Creates, updates, deletes or gets a <code>channel_namespace</code> resource or l
   {
     "name": "tags",
     "type": "array",
-    "description": "An arbitrary set of tags (key-value pairs) for this Domain Name.",
+    "description": "An arbitrary set of tags (key-value pairs) for this AppSync API.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "A string used to identify this tag. You can specify a maximum of 128 characters for a tag key."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "A string containing the value for this tag. You can specify a maximum of 256 characters for a tag value."
       }
     ]
   },
@@ -358,8 +358,8 @@ resources:
         value: '{{ code_s3_location }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'
+          - key: '{{ key }}'
+            value: '{{ value }}'
       - name: handler_configs
         value:
           on_publish:
@@ -367,7 +367,7 @@ resources:
             integration:
               data_source_name: '{{ data_source_name }}'
               lambda_config:
-                lambda_function_arn: '{{ lambda_function_arn }}'
+                invoke_type: '{{ invoke_type }}'
           on_subscribe: null`}</CodeBlock>
 
 </TabItem>
diff --git a/website/docs/services/appsync/domain_names/index.md b/website/docs/services/appsync/domain_names/index.md
index 8a17540b6..0de5d7dc5 100644
--- a/website/docs/services/appsync/domain_names/index.md
+++ b/website/docs/services/appsync/domain_names/index.md
@@ -80,14 +80,14 @@ Creates, updates, deletes or gets a <code>domain_name</code> resource or lists <
     "description": "An arbitrary set of tags (key-value pairs) for this Domain Name.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "A string used to identify this tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "A string containing the value for this tag. You can specify a maximum of 256 characters for a tag value."
       }
     ]
   },
@@ -293,8 +293,8 @@ resources:
         value: '{{ certificate_arn }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/appsync/function_configurations/index.md b/website/docs/services/appsync/function_configurations/index.md
index 887aff28e..0b063029d 100644
--- a/website/docs/services/appsync/function_configurations/index.md
+++ b/website/docs/services/appsync/function_configurations/index.md
@@ -120,14 +120,14 @@ Creates, updates, deletes or gets a <code>function_configuration</code> resource
     "description": "Describes a runtime used by an AWS AppSync pipeline resolver or AWS AppSync function. Specifies the name and version of the runtime to use. Note that if a runtime is specified, code must also be specified.",
     "children": [
       {
-        "name": "runtime_version",
+        "name": "name",
         "type": "string",
-        "description": "The <code>version</code> of the runtime to use. Currently, the only allowed version is <code>1.0.0</code>."
+        "description": "The name of the runtime to use. Currently, the only allowed value is APPSYNC_JS."
       },
       {
-        "name": "name",
+        "name": "runtime_version",
         "type": "string",
-        "description": "The <code>name</code> of the runtime to use. Currently, the only allowed value is <code>APPSYNC_JS</code>."
+        "description": "The version of the runtime to use. Currently, the only allowed version is 1.0.0."
       }
     ]
   },
@@ -137,19 +137,19 @@ Creates, updates, deletes or gets a <code>function_configuration</code> resource
     "description": "Describes a Sync configuration for a resolver. Specifies which Conflict Detection strategy and Resolution strategy to use when the resolver is invoked.",
     "children": [
       {
-        "name": "conflict_handler",
+        "name": "conflict_detection",
         "type": "string",
-        "description": "<details><summary>The Conflict Resolution strategy to perform in the event of a conflict.</summary>+  <i>OPTIMISTIC_CONCURRENCY</i>: Resolve conflicts by rejecting mutations when versions don't match the latest version at the server.<br />+  <i>AUTOMERGE</i>: Resolve conflicts with the Automerge conflict resolution strategy.<br />+  <i>LAMBDA</i>: Resolve conflicts with an LAMlong function supplied in the <code>LambdaConflictHandlerConfig</code>.</details>"
+        "description": "The Conflict Detection strategy to use."
       },
       {
-        "name": "conflict_detection",
+        "name": "conflict_handler",
         "type": "string",
-        "description": "<details><summary>The Conflict Detection strategy to use.</summary>+  <i>VERSION</i>: Detect conflicts based on object versions for this resolver.<br />+  <i>NONE</i>: Do not detect conflicts when invoking this resolver.</details>"
+        "description": "The Conflict Resolution strategy to perform in the event of a conflict."
       },
       {
         "name": "lambda_conflict_handler_config",
         "type": "object",
-        "description": "The <code>LambdaConflictHandlerConfig</code> when configuring <code>LAMBDA</code> as the Conflict Handler.",
+        "description": "The LambdaConflictHandlerConfig when configuring LAMBDA as the Conflict Handler.",
         "children": [
           {
             "name": "lambda_conflict_handler_arn",
@@ -411,12 +411,12 @@ resources:
         value: '{{ response_mapping_template_s3_location }}'
       - name: runtime
         value:
-          runtime_version: '{{ runtime_version }}'
           name: '{{ name }}'
+          runtime_version: '{{ runtime_version }}'
       - name: sync_config
         value:
-          conflict_handler: '{{ conflict_handler }}'
           conflict_detection: '{{ conflict_detection }}'
+          conflict_handler: '{{ conflict_handler }}'
           lambda_conflict_handler_config:
             lambda_conflict_handler_arn: '{{ lambda_conflict_handler_arn }}'`}</CodeBlock>
 
diff --git a/website/docs/services/arczonalshift/autoshift_observer_notification_statuses/index.md b/website/docs/services/arczonalshift/autoshift_observer_notification_statuses/index.md
index 2207b6b56..382bd05db 100644
--- a/website/docs/services/arczonalshift/autoshift_observer_notification_statuses/index.md
+++ b/website/docs/services/arczonalshift/autoshift_observer_notification_statuses/index.md
@@ -46,20 +46,8 @@ Creates, updates, deletes or gets an <code>autoshift_observer_notification_statu
 <SchemaTable fields={[
   {
     "name": "status",
-    "type": "object",
-    "description": "Definition of AWS::ARCZonalShift::AutoshiftObserverNotificationStatus Resource Type",
-    "children": [
-      {
-        "name": "account_id",
-        "type": "string",
-        "description": "User account id, used as part of the primary identifier for the resource"
-      },
-      {
-        "name": "region",
-        "type": "string",
-        "description": "Region, used as part of the primary identifier for the resource"
-      }
-    ]
+    "type": "string",
+    "description": ""
   },
   {
     "name": "account_id",
@@ -254,8 +242,7 @@ resources:
   - name: autoshift_observer_notification_status
     props:
       - name: status
-        value:
-          status: null`}</CodeBlock>
+        value: '{{ status }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/backup/frameworks/index.md b/website/docs/services/backup/frameworks/index.md
index 625789bf4..8dc3b020f 100644
--- a/website/docs/services/backup/frameworks/index.md
+++ b/website/docs/services/backup/frameworks/index.md
@@ -117,14 +117,14 @@ Creates, updates, deletes or gets a <code>framework</code> resource or lists <co
             "description": "Describes whether the control scope includes resources with one or more tags. Each tag is a key-value pair.",
             "children": [
               {
-                "name": "value",
+                "name": "key",
                 "type": "string",
-                "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+                "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
               },
               {
-                "name": "key",
+                "name": "value",
                 "type": "string",
-                "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+                "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
               }
             ]
           }
@@ -143,14 +143,14 @@ Creates, updates, deletes or gets a <code>framework</code> resource or lists <co
     "description": "Metadata that you can assign to help organize the frameworks that you create. Each tag is a key-value pair.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -363,8 +363,8 @@ resources:
               compliance_resource_types:
                 - '{{ compliance_resource_types[0] }}'
               tags:
-                - value: '{{ value }}'
-                  key: '{{ key }}'
+                - key: '{{ key }}'
+                  value: '{{ value }}'
       - name: framework_tags
         value:
           - null`}</CodeBlock>
diff --git a/website/docs/services/backup/report_plans/index.md b/website/docs/services/backup/report_plans/index.md
index e69579214..4db310003 100644
--- a/website/docs/services/backup/report_plans/index.md
+++ b/website/docs/services/backup/report_plans/index.md
@@ -65,14 +65,14 @@ Creates, updates, deletes or gets a <code>report_plan</code> resource or lists <
     "description": "Metadata that you can assign to help organize the report plans that you create. Each tag is a key-value pair.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -331,8 +331,8 @@ resources:
         value: '{{ report_plan_description }}'
       - name: report_plan_tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'
+          - key: '{{ key }}'
+            value: '{{ value }}'
       - name: report_delivery_channel
         value:
           formats:
diff --git a/website/docs/services/batch/consumable_resources/index.md b/website/docs/services/batch/consumable_resources/index.md
index e7dff0e35..5aac9a2f8 100644
--- a/website/docs/services/batch/consumable_resources/index.md
+++ b/website/docs/services/batch/consumable_resources/index.md
@@ -52,7 +52,7 @@ Creates, updates, deletes or gets a <code>consumable_resource</code> resource or
   {
     "name": "consumable_resource_arn",
     "type": "string",
-    "description": "ARN of the Scheduling Policy."
+    "description": "ARN of the Consumable Resource."
   },
   {
     "name": "total_quantity",
@@ -97,7 +97,7 @@ Creates, updates, deletes or gets a <code>consumable_resource</code> resource or
   {
     "name": "consumable_resource_arn",
     "type": "string",
-    "description": "ARN of the Scheduling Policy."
+    "description": "ARN of the Consumable Resource."
   },
   {
     "name": "region",
diff --git a/website/docs/services/batch/job_queues/index.md b/website/docs/services/batch/job_queues/index.md
index 9756feb69..69d76e30f 100644
--- a/website/docs/services/batch/job_queues/index.md
+++ b/website/docs/services/batch/job_queues/index.md
@@ -52,7 +52,7 @@ Creates, updates, deletes or gets a <code>job_queue</code> resource or lists <co
   {
     "name": "job_queue_arn",
     "type": "string",
-    "description": "ARN of the Scheduling Policy."
+    "description": ""
   },
   {
     "name": "job_queue_type",
@@ -148,7 +148,7 @@ Creates, updates, deletes or gets a <code>job_queue</code> resource or lists <co
   {
     "name": "job_queue_arn",
     "type": "string",
-    "description": "ARN of the Scheduling Policy."
+    "description": ""
   },
   {
     "name": "region",
diff --git a/website/docs/services/bcmdataexports/exports/index.md b/website/docs/services/bcmdataexports/exports/index.md
index 7cb877e84..9b6fc0f87 100644
--- a/website/docs/services/bcmdataexports/exports/index.md
+++ b/website/docs/services/bcmdataexports/exports/index.md
@@ -47,7 +47,7 @@ Creates, updates, deletes or gets an <code>export</code> resource or lists <code
   {
     "name": "export",
     "type": "object",
-    "description": "Definition of AWS::BCMDataExports::Export Resource Type",
+    "description": "",
     "children": [
       {
         "name": "export_arn",
@@ -55,17 +55,73 @@ Creates, updates, deletes or gets an <code>export</code> resource or lists <code
         "description": ""
       },
       {
-        "name": "tags",
-        "type": "array",
+        "name": "name",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "description",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "data_query",
+        "type": "object",
         "description": "",
         "children": [
           {
-            "name": "key",
+            "name": "query_statement",
             "type": "string",
             "description": ""
           },
           {
-            "name": "value",
+            "name": "table_configurations",
+            "type": "object",
+            "description": ""
+          }
+        ]
+      },
+      {
+        "name": "destination_configurations",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "s3_destination",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "s3_bucket",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "s3_prefix",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "s3_region",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "s3_output_configurations",
+                "type": "object",
+                "description": ""
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "refresh_cadence",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "frequency",
             "type": "string",
             "description": ""
           }
@@ -108,7 +164,7 @@ Creates, updates, deletes or gets an <code>export</code> resource or lists <code
   {
     "name": "export",
     "type": "object",
-    "description": "Definition of AWS::BCMDataExports::Export Resource Type",
+    "description": "",
     "children": [
       {
         "name": "export_arn",
@@ -116,17 +172,73 @@ Creates, updates, deletes or gets an <code>export</code> resource or lists <code
         "description": ""
       },
       {
-        "name": "tags",
-        "type": "array",
+        "name": "name",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "description",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "data_query",
+        "type": "object",
         "description": "",
         "children": [
           {
-            "name": "key",
+            "name": "query_statement",
             "type": "string",
             "description": ""
           },
           {
-            "name": "value",
+            "name": "table_configurations",
+            "type": "object",
+            "description": ""
+          }
+        ]
+      },
+      {
+        "name": "destination_configurations",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "s3_destination",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "s3_bucket",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "s3_prefix",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "s3_region",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "s3_output_configurations",
+                "type": "object",
+                "description": ""
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "refresh_cadence",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "frequency",
             "type": "string",
             "description": ""
           }
@@ -310,13 +422,28 @@ resources:
     props:
       - name: export
         value:
-          export: null
-          tags:
-            - key: '{{ key }}'
-              value: '{{ value }}'
+          export_arn: '{{ export_arn }}'
+          name: '{{ name }}'
+          description: '{{ description }}'
+          data_query:
+            query_statement: '{{ query_statement }}'
+            table_configurations: {}
+          destination_configurations:
+            s3_destination:
+              s3_bucket: '{{ s3_bucket }}'
+              s3_prefix: '{{ s3_prefix }}'
+              s3_region: '{{ s3_region }}'
+              s3_output_configurations:
+                output_type: '{{ output_type }}'
+                format: '{{ format }}'
+                compression: '{{ compression }}'
+                overwrite: '{{ overwrite }}'
+          refresh_cadence:
+            frequency: '{{ frequency }}'
       - name: tags
         value:
-          - null`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/bedrock/agents/index.md b/website/docs/services/bedrock/agents/index.md
index 1e3119946..aa3039f83 100644
--- a/website/docs/services/bedrock/agents/index.md
+++ b/website/docs/services/bedrock/agents/index.md
@@ -207,7 +207,7 @@ Creates, updates, deletes or gets an <code>agent</code> resource or lists <code>
   {
     "name": "guardrail_configuration",
     "type": "object",
-    "description": "Configuration for a guardrail",
+    "description": "Configuration for a guardrail.",
     "children": [
       {
         "name": "guardrail_identifier",
@@ -396,7 +396,7 @@ Creates, updates, deletes or gets an <code>agent</code> resource or lists <code>
           {
             "name": "additional_model_request_fields",
             "type": "object",
-            "description": "Contains model-specific configurations"
+            "description": "Additional Model Request Fields for Prompt Configuration"
           }
         ]
       },
diff --git a/website/docs/services/bedrock/automated_reasoning_policies/index.md b/website/docs/services/bedrock/automated_reasoning_policies/index.md
index 0af34c0c9..d5252e618 100644
--- a/website/docs/services/bedrock/automated_reasoning_policies/index.md
+++ b/website/docs/services/bedrock/automated_reasoning_policies/index.md
@@ -47,12 +47,12 @@ Creates, updates, deletes or gets an <code>automated_reasoning_policy</code> res
   {
     "name": "name",
     "type": "string",
-    "description": "The name inherited from the policy"
+    "description": ""
   },
   {
     "name": "description",
     "type": "string",
-    "description": "The description inherited from the policy"
+    "description": ""
   },
   {
     "name": "policy_definition",
@@ -147,12 +147,12 @@ Creates, updates, deletes or gets an <code>automated_reasoning_policy</code> res
   {
     "name": "policy_arn",
     "type": "string",
-    "description": "Arn of the policy"
+    "description": ""
   },
   {
     "name": "version",
     "type": "string",
-    "description": "The version of the policy"
+    "description": "Version of the policy that was created. This will always be <code>DRAFT</code>"
   },
   {
     "name": "definition_hash",
@@ -162,7 +162,7 @@ Creates, updates, deletes or gets an <code>automated_reasoning_policy</code> res
   {
     "name": "created_at",
     "type": "string",
-    "description": "Time this policy version was created"
+    "description": "Time this policy was created"
   },
   {
     "name": "updated_at",
@@ -172,7 +172,7 @@ Creates, updates, deletes or gets an <code>automated_reasoning_policy</code> res
   {
     "name": "policy_id",
     "type": "string",
-    "description": "The id of the associated policy"
+    "description": "The id of the policy"
   },
   {
     "name": "tags",
@@ -204,7 +204,7 @@ Creates, updates, deletes or gets an <code>automated_reasoning_policy</code> res
   {
     "name": "policy_arn",
     "type": "string",
-    "description": "Arn of the policy"
+    "description": ""
   },
   {
     "name": "region",
diff --git a/website/docs/services/bedrock/blueprints/index.md b/website/docs/services/bedrock/blueprints/index.md
index 5af8bd069..d64bf2dad 100644
--- a/website/docs/services/bedrock/blueprints/index.md
+++ b/website/docs/services/bedrock/blueprints/index.md
@@ -97,12 +97,12 @@ Creates, updates, deletes or gets a <code>blueprint</code> resource or lists <co
       {
         "name": "key",
         "type": "string",
-        "description": "Tag Key"
+        "description": "Key for the tag"
       },
       {
         "name": "value",
         "type": "string",
-        "description": "Tag Value"
+        "description": "Value for the tag"
       }
     ]
   },
diff --git a/website/docs/services/bedrock/data_automation_projects/index.md b/website/docs/services/bedrock/data_automation_projects/index.md
index ac461fb9d..fd7a27b5f 100644
--- a/website/docs/services/bedrock/data_automation_projects/index.md
+++ b/website/docs/services/bedrock/data_automation_projects/index.md
@@ -411,12 +411,12 @@ Creates, updates, deletes or gets a <code>data_automation_project</code> resourc
       {
         "name": "key",
         "type": "string",
-        "description": "Tag Key"
+        "description": "Key for the tag"
       },
       {
         "name": "value",
         "type": "string",
-        "description": "Tag Value"
+        "description": "Value for the tag"
       }
     ]
   },
diff --git a/website/docs/services/bedrock/flows/index.md b/website/docs/services/bedrock/flows/index.md
index d026ded48..afdcb65da 100644
--- a/website/docs/services/bedrock/flows/index.md
+++ b/website/docs/services/bedrock/flows/index.md
@@ -98,6 +98,11 @@ Creates, updates, deletes or gets a <code>flow</code> resource or lists <code>fl
                 "name": "expression",
                 "type": "string",
                 "description": "Expression for a node input in a flow"
+              },
+              {
+                "name": "category",
+                "type": "string",
+                "description": "Optional tag to classify input type, currently exclusive to LoopNode"
               }
             ]
           },
@@ -162,12 +167,22 @@ Creates, updates, deletes or gets a <code>flow</code> resource or lists <code>fl
   {
     "name": "definition_s3_location",
     "type": "object",
-    "description": "An Amazon S3 location.",
+    "description": "A bucket, key and optional version pointing to an S3 object containing a UTF-8 encoded JSON string Definition with the same schema as the Definition property of this resource",
     "children": [
       {
-        "name": "uri",
+        "name": "bucket",
+        "type": "string",
+        "description": "A bucket in S3"
+      },
+      {
+        "name": "key",
+        "type": "string",
+        "description": "A object key in S3"
+      },
+      {
+        "name": "version",
         "type": "string",
-        "description": "The location's URI"
+        "description": "The version of the the S3 object to use"
       }
     ]
   },
@@ -459,6 +474,7 @@ resources:
                 - name: '{{ name }}'
                   type: '{{ type }}'
                   expression: '{{ expression }}'
+                  category: '{{ category }}'
               outputs:
                 - name: '{{ name }}'
                   type: null
@@ -472,7 +488,9 @@ resources:
         value: '{{ definition_string }}'
       - name: definition_s3_location
         value:
-          uri: '{{ uri }}'
+          bucket: '{{ bucket }}'
+          key: '{{ key }}'
+          version: '{{ version }}'
       - name: definition_substitutions
         value: {}
       - name: description
diff --git a/website/docs/services/ce/anomaly_monitors/index.md b/website/docs/services/ce/anomaly_monitors/index.md
index 8d6e275b7..c0431080b 100644
--- a/website/docs/services/ce/anomaly_monitors/index.md
+++ b/website/docs/services/ce/anomaly_monitors/index.md
@@ -47,7 +47,7 @@ Creates, updates, deletes or gets an <code>anomaly_monitor</code> resource or li
   {
     "name": "monitor_arn",
     "type": "string",
-    "description": "Subscription ARN"
+    "description": "Monitor ARN"
   },
   {
     "name": "monitor_type",
@@ -119,7 +119,7 @@ Creates, updates, deletes or gets an <code>anomaly_monitor</code> resource or li
   {
     "name": "monitor_arn",
     "type": "string",
-    "description": "Subscription ARN"
+    "description": "Monitor ARN"
   },
   {
     "name": "region",
diff --git a/website/docs/services/chatbot/custom_actions/index.md b/website/docs/services/chatbot/custom_actions/index.md
index b62949eb1..f93bf9fa0 100644
--- a/website/docs/services/chatbot/custom_actions/index.md
+++ b/website/docs/services/chatbot/custom_actions/index.md
@@ -121,12 +121,12 @@ Creates, updates, deletes or gets a <code>custom_action</code> resource or lists
     "description": "",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
         "description": ""
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
         "description": ""
       }
@@ -345,8 +345,8 @@ resources:
           command_text: '{{ command_text }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/cloudformation/stacks/index.md b/website/docs/services/cloudformation/stacks/index.md
index 0086dd9ae..1e4609bb1 100644
--- a/website/docs/services/cloudformation/stacks/index.md
+++ b/website/docs/services/cloudformation/stacks/index.md
@@ -159,12 +159,12 @@ Creates, updates, deletes or gets a <code>stack</code> resource or lists <code>s
       {
         "name": "key",
         "type": "string",
-        "description": "A string used to identify this tag. You can specify a maximum of 127 characters for a tag key."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "A string containing the value for this tag. You can specify a maximum of 256 characters for a tag value."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/cloudfront/anycast_ip_lists/index.md b/website/docs/services/cloudfront/anycast_ip_lists/index.md
index 31521e0fb..c1ec52edd 100644
--- a/website/docs/services/cloudfront/anycast_ip_lists/index.md
+++ b/website/docs/services/cloudfront/anycast_ip_lists/index.md
@@ -50,48 +50,39 @@ Creates, updates, deletes or gets an <code>anycast_ip_list</code> resource or li
     "description": "An Anycast static IP list. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/request-static-ips.html\">Request Anycast static IPs to use for allowlisting</a> in the <i>Amazon CloudFront Developer Guide</i>.",
     "children": [
       {
-        "name": "e_tag",
+        "name": "anycast_ips",
+        "type": "array",
+        "description": "The static IP addresses that are allocated to the Anycast static IP list."
+      },
+      {
+        "name": "arn",
         "type": "string",
-        "description": ""
+        "description": "The Amazon Resource Name (ARN) of the Anycast static IP list."
       },
       {
         "name": "id",
         "type": "string",
-        "description": ""
+        "description": "The ID of the Anycast static IP list."
       },
       {
         "name": "ip_count",
         "type": "integer",
         "description": "The number of IP addresses in the Anycast static IP list."
       },
+      {
+        "name": "last_modified_time",
+        "type": "string",
+        "description": "The last time the Anycast static IP list was modified."
+      },
       {
         "name": "name",
         "type": "string",
         "description": "The name of the Anycast static IP list."
       },
       {
-        "name": "tags",
-        "type": "object",
-        "description": "A complex type that contains zero or more <code>Tag</code> elements.",
-        "children": [
-          {
-            "name": "items",
-            "type": "array",
-            "description": "A complex type that contains <code>Tag</code> elements.",
-            "children": [
-              {
-                "name": "key",
-                "type": "string",
-                "description": "<details><summary>A string that contains <code>Tag</code> key.</summary>The string length should be between 1 and 128 characters. Valid characters include <code>a-z</code>, <code>A-Z</code>, <code>0-9</code>, space, and the special characters <code>_ - . : / = + @</code>.</details>"
-              },
-              {
-                "name": "value",
-                "type": "string",
-                "description": "<details><summary>A string that contains an optional <code>Tag</code> value.</summary>The string length should be between 0 and 256 characters. Valid characters include <code>a-z</code>, <code>A-Z</code>, <code>0-9</code>, space, and the special characters <code>_ - . : / = + @</code>.</details>"
-              }
-            ]
-          }
-        ]
+        "name": "status",
+        "type": "string",
+        "description": "The status of the Anycast static IP list. Valid values: <code>Deployed</code>, <code>Deploying</code>, or <code>Failed</code>."
       }
     ]
   },
diff --git a/website/docs/services/cloudfront/cache_policies/index.md b/website/docs/services/cloudfront/cache_policies/index.md
index 4eb6fd9be..6d41964a4 100644
--- a/website/docs/services/cloudfront/cache_policies/index.md
+++ b/website/docs/services/cloudfront/cache_policies/index.md
@@ -87,7 +87,7 @@ Creates, updates, deletes or gets a <code>cache_policy</code> resource or lists
               {
                 "name": "cookie_behavior",
                 "type": "string",
-                "description": "<details><summary>Determines whether cookies in viewer requests are included in requests that CloudFront sends to the origin. Valid values are:</summary>+  <code>none</code> – No cookies in viewer requests are included in requests that CloudFront sends to the origin. Even when this field is set to <code>none</code>, any cookies that are listed in a <code>CachePolicy</code><i>are</i> included in origin requests.<br />+  <code>whitelist</code> – Only the cookies in viewer requests that are listed in the <code>CookieNames</code> type are included in requests that CloudFront sends to the origin.<br />+  <code>all</code> – All cookies in viewer requests are included in requests that CloudFront sends to the origin.<br />+  <code>allExcept</code> – All cookies in viewer requests are included in requests that CloudFront sends to the origin, <i>except</i> for those listed in the <code>CookieNames</code> type, which are not included.</details>"
+                "description": "<details><summary>Determines whether any cookies in viewer requests are included in the cache key and in requests that CloudFront sends to the origin. Valid values are:</summary>+  <code>none</code> – No cookies in viewer requests are included in the cache key or in requests that CloudFront sends to the origin. Even when this field is set to <code>none</code>, any cookies that are listed in an <code>OriginRequestPolicy</code><i>are</i> included in origin requests.<br />+  <code>whitelist</code> – Only the cookies in viewer requests that are listed in the <code>CookieNames</code> type are included in the cache key and in requests that CloudFront sends to the origin.<br />+  <code>allExcept</code> – All cookies in viewer requests are included in the cache key and in requests that CloudFront sends to the origin, <i>except</i> for those that are listed in the <code>CookieNames</code> type, which are not included.<br />+  <code>all</code> – All cookies in viewer requests are included in the cache key and in requests that CloudFront sends to the origin.</details>"
               },
               {
                 "name": "cookies",
@@ -114,7 +114,7 @@ Creates, updates, deletes or gets a <code>cache_policy</code> resource or lists
               {
                 "name": "header_behavior",
                 "type": "string",
-                "description": "<details><summary>Determines whether any HTTP headers are included in requests that CloudFront sends to the origin. Valid values are:</summary>+  <code>none</code> – No HTTP headers in viewer requests are included in requests that CloudFront sends to the origin. Even when this field is set to <code>none</code>, any headers that are listed in a <code>CachePolicy</code><i>are</i> included in origin requests.<br />+  <code>whitelist</code> – Only the HTTP headers that are listed in the <code>Headers</code> type are included in requests that CloudFront sends to the origin.<br />+  <code>allViewer</code> – All HTTP headers in viewer requests are included in requests that CloudFront sends to the origin.<br />+  <code>allViewerAndWhitelistCloudFront</code> – All HTTP headers in viewer requests and the additional CloudFront headers that are listed in the <code>Headers</code> type are included in requests that CloudFront sends to the origin. The additional headers are added by CloudFront.<br />+  <code>allExcept</code> – All HTTP headers in viewer requests are included in requests that CloudFront sends to the origin, <i>except</i> for those listed in the <code>Headers</code> type, which are not included.</details>"
+                "description": "<details><summary>Determines whether any HTTP headers are included in the cache key and in requests that CloudFront sends to the origin. Valid values are:</summary>+  <code>none</code> – No HTTP headers are included in the cache key or in requests that CloudFront sends to the origin. Even when this field is set to <code>none</code>, any headers that are listed in an <code>OriginRequestPolicy</code><i>are</i> included in origin requests.<br />+  <code>whitelist</code> – Only the HTTP headers that are listed in the <code>Headers</code> type are included in the cache key and in requests that CloudFront sends to the origin.</details>"
               },
               {
                 "name": "headers",
@@ -131,7 +131,7 @@ Creates, updates, deletes or gets a <code>cache_policy</code> resource or lists
               {
                 "name": "query_string_behavior",
                 "type": "string",
-                "description": "<details><summary>Determines whether any URL query strings in viewer requests are included in requests that CloudFront sends to the origin. Valid values are:</summary>+  <code>none</code> – No query strings in viewer requests are included in requests that CloudFront sends to the origin. Even when this field is set to <code>none</code>, any query strings that are listed in a <code>CachePolicy</code><i>are</i> included in origin requests.<br />+  <code>whitelist</code> – Only the query strings in viewer requests that are listed in the <code>QueryStringNames</code> type are included in requests that CloudFront sends to the origin.<br />+  <code>all</code> – All query strings in viewer requests are included in requests that CloudFront sends to the origin.<br />+  <code>allExcept</code> – All query strings in viewer requests are included in requests that CloudFront sends to the origin, <i>except</i> for those listed in the <code>QueryStringNames</code> type, which are not included.</details>"
+                "description": "<details><summary>Determines whether any URL query strings in viewer requests are included in the cache key and in requests that CloudFront sends to the origin. Valid values are:</summary>+  <code>none</code> – No query strings in viewer requests are included in the cache key or in requests that CloudFront sends to the origin. Even when this field is set to <code>none</code>, any query strings that are listed in an <code>OriginRequestPolicy</code><i>are</i> included in origin requests.<br />+  <code>whitelist</code> – Only the query strings in viewer requests that are listed in the <code>QueryStringNames</code> type are included in the cache key and in requests that CloudFront sends to the origin.<br />+  <code>allExcept</code> – All query strings in viewer requests are included in the cache key and in requests that CloudFront sends to the origin, <i>except</i> those that are listed in the <code>QueryStringNames</code> type, which are not included.<br />+  <code>all</code> – All query strings in viewer requests are included in the cache key and in requests that CloudFront sends to the origin.</details>"
               },
               {
                 "name": "query_strings",
diff --git a/website/docs/services/cloudfront/monitoring_subscriptions/index.md b/website/docs/services/cloudfront/monitoring_subscriptions/index.md
index 374f12a0b..86270059e 100644
--- a/website/docs/services/cloudfront/monitoring_subscriptions/index.md
+++ b/website/docs/services/cloudfront/monitoring_subscriptions/index.md
@@ -46,9 +46,16 @@ Creates, updates, deletes or gets a <code>monitoring_subscription</code> resourc
     "description": "A subscription configuration for additional CloudWatch metrics.",
     "children": [
       {
-        "name": "distribution_id",
-        "type": "string",
-        "description": "The ID of the distribution that you are enabling metrics for."
+        "name": "realtime_metrics_subscription_config",
+        "type": "object",
+        "description": "A subscription configuration for additional CloudWatch metrics.",
+        "children": [
+          {
+            "name": "realtime_metrics_subscription_status",
+            "type": "string",
+            "description": "A flag that indicates whether additional CloudWatch metrics are enabled for a given CloudFront distribution."
+          }
+        ]
       }
     ]
   },
@@ -185,8 +192,8 @@ resources:
         value: '{{ distribution_id }}'
       - name: monitoring_subscription
         value:
-          distribution_id: '{{ distribution_id }}'
-          monitoring_subscription: null`}</CodeBlock>
+          realtime_metrics_subscription_config:
+            realtime_metrics_subscription_status: '{{ realtime_metrics_subscription_status }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/cloudtrail/channels/index.md b/website/docs/services/cloudtrail/channels/index.md
index 6f6bfc7da..c3590935d 100644
--- a/website/docs/services/cloudtrail/channels/index.md
+++ b/website/docs/services/cloudtrail/channels/index.md
@@ -82,14 +82,14 @@ Creates, updates, deletes or gets a <code>channel</code> resource or lists <code
     "description": "An array of key-value pairs to apply to this resource.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -293,8 +293,8 @@ resources:
             location: '{{ location }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/cloudtrail/dashboards/index.md b/website/docs/services/cloudtrail/dashboards/index.md
index a56054db5..41713e565 100644
--- a/website/docs/services/cloudtrail/dashboards/index.md
+++ b/website/docs/services/cloudtrail/dashboards/index.md
@@ -136,14 +136,14 @@ Creates, updates, deletes or gets a <code>dashboard</code> resource or lists <co
     "description": "",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -363,8 +363,8 @@ resources:
         value: '{{ termination_protection_enabled }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/cloudtrail/event_data_stores/index.md b/website/docs/services/cloudtrail/event_data_stores/index.md
index 6185dba30..b6213ce79 100644
--- a/website/docs/services/cloudtrail/event_data_stores/index.md
+++ b/website/docs/services/cloudtrail/event_data_stores/index.md
@@ -164,14 +164,14 @@ Creates, updates, deletes or gets an <code>event_data_store</code> resource or l
     "description": "",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -183,7 +183,7 @@ Creates, updates, deletes or gets an <code>event_data_store</code> resource or l
       {
         "name": "insight_type",
         "type": "string",
-        "description": "The type of insight to log on a trail."
+        "description": "The type of Insights to log on an event data store."
       }
     ]
   },
@@ -485,8 +485,8 @@ resources:
         value: '{{ kms_key_id }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'
+          - key: '{{ key }}'
+            value: '{{ value }}'
       - name: insight_selectors
         value:
           - insight_type: '{{ insight_type }}'
diff --git a/website/docs/services/cloudwatch/alarms/index.md b/website/docs/services/cloudwatch/alarms/index.md
index 5f22033c4..f19c50953 100644
--- a/website/docs/services/cloudwatch/alarms/index.md
+++ b/website/docs/services/cloudwatch/alarms/index.md
@@ -250,12 +250,12 @@ Creates, updates, deletes or gets an <code>alarm</code> resource or lists <code>
       {
         "name": "key",
         "type": "string",
-        "description": "A unique identifier for the tag."
+        "description": "A string that you can use to assign a value. The combination of tag keys and values can help you organize and categorize your resources."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "String which you can use to describe or define the tag."
+        "description": "The value for the specified tag key."
       }
     ]
   },
diff --git a/website/docs/services/cloudwatch/composite_alarms/index.md b/website/docs/services/cloudwatch/composite_alarms/index.md
index 4774812f6..95f58ac2d 100644
--- a/website/docs/services/cloudwatch/composite_alarms/index.md
+++ b/website/docs/services/cloudwatch/composite_alarms/index.md
@@ -107,12 +107,12 @@ Creates, updates, deletes or gets a <code>composite_alarm</code> resource or lis
       {
         "name": "key",
         "type": "string",
-        "description": "A unique identifier for the tag."
+        "description": "A unique identifier for the tag. The combination of tag keys and values can help you organize and categorize your resources."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "String which you can use to describe or define the tag."
+        "description": "The value for the specified tag key."
       }
     ]
   },
diff --git a/website/docs/services/codepipeline/custom_action_types/index.md b/website/docs/services/codepipeline/custom_action_types/index.md
index 6fc6da9d7..aaa654737 100644
--- a/website/docs/services/codepipeline/custom_action_types/index.md
+++ b/website/docs/services/codepipeline/custom_action_types/index.md
@@ -148,12 +148,12 @@ Creates, updates, deletes or gets a <code>custom_action_type</code> resource or
       {
         "name": "value",
         "type": "string",
-        "description": "The tag's value."
+        "description": ""
       },
       {
         "name": "key",
         "type": "string",
-        "description": "The tag's key."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/codestarconnections/connections/index.md b/website/docs/services/codestarconnections/connections/index.md
index a3d5cd796..05b55bb12 100644
--- a/website/docs/services/codestarconnections/connections/index.md
+++ b/website/docs/services/codestarconnections/connections/index.md
@@ -82,12 +82,12 @@ Creates, updates, deletes or gets a <code>connection</code> resource or lists <c
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, , ., /, =, +, and -."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, , ., /, =, +, and -."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/config/aggregation_authorizations/index.md b/website/docs/services/config/aggregation_authorizations/index.md
index d297152b1..827db9b20 100644
--- a/website/docs/services/config/aggregation_authorizations/index.md
+++ b/website/docs/services/config/aggregation_authorizations/index.md
@@ -72,7 +72,7 @@ Creates, updates, deletes or gets an <code>aggregation_authorization</code> reso
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/config/configuration_aggregators/index.md b/website/docs/services/config/configuration_aggregators/index.md
index bd90fd657..505c89434 100644
--- a/website/docs/services/config/configuration_aggregators/index.md
+++ b/website/docs/services/config/configuration_aggregators/index.md
@@ -111,7 +111,7 @@ Creates, updates, deletes or gets a <code>configuration_aggregator</code> resour
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/config/conformance_packs/index.md b/website/docs/services/config/conformance_packs/index.md
index d6c801475..00a1da155 100644
--- a/website/docs/services/config/conformance_packs/index.md
+++ b/website/docs/services/config/conformance_packs/index.md
@@ -94,12 +94,12 @@ Creates, updates, deletes or gets a <code>conformance_pack</code> resource or li
       {
         "name": "parameter_name",
         "type": "string",
-        "description": ""
+        "description": "Key part of key-value pair with value being parameter value"
       },
       {
         "name": "parameter_value",
         "type": "string",
-        "description": ""
+        "description": "Value part of key-value pair with key being parameter Name"
       }
     ]
   },
diff --git a/website/docs/services/connect/agent_statuses/index.md b/website/docs/services/connect/agent_statuses/index.md
index 8800f8a22..9246999b6 100644
--- a/website/docs/services/connect/agent_statuses/index.md
+++ b/website/docs/services/connect/agent_statuses/index.md
@@ -92,12 +92,12 @@ Creates, updates, deletes or gets an <code>agent_status</code> resource or lists
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. . You can specify a value that is maximum of 256 Unicode characters"
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/connect/contact_flow_modules/index.md b/website/docs/services/connect/contact_flow_modules/index.md
index 3e50f0c52..940ea73bd 100644
--- a/website/docs/services/connect/contact_flow_modules/index.md
+++ b/website/docs/services/connect/contact_flow_modules/index.md
@@ -87,12 +87,12 @@ Creates, updates, deletes or gets a <code>contact_flow_module</code> resource or
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. . You can specify a value that is maximum of 256 Unicode characters"
+        "description": "The value for the tag. You can specify a value that is maximum of 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/connect/contact_flows/index.md b/website/docs/services/connect/contact_flows/index.md
index bf19f87c6..1afc4c54a 100644
--- a/website/docs/services/connect/contact_flows/index.md
+++ b/website/docs/services/connect/contact_flows/index.md
@@ -87,12 +87,12 @@ Creates, updates, deletes or gets a <code>contact_flow</code> resource or lists
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. . You can specify a value that is maximum of 256 Unicode characters"
+        "description": "The value for the tag. . You can specify a value that is maximum of 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/connect/email_addresses/index.md b/website/docs/services/connect/email_addresses/index.md
index 4e2ec277e..8c53b64a1 100644
--- a/website/docs/services/connect/email_addresses/index.md
+++ b/website/docs/services/connect/email_addresses/index.md
@@ -77,12 +77,12 @@ Creates, updates, deletes or gets an <code>email_address</code> resource or list
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. . You can specify a value that is maximum of 256 Unicode characters"
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/connect/evaluation_forms/index.md b/website/docs/services/connect/evaluation_forms/index.md
index ca9aa9c50..9bb451416 100644
--- a/website/docs/services/connect/evaluation_forms/index.md
+++ b/website/docs/services/connect/evaluation_forms/index.md
@@ -150,14 +150,14 @@ Creates, updates, deletes or gets an <code>evaluation_form</code> resource or li
     "description": "The tags used to organize, track, or control access for this resource. For example, &#123; \"tags\": &#123;\"key1\":\"value1\", \"key2\":\"value2\"&#125; &#125;.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters"
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -"
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The value for the tag. . You can specify a value that is maximum of 256 Unicode characters"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -"
       }
     ]
   },
@@ -429,8 +429,8 @@ resources:
               weight: null
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/connect/hours_of_operations/index.md b/website/docs/services/connect/hours_of_operations/index.md
index d38f930a8..01408c411 100644
--- a/website/docs/services/connect/hours_of_operations/index.md
+++ b/website/docs/services/connect/hours_of_operations/index.md
@@ -106,12 +106,12 @@ Creates, updates, deletes or gets a <code>hours_of_operation</code> resource or
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. . You can specify a value that is maximum of 256 Unicode characters"
+        "description": "The value for the tag. You can specify a value that is maximum of 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/connect/index.md b/website/docs/services/connect/index.md
index 561318a70..a93ea85a3 100644
--- a/website/docs/services/connect/index.md
+++ b/website/docs/services/connect/index.md
@@ -20,7 +20,7 @@ The connect service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>26</b></span><br />
+<span>total resources:&nbsp;<b>27</b></span><br />
 </div>
 </div>
 
@@ -40,6 +40,7 @@ The connect service documentation.
 <a href="/services/connect/instance_storage_configs/">instance_storage_configs</a><br />
 <a href="/services/connect/instances/">instances</a><br />
 <a href="/services/connect/integration_associations/">integration_associations</a><br />
+<a href="/services/connect/phone_numbers/">phone_numbers</a><br />
 <a href="/services/connect/predefined_attributes/">predefined_attributes</a><br />
 <a href="/services/connect/prompts/">prompts</a>
 </div>
diff --git a/website/docs/services/connect/instances/index.md b/website/docs/services/connect/instances/index.md
index e0c2fa140..95779f43f 100644
--- a/website/docs/services/connect/instances/index.md
+++ b/website/docs/services/connect/instances/index.md
@@ -159,12 +159,12 @@ Creates, updates, deletes or gets an <code>instance</code> resource or lists <co
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. . You can specify a value that is maximum of 256 Unicode characters"
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/connect/phone_numbers/index.md b/website/docs/services/connect/phone_numbers/index.md
new file mode 100644
index 000000000..0d766dc14
--- /dev/null
+++ b/website/docs/services/connect/phone_numbers/index.md
@@ -0,0 +1,448 @@
+---
+title: phone_numbers
+hide_title: false
+hide_table_of_contents: false
+keywords:
+  - phone_numbers
+  - connect
+  - aws
+  - stackql
+  - infrastructure-as-code
+  - configuration-as-data
+  - cloud inventory
+description: Query, deploy and manage AWS resources using SQL
+custom_edit_url: null
+image: /img/stackql-aws-provider-featured-image.png
+---
+
+import CodeBlock from '@theme/CodeBlock';
+import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
+
+Creates, updates, deletes or gets a <code>phone_number</code> resource or lists <code>phone_numbers</code> in a region
+
+## Overview
+<table>
+<tbody>
+<tr><td><b>Name</b></td><td><code>phone_numbers</code></td></tr>
+<tr><td><b>Type</b></td><td>Resource</td></tr>
+<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Connect::PhoneNumber</td></tr>
+<tr><td><b>Id</b></td><td><CopyableCode code="awscc.connect.phone_numbers" /></td></tr>
+</tbody>
+</table>
+
+## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "target_arn",
+    "type": "string",
+    "description": "The ARN of the target the phone number is claimed to."
+  },
+  {
+    "name": "phone_number_arn",
+    "type": "string",
+    "description": "The phone number ARN"
+  },
+  {
+    "name": "description",
+    "type": "string",
+    "description": "The description of the phone number."
+  },
+  {
+    "name": "type",
+    "type": "string",
+    "description": "The phone number type"
+  },
+  {
+    "name": "country_code",
+    "type": "string",
+    "description": "The phone number country code."
+  },
+  {
+    "name": "prefix",
+    "type": "string",
+    "description": "The phone number prefix."
+  },
+  {
+    "name": "address",
+    "type": "string",
+    "description": "The phone number e164 address."
+  },
+  {
+    "name": "tags",
+    "type": "array",
+    "description": "One or more tags.",
+    "children": [
+      {
+        "name": "key",
+        "type": "string",
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+      },
+      {
+        "name": "value",
+        "type": "string",
+        "description": "The value for the tag. You can specify a value that is 1 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+      }
+    ]
+  },
+  {
+    "name": "source_phone_number_arn",
+    "type": "string",
+    "description": "The source phone number arn."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "phone_number_arn",
+    "type": "string",
+    "description": "The phone number ARN"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
+
+For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-phonenumber.html"><code>AWS::Connect::PhoneNumber</code></a>.
+
+## Methods
+
+<table>
+<tbody>
+  <tr>
+    <th>Name</th>
+    <th>Resource</th>
+    <th>Accessible by</th>
+    <th>Required Params</th>
+  </tr>
+  <tr>
+    <td><CopyableCode code="create_resource" /></td>
+    <td><code>phone_numbers</code></td>
+    <td><code>INSERT</code></td>
+    <td><CopyableCode code="TargetArn, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="delete_resource" /></td>
+    <td><code>phone_numbers</code></td>
+    <td><code>DELETE</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="update_resource" /></td>
+    <td><code>phone_numbers</code></td>
+    <td><code>UPDATE</code></td>
+    <td><CopyableCode code="Identifier, PatchDocument, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="list_resources" /></td>
+    <td><code>phone_numbers_list_only</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="get_resource" /></td>
+    <td><code>phone_numbers</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+</tbody>
+</table>
+
+## `SELECT` examples
+
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+Gets all properties from an individual <code>phone_number</code>.
+```sql
+SELECT
+  region,
+  target_arn,
+  phone_number_arn,
+  description,
+  type,
+  country_code,
+  prefix,
+  address,
+  tags,
+  source_phone_number_arn
+FROM awscc.connect.phone_numbers
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ phone_number_arn }}';
+```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>phone_numbers</code> in a region.
+```sql
+SELECT
+  region,
+  phone_number_arn
+FROM awscc.connect.phone_numbers_list_only
+WHERE
+  region = '{{ region }}';
+```
+</TabItem>
+</Tabs>
+
+## `INSERT` example
+
+Use the following StackQL query and manifest file to create a new <code>phone_number</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+<Tabs
+    defaultValue="required"
+    values={[
+      { label: 'Required Properties', value: 'required', },
+      { label: 'All Properties', value: 'all', },
+      { label: 'Manifest', value: 'manifest', },
+    ]
+}>
+<TabItem value="required">
+
+```sql
+/*+ create */
+INSERT INTO awscc.connect.phone_numbers (
+  TargetArn,
+  region
+)
+SELECT
+  '{{ target_arn }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="all">
+
+```sql
+/*+ create */
+INSERT INTO awscc.connect.phone_numbers (
+  TargetArn,
+  Description,
+  Type,
+  CountryCode,
+  Prefix,
+  Tags,
+  SourcePhoneNumberArn,
+  region
+)
+SELECT
+  '{{ target_arn }}',
+  '{{ description }}',
+  '{{ type }}',
+  '{{ country_code }}',
+  '{{ prefix }}',
+  '{{ tags }}',
+  '{{ source_phone_number_arn }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="manifest">
+
+<CodeBlock language="yaml">{`version: 1
+name: stack name
+description: stack description
+providers:
+  - aws
+globals:
+  - name: region
+    value: '{{ vars.AWS_REGION }}'
+resources:
+  - name: phone_number
+    props:
+      - name: target_arn
+        value: '{{ target_arn }}'
+      - name: description
+        value: '{{ description }}'
+      - name: type
+        value: '{{ type }}'
+      - name: country_code
+        value: '{{ country_code }}'
+      - name: prefix
+        value: '{{ prefix }}'
+      - name: tags
+        value:
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: source_phone_number_arn
+        value: '{{ source_phone_number_arn }}'`}</CodeBlock>
+
+</TabItem>
+</Tabs>
+
+## `UPDATE` example
+
+Use the following StackQL query and manifest file to update a <code>phone_number</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+```sql
+/*+ update */
+UPDATE awscc.connect.phone_numbers
+SET PatchDocument = string('{{ {
+    "TargetArn": target_arn,
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ phone_number_arn }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## `DELETE` example
+
+```sql
+/*+ delete */
+DELETE FROM awscc.connect.phone_numbers
+WHERE
+  Identifier = '{{ phone_number_arn }}' AND
+  region = '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## Additional Parameters
+
+Mutable resources in the Cloud Control provider support additional optional parameters which can be supplied with `INSERT`, `UPDATE`, or `DELETE` operations. These include:
+
+| Parameter | Description |
+|-----------|-------------|
+| <CopyableCode code="ClientToken" /> | <details><summary>A unique identifier to ensure the idempotency of the resource request.</summary>This allows the provider to accurately distinguish between retries and new requests.<br />A client token is valid for 36 hours once used.<br />After that, a resource request with the same client token is treated as a new request.<br />If you do not specify a client token, one is generated for inclusion in the request.</details> |
+| <CopyableCode code="RoleArn" /> | <details><summary>The ARN of the IAM role used to perform this resource operation.</summary>The role specified must have the permissions required for this operation.<br />If you do not specify a role, a temporary session is created using your AWS user credentials.</details> |
+| <CopyableCode code="TypeVersionId" /> | <details><summary>For private resource types, the type version to use in this resource operation.</summary>If you do not specify a resource version, the default version is used.</details> |
+
+## Permissions
+
+To operate on the <code>phone_numbers</code> resource, the following permissions are required:
+
+<Tabs
+    defaultValue="create"
+    values={[
+      { label: 'Create', value: 'create', },
+      { label: 'Read', value: 'read', },
+      { label: 'Delete', value: 'delete', },
+      { label: 'Update', value: 'update', },
+      { label: 'List', value: 'list', },
+    ]
+}>
+<TabItem value="create">
+
+```json
+connect:ClaimPhoneNumber,
+connect:SearchAvailablePhoneNumbers,
+connect:DescribePhoneNumber,
+connect:TagResource,
+connect:ImportPhoneNumber,
+sms-voice:DescribePhoneNumbers,
+social-messaging:GetLinkedWhatsAppBusinessAccountPhoneNumber,
+social-messaging:TagResource
+```
+
+</TabItem>
+<TabItem value="read">
+
+```json
+connect:DescribePhoneNumber
+```
+
+</TabItem>
+<TabItem value="delete">
+
+```json
+connect:ReleasePhoneNumber,
+connect:UntagResource
+```
+
+</TabItem>
+<TabItem value="update">
+
+```json
+connect:UpdatePhoneNumber,
+connect:UpdatePhoneNumberMetadata,
+connect:DescribePhoneNumber,
+connect:TagResource,
+connect:UntagResource
+```
+
+</TabItem>
+<TabItem value="list">
+
+```json
+connect:ListPhoneNumbersV2
+```
+
+</TabItem>
+</Tabs>
\ No newline at end of file
diff --git a/website/docs/services/connect/prompts/index.md b/website/docs/services/connect/prompts/index.md
index a726518cc..70a397145 100644
--- a/website/docs/services/connect/prompts/index.md
+++ b/website/docs/services/connect/prompts/index.md
@@ -77,12 +77,12 @@ Creates, updates, deletes or gets a <code>prompt</code> resource or lists <code>
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. . You can specify a value that is maximum of 256 Unicode characters"
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/connect/queues/index.md b/website/docs/services/connect/queues/index.md
index 5d3e0a205..afee74d65 100644
--- a/website/docs/services/connect/queues/index.md
+++ b/website/docs/services/connect/queues/index.md
@@ -126,12 +126,12 @@ Creates, updates, deletes or gets a <code>queue</code> resource or lists <code>q
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. . You can specify a value that is maximum of 256 Unicode characters"
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/connect/quick_connects/index.md b/website/docs/services/connect/quick_connects/index.md
index dc12a4534..9b5284922 100644
--- a/website/docs/services/connect/quick_connects/index.md
+++ b/website/docs/services/connect/quick_connects/index.md
@@ -94,7 +94,7 @@ Creates, updates, deletes or gets a <code>quick_connect</code> resource or lists
           {
             "name": "queue_arn",
             "type": "string",
-            "description": "The Amazon Resource Name (ARN) for the queue."
+            "description": "The identifier for the queue."
           }
         ]
       },
@@ -111,7 +111,7 @@ Creates, updates, deletes or gets a <code>quick_connect</code> resource or lists
           {
             "name": "user_arn",
             "type": "string",
-            "description": "The Amazon Resource Name (ARN) of the user or a dynamic recipient string starting with '$.'."
+            "description": "The identifier of the user."
           }
         ]
       }
@@ -130,12 +130,12 @@ Creates, updates, deletes or gets a <code>quick_connect</code> resource or lists
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. . You can specify a value that is maximum of 256 Unicode characters"
+        "description": "The value for the tag. You can specify a value that is maximum of 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/connect/routing_profiles/index.md b/website/docs/services/connect/routing_profiles/index.md
index 523e09724..cf46581fc 100644
--- a/website/docs/services/connect/routing_profiles/index.md
+++ b/website/docs/services/connect/routing_profiles/index.md
@@ -140,12 +140,12 @@ Creates, updates, deletes or gets a <code>routing_profile</code> resource or lis
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. . You can specify a value that is maximum of 256 Unicode characters"
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/connect/rules/index.md b/website/docs/services/connect/rules/index.md
index d1454f241..1a940a280 100644
--- a/website/docs/services/connect/rules/index.md
+++ b/website/docs/services/connect/rules/index.md
@@ -177,23 +177,13 @@ Creates, updates, deletes or gets a <code>rule</code> resource or lists <code>ru
             "children": [
               {
                 "name": "id",
-                "type": "object",
-                "description": "the identifier (name) for the task template field"
-              },
-              {
-                "name": "description",
-                "type": "string",
-                "description": "The description of the task template's field"
-              },
-              {
-                "name": "type",
                 "type": "string",
-                "description": "The type of the task template's field"
+                "description": ""
               },
               {
-                "name": "single_select_options",
-                "type": "array",
-                "description": "list of field options to be used with single select"
+                "name": "value",
+                "type": "object",
+                "description": "Object for case field values."
               }
             ]
           },
@@ -216,23 +206,13 @@ Creates, updates, deletes or gets a <code>rule</code> resource or lists <code>ru
             "children": [
               {
                 "name": "id",
-                "type": "object",
-                "description": "the identifier (name) for the task template field"
-              },
-              {
-                "name": "description",
-                "type": "string",
-                "description": "The description of the task template's field"
-              },
-              {
-                "name": "type",
                 "type": "string",
-                "description": "The type of the task template's field"
+                "description": ""
               },
               {
-                "name": "single_select_options",
-                "type": "array",
-                "description": "list of field options to be used with single select"
+                "name": "value",
+                "type": "object",
+                "description": "Object for case field values."
               }
             ]
           }
@@ -270,12 +250,12 @@ Creates, updates, deletes or gets a <code>rule</code> resource or lists <code>ru
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -"
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. . You can specify a value that is maximum of 256 Unicode characters"
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -"
       }
     ]
   },
@@ -469,12 +449,12 @@ resources:
                   - '{{ user_arns[0] }}'
           create_case_actions:
             - fields:
-                - id:
-                    name: '{{ name }}'
-                  description: '{{ description }}'
-                  type: '{{ type }}'
-                  single_select_options:
-                    - '{{ single_select_options[0] }}'
+                - id: '{{ id }}'
+                  value:
+                    string_value: '{{ string_value }}'
+                    boolean_value: '{{ boolean_value }}'
+                    double_value: null
+                    empty_value: {}
               template_id: '{{ template_id }}'
           update_case_actions:
             - fields: null
diff --git a/website/docs/services/connect/security_profiles/index.md b/website/docs/services/connect/security_profiles/index.md
index c6e2f44ad..848b99a23 100644
--- a/website/docs/services/connect/security_profiles/index.md
+++ b/website/docs/services/connect/security_profiles/index.md
@@ -52,12 +52,12 @@ Creates, updates, deletes or gets a <code>security_profile</code> resource or li
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. . You can specify a value that is maximum of 256 Unicode characters"
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/connect/task_templates/index.md b/website/docs/services/connect/task_templates/index.md
index 02bd8ee21..36cd822f7 100644
--- a/website/docs/services/connect/task_templates/index.md
+++ b/website/docs/services/connect/task_templates/index.md
@@ -214,12 +214,12 @@ Creates, updates, deletes or gets a <code>task_template</code> resource or lists
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. . You can specify a value that is maximum of 256 Unicode characters"
+        "description": "The value for the tag. . You can specify a value that is maximum of 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/connect/traffic_distribution_groups/index.md b/website/docs/services/connect/traffic_distribution_groups/index.md
index 949fba03c..4e9e6fe8f 100644
--- a/website/docs/services/connect/traffic_distribution_groups/index.md
+++ b/website/docs/services/connect/traffic_distribution_groups/index.md
@@ -77,12 +77,12 @@ Creates, updates, deletes or gets a <code>traffic_distribution_group</code> reso
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. . You can specify a value that is maximum of 256 Unicode characters"
+        "description": "The value for the tag. You can specify a value that is 1 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/connect/user_hierarchy_groups/index.md b/website/docs/services/connect/user_hierarchy_groups/index.md
index 6e71774c9..1be22d975 100644
--- a/website/docs/services/connect/user_hierarchy_groups/index.md
+++ b/website/docs/services/connect/user_hierarchy_groups/index.md
@@ -67,12 +67,12 @@ Creates, updates, deletes or gets an <code>user_hierarchy_group</code> resource
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. . You can specify a value that is maximum of 256 Unicode characters"
+        "description": "The value for the tag. You can specify a value that is maximum of 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/connect/users/index.md b/website/docs/services/connect/users/index.md
index ede2cd57a..091dad691 100644
--- a/website/docs/services/connect/users/index.md
+++ b/website/docs/services/connect/users/index.md
@@ -156,12 +156,12 @@ Creates, updates, deletes or gets a <code>user</code> resource or lists <code>us
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. . You can specify a value that is maximum of 256 Unicode characters"
+        "description": "The value for the tag. You can specify a value that is maximum of 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/controltower/enabled_controls/index.md b/website/docs/services/controltower/enabled_controls/index.md
index 576cf70ce..d1e7536f6 100644
--- a/website/docs/services/controltower/enabled_controls/index.md
+++ b/website/docs/services/controltower/enabled_controls/index.md
@@ -77,14 +77,14 @@ Creates, updates, deletes or gets an <code>enabled_control</code> resource or li
     "description": "A set of tags to assign to the enabled control.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:."
       }
     ]
   },
@@ -295,8 +295,8 @@ resources:
             key: '{{ key }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/customerprofiles/calculated_attribute_definitions/index.md b/website/docs/services/customerprofiles/calculated_attribute_definitions/index.md
index d7e18446e..8a76d07e2 100644
--- a/website/docs/services/customerprofiles/calculated_attribute_definitions/index.md
+++ b/website/docs/services/customerprofiles/calculated_attribute_definitions/index.md
@@ -62,7 +62,7 @@ Creates, updates, deletes or gets a <code>calculated_attribute_definition</code>
   {
     "name": "description",
     "type": "string",
-    "description": "The description of the event trigger."
+    "description": "The description of the calculated attribute."
   },
   {
     "name": "attribute_details",
diff --git a/website/docs/services/customerprofiles/domains/index.md b/website/docs/services/customerprofiles/domains/index.md
index 2867a651e..e9bbf1af8 100644
--- a/website/docs/services/customerprofiles/domains/index.md
+++ b/website/docs/services/customerprofiles/domains/index.md
@@ -305,12 +305,12 @@ Creates, updates, deletes or gets a <code>domain</code> resource or lists <code>
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/customerprofiles/integrations/index.md b/website/docs/services/customerprofiles/integrations/index.md
index 9e123d0aa..f3a50c35a 100644
--- a/website/docs/services/customerprofiles/integrations/index.md
+++ b/website/docs/services/customerprofiles/integrations/index.md
@@ -255,12 +255,12 @@ Creates, updates, deletes or gets an <code>integration</code> resource or lists
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/customerprofiles/object_types/index.md b/website/docs/services/customerprofiles/object_types/index.md
index 4bd7d92dd..6a2ee6c7f 100644
--- a/website/docs/services/customerprofiles/object_types/index.md
+++ b/website/docs/services/customerprofiles/object_types/index.md
@@ -160,12 +160,12 @@ Creates, updates, deletes or gets an <code>object_type</code> resource or lists
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/databrew/datasets/index.md b/website/docs/services/databrew/datasets/index.md
index a008319f9..3ab86340e 100644
--- a/website/docs/services/databrew/datasets/index.md
+++ b/website/docs/services/databrew/datasets/index.md
@@ -131,6 +131,11 @@ Creates, updates, deletes or gets a <code>dataset</code> resource or lists <code
             "name": "key",
             "type": "string",
             "description": ""
+          },
+          {
+            "name": "bucket_owner",
+            "type": "string",
+            "description": "Bucket owner"
           }
         ]
       },
@@ -528,6 +533,7 @@ resources:
           s3_input_definition:
             bucket: '{{ bucket }}'
             key: '{{ key }}'
+            bucket_owner: '{{ bucket_owner }}'
           data_catalog_input_definition:
             catalog_id: '{{ catalog_id }}'
             database_name: '{{ database_name }}'
diff --git a/website/docs/services/databrew/jobs/index.md b/website/docs/services/databrew/jobs/index.md
index d5bfaa54b..12e8736ff 100644
--- a/website/docs/services/databrew/jobs/index.md
+++ b/website/docs/services/databrew/jobs/index.md
@@ -126,7 +126,7 @@ Creates, updates, deletes or gets a <code>job</code> resource or lists <code>job
       {
         "name": "location",
         "type": "object",
-        "description": "Input location",
+        "description": "S3 Output location",
         "children": [
           {
             "name": "bucket",
@@ -137,6 +137,11 @@ Creates, updates, deletes or gets a <code>job</code> resource or lists <code>job
             "name": "key",
             "type": "string",
             "description": ""
+          },
+          {
+            "name": "bucket_owner",
+            "type": "string",
+            "description": ""
           }
         ]
       },
@@ -180,7 +185,7 @@ Creates, updates, deletes or gets a <code>job</code> resource or lists <code>job
           {
             "name": "location",
             "type": "object",
-            "description": "Input location",
+            "description": "S3 Output location",
             "children": [
               {
                 "name": "bucket",
@@ -191,6 +196,11 @@ Creates, updates, deletes or gets a <code>job</code> resource or lists <code>job
                 "name": "key",
                 "type": "string",
                 "description": ""
+              },
+              {
+                "name": "bucket_owner",
+                "type": "string",
+                "description": ""
               }
             ]
           }
@@ -204,7 +214,7 @@ Creates, updates, deletes or gets a <code>job</code> resource or lists <code>job
           {
             "name": "temp_directory",
             "type": "object",
-            "description": "Input location",
+            "description": "S3 Output location",
             "children": [
               {
                 "name": "bucket",
@@ -215,6 +225,11 @@ Creates, updates, deletes or gets a <code>job</code> resource or lists <code>job
                 "name": "key",
                 "type": "string",
                 "description": ""
+              },
+              {
+                "name": "bucket_owner",
+                "type": "string",
+                "description": ""
               }
             ]
           },
@@ -255,7 +270,7 @@ Creates, updates, deletes or gets a <code>job</code> resource or lists <code>job
           {
             "name": "temp_directory",
             "type": "object",
-            "description": "Input location",
+            "description": "S3 Output location",
             "children": [
               {
                 "name": "bucket",
@@ -266,6 +281,11 @@ Creates, updates, deletes or gets a <code>job</code> resource or lists <code>job
                 "name": "key",
                 "type": "string",
                 "description": ""
+              },
+              {
+                "name": "bucket_owner",
+                "type": "string",
+                "description": ""
               }
             ]
           },
@@ -308,80 +328,17 @@ Creates, updates, deletes or gets a <code>job</code> resource or lists <code>job
   {
     "name": "recipe",
     "type": "object",
-    "description": "Resource schema for AWS::DataBrew::Recipe.",
+    "description": "",
     "children": [
-      {
-        "name": "description",
-        "type": "string",
-        "description": "Description of the recipe"
-      },
       {
         "name": "name",
         "type": "string",
         "description": "Recipe name"
       },
       {
-        "name": "steps",
-        "type": "array",
-        "description": "",
-        "children": [
-          {
-            "name": "action",
-            "type": "object",
-            "description": "",
-            "children": [
-              {
-                "name": "operation",
-                "type": "string",
-                "description": "Step action operation"
-              },
-              {
-                "name": "parameters",
-                "type": "object",
-                "description": ""
-              }
-            ]
-          },
-          {
-            "name": "condition_expressions",
-            "type": "array",
-            "description": "Condition expressions applied to the step action",
-            "children": [
-              {
-                "name": "condition",
-                "type": "string",
-                "description": "Input condition to be applied to the target column"
-              },
-              {
-                "name": "value",
-                "type": "string",
-                "description": "Value of the condition"
-              },
-              {
-                "name": "target_column",
-                "type": "string",
-                "description": "Name of the target column"
-              }
-            ]
-          }
-        ]
-      },
-      {
-        "name": "tags",
-        "type": "array",
-        "description": "",
-        "children": [
-          {
-            "name": "key",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "value",
-            "type": "string",
-            "description": ""
-          }
-        ]
+        "name": "version",
+        "type": "string",
+        "description": "Recipe version"
       }
     ]
   },
@@ -466,12 +423,12 @@ Creates, updates, deletes or gets a <code>job</code> resource or lists <code>job
           {
             "name": "regex",
             "type": "string",
-            "description": "A regular expression for selecting a column from a dataset"
+            "description": ""
           },
           {
             "name": "name",
             "type": "string",
-            "description": "The name of a column from a dataset"
+            "description": ""
           }
         ]
       },
@@ -799,6 +756,7 @@ resources:
             location:
               bucket: '{{ bucket }}'
               key: '{{ key }}'
+              bucket_owner: '{{ bucket_owner }}'
             overwrite: '{{ overwrite }}'
             max_output_files: '{{ max_output_files }}'
       - name: data_catalog_outputs
@@ -826,24 +784,14 @@ resources:
         value: '{{ project_name }}'
       - name: recipe
         value:
-          description: '{{ description }}'
           name: '{{ name }}'
-          steps:
-            - action:
-                operation: '{{ operation }}'
-                parameters: null
-              condition_expressions:
-                - condition: '{{ condition }}'
-                  value: '{{ value }}'
-                  target_column: '{{ target_column }}'
-          tags:
-            - key: '{{ key }}'
-              value: '{{ value }}'
+          version: '{{ version }}'
       - name: role_arn
         value: '{{ role_arn }}'
       - name: tags
         value:
-          - null
+          - key: '{{ key }}'
+            value: '{{ value }}'
       - name: timeout
         value: '{{ timeout }}'
       - name: job_sample
diff --git a/website/docs/services/datasync/location_hdfs/index.md b/website/docs/services/datasync/location_hdfs/index.md
index 42870a83b..1dda8c346 100644
--- a/website/docs/services/datasync/location_hdfs/index.md
+++ b/website/docs/services/datasync/location_hdfs/index.md
@@ -126,12 +126,12 @@ Creates, updates, deletes or gets a <code>location_hdf</code> resource or lists
       {
         "name": "key",
         "type": "string",
-        "description": "The key for an AWS resource tag."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for an AWS resource tag."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/datasync/location_nfs/index.md b/website/docs/services/datasync/location_nfs/index.md
index e5c369998..fee26fb63 100644
--- a/website/docs/services/datasync/location_nfs/index.md
+++ b/website/docs/services/datasync/location_nfs/index.md
@@ -47,12 +47,12 @@ Creates, updates, deletes or gets a <code>location_nf</code> resource or lists <
   {
     "name": "mount_options",
     "type": "object",
-    "description": "The mount options used by DataSync to access the SMB server.",
+    "description": "The NFS mount options that DataSync can use to mount your NFS share.",
     "children": [
       {
         "name": "version",
         "type": "string",
-        "description": "The specific SMB version that you want DataSync to use to mount your SMB share."
+        "description": "The specific NFS version that you want DataSync to use to mount your NFS share."
       }
     ]
   },
diff --git a/website/docs/services/datasync/locationf_sx_ontaps/index.md b/website/docs/services/datasync/locationf_sx_ontaps/index.md
index bcaf4ffb8..f03c6e226 100644
--- a/website/docs/services/datasync/locationf_sx_ontaps/index.md
+++ b/website/docs/services/datasync/locationf_sx_ontaps/index.md
@@ -62,12 +62,31 @@ Creates, updates, deletes or gets a <code>locationf_sx_ontap</code> resource or
   {
     "name": "protocol",
     "type": "object",
-    "description": "Configuration settings for an NFS or SMB protocol, currently only support NFS",
+    "description": "Configuration settings for NFS or SMB protocol.",
     "children": [
       {
         "name": "n_fs",
         "type": "object",
-        "description": "FSx OpenZFS file system NFS protocol information",
+        "description": "NFS protocol configuration for FSx ONTAP file system.",
+        "children": [
+          {
+            "name": "mount_options",
+            "type": "object",
+            "description": "The NFS mount options that DataSync can use to mount your NFS share.",
+            "children": [
+              {
+                "name": "version",
+                "type": "string",
+                "description": "The specific NFS version that you want DataSync to use to mount your NFS share."
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "s_mb",
+        "type": "object",
+        "description": "SMB protocol configuration for FSx ONTAP file system.",
         "children": [
           {
             "name": "mount_options",
@@ -80,6 +99,21 @@ Creates, updates, deletes or gets a <code>locationf_sx_ontap</code> resource or
                 "description": "The specific SMB version that you want DataSync to use to mount your SMB share."
               }
             ]
+          },
+          {
+            "name": "domain",
+            "type": "string",
+            "description": "The name of the Windows domain that the SMB server belongs to."
+          },
+          {
+            "name": "password",
+            "type": "string",
+            "description": "The password of the user who can mount the share and has the permissions to access files and folders in the SMB share."
+          },
+          {
+            "name": "user",
+            "type": "string",
+            "description": "The user who can mount the share, has the permissions to access files and folders in the SMB share."
           }
         ]
       }
@@ -324,6 +358,12 @@ resources:
           n_fs:
             mount_options:
               version: '{{ version }}'
+          s_mb:
+            mount_options:
+              version: '{{ version }}'
+            domain: '{{ domain }}'
+            password: '{{ password }}'
+            user: '{{ user }}'
       - name: subdirectory
         value: '{{ subdirectory }}'
       - name: tags
diff --git a/website/docs/services/datasync/locationf_sx_open_zfs/index.md b/website/docs/services/datasync/locationf_sx_open_zfs/index.md
index ac6d8972a..1e5067234 100644
--- a/website/docs/services/datasync/locationf_sx_open_zfs/index.md
+++ b/website/docs/services/datasync/locationf_sx_open_zfs/index.md
@@ -67,12 +67,12 @@ Creates, updates, deletes or gets a <code>locationf_sx_open_zf</code> resource o
           {
             "name": "mount_options",
             "type": "object",
-            "description": "The mount options used by DataSync to access the SMB server.",
+            "description": "The NFS mount options that DataSync can use to mount your NFS share.",
             "children": [
               {
                 "name": "version",
                 "type": "string",
-                "description": "The specific SMB version that you want DataSync to use to mount your SMB share."
+                "description": "The specific NFS version that you want DataSync to use to mount your NFS share."
               }
             ]
           }
diff --git a/website/docs/services/datazone/environment_profiles/index.md b/website/docs/services/datazone/environment_profiles/index.md
index 9d9eb65be..29176de42 100644
--- a/website/docs/services/datazone/environment_profiles/index.md
+++ b/website/docs/services/datazone/environment_profiles/index.md
@@ -122,12 +122,12 @@ Creates, updates, deletes or gets an <code>environment_profile</code> resource o
       {
         "name": "name",
         "type": "string",
-        "description": ""
+        "description": "The name of an environment profile parameter."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value of an environment profile parameter."
       }
     ]
   },
diff --git a/website/docs/services/datazone/environments/index.md b/website/docs/services/datazone/environments/index.md
index df4387912..6cf7f8dbf 100644
--- a/website/docs/services/datazone/environments/index.md
+++ b/website/docs/services/datazone/environments/index.md
@@ -157,12 +157,12 @@ Creates, updates, deletes or gets an <code>environment</code> resource or lists
       {
         "name": "name",
         "type": "string",
-        "description": ""
+        "description": "The name of an environment parameter."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value of an environment parameter."
       }
     ]
   },
diff --git a/website/docs/services/dms/data_migrations/index.md b/website/docs/services/dms/data_migrations/index.md
index a8f211e07..a17268266 100644
--- a/website/docs/services/dms/data_migrations/index.md
+++ b/website/docs/services/dms/data_migrations/index.md
@@ -136,12 +136,12 @@ Creates, updates, deletes or gets a <code>data_migration</code> resource or list
       {
         "name": "key",
         "type": "string",
-        "description": "<p>Tag key.</p>"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "<p>Tag value.</p>"
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/dms/data_providers/index.md b/website/docs/services/dms/data_providers/index.md
index ae976f479..77535b27a 100644
--- a/website/docs/services/dms/data_providers/index.md
+++ b/website/docs/services/dms/data_providers/index.md
@@ -434,12 +434,12 @@ Creates, updates, deletes or gets a <code>data_provider</code> resource or lists
       {
         "name": "key",
         "type": "string",
-        "description": "<p>Tag key.</p>"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "<p>Tag value.</p>"
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/dms/instance_profiles/index.md b/website/docs/services/dms/instance_profiles/index.md
index 752613070..484da938e 100644
--- a/website/docs/services/dms/instance_profiles/index.md
+++ b/website/docs/services/dms/instance_profiles/index.md
@@ -107,12 +107,12 @@ Creates, updates, deletes or gets an <code>instance_profile</code> resource or l
       {
         "name": "key",
         "type": "string",
-        "description": "<p>Tag key.</p>"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "<p>Tag value.</p>"
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/dms/migration_projects/index.md b/website/docs/services/dms/migration_projects/index.md
index 819120780..cdf351387 100644
--- a/website/docs/services/dms/migration_projects/index.md
+++ b/website/docs/services/dms/migration_projects/index.md
@@ -151,12 +151,12 @@ Creates, updates, deletes or gets a <code>migration_project</code> resource or l
       {
         "name": "key",
         "type": "string",
-        "description": "<p>Tag key.</p>"
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, , and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "<p>Tag value.</p>"
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, , and -."
       }
     ]
   },
diff --git a/website/docs/services/dynamodb/global_tables/index.md b/website/docs/services/dynamodb/global_tables/index.md
index 4e13ca24d..e98d55ded 100644
--- a/website/docs/services/dynamodb/global_tables/index.md
+++ b/website/docs/services/dynamodb/global_tables/index.md
@@ -57,63 +57,46 @@ Creates, updates, deletes or gets a <code>global_table</code> resource or lists
   {
     "name": "sse_specification",
     "type": "object",
-    "description": "Represents the settings used to enable server-side encryption.",
+    "description": "",
     "children": [
       {
         "name": "sse_enabled",
         "type": "boolean",
-        "description": "Indicates whether server-side encryption is done using an AWS managed key or an AWS owned key. If enabled (true), server-side encryption type is set to <code>KMS</code> and an AWS managed key is used (KMS charges apply). If disabled (false) or not specified, server-side encryption is set to AWS owned key."
+        "description": ""
       },
       {
         "name": "sse_type",
         "type": "string",
-        "description": "<details><summary>Server-side encryption type. The only supported value is:</summary>+  <code>KMS</code> - Server-side encryption that uses KMSlong. The key is stored in your account and is managed by KMS (KMS charges apply).</details>"
-      },
-      {
-        "name": "kms_master_key_id",
-        "type": "string",
-        "description": "The KMS key that should be used for the KMS encryption. To specify a key, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. Note that you should only provide this parameter if the key is different from the default DynamoDB key <code>alias/aws/dynamodb</code>."
+        "description": ""
       }
     ]
   },
   {
     "name": "stream_specification",
     "type": "object",
-    "description": "Represents the DynamoDB Streams configuration for a table in DynamoDB.",
+    "description": "",
     "children": [
       {
         "name": "stream_view_type",
         "type": "string",
-        "description": "<details><summary>When an item in the table is modified, <code>StreamViewType</code> determines what information is written to the stream for this table. Valid values for <code>StreamViewType</code> are:</summary>+  <code>KEYS_ONLY</code> - Only the key attributes of the modified item are written to the stream.<br />+  <code>NEW_IMAGE</code> - The entire item, as it appears after it was modified, is written to the stream.<br />+  <code>OLD_IMAGE</code> - The entire item, as it appeared before it was modified, is written to the stream.<br />+  <code>NEW_AND_OLD_IMAGES</code> - Both the new and the old item images of the item are written to the stream.</details>"
-      },
-      {
-        "name": "resource_policy",
-        "type": "object",
-        "description": "<details><summary>Creates or updates a resource-based policy document that contains the permissions for DDB resources, such as a table's streams. Resource-based policies let you define access permissions by specifying who has access to each resource, and the actions they are allowed to perform on each resource.</summary>In a CFNshort template, you can provide the policy in JSON or YAML format because CFNshort converts YAML to JSON before submitting it to DDB. For more information about resource-based policies, see <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/access-control-resource-based.html\">Using resource-based policies for</a> and <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/rbac-examples.html\">Resource-based policy examples</a>.</details>",
-        "children": [
-          {
-            "name": "policy_document",
-            "type": "object",
-            "description": "A resource-based policy document that contains permissions to add to the specified DDB table, index, or both. In a CFNshort template, you can provide the policy in JSON or YAML format because CFNshort converts YAML to JSON before submitting it to DDB. For more information about resource-based policies, see <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/access-control-resource-based.html\">Using resource-based policies for</a> and <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/rbac-examples.html\">Resource-based policy examples</a>."
-          }
-        ]
+        "description": ""
       }
     ]
   },
   {
     "name": "warm_throughput",
     "type": "object",
-    "description": "Provides visibility into the number of read and write operations your table or secondary index can instantaneously support. The settings can be modified using the <code>UpdateTable</code> operation to meet the throughput requirements of an upcoming peak event.",
+    "description": "",
     "children": [
       {
         "name": "read_units_per_second",
         "type": "integer",
-        "description": "Represents the number of read operations your base table can instantaneously support."
+        "description": ""
       },
       {
         "name": "write_units_per_second",
         "type": "integer",
-        "description": "Represents the number of write operations your base table can instantaneously support."
+        "description": ""
       }
     ]
   },
@@ -137,24 +120,24 @@ Creates, updates, deletes or gets a <code>global_table</code> resource or lists
       {
         "name": "kinesis_stream_specification",
         "type": "object",
-        "description": "The Kinesis Data Streams configuration for the specified table.",
+        "description": "",
         "children": [
           {
             "name": "approximate_creation_date_time_precision",
             "type": "string",
-            "description": "The precision for the time and date that the stream was created."
+            "description": ""
           },
           {
             "name": "stream_arn",
             "type": "string",
-            "description": "<details><summary>The ARN for a specific Kinesis data stream.</summary>Length Constraints: Minimum length of 37. Maximum length of 1024.</details>"
+            "description": ""
           }
         ]
       },
       {
         "name": "contributor_insights_specification",
         "type": "object",
-        "description": "The settings used to enable or disable CloudWatch Contributor Insights.",
+        "description": "",
         "children": [
           {
             "name": "mode",
@@ -164,24 +147,24 @@ Creates, updates, deletes or gets a <code>global_table</code> resource or lists
           {
             "name": "enabled",
             "type": "boolean",
-            "description": "Indicates whether CloudWatch Contributor Insights are to be enabled (true) or disabled (false)."
+            "description": ""
           }
         ]
       },
       {
         "name": "point_in_time_recovery_specification",
         "type": "object",
-        "description": "The settings used to enable point in time recovery.",
+        "description": "",
         "children": [
           {
             "name": "point_in_time_recovery_enabled",
             "type": "boolean",
-            "description": "Indicates whether point in time recovery is enabled (true) or disabled (false) on the table."
+            "description": ""
           },
           {
             "name": "recovery_period_in_days",
             "type": "integer",
-            "description": "The number of preceding days for which continuous backups are taken and maintained. Your table data is only recoverable to any point-in-time from within the configured recovery period. This parameter is optional. If no value is provided, the value will default to 35."
+            "description": ""
           }
         ]
       },
@@ -193,12 +176,12 @@ Creates, updates, deletes or gets a <code>global_table</code> resource or lists
           {
             "name": "resource_policy",
             "type": "object",
-            "description": "<details><summary>Creates or updates a resource-based policy document that contains the permissions for DDB resources, such as a table, its indexes, and stream. Resource-based policies let you define access permissions by specifying who has access to each resource, and the actions they are allowed to perform on each resource.</summary>In a CFNshort template, you can provide the policy in JSON or YAML format because CFNshort converts YAML to JSON before submitting it to DDB. For more information about resource-based policies, see <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/access-control-resource-based.html\">Using resource-based policies for</a> and <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/rbac-examples.html\">Resource-based policy examples</a>.<br />While defining resource-based policies in your CFNshort templates, the following considerations apply:<br />+  The maximum size supported for a resource-based policy document in JSON format is 20 KB. DDB counts whitespaces when calculating the size of a policy against this limit.<br />+  Resource-based policies don't support <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-stack-drift.html#\">drift detection</a>. If you update a policy outside of the CFNshort stack template, you'll need to update the CFNshort stack with the changes.<br />+  Resource-based policies don't support out-of-band changes. If you add, update, or delete a policy outside of the CFNshort template, the change won't be overwritten if there are no changes to the policy within the template.<br />For example, say that your template contains a resource-based policy, which you later update outside of the template. If you don't make any changes to the policy in the template, the updated policy in DDB won’t be synced with the policy in the template.<br />Conversely, say that your template doesn’t contain a resource-based policy, but you add a policy outside of the template. This policy won’t be removed from DDB as long as you don’t add it to the template. When you add a policy to the template and update the stack, the existing policy in DDB will be updated to match the one defined in the template.<br />For a full list of all considerations, see <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/rbac-considerations.html\">Resource-based policy considerations</a>.</details>",
+            "description": "",
             "children": [
               {
                 "name": "policy_document",
                 "type": "object",
-                "description": "A resource-based policy document that contains permissions to add to the specified DDB table, index, or both. In a CFNshort template, you can provide the policy in JSON or YAML format because CFNshort converts YAML to JSON before submitting it to DDB. For more information about resource-based policies, see <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/access-control-resource-based.html\">Using resource-based policies for</a> and <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/rbac-examples.html\">Resource-based policy examples</a>."
+                "description": ""
               }
             ]
           }
@@ -253,12 +236,12 @@ Creates, updates, deletes or gets a <code>global_table</code> resource or lists
       {
         "name": "resource_policy",
         "type": "object",
-        "description": "<details><summary>Creates or updates a resource-based policy document that contains the permissions for DDB resources, such as a table, its indexes, and stream. Resource-based policies let you define access permissions by specifying who has access to each resource, and the actions they are allowed to perform on each resource.</summary>In a CFNshort template, you can provide the policy in JSON or YAML format because CFNshort converts YAML to JSON before submitting it to DDB. For more information about resource-based policies, see <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/access-control-resource-based.html\">Using resource-based policies for</a> and <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/rbac-examples.html\">Resource-based policy examples</a>.<br />While defining resource-based policies in your CFNshort templates, the following considerations apply:<br />+  The maximum size supported for a resource-based policy document in JSON format is 20 KB. DDB counts whitespaces when calculating the size of a policy against this limit.<br />+  Resource-based policies don't support <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-stack-drift.html#\">drift detection</a>. If you update a policy outside of the CFNshort stack template, you'll need to update the CFNshort stack with the changes.<br />+  Resource-based policies don't support out-of-band changes. If you add, update, or delete a policy outside of the CFNshort template, the change won't be overwritten if there are no changes to the policy within the template.<br />For example, say that your template contains a resource-based policy, which you later update outside of the template. If you don't make any changes to the policy in the template, the updated policy in DDB won’t be synced with the policy in the template.<br />Conversely, say that your template doesn’t contain a resource-based policy, but you add a policy outside of the template. This policy won’t be removed from DDB as long as you don’t add it to the template. When you add a policy to the template and update the stack, the existing policy in DDB will be updated to match the one defined in the template.<br />For a full list of all considerations, see <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/rbac-considerations.html\">Resource-based policy considerations</a>.</details>",
+        "description": "",
         "children": [
           {
             "name": "policy_document",
             "type": "object",
-            "description": "A resource-based policy document that contains permissions to add to the specified DDB table, index, or both. In a CFNshort template, you can provide the policy in JSON or YAML format because CFNshort converts YAML to JSON before submitting it to DDB. For more information about resource-based policies, see <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/access-control-resource-based.html\">Using resource-based policies for</a> and <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/rbac-examples.html\">Resource-based policy examples</a>."
+            "description": ""
           }
         ]
       },
@@ -319,12 +302,12 @@ Creates, updates, deletes or gets a <code>global_table</code> resource or lists
           {
             "name": "value",
             "type": "string",
-            "description": "The value of the tag. Tag values are case-sensitive and can be null."
+            "description": ""
           },
           {
             "name": "key",
             "type": "string",
-            "description": "The key of the tag. Tag keys are case sensitive. Each DynamoDB table can only have up to one tag with the same key. If you try to add an existing tag (same key), the existing tag value will be updated to the new value."
+            "description": ""
           }
         ]
       },
@@ -435,12 +418,12 @@ Creates, updates, deletes or gets a <code>global_table</code> resource or lists
       {
         "name": "attribute_type",
         "type": "string",
-        "description": "<details><summary>The data type for the attribute, where:</summary>+  <code>S</code> - the attribute is of type String<br />+  <code>N</code> - the attribute is of type Number<br />+  <code>B</code> - the attribute is of type Binary</details>"
+        "description": ""
       },
       {
         "name": "attribute_name",
         "type": "string",
-        "description": "A name for the attribute."
+        "description": ""
       }
     ]
   },
@@ -457,90 +440,39 @@ Creates, updates, deletes or gets a <code>global_table</code> resource or lists
       {
         "name": "index_name",
         "type": "string",
-        "description": "The name of the global secondary index. The name must be unique among all other indexes on this table."
-      },
-      {
-        "name": "on_demand_throughput",
-        "type": "object",
-        "description": "The maximum number of read and write units for the specified global secondary index. If you use this parameter, you must specify <code>MaxReadRequestUnits</code>, <code>MaxWriteRequestUnits</code>, or both. You must use either <code>OnDemandThroughput</code> or <code>ProvisionedThroughput</code> based on your table's capacity mode.",
-        "children": [
-          {
-            "name": "max_read_request_units",
-            "type": "integer",
-            "description": "<details><summary>Maximum number of read request units for the specified table.</summary>To specify a maximum <code>OnDemandThroughput</code> on your table, set the value of <code>MaxReadRequestUnits</code> as greater than or equal to 1. To remove the maximum <code>OnDemandThroughput</code> that is currently set on your table, set the value of <code>MaxReadRequestUnits</code> to -1.</details>"
-          },
-          {
-            "name": "max_write_request_units",
-            "type": "integer",
-            "description": "<details><summary>Maximum number of write request units for the specified table.</summary>To specify a maximum <code>OnDemandThroughput</code> on your table, set the value of <code>MaxWriteRequestUnits</code> as greater than or equal to 1. To remove the maximum <code>OnDemandThroughput</code> that is currently set on your table, set the value of <code>MaxWriteRequestUnits</code> to -1.</details>"
-          }
-        ]
-      },
-      {
-        "name": "contributor_insights_specification",
-        "type": "object",
-        "description": "The settings used to enable or disable CloudWatch Contributor Insights for the specified global secondary index.",
-        "children": [
-          {
-            "name": "mode",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "enabled",
-            "type": "boolean",
-            "description": "Indicates whether CloudWatch Contributor Insights are to be enabled (true) or disabled (false)."
-          }
-        ]
+        "description": ""
       },
       {
         "name": "projection",
         "type": "object",
-        "description": "Represents attributes that are copied (projected) from the table into the global secondary index. These are in addition to the primary key attributes and index key attributes, which are automatically projected.",
+        "description": "",
         "children": [
           {
             "name": "non_key_attributes",
             "type": "array",
-            "description": "<details><summary>Represents the non-key attribute names which will be projected into the index.</summary>For global and local secondary indexes, the total count of <code>NonKeyAttributes</code> summed across all of the secondary indexes, must not exceed 100. If you project the same attribute into two different indexes, this counts as two distinct attributes when determining the total. This limit only applies when you specify the ProjectionType of <code>INCLUDE</code>. You still can specify the ProjectionType of <code>ALL</code> to project all attributes from the source table, even if the table has more than 100 attributes.</details>"
+            "description": ""
           },
           {
             "name": "projection_type",
             "type": "string",
-            "description": "<details><summary>The set of attributes that are projected into the index:</summary>+  <code>KEYS_ONLY</code> - Only the index and primary keys are projected into the index.<br />+  <code>INCLUDE</code> - In addition to the attributes described in <code>KEYS_ONLY</code>, the secondary index will include other non-key attributes that you specify.<br />+  <code>ALL</code> - All of the table attributes are projected into the index.<br />When using the DynamoDB console, <code>ALL</code> is selected by default.</details>"
-          }
-        ]
-      },
-      {
-        "name": "provisioned_throughput",
-        "type": "object",
-        "description": "<details><summary>Represents the provisioned throughput settings for the specified global secondary index. You must use either <code>OnDemandThroughput</code> or <code>ProvisionedThroughput</code> based on your table's capacity mode.</summary>For current minimum and maximum provisioned throughput values, see <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Limits.html\">Service, Account, and Table Quotas</a> in the <i>Amazon DynamoDB Developer Guide</i>.</details>",
-        "children": [
-          {
-            "name": "write_capacity_units",
-            "type": "integer",
-            "description": "<details><summary>The maximum number of writes consumed per second before DynamoDB returns a <code>ThrottlingException</code>. For more information, see <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/ProvisionedThroughput.html\">Specifying Read and Write Requirements</a> in the <i>Amazon DynamoDB Developer Guide</i>.</summary>If read/write capacity mode is <code>PAY_PER_REQUEST</code> the value is set to 0.</details>"
-          },
-          {
-            "name": "read_capacity_units",
-            "type": "integer",
-            "description": "<details><summary>The maximum number of strongly consistent reads consumed per second before DynamoDB returns a <code>ThrottlingException</code>. For more information, see <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/ProvisionedThroughput.html\">Specifying Read and Write Requirements</a> in the <i>Amazon DynamoDB Developer Guide</i>.</summary>If read/write capacity mode is <code>PAY_PER_REQUEST</code> the value is set to 0.</details>"
+            "description": ""
           }
         ]
       },
       {
         "name": "key_schema",
         "type": "array",
-        "description": "<details><summary>The complete key schema for a global secondary index, which consists of one or more pairs of attribute names and key types:</summary>+  <code>HASH</code> - partition key<br />+  <code>RANGE</code> - sort key<br />The partition key of an item is also known as its <i>hash attribute</i>. The term \"hash attribute\" derives from DynamoDB's usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.<br />The sort key of an item is also known as its <i>range attribute</i>. The term \"range attribute\" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.</details>",
+        "description": "",
         "children": [
           {
             "name": "key_type",
             "type": "string",
-            "description": "<details><summary>The role that this key attribute will assume:</summary>+  <code>HASH</code> - partition key<br />+  <code>RANGE</code> - sort key<br />The partition key of an item is also known as its <i>hash attribute</i>. The term \"hash attribute\" derives from DynamoDB's usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.<br />The sort key of an item is also known as its <i>range attribute</i>. The term \"range attribute\" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.</details>"
+            "description": ""
           },
           {
             "name": "attribute_name",
             "type": "string",
-            "description": "The name of a key attribute."
+            "description": ""
           }
         ]
       }
@@ -554,12 +486,12 @@ Creates, updates, deletes or gets a <code>global_table</code> resource or lists
       {
         "name": "key_type",
         "type": "string",
-        "description": "<details><summary>The role that this key attribute will assume:</summary>+  <code>HASH</code> - partition key<br />+  <code>RANGE</code> - sort key<br />The partition key of an item is also known as its <i>hash attribute</i>. The term \"hash attribute\" derives from DynamoDB's usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.<br />The sort key of an item is also known as its <i>range attribute</i>. The term \"range attribute\" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.</details>"
+        "description": ""
       },
       {
         "name": "attribute_name",
         "type": "string",
-        "description": "The name of a key attribute."
+        "description": ""
       }
     ]
   },
@@ -571,29 +503,29 @@ Creates, updates, deletes or gets a <code>global_table</code> resource or lists
       {
         "name": "index_name",
         "type": "string",
-        "description": "The name of the local secondary index. The name must be unique among all other indexes on this table."
+        "description": ""
       },
       {
         "name": "projection",
         "type": "object",
-        "description": "Represents attributes that are copied (projected) from the table into the local secondary index. These are in addition to the primary key attributes and index key attributes, which are automatically projected.",
+        "description": "",
         "children": [
           {
             "name": "non_key_attributes",
             "type": "array",
-            "description": "<details><summary>Represents the non-key attribute names which will be projected into the index.</summary>For global and local secondary indexes, the total count of <code>NonKeyAttributes</code> summed across all of the secondary indexes, must not exceed 100. If you project the same attribute into two different indexes, this counts as two distinct attributes when determining the total. This limit only applies when you specify the ProjectionType of <code>INCLUDE</code>. You still can specify the ProjectionType of <code>ALL</code> to project all attributes from the source table, even if the table has more than 100 attributes.</details>"
+            "description": ""
           },
           {
             "name": "projection_type",
             "type": "string",
-            "description": "<details><summary>The set of attributes that are projected into the index:</summary>+  <code>KEYS_ONLY</code> - Only the index and primary keys are projected into the index.<br />+  <code>INCLUDE</code> - In addition to the attributes described in <code>KEYS_ONLY</code>, the secondary index will include other non-key attributes that you specify.<br />+  <code>ALL</code> - All of the table attributes are projected into the index.<br />When using the DynamoDB console, <code>ALL</code> is selected by default.</details>"
+            "description": ""
           }
         ]
       },
       {
         "name": "key_schema",
         "type": "array",
-        "description": "<details><summary>The complete key schema for the local secondary index, consisting of one or more pairs of attribute names and key types:</summary>+  <code>HASH</code> - partition key<br />+  <code>RANGE</code> - sort key<br />The partition key of an item is also known as its <i>hash attribute</i>. The term \"hash attribute\" derives from DynamoDB's usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.<br />The sort key of an item is also known as its <i>range attribute</i>. The term \"range attribute\" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.</details>"
+        "description": ""
       }
     ]
   },
@@ -610,17 +542,17 @@ Creates, updates, deletes or gets a <code>global_table</code> resource or lists
   {
     "name": "time_to_live_specification",
     "type": "object",
-    "description": "Represents the settings used to enable or disable Time to Live (TTL) for the specified table.",
+    "description": "",
     "children": [
       {
         "name": "enabled",
         "type": "boolean",
-        "description": "Indicates whether TTL is to be enabled (true) or disabled (false) on the table."
+        "description": ""
       },
       {
         "name": "attribute_name",
         "type": "string",
-        "description": "<details><summary>The name of the TTL attribute used to store the expiration time for items in the table.</summary>+  The <code>AttributeName</code> property is required when enabling the TTL, or when TTL is already enabled.<br />+  To update this property, you must first disable TTL and then enable TTL with the new attribute name.</details>"
+        "description": ""
       }
     ]
   },
@@ -859,12 +791,9 @@ resources:
         value:
           sse_enabled: '{{ sse_enabled }}'
           sse_type: '{{ sse_type }}'
-          kms_master_key_id: '{{ kms_master_key_id }}'
       - name: stream_specification
         value:
           stream_view_type: '{{ stream_view_type }}'
-          resource_policy:
-            policy_document: {}
       - name: warm_throughput
         value:
           read_units_per_second: '{{ read_units_per_second }}'
@@ -883,7 +812,8 @@ resources:
               point_in_time_recovery_enabled: '{{ point_in_time_recovery_enabled }}'
               recovery_period_in_days: '{{ recovery_period_in_days }}'
             replica_stream_specification:
-              resource_policy: null
+              resource_policy:
+                policy_document: {}
             global_secondary_indexes:
               - index_name: '{{ index_name }}'
                 contributor_insights_specification: null
@@ -929,21 +859,16 @@ resources:
       - name: global_secondary_indexes
         value:
           - index_name: '{{ index_name }}'
-            on_demand_throughput:
-              max_read_request_units: '{{ max_read_request_units }}'
-              max_write_request_units: '{{ max_write_request_units }}'
-            contributor_insights_specification: null
             projection:
               non_key_attributes:
                 - '{{ non_key_attributes[0] }}'
               projection_type: '{{ projection_type }}'
-            provisioned_throughput:
-              write_capacity_units: '{{ write_capacity_units }}'
-              read_capacity_units: '{{ read_capacity_units }}'
             key_schema:
               - key_type: '{{ key_type }}'
                 attribute_name: '{{ attribute_name }}'
             warm_throughput: null
+            write_provisioned_throughput_settings: null
+            write_on_demand_throughput_settings: null
       - name: key_schema
         value:
           - null
diff --git a/website/docs/services/ec2/capacity_reservation_fleets/index.md b/website/docs/services/ec2/capacity_reservation_fleets/index.md
index 597f946ad..90dfdab17 100644
--- a/website/docs/services/ec2/capacity_reservation_fleets/index.md
+++ b/website/docs/services/ec2/capacity_reservation_fleets/index.md
@@ -57,22 +57,22 @@ Creates, updates, deletes or gets a <code>capacity_reservation_fleet</code> reso
       {
         "name": "resource_type",
         "type": "string",
-        "description": "<details><summary>The type of resource to tag. You can specify tags for the following resource types only: <code>instance</code> | <code>volume</code> | <code>network-interface</code> | <code>spot-instances-request</code>. If the instance does not include the resource type that you specify, the instance launch fails. For example, not all instance types include a volume.</summary>To tag a resource after it has been created, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html\">CreateTags</a>.</details>"
+        "description": ""
       },
       {
         "name": "tags",
         "type": "array",
-        "description": "The tags to apply to the resource.",
+        "description": "",
         "children": [
           {
-            "name": "key",
+            "name": "value",
             "type": "string",
-            "description": "The tag key."
+            "description": ""
           },
           {
-            "name": "value",
+            "name": "key",
             "type": "string",
-            "description": "The tag value."
+            "description": ""
           }
         ]
       }
@@ -382,8 +382,8 @@ resources:
         value:
           - resource_type: '{{ resource_type }}'
             tags:
-              - key: '{{ key }}'
-                value: '{{ value }}'
+              - value: '{{ value }}'
+                key: '{{ key }}'
       - name: instance_type_specifications
         value:
           - instance_type: '{{ instance_type }}'
diff --git a/website/docs/services/ec2/capacity_reservations/index.md b/website/docs/services/ec2/capacity_reservations/index.md
index 4d740c31b..b25ffcc92 100644
--- a/website/docs/services/ec2/capacity_reservations/index.md
+++ b/website/docs/services/ec2/capacity_reservations/index.md
@@ -62,22 +62,22 @@ Creates, updates, deletes or gets a <code>capacity_reservation</code> resource o
       {
         "name": "resource_type",
         "type": "string",
-        "description": "<details><summary>The type of resource to tag. You can specify tags for the following resource types only: <code>instance</code> | <code>volume</code> | <code>network-interface</code> | <code>spot-instances-request</code>. If the instance does not include the resource type that you specify, the instance launch fails. For example, not all instance types include a volume.</summary>To tag a resource after it has been created, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html\">CreateTags</a>.</details>"
+        "description": ""
       },
       {
         "name": "tags",
         "type": "array",
-        "description": "The tags to apply to the resource.",
+        "description": "",
         "children": [
           {
-            "name": "key",
+            "name": "value",
             "type": "string",
-            "description": "The tag key."
+            "description": ""
           },
           {
-            "name": "value",
+            "name": "key",
             "type": "string",
-            "description": "The tag value."
+            "description": ""
           }
         ]
       }
@@ -479,8 +479,8 @@ resources:
         value:
           - resource_type: '{{ resource_type }}'
             tags:
-              - key: '{{ key }}'
-                value: '{{ value }}'
+              - value: '{{ value }}'
+                key: '{{ key }}'
       - name: availability_zone
         value: '{{ availability_zone }}'
       - name: end_date
diff --git a/website/docs/services/ec2/carrier_gateways/index.md b/website/docs/services/ec2/carrier_gateways/index.md
index 1ff065c0e..5a6420e08 100644
--- a/website/docs/services/ec2/carrier_gateways/index.md
+++ b/website/docs/services/ec2/carrier_gateways/index.md
@@ -72,12 +72,12 @@ Creates, updates, deletes or gets a <code>carrier_gateway</code> resource or lis
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/ec2/customer_gateways/index.md b/website/docs/services/ec2/customer_gateways/index.md
index 3762b3bda..e866487f4 100644
--- a/website/docs/services/ec2/customer_gateways/index.md
+++ b/website/docs/services/ec2/customer_gateways/index.md
@@ -75,14 +75,14 @@ Creates, updates, deletes or gets a <code>customer_gateway</code> resource or li
     "description": "One or more tags for the customer gateway.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": "The tag value."
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": "The tag key."
       }
     ]
   },
@@ -307,8 +307,8 @@ resources:
         value: '{{ bgp_asn }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'
+          - value: '{{ value }}'
+            key: '{{ key }}'
       - name: certificate_arn
         value: '{{ certificate_arn }}'
       - name: device_name
diff --git a/website/docs/services/ec2/dhcp_options/index.md b/website/docs/services/ec2/dhcp_options/index.md
index ad2d0a6ed..c263ecca3 100644
--- a/website/docs/services/ec2/dhcp_options/index.md
+++ b/website/docs/services/ec2/dhcp_options/index.md
@@ -87,12 +87,12 @@ Creates, updates, deletes or gets a <code>dhcp_option</code> resource or lists <
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/ec2/ec2fleets/index.md b/website/docs/services/ec2/ec2fleets/index.md
index 485aa6e3b..fa800910b 100644
--- a/website/docs/services/ec2/ec2fleets/index.md
+++ b/website/docs/services/ec2/ec2fleets/index.md
@@ -138,22 +138,22 @@ Creates, updates, deletes or gets an <code>ec2fleet</code> resource or lists <co
       {
         "name": "resource_type",
         "type": "string",
-        "description": "<details><summary>The type of resource to tag. You can specify tags for the following resource types only: <code>instance</code> | <code>volume</code> | <code>network-interface</code> | <code>spot-instances-request</code>. If the instance does not include the resource type that you specify, the instance launch fails. For example, not all instance types include a volume.</summary>To tag a resource after it has been created, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html\">CreateTags</a>.</details>"
+        "description": ""
       },
       {
         "name": "tags",
         "type": "array",
-        "description": "The tags to apply to the resource.",
+        "description": "",
         "children": [
           {
-            "name": "key",
+            "name": "value",
             "type": "string",
-            "description": "The tag key."
+            "description": ""
           },
           {
-            "name": "value",
+            "name": "key",
             "type": "string",
-            "description": "The tag value."
+            "description": ""
           }
         ]
       }
@@ -275,52 +275,47 @@ Creates, updates, deletes or gets an <code>ec2fleet</code> resource or lists <co
           {
             "name": "placement",
             "type": "object",
-            "description": "<details><summary>Specifies the placement of an instance.</summary><code>Placement</code> is a property of <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html\">AWS::EC2::LaunchTemplate LaunchTemplateData</a>.</details>",
+            "description": "",
             "children": [
               {
                 "name": "group_name",
                 "type": "string",
-                "description": "The name of the placement group for the instance."
+                "description": ""
               },
               {
                 "name": "tenancy",
                 "type": "string",
-                "description": "The tenancy of the instance. An instance with a tenancy of dedicated runs on single-tenant hardware."
+                "description": ""
               },
               {
                 "name": "spread_domain",
                 "type": "string",
-                "description": "Reserved for future use."
+                "description": ""
               },
               {
                 "name": "partition_number",
                 "type": "integer",
-                "description": "The number of the partition the instance should launch in. Valid only if the placement group strategy is set to <code>partition</code>."
+                "description": ""
               },
               {
                 "name": "availability_zone",
                 "type": "string",
-                "description": "The Availability Zone for the instance."
+                "description": ""
               },
               {
                 "name": "affinity",
                 "type": "string",
-                "description": "The affinity setting for an instance on a Dedicated Host."
+                "description": ""
               },
               {
                 "name": "host_id",
                 "type": "string",
-                "description": "The ID of the Dedicated Host for the instance."
+                "description": ""
               },
               {
                 "name": "host_resource_group_arn",
                 "type": "string",
-                "description": "The ARN of the host resource group in which to launch the instances. If you specify a host resource group ARN, omit the <i>Tenancy</i> parameter or set it to <code>host</code>."
-              },
-              {
-                "name": "group_id",
-                "type": "string",
-                "description": "The Group Id of a placement group. You must specify the Placement Group <i>Group Id</i> to launch an instance in a shared placement group."
+                "description": ""
               }
             ]
           },
@@ -772,8 +767,8 @@ resources:
         value:
           - resource_type: '{{ resource_type }}'
             tags:
-              - key: '{{ key }}'
-                value: '{{ value }}'
+              - value: '{{ value }}'
+                key: '{{ key }}'
       - name: spot_options
         value:
           maintenance_strategies:
@@ -808,7 +803,6 @@ resources:
                   affinity: '{{ affinity }}'
                   host_id: '{{ host_id }}'
                   host_resource_group_arn: '{{ host_resource_group_arn }}'
-                  group_id: '{{ group_id }}'
                 priority: null
                 availability_zone: '{{ availability_zone }}'
                 subnet_id: '{{ subnet_id }}'
@@ -875,6 +869,7 @@ resources:
                       delete_on_termination: '{{ delete_on_termination }}'
                       encrypted: '{{ encrypted }}'
                       iops: '{{ iops }}'
+                      kms_key_id: '{{ kms_key_id }}'
                       snapshot_id: '{{ snapshot_id }}'
                       volume_size: '{{ volume_size }}'
                       volume_type: '{{ volume_type }}'
diff --git a/website/docs/services/ec2/egress_only_internet_gateways/index.md b/website/docs/services/ec2/egress_only_internet_gateways/index.md
index b731ebffe..2981eff39 100644
--- a/website/docs/services/ec2/egress_only_internet_gateways/index.md
+++ b/website/docs/services/ec2/egress_only_internet_gateways/index.md
@@ -62,12 +62,12 @@ Creates, updates, deletes or gets an <code>egress_only_internet_gateway</code> r
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/ec2/flow_logs/index.md b/website/docs/services/ec2/flow_logs/index.md
index 8dd73fb98..a34a88c27 100644
--- a/website/docs/services/ec2/flow_logs/index.md
+++ b/website/docs/services/ec2/flow_logs/index.md
@@ -100,14 +100,14 @@ Creates, updates, deletes or gets a <code>flow_log</code> resource or lists <cod
     "description": "The tags to apply to the flow logs.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
@@ -374,8 +374,8 @@ resources:
         value: '{{ resource_type }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'
+          - value: '{{ value }}'
+            key: '{{ key }}'
       - name: traffic_type
         value: '{{ traffic_type }}'
       - name: destination_options
diff --git a/website/docs/services/ec2/hosts/index.md b/website/docs/services/ec2/hosts/index.md
index b7590f86f..9fab0bc89 100644
--- a/website/docs/services/ec2/hosts/index.md
+++ b/website/docs/services/ec2/hosts/index.md
@@ -95,14 +95,14 @@ Creates, updates, deletes or gets a <code>host</code> resource or lists <code>ho
     "description": "Any tags assigned to the Host.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
@@ -329,8 +329,8 @@ resources:
         value: '{{ asset_id }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/ec2/instance_connect_endpoints/index.md b/website/docs/services/ec2/instance_connect_endpoints/index.md
index b15fa88a6..8b3dcc335 100644
--- a/website/docs/services/ec2/instance_connect_endpoints/index.md
+++ b/website/docs/services/ec2/instance_connect_endpoints/index.md
@@ -72,12 +72,12 @@ Creates, updates, deletes or gets an <code>instance_connect_endpoint</code> reso
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/ec2/instances/index.md b/website/docs/services/ec2/instances/index.md
index 77889a773..ddfb0810e 100644
--- a/website/docs/services/ec2/instances/index.md
+++ b/website/docs/services/ec2/instances/index.md
@@ -54,87 +54,15 @@ Creates, updates, deletes or gets an <code>instance</code> resource or lists <co
     "type": "array",
     "description": "The volumes to attach to the instance.",
     "children": [
-      {
-        "name": "multi_attach_enabled",
-        "type": "boolean",
-        "description": "<details><summary>Indicates whether Amazon EBS Multi-Attach is enabled.</summary>CFNlong does not currently support updating a single-attach volume to be multi-attach enabled, updating a multi-attach enabled volume to be single-attach, or updating the size or number of I/O operations per second (IOPS) of a multi-attach enabled volume.</details>"
-      },
-      {
-        "name": "kms_key_id",
-        "type": "string",
-        "description": "<details><summary>The identifier of the kms-key-long to use for Amazon EBS encryption. If <code>KmsKeyId</code> is specified, the encrypted state must be <code>true</code>.</summary>If you omit this property and your account is enabled for encryption by default, or <i>Encrypted</i> is set to <code>true</code>, then the volume is encrypted using the default key specified for your account. If your account does not have a default key, then the volume is encrypted using the aws-managed-key.<br />Alternatively, if you want to specify a different key, you can specify one of the following:<br />+  Key ID. For example, 1234abcd-12ab-34cd-56ef-1234567890ab.<br />+  Key alias. Specify the alias for the key, prefixed with <code>alias/</code>. For example, for a key with the alias <code>my_cmk</code>, use <code>alias/my_cmk</code>. Or to specify the aws-managed-key, use <code>alias/aws/ebs</code>.<br />+  Key ARN. For example, arn:aws:kms:us-east-1:012345678910:key/1234abcd-12ab-34cd-56ef-1234567890ab.<br />+  Alias ARN. For example, arn:aws:kms:us-east-1:012345678910:alias/ExampleAlias.</details>"
-      },
-      {
-        "name": "encrypted",
-        "type": "boolean",
-        "description": "<details><summary>Indicates whether the volume should be encrypted. The effect of setting the encryption state to <code>true</code> depends on the volume origin (new or from a snapshot), starting encryption state, ownership, and whether encryption by default is enabled. For more information, see <a href=\"https://docs.aws.amazon.com/ebs/latest/userguide/work-with-ebs-encr.html#encryption-by-default\">Encryption by default</a> in the <i>Amazon EBS User Guide</i>.</summary>Encrypted Amazon EBS volumes must be attached to instances that support Amazon EBS encryption. For more information, see <a href=\"https://docs.aws.amazon.com/ebs/latest/userguide/ebs-encryption-requirements.html#ebs-encryption_supported_instances\">Supported instance types</a>.</details>"
-      },
-      {
-        "name": "size",
-        "type": "integer",
-        "description": "<details><summary>The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. If you specify a snapshot, the default is the snapshot size. You can specify a volume size that is equal to or larger than the snapshot size.</summary>The following are the supported volumes sizes for each volume type:<br />+  <code>gp2</code> and <code>gp3</code>: 1 - 16,384 GiB<br />+  <code>io1</code>: 4 - 16,384 GiB<br />+  <code>io2</code>: 4 - 65,536 GiB<br />+  <code>st1</code> and <code>sc1</code>: 125 - 16,384 GiB<br />+  <code>standard</code>: 1 - 1024 GiB</details>"
-      },
-      {
-        "name": "auto_enable_io",
-        "type": "boolean",
-        "description": "Indicates whether the volume is auto-enabled for I/O operations. By default, Amazon EBS disables I/O to the volume from attached EC2 instances when it determines that a volume's data is potentially inconsistent. If the consistency of the volume is not a concern, and you prefer that the volume be made available immediately if it's impaired, you can configure the volume to automatically enable I/O."
-      },
-      {
-        "name": "outpost_arn",
-        "type": "string",
-        "description": "The Amazon Resource Name (ARN) of the Outpost."
-      },
-      {
-        "name": "availability_zone",
-        "type": "string",
-        "description": "<details><summary>The ID of the Availability Zone in which to create the volume. For example, <code>us-east-1a</code>.</summary>Either <code>AvailabilityZone</code> or <code>AvailabilityZoneId</code> must be specified, but not both.</details>"
-      },
-      {
-        "name": "throughput",
-        "type": "integer",
-        "description": "<details><summary>The throughput to provision for a volume, with a maximum of 1,000 MiB/s.</summary>This parameter is valid only for <code>gp3</code> volumes. The default value is 125.<br />Valid Range: Minimum value of 125. Maximum value of 1000.</details>"
-      },
-      {
-        "name": "iops",
-        "type": "integer",
-        "description": "<details><summary>The number of I/O operations per second (IOPS). For <code>gp3</code>, <code>io1</code>, and <code>io2</code> volumes, this represents the number of IOPS that are provisioned for the volume. For <code>gp2</code> volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.</summary>The following are the supported values for each volume type:<br />+  <code>gp3</code>: 3,000 - 16,000 IOPS<br />+  <code>io1</code>: 100 - 64,000 IOPS<br />+  <code>io2</code>: 100 - 256,000 IOPS<br />For <code>io2</code> volumes, you can achieve up to 256,000 IOPS on <a href=\"https://docs.aws.amazon.com/ec2/latest/instancetypes/ec2-nitro-instances.html\">instances built on the Nitro System</a>. On other instances, you can achieve performance up to 32,000 IOPS.<br />This parameter is required for <code>io1</code> and <code>io2</code> volumes. The default for <code>gp3</code> volumes is 3,000 IOPS. This parameter is not supported for <code>gp2</code>, <code>st1</code>, <code>sc1</code>, or <code>standard</code> volumes.</details>"
-      },
-      {
-        "name": "volume_initialization_rate",
-        "type": "integer",
-        "description": "<details><summary>Specifies the Amazon EBS Provisioned Rate for Volume Initialization (volume initialization rate), in MiB/s, at which to download the snapshot blocks from Amazon S3 to the volume. This is also known as <i>volume initialization</i>. Specifying a volume initialization rate ensures that the volume is initialized at a predictable and consistent rate after creation.</summary>This parameter is supported only for volumes created from snapshots. Omit this parameter if:<br />+  You want to create the volume using fast snapshot restore. You must specify a snapshot that is enabled for fast snapshot restore. In this case, the volume is fully initialized at creation.<br />If you specify a snapshot that is enabled for fast snapshot restore and a volume initialization rate, the volume will be initialized at the specified rate instead of fast snapshot restore.<br />+  You want to create a volume that is initialized at the default rate.<br />For more information, see <a href=\"https://docs.aws.amazon.com/ebs/latest/userguide/initalize-volume.html\">Initialize Amazon EBS volumes</a> in the <i>Amazon EC2 User Guide</i>.<br />Valid range: 100 - 300 MiB/s</details>"
-      },
-      {
-        "name": "snapshot_id",
-        "type": "string",
-        "description": "The snapshot from which to create the volume. You must specify either a snapshot ID or a volume size."
-      },
       {
         "name": "volume_id",
         "type": "string",
-        "description": ""
+        "description": "The ID of the EBS volume. The volume and instance must be within the same Availability Zone."
       },
       {
-        "name": "volume_type",
+        "name": "device",
         "type": "string",
-        "description": "<details><summary>The volume type. This parameter can be one of the following values:</summary>+  General Purpose SSD: <code>gp2</code> | <code>gp3</code><br />+  Provisioned IOPS SSD: <code>io1</code> | <code>io2</code><br />+  Throughput Optimized HDD: <code>st1</code><br />+  Cold HDD: <code>sc1</code><br />+  Magnetic: <code>standard</code><br />For more information, see <a href=\"https://docs.aws.amazon.com/ebs/latest/userguide/ebs-volume-types.html\">Amazon EBS volume types</a>.<br />Default: <code>gp2</code></details>"
-      },
-      {
-        "name": "tags",
-        "type": "array",
-        "description": "The tags to apply to the volume during creation.",
-        "children": [
-          {
-            "name": "key",
-            "type": "string",
-            "description": "The tag key."
-          },
-          {
-            "name": "value",
-            "type": "string",
-            "description": "The tag value."
-          }
-        ]
+        "description": "The device name (for example, /dev/sdh or xvdh)."
       }
     ]
   },
@@ -166,14 +94,14 @@ Creates, updates, deletes or gets an <code>instance</code> resource or lists <co
     "description": "The tags to add to the instance.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
@@ -214,27 +142,27 @@ Creates, updates, deletes or gets an <code>instance</code> resource or lists <co
       {
         "name": "http_put_response_hop_limit",
         "type": "integer",
-        "description": "<details><summary>The desired HTTP PUT response hop limit for instance metadata requests. The larger the number, the further instance metadata requests can travel.</summary>Default: <code>1</code><br />Possible values: Integers from 1 to 64</details>"
+        "description": "The number of network hops that the metadata token can travel. Maximum is 64."
       },
       {
-        "name": "http_tokens",
+        "name": "http_protocol_ipv6",
         "type": "string",
-        "description": "<details><summary>Indicates whether IMDSv2 is required.</summary>+  <code>optional</code> - IMDSv2 is optional. You can choose whether to send a session token in your instance metadata retrieval requests. If you retrieve IAM role credentials without a session token, you receive the IMDSv1 role credentials. If you retrieve IAM role credentials using a valid session token, you receive the IMDSv2 role credentials.<br />+  <code>required</code> - IMDSv2 is required. You must send a session token in your instance metadata retrieval requests. With this option, retrieving the IAM role credentials always returns IMDSv2 credentials; IMDSv1 credentials are not available.<br />Default: If the value of <code>ImdsSupport</code> for the Amazon Machine Image (AMI) for your instance is <code>v2.0</code>, the default is <code>required</code>.</details>"
+        "description": "Enables or disables the IPv6 endpoint for the instance metadata service. To use this option, the instance must be a Nitro-based instance launched in a subnet that supports IPv6."
       },
       {
-        "name": "http_protocol_ipv6",
+        "name": "http_tokens",
         "type": "string",
-        "description": "<details><summary>Enables or disables the IPv6 endpoint for the instance metadata service.</summary>Default: <code>disabled</code></details>"
+        "description": "Indicates whether IMDSv2 is required."
       },
       {
         "name": "instance_metadata_tags",
         "type": "string",
-        "description": "<details><summary>Set to <code>enabled</code> to allow access to instance tags from the instance metadata. Set to <code>disabled</code> to turn off access to instance tags from the instance metadata. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/work-with-tags-in-IMDS.html\">View tags for your EC2 instances using instance metadata</a>.</summary>Default: <code>disabled</code></details>"
+        "description": "Indicates whether tags from the instance are propagated to the EBS volumes."
       },
       {
         "name": "http_endpoint",
         "type": "string",
-        "description": "<details><summary>Enables or disables the HTTP metadata endpoint on your instances. If the parameter is not specified, the default state is <code>enabled</code>.</summary>If you specify a value of <code>disabled</code>, you will not be able to access your instance metadata.</details>"
+        "description": "Enables or disables the HTTP metadata endpoint on your instances. If you specify a value of disabled, you cannot access your instance metadata."
       }
     ]
   },
@@ -273,17 +201,17 @@ Creates, updates, deletes or gets an <code>instance</code> resource or lists <co
       {
         "name": "enable_resource_name_dns_arecord",
         "type": "boolean",
-        "description": "Indicates whether to respond to DNS queries for instance hostnames with DNS A records."
+        "description": "Indicates whether to respond to DNS queries for instance hostnames with DNS A records. For more information, see Amazon EC2 instance hostname types in the Amazon Elastic Compute Cloud User Guide."
       },
       {
         "name": "hostname_type",
         "type": "string",
-        "description": "The type of hostname for EC2 instances. For IPv4 only subnets, an instance DNS name must be based on the instance IPv4 address. For IPv6 only subnets, an instance DNS name must be based on the instance ID. For dual-stack subnets, you can specify whether DNS names use the instance IPv4 address or the instance ID. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-naming.html\">Amazon EC2 instance hostname types</a> in the <i>User Guide</i>."
+        "description": "The type of hostnames to assign to instances in the subnet at launch. For IPv4 only subnets, an instance DNS name must be based on the instance IPv4 address. For IPv6 only subnets, an instance DNS name must be based on the instance ID. For dual-stack subnets, you can specify whether DNS names use the instance IPv4 address or the instance ID. For more information, see Amazon EC2 instance hostname types in the Amazon Elastic Compute Cloud User Guide."
       },
       {
         "name": "enable_resource_name_dns_aa_aa_record",
         "type": "boolean",
-        "description": "Indicates whether to respond to DNS queries for instance hostnames with DNS AAAA records."
+        "description": "Indicates whether to respond to DNS queries for instance hostnames with DNS AAAA records. For more information, see Amazon EC2 instance hostname types in the Amazon Elastic Compute Cloud User Guide."
       }
     ]
   },
@@ -388,57 +316,62 @@ Creates, updates, deletes or gets an <code>instance</code> resource or lists <co
     "type": "array",
     "description": "The block device mapping entries that defines the block devices to attach to the instance at launch.",
     "children": [
-      {
-        "name": "device_name",
-        "type": "string",
-        "description": ""
-      },
       {
         "name": "ebs",
         "type": "object",
-        "description": "",
+        "description": "Parameters used to automatically set up EBS volumes when the instance is launched.",
         "children": [
           {
-            "name": "delete_on_termination",
-            "type": "boolean",
-            "description": ""
+            "name": "snapshot_id",
+            "type": "string",
+            "description": "The ID of the snapshot."
+          },
+          {
+            "name": "volume_type",
+            "type": "string",
+            "description": "The volume type."
+          },
+          {
+            "name": "kms_key_id",
+            "type": "string",
+            "description": "The identifier of the AWS Key Management Service (AWS KMS) customer managed CMK to use for Amazon EBS encryption. If KmsKeyId is specified, the encrypted state must be true. If the encrypted state is true but you do not specify KmsKeyId, your AWS managed CMK for EBS is used."
           },
           {
             "name": "encrypted",
             "type": "boolean",
-            "description": ""
+            "description": "Indicates whether the volume should be encrypted."
           },
           {
             "name": "iops",
             "type": "integer",
-            "description": ""
-          },
-          {
-            "name": "snapshot_id",
-            "type": "string",
-            "description": ""
+            "description": "The number of I/O operations per second (IOPS). For gp3, io1, and io2 volumes, this represents the number of IOPS that are provisioned for the volume. For gp2 volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting."
           },
           {
             "name": "volume_size",
             "type": "integer",
-            "description": ""
+            "description": "The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. If you specify a snapshot, the default is the snapshot size. You can specify a volume size that is equal to or larger than the snapshot size."
           },
           {
-            "name": "volume_type",
-            "type": "string",
-            "description": ""
+            "name": "delete_on_termination",
+            "type": "boolean",
+            "description": "Indicates whether the EBS volume is deleted on instance termination."
           }
         ]
       },
       {
         "name": "no_device",
-        "type": "string",
+        "type": "object",
         "description": ""
       },
       {
         "name": "virtual_name",
         "type": "string",
         "description": ""
+      },
+      {
+        "name": "device_name",
+        "type": "string",
+        "description": "The device name (for example, /dev/sdh or xvdh)."
       }
     ]
   },
@@ -455,7 +388,7 @@ Creates, updates, deletes or gets an <code>instance</code> resource or lists <co
       {
         "name": "ipv6_address",
         "type": "string",
-        "description": ""
+        "description": "The IPv6 address."
       }
     ]
   },
@@ -543,155 +476,103 @@ Creates, updates, deletes or gets an <code>instance</code> resource or lists <co
       {
         "name": "description",
         "type": "string",
-        "description": "A description for the network interface."
+        "description": "The description of the network interface."
       },
       {
         "name": "private_ip_address",
         "type": "string",
-        "description": "Assigns a single private IP address to the network interface, which is used as the primary private IP address. If you want to specify multiple private IP address, use the PrivateIpAddresses property."
-      },
-      {
-        "name": "primary_ipv6_address",
-        "type": "string",
-        "description": "The primary IPv6 address"
+        "description": "The private IPv4 address of the network interface."
       },
       {
         "name": "private_ip_addresses",
         "type": "array",
-        "description": "Assigns a list of private IP addresses to the network interface. You can specify a primary private IP address by setting the value of the Primary property to true in the PrivateIpAddressSpecification property. If you want EC2 to automatically assign private IP addresses, use the SecondaryPrivateIpAddressCount property and do not specify this property.",
+        "description": "One or more private IPv4 addresses to assign to the network interface.",
         "children": [
-          {
-            "name": "primary",
-            "type": "boolean",
-            "description": ""
-          },
           {
             "name": "private_ip_address",
             "type": "string",
-            "description": ""
+            "description": "The private IPv4 addresses."
+          },
+          {
+            "name": "primary",
+            "type": "boolean",
+            "description": "Indicates whether the private IPv4 address is the primary private IPv4 address. Only one IPv4 address can be designated as primary."
           }
         ]
       },
       {
         "name": "secondary_private_ip_address_count",
         "type": "integer",
-        "description": "The number of secondary private IPv4 addresses to assign to a network interface. When you specify a number of secondary IPv4 addresses, Amazon EC2 selects these IP addresses within the subnet's IPv4 CIDR range. You can't specify this option and specify more than one private IP address using privateIpAddresses"
-      },
-      {
-        "name": "ipv6_prefix_count",
-        "type": "integer",
-        "description": "The number of IPv6 prefixes to assign to a network interface. When you specify a number of IPv6 prefixes, Amazon EC2 selects these prefixes from your existing subnet CIDR reservations, if available, or from free spaces in the subnet. By default, these will be /80 prefixes. You can't specify a count of IPv6 prefixes if you've specified one of the following: specific IPv6 prefixes, specific IPv6 addresses, or a count of IPv6 addresses."
+        "description": "The number of secondary private IPv4 addresses."
       },
       {
-        "name": "primary_private_ip_address",
+        "name": "device_index",
         "type": "string",
-        "description": "Returns the primary private IP address of the network interface."
-      },
-      {
-        "name": "ipv4_prefixes",
-        "type": "array",
-        "description": "Assigns a list of IPv4 prefixes to the network interface. If you want EC2 to automatically assign IPv4 prefixes, use the Ipv4PrefixCount property and do not specify this property. Presently, only /28 prefixes are supported. You can't specify IPv4 prefixes if you've specified one of the following: a count of IPv4 prefixes, specific private IPv4 addresses, or a count of private IPv4 addresses.",
-        "children": [
-          {
-            "name": "ipv4_prefix",
-            "type": "string",
-            "description": ""
-          }
-        ]
-      },
-      {
-        "name": "ipv4_prefix_count",
-        "type": "integer",
-        "description": "The number of IPv4 prefixes to assign to a network interface. When you specify a number of IPv4 prefixes, Amazon EC2 selects these prefixes from your existing subnet CIDR reservations, if available, or from free spaces in the subnet. By default, these will be /28 prefixes. You can't specify a count of IPv4 prefixes if you've specified one of the following: specific IPv4 prefixes, specific private IPv4 addresses, or a count of private IPv4 addresses."
-      },
-      {
-        "name": "enable_primary_ipv6",
-        "type": "boolean",
-        "description": "If you have instances or ENIs that rely on the IPv6 address not changing, to avoid disrupting traffic to instances or ENIs, you can enable a primary IPv6 address. Enable this option to automatically assign an IPv6 associated with the ENI attached to your instance to be the primary IPv6 address. When you enable an IPv6 address to be a primary IPv6, you cannot disable it. Traffic will be routed to the primary IPv6 address until the instance is terminated or the ENI is detached. If you have multiple IPv6 addresses associated with an ENI and you enable a primary IPv6 address, the first IPv6 address associated with the ENI becomes the primary IPv6 address."
+        "description": "The position of the network interface in the attachment order. A primary network interface has a device index of 0."
       },
       {
         "name": "group_set",
         "type": "array",
-        "description": "A list of security group IDs associated with this network interface."
+        "description": "The IDs of the security groups for the network interface."
       },
       {
         "name": "ipv6_addresses",
         "type": "array",
-        "description": "One or more specific IPv6 addresses from the IPv6 CIDR block range of your subnet to associate with the network interface. If you're specifying a number of IPv6 addresses, use the Ipv6AddressCount property and don't specify this property."
-      },
-      {
-        "name": "ipv6_prefixes",
-        "type": "array",
-        "description": "Assigns a list of IPv6 prefixes to the network interface. If you want EC2 to automatically assign IPv6 prefixes, use the Ipv6PrefixCount property and do not specify this property. Presently, only /80 prefixes are supported. You can't specify IPv6 prefixes if you've specified one of the following: a count of IPv6 prefixes, specific IPv6 addresses, or a count of IPv6 addresses.",
-        "children": [
-          {
-            "name": "ipv6_prefix",
-            "type": "string",
-            "description": ""
-          }
-        ]
+        "description": "The IPv6 addresses associated with the network interface."
       },
       {
         "name": "subnet_id",
         "type": "string",
-        "description": "The ID of the subnet to associate with the network interface."
+        "description": "The ID of the subnet."
       },
       {
-        "name": "source_dest_check",
+        "name": "associate_public_ip_address",
         "type": "boolean",
-        "description": "Indicates whether traffic to or from the instance is validated."
-      },
-      {
-        "name": "interface_type",
-        "type": "string",
-        "description": "Indicates the type of network interface."
-      },
-      {
-        "name": "secondary_private_ip_addresses",
-        "type": "array",
-        "description": "Returns the secondary private IP addresses of the network interface."
-      },
-      {
-        "name": "vpc_id",
-        "type": "string",
-        "description": "The ID of the VPC"
-      },
-      {
-        "name": "ipv6_address_count",
-        "type": "integer",
-        "description": "The number of IPv6 addresses to assign to a network interface. Amazon EC2 automatically selects the IPv6 addresses from the subnet range. To specify specific IPv6 addresses, use the Ipv6Addresses property and don't specify this property."
+        "description": "Indicates whether to assign a public IPv4 address to an instance you launch in a VPC."
       },
       {
-        "name": "id",
+        "name": "network_interface_id",
         "type": "string",
-        "description": "Network interface id."
+        "description": "The ID of the network interface."
       },
       {
-        "name": "tags",
-        "type": "array",
-        "description": "An arbitrary set of tags (key-value pairs) for this network interface."
+        "name": "associate_carrier_ip_address",
+        "type": "boolean",
+        "description": "Not currently supported by AWS CloudFormation."
       },
       {
-        "name": "connection_tracking_specification",
+        "name": "ena_srd_specification",
         "type": "object",
-        "description": "",
+        "description": "Specifies the ENA Express settings for the network interface that's attached to the instance.",
         "children": [
           {
-            "name": "udp_timeout",
-            "type": "integer",
-            "description": ""
-          },
-          {
-            "name": "tcp_established_timeout",
-            "type": "integer",
-            "description": ""
+            "name": "ena_srd_enabled",
+            "type": "boolean",
+            "description": "Specifies whether ENA Express is enabled for the network interface when you launch an instance."
           },
           {
-            "name": "udp_stream_timeout",
-            "type": "integer",
-            "description": ""
+            "name": "ena_srd_udp_specification",
+            "type": "object",
+            "description": "Contains ENA Express settings for UDP network traffic for the network interface that's attached to the instance.",
+            "children": [
+              {
+                "name": "ena_srd_udp_enabled",
+                "type": "boolean",
+                "description": "Indicates whether UDP traffic uses ENA Express for your instance."
+              }
+            ]
           }
         ]
+      },
+      {
+        "name": "ipv6_address_count",
+        "type": "integer",
+        "description": "A number of IPv6 addresses to assign to the network interface."
+      },
+      {
+        "name": "delete_on_termination",
+        "type": "boolean",
+        "description": "If set to true, the interface is deleted when the instance is terminated."
       }
     ]
   },
@@ -1141,21 +1022,8 @@ resources:
     props:
       - name: volumes
         value:
-          - multi_attach_enabled: '{{ multi_attach_enabled }}'
-            kms_key_id: '{{ kms_key_id }}'
-            encrypted: '{{ encrypted }}'
-            size: '{{ size }}'
-            auto_enable_io: '{{ auto_enable_io }}'
-            outpost_arn: '{{ outpost_arn }}'
-            availability_zone: '{{ availability_zone }}'
-            throughput: '{{ throughput }}'
-            iops: '{{ iops }}'
-            volume_initialization_rate: '{{ volume_initialization_rate }}'
-            snapshot_id: '{{ snapshot_id }}'
-            volume_type: '{{ volume_type }}'
-            tags:
-              - key: '{{ key }}'
-                value: '{{ value }}'
+          - volume_id: '{{ volume_id }}'
+            device: '{{ device }}'
       - name: enclave_options
         value:
           enabled: '{{ enabled }}'
@@ -1163,7 +1031,8 @@ resources:
         value: '{{ image_id }}'
       - name: tags
         value:
-          - null
+          - value: '{{ value }}'
+            key: '{{ key }}'
       - name: additional_info
         value: '{{ additional_info }}'
       - name: hibernation_options
@@ -1175,8 +1044,8 @@ resources:
       - name: metadata_options
         value:
           http_put_response_hop_limit: '{{ http_put_response_hop_limit }}'
-          http_tokens: '{{ http_tokens }}'
           http_protocol_ipv6: '{{ http_protocol_ipv6 }}'
+          http_tokens: '{{ http_tokens }}'
           instance_metadata_tags: '{{ instance_metadata_tags }}'
           http_endpoint: '{{ http_endpoint }}'
       - name: cpu_options
@@ -1217,16 +1086,17 @@ resources:
         value: '{{ user_data }}'
       - name: block_device_mappings
         value:
-          - device_name: '{{ device_name }}'
-            ebs:
-              delete_on_termination: '{{ delete_on_termination }}'
+          - ebs:
+              snapshot_id: '{{ snapshot_id }}'
+              volume_type: '{{ volume_type }}'
+              kms_key_id: '{{ kms_key_id }}'
               encrypted: '{{ encrypted }}'
               iops: '{{ iops }}'
-              snapshot_id: '{{ snapshot_id }}'
               volume_size: '{{ volume_size }}'
-              volume_type: '{{ volume_type }}'
-            no_device: '{{ no_device }}'
+              delete_on_termination: '{{ delete_on_termination }}'
+            no_device: {}
             virtual_name: '{{ virtual_name }}'
+            device_name: '{{ device_name }}'
       - name: iam_instance_profile
         value: '{{ iam_instance_profile }}'
       - name: ipv6_addresses
@@ -1259,30 +1129,24 @@ resources:
           - description: '{{ description }}'
             private_ip_address: '{{ private_ip_address }}'
             private_ip_addresses:
-              - primary: '{{ primary }}'
-                private_ip_address: '{{ private_ip_address }}'
+              - private_ip_address: '{{ private_ip_address }}'
+                primary: '{{ primary }}'
             secondary_private_ip_address_count: '{{ secondary_private_ip_address_count }}'
-            ipv6_prefix_count: '{{ ipv6_prefix_count }}'
-            ipv4_prefixes:
-              - ipv4_prefix: '{{ ipv4_prefix }}'
-            ipv4_prefix_count: '{{ ipv4_prefix_count }}'
-            enable_primary_ipv6: '{{ enable_primary_ipv6 }}'
+            device_index: '{{ device_index }}'
             group_set:
               - '{{ group_set[0] }}'
             ipv6_addresses:
               - null
-            ipv6_prefixes:
-              - ipv6_prefix: '{{ ipv6_prefix }}'
             subnet_id: '{{ subnet_id }}'
-            source_dest_check: '{{ source_dest_check }}'
-            interface_type: '{{ interface_type }}'
+            associate_public_ip_address: '{{ associate_public_ip_address }}'
+            network_interface_id: '{{ network_interface_id }}'
+            associate_carrier_ip_address: '{{ associate_carrier_ip_address }}'
+            ena_srd_specification:
+              ena_srd_enabled: '{{ ena_srd_enabled }}'
+              ena_srd_udp_specification:
+                ena_srd_udp_enabled: '{{ ena_srd_udp_enabled }}'
             ipv6_address_count: '{{ ipv6_address_count }}'
-            tags:
-              - null
-            connection_tracking_specification:
-              udp_timeout: '{{ udp_timeout }}'
-              tcp_established_timeout: '{{ tcp_established_timeout }}'
-              udp_stream_timeout: '{{ udp_stream_timeout }}'
+            delete_on_termination: '{{ delete_on_termination }}'
       - name: instance_type
         value: '{{ instance_type }}'
       - name: monitoring
diff --git a/website/docs/services/ec2/ipam_allocations/index.md b/website/docs/services/ec2/ipam_allocations/index.md
index a3d336c4c..d224ba578 100644
--- a/website/docs/services/ec2/ipam_allocations/index.md
+++ b/website/docs/services/ec2/ipam_allocations/index.md
@@ -57,7 +57,7 @@ Creates, updates, deletes or gets an <code>ipam_allocation</code> resource or li
   {
     "name": "cidr",
     "type": "string",
-    "description": "Represents a single IPv4 or IPv6 CIDR"
+    "description": "Represents an IPAM custom allocation of a single IPv4 or IPv6 CIDR"
   },
   {
     "name": "netmask_length",
@@ -92,7 +92,7 @@ Creates, updates, deletes or gets an <code>ipam_allocation</code> resource or li
   {
     "name": "cidr",
     "type": "string",
-    "description": "Represents a single IPv4 or IPv6 CIDR"
+    "description": "Represents an IPAM custom allocation of a single IPv4 or IPv6 CIDR"
   },
   {
     "name": "region",
diff --git a/website/docs/services/ec2/ipam_pools/index.md b/website/docs/services/ec2/ipam_pools/index.md
index 145778bd6..4d6ede569 100644
--- a/website/docs/services/ec2/ipam_pools/index.md
+++ b/website/docs/services/ec2/ipam_pools/index.md
@@ -77,12 +77,12 @@ Creates, updates, deletes or gets an <code>ipam_pool</code> resource or lists <c
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/ec2/ipam_resource_discoveries/index.md b/website/docs/services/ec2/ipam_resource_discoveries/index.md
index 482f35c55..1eff9c8df 100644
--- a/website/docs/services/ec2/ipam_resource_discoveries/index.md
+++ b/website/docs/services/ec2/ipam_resource_discoveries/index.md
@@ -111,12 +111,12 @@ Creates, updates, deletes or gets an <code>ipam_resource_discovery</code> resour
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/ec2/ipam_resource_discovery_associations/index.md b/website/docs/services/ec2/ipam_resource_discovery_associations/index.md
index bed929600..95be43a59 100644
--- a/website/docs/services/ec2/ipam_resource_discovery_associations/index.md
+++ b/website/docs/services/ec2/ipam_resource_discovery_associations/index.md
@@ -102,12 +102,12 @@ Creates, updates, deletes or gets an <code>ipam_resource_discovery_association</
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/ec2/ipam_scopes/index.md b/website/docs/services/ec2/ipam_scopes/index.md
index f4b380910..492cffbe5 100644
--- a/website/docs/services/ec2/ipam_scopes/index.md
+++ b/website/docs/services/ec2/ipam_scopes/index.md
@@ -92,12 +92,12 @@ Creates, updates, deletes or gets an <code>ipam_scope</code> resource or lists <
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/ec2/ipams/index.md b/website/docs/services/ec2/ipams/index.md
index 2bfe7967c..e3dd8465c 100644
--- a/website/docs/services/ec2/ipams/index.md
+++ b/website/docs/services/ec2/ipams/index.md
@@ -136,12 +136,12 @@ Creates, updates, deletes or gets an <code>ipam</code> resource or lists <code>i
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/ec2/launch_templates/index.md b/website/docs/services/ec2/launch_templates/index.md
index 6ba93886a..5d5d6b5e7 100644
--- a/website/docs/services/ec2/launch_templates/index.md
+++ b/website/docs/services/ec2/launch_templates/index.md
@@ -75,14 +75,14 @@ Creates, updates, deletes or gets a <code>launch_template</code> resource or lis
             "description": "The tags to apply to the resource.",
             "children": [
               {
-                "name": "key",
+                "name": "value",
                 "type": "string",
-                "description": "The tag key."
+                "description": "The tag value."
               },
               {
-                "name": "value",
+                "name": "key",
                 "type": "string",
-                "description": "The tag value."
+                "description": "The tag key."
               }
             ]
           }
@@ -110,57 +110,72 @@ Creates, updates, deletes or gets a <code>launch_template</code> resource or lis
         "type": "array",
         "description": "The block device mapping.",
         "children": [
-          {
-            "name": "device_name",
-            "type": "string",
-            "description": ""
-          },
           {
             "name": "ebs",
             "type": "object",
-            "description": "",
+            "description": "Parameters used to automatically set up EBS volumes when the instance is launched.",
             "children": [
               {
-                "name": "delete_on_termination",
-                "type": "boolean",
-                "description": ""
+                "name": "snapshot_id",
+                "type": "string",
+                "description": "The ID of the snapshot."
+              },
+              {
+                "name": "volume_type",
+                "type": "string",
+                "description": "The volume type. For more information, see <a href=\"https://docs.aws.amazon.com/ebs/latest/userguide/ebs-volume-types.html\">Amazon EBS volume types</a> in the <i>Amazon EBS User Guide</i>."
+              },
+              {
+                "name": "kms_key_id",
+                "type": "string",
+                "description": "Identifier (key ID, key alias, key ARN, or alias ARN) of the customer managed KMS key to use for EBS encryption."
               },
               {
                 "name": "encrypted",
                 "type": "boolean",
-                "description": ""
+                "description": "Indicates whether the EBS volume is encrypted. Encrypted volumes can only be attached to instances that support Amazon EBS encryption. If you are creating a volume from a snapshot, you can't specify an encryption value."
+              },
+              {
+                "name": "throughput",
+                "type": "integer",
+                "description": "<details><summary>The throughput to provision for a <code>gp3</code> volume, with a maximum of 1,000 MiB/s.</summary>Valid Range: Minimum value of 125. Maximum value of 1000.</details>"
               },
               {
                 "name": "iops",
                 "type": "integer",
-                "description": ""
+                "description": "<details><summary>The number of I/O operations per second (IOPS). For <code>gp3</code>, <code>io1</code>, and <code>io2</code> volumes, this represents the number of IOPS that are provisioned for the volume. For <code>gp2</code> volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.</summary>The following are the supported values for each volume type:<br />+  <code>gp3</code>: 3,000 - 16,000 IOPS<br />+  <code>io1</code>: 100 - 64,000 IOPS<br />+  <code>io2</code>: 100 - 256,000 IOPS<br />For <code>io2</code> volumes, you can achieve up to 256,000 IOPS on <a href=\"https://docs.aws.amazon.com/ec2/latest/instancetypes/ec2-nitro-instances.html\">instances built on the Nitro System</a>. On other instances, you can achieve performance up to 32,000 IOPS.<br />This parameter is supported for <code>io1</code>, <code>io2</code>, and <code>gp3</code> volumes only.</details>"
               },
               {
-                "name": "snapshot_id",
-                "type": "string",
-                "description": ""
+                "name": "volume_initialization_rate",
+                "type": "integer",
+                "description": "<details><summary>Specifies the Amazon EBS Provisioned Rate for Volume Initialization (volume initialization rate), in MiB/s, at which to download the snapshot blocks from Amazon S3 to the volume. This is also known as <i>volume initialization</i>. Specifying a volume initialization rate ensures that the volume is initialized at a predictable and consistent rate after creation.</summary>This parameter is supported only for volumes created from snapshots. Omit this parameter if:<br />+  You want to create the volume using fast snapshot restore. You must specify a snapshot that is enabled for fast snapshot restore. In this case, the volume is fully initialized at creation.<br />If you specify a snapshot that is enabled for fast snapshot restore and a volume initialization rate, the volume will be initialized at the specified rate instead of fast snapshot restore.<br />+  You want to create a volume that is initialized at the default rate.<br />For more information, see <a href=\"https://docs.aws.amazon.com/ebs/latest/userguide/initalize-volume.html\">Initialize Amazon EBS volumes</a> in the <i>Amazon EC2 User Guide</i>.<br />Valid range: 100 - 300 MiB/s</details>"
               },
               {
                 "name": "volume_size",
                 "type": "integer",
-                "description": ""
+                "description": "<details><summary>The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. The following are the supported volumes sizes for each volume type:</summary>+  <code>gp2</code> and <code>gp3</code>: 1 - 16,384 GiB<br />+  <code>io1</code>: 4 - 16,384 GiB<br />+  <code>io2</code>: 4 - 65,536 GiB<br />+  <code>st1</code> and <code>sc1</code>: 125 - 16,384 GiB<br />+  <code>standard</code>: 1 - 1024 GiB</details>"
               },
               {
-                "name": "volume_type",
-                "type": "string",
-                "description": ""
+                "name": "delete_on_termination",
+                "type": "boolean",
+                "description": "Indicates whether the EBS volume is deleted on instance termination."
               }
             ]
           },
           {
             "name": "no_device",
             "type": "string",
-            "description": ""
+            "description": "To omit the device from the block device mapping, specify an empty string."
           },
           {
             "name": "virtual_name",
             "type": "string",
-            "description": ""
+            "description": "The virtual device name (ephemeralN). Instance store volumes are numbered starting from 0. An instance type with 2 available instance store volumes can specify mappings for ephemeral0 and ephemeral1. The number of available instance store volumes depends on the instance type. After you connect to the instance, you must mount the volume."
+          },
+          {
+            "name": "device_name",
+            "type": "string",
+            "description": "The device name (for example, /dev/sdh or xvdh)."
           }
         ]
       },
@@ -268,167 +283,172 @@ Creates, updates, deletes or gets a <code>launch_template</code> resource or lis
           {
             "name": "private_ip_address",
             "type": "string",
-            "description": "Assigns a single private IP address to the network interface, which is used as the primary private IP address. If you want to specify multiple private IP address, use the PrivateIpAddresses property."
-          },
-          {
-            "name": "primary_ipv6_address",
-            "type": "string",
-            "description": "The primary IPv6 address"
+            "description": "The primary private IPv4 address of the network interface."
           },
           {
             "name": "private_ip_addresses",
             "type": "array",
-            "description": "Assigns a list of private IP addresses to the network interface. You can specify a primary private IP address by setting the value of the Primary property to true in the PrivateIpAddressSpecification property. If you want EC2 to automatically assign private IP addresses, use the SecondaryPrivateIpAddressCount property and do not specify this property.",
+            "description": "One or more private IPv4 addresses.",
             "children": [
-              {
-                "name": "primary",
-                "type": "boolean",
-                "description": ""
-              },
               {
                 "name": "private_ip_address",
                 "type": "string",
-                "description": ""
+                "description": "The private IPv4 address."
+              },
+              {
+                "name": "primary",
+                "type": "boolean",
+                "description": "Indicates whether the private IPv4 address is the primary private IPv4 address. Only one IPv4 address can be designated as primary."
               }
             ]
           },
           {
             "name": "secondary_private_ip_address_count",
             "type": "integer",
-            "description": "The number of secondary private IPv4 addresses to assign to a network interface. When you specify a number of secondary IPv4 addresses, Amazon EC2 selects these IP addresses within the subnet's IPv4 CIDR range. You can't specify this option and specify more than one private IP address using privateIpAddresses"
+            "description": "The number of secondary private IPv4 addresses to assign to a network interface."
           },
           {
             "name": "ipv6_prefix_count",
             "type": "integer",
-            "description": "The number of IPv6 prefixes to assign to a network interface. When you specify a number of IPv6 prefixes, Amazon EC2 selects these prefixes from your existing subnet CIDR reservations, if available, or from free spaces in the subnet. By default, these will be /80 prefixes. You can't specify a count of IPv6 prefixes if you've specified one of the following: specific IPv6 prefixes, specific IPv6 addresses, or a count of IPv6 addresses."
-          },
-          {
-            "name": "primary_private_ip_address",
-            "type": "string",
-            "description": "Returns the primary private IP address of the network interface."
+            "description": "The number of IPv6 prefixes to be automatically assigned to the network interface. You cannot use this option if you use the <code>Ipv6Prefix</code> option."
           },
           {
             "name": "ipv4_prefixes",
             "type": "array",
-            "description": "Assigns a list of IPv4 prefixes to the network interface. If you want EC2 to automatically assign IPv4 prefixes, use the Ipv4PrefixCount property and do not specify this property. Presently, only /28 prefixes are supported. You can't specify IPv4 prefixes if you've specified one of the following: a count of IPv4 prefixes, specific private IPv4 addresses, or a count of private IPv4 addresses.",
+            "description": "One or more IPv4 prefixes to be assigned to the network interface. You cannot use this option if you use the <code>Ipv4PrefixCount</code> option.",
             "children": [
               {
                 "name": "ipv4_prefix",
                 "type": "string",
-                "description": ""
+                "description": "The IPv4 prefix. For information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-prefix-eni.html\">Assigning prefixes to network interfaces</a> in the <i>Amazon EC2 User Guide</i>."
               }
             ]
           },
           {
-            "name": "ipv4_prefix_count",
+            "name": "device_index",
             "type": "integer",
-            "description": "The number of IPv4 prefixes to assign to a network interface. When you specify a number of IPv4 prefixes, Amazon EC2 selects these prefixes from your existing subnet CIDR reservations, if available, or from free spaces in the subnet. By default, these will be /28 prefixes. You can't specify a count of IPv4 prefixes if you've specified one of the following: specific IPv4 prefixes, specific private IPv4 addresses, or a count of private IPv4 addresses."
+            "description": "<details><summary>The device index for the network interface attachment. The primary network interface has a device index of 0. If the network interface is of type <code>interface</code>, you must specify a device index.</summary>If you create a launch template that includes secondary network interfaces but no primary network interface, and you specify it using the <code>LaunchTemplate</code> property of <code>AWS::EC2::Instance</code>, then you must include a primary network interface using the <code>NetworkInterfaces</code> property of <code>AWS::EC2::Instance</code>.</details>"
           },
           {
-            "name": "enable_primary_ipv6",
+            "name": "primary_ipv6",
             "type": "boolean",
-            "description": "If you have instances or ENIs that rely on the IPv6 address not changing, to avoid disrupting traffic to instances or ENIs, you can enable a primary IPv6 address. Enable this option to automatically assign an IPv6 associated with the ENI attached to your instance to be the primary IPv6 address. When you enable an IPv6 address to be a primary IPv6, you cannot disable it. Traffic will be routed to the primary IPv6 address until the instance is terminated or the ENI is detached. If you have multiple IPv6 addresses associated with an ENI and you enable a primary IPv6 address, the first IPv6 address associated with the ENI becomes the primary IPv6 address."
+            "description": "The primary IPv6 address of the network interface. When you enable an IPv6 GUA address to be a primary IPv6, the first IPv6 GUA will be made the primary IPv6 address until the instance is terminated or the network interface is detached. For more information about primary IPv6 addresses, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html\">RunInstances</a>."
           },
           {
-            "name": "group_set",
-            "type": "array",
-            "description": "A list of security group IDs associated with this network interface."
+            "name": "ipv4_prefix_count",
+            "type": "integer",
+            "description": "The number of IPv4 prefixes to be automatically assigned to the network interface. You cannot use this option if you use the <code>Ipv4Prefix</code> option."
           },
           {
-            "name": "ipv6_addresses",
-            "type": "array",
-            "description": "One or more specific IPv6 addresses from the IPv6 CIDR block range of your subnet to associate with the network interface. If you're specifying a number of IPv6 addresses, use the Ipv6AddressCount property and don't specify this property.",
-            "children": [
-              {
-                "name": "ipv6_address",
-                "type": "string",
-                "description": ""
-              }
-            ]
+            "name": "ena_queue_count",
+            "type": "integer",
+            "description": ""
           },
           {
             "name": "ipv6_prefixes",
             "type": "array",
-            "description": "Assigns a list of IPv6 prefixes to the network interface. If you want EC2 to automatically assign IPv6 prefixes, use the Ipv6PrefixCount property and do not specify this property. Presently, only /80 prefixes are supported. You can't specify IPv6 prefixes if you've specified one of the following: a count of IPv6 prefixes, specific IPv6 addresses, or a count of IPv6 addresses.",
+            "description": "One or more IPv6 prefixes to be assigned to the network interface. You cannot use this option if you use the <code>Ipv6PrefixCount</code> option.",
             "children": [
               {
                 "name": "ipv6_prefix",
                 "type": "string",
-                "description": ""
+                "description": "The IPv6 prefix."
               }
             ]
           },
           {
             "name": "subnet_id",
             "type": "string",
-            "description": "The ID of the subnet to associate with the network interface."
+            "description": "The ID of the subnet for the network interface."
           },
           {
-            "name": "source_dest_check",
-            "type": "boolean",
-            "description": "Indicates whether traffic to or from the instance is validated."
-          },
-          {
-            "name": "interface_type",
-            "type": "string",
-            "description": "Indicates the type of network interface."
+            "name": "ipv6_addresses",
+            "type": "array",
+            "description": "One or more specific IPv6 addresses from the IPv6 CIDR block range of your subnet. You can't use this option if you're specifying a number of IPv6 addresses.",
+            "children": [
+              {
+                "name": "ipv6_address",
+                "type": "string",
+                "description": "One or more specific IPv6 addresses from the IPv6 CIDR block range of your subnet. You can't use this option if you're specifying a number of IPv6 addresses."
+              }
+            ]
           },
           {
-            "name": "secondary_private_ip_addresses",
-            "type": "array",
-            "description": "Returns the secondary private IP addresses of the network interface."
+            "name": "associate_public_ip_address",
+            "type": "boolean",
+            "description": "<details><summary>Associates a public IPv4 address with eth0 for a new network interface.</summary>AWS charges for all public IPv4 addresses, including public IPv4 addresses associated with running instances and Elastic IP addresses. For more information, see the <i>Public IPv4 Address</i> tab on the <a href=\"https://docs.aws.amazon.com/vpc/pricing/\">Amazon VPC pricing page</a>.</details>"
           },
           {
-            "name": "vpc_id",
+            "name": "network_interface_id",
             "type": "string",
-            "description": "The ID of the VPC"
+            "description": "The ID of the network interface."
           },
           {
-            "name": "ipv6_address_count",
+            "name": "network_card_index",
             "type": "integer",
-            "description": "The number of IPv6 addresses to assign to a network interface. Amazon EC2 automatically selects the IPv6 addresses from the subnet range. To specify specific IPv6 addresses, use the Ipv6Addresses property and don't specify this property."
+            "description": "The index of the network card. Some instance types support multiple network cards. The primary network interface must be assigned to network card index 0. The default is network card index 0."
           },
           {
-            "name": "id",
+            "name": "interface_type",
             "type": "string",
-            "description": "Network interface id."
+            "description": "<details><summary>The type of network interface. To create an Elastic Fabric Adapter (EFA), specify <code>efa</code> or <code>efa</code>. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/efa.html\">Elastic Fabric Adapter for AI/ML and HPC workloads on Amazon EC2</a> in the <i>Amazon EC2 User Guide</i>.</summary>If you are not creating an EFA, specify <code>interface</code> or omit this parameter.<br />If you specify <code>efa-only</code>, do not assign any IP addresses to the network interface. EFA-only network interfaces do not support IP addresses.<br />Valid values: <code>interface</code> | <code>efa</code> | <code>efa-only</code></details>"
           },
           {
-            "name": "tags",
-            "type": "array",
-            "description": "An arbitrary set of tags (key-value pairs) for this network interface.",
+            "name": "associate_carrier_ip_address",
+            "type": "boolean",
+            "description": "<details><summary>Associates a Carrier IP address with eth0 for a new network interface.</summary>Use this option when you launch an instance in a Wavelength Zone and want to associate a Carrier IP address with the network interface. For more information about Carrier IP addresses, see <a href=\"https://docs.aws.amazon.com/wavelength/latest/developerguide/how-wavelengths-work.html#provider-owned-ip\">Carrier IP addresses</a> in the <i>Developer Guide</i>.</details>"
+          },
+          {
+            "name": "ena_srd_specification",
+            "type": "object",
+            "description": "The ENA Express configuration for the network interface.",
             "children": [
               {
-                "name": "key",
-                "type": "string",
-                "description": "The tag key."
+                "name": "ena_srd_enabled",
+                "type": "boolean",
+                "description": "Indicates whether ENA Express is enabled for the network interface."
               },
               {
-                "name": "value",
-                "type": "string",
-                "description": "The tag value."
+                "name": "ena_srd_udp_specification",
+                "type": "object",
+                "description": "Configures ENA Express for UDP network traffic."
               }
             ]
           },
+          {
+            "name": "ipv6_address_count",
+            "type": "integer",
+            "description": "The number of IPv6 addresses to assign to a network interface. Amazon EC2 automatically selects the IPv6 addresses from the subnet range. You can't use this option if specifying specific IPv6 addresses."
+          },
+          {
+            "name": "groups",
+            "type": "array",
+            "description": "The IDs of one or more security groups."
+          },
+          {
+            "name": "delete_on_termination",
+            "type": "boolean",
+            "description": "Indicates whether the network interface is deleted when the instance is terminated."
+          },
           {
             "name": "connection_tracking_specification",
             "type": "object",
-            "description": "",
+            "description": "A connection tracking specification for the network interface.",
             "children": [
               {
                 "name": "udp_timeout",
                 "type": "integer",
-                "description": ""
+                "description": "Timeout (in seconds) for idle UDP flows that have seen traffic only in a single direction or a single request-response transaction. Min: 30 seconds. Max: 60 seconds. Default: 30 seconds."
               },
               {
                 "name": "tcp_established_timeout",
                 "type": "integer",
-                "description": ""
+                "description": "Timeout (in seconds) for idle TCP connections in an established state. Min: 60 seconds. Max: 432000 seconds (5 days). Default: 432000 seconds. Recommended: Less than 432000 seconds."
               },
               {
                 "name": "udp_stream_timeout",
                 "type": "integer",
-                "description": ""
+                "description": "Timeout (in seconds) for idle UDP flows classified as streams which have seen more than one request-response transaction. Min: 60 seconds. Max: 180 seconds (3 minutes). Default: 180 seconds."
               }
             ]
           }
@@ -953,14 +973,14 @@ Creates, updates, deletes or gets a <code>launch_template</code> resource or lis
         "description": "The tags for the resource.",
         "children": [
           {
-            "name": "key",
+            "name": "value",
             "type": "string",
-            "description": "The tag key."
+            "description": "The tag value."
           },
           {
-            "name": "value",
+            "name": "key",
             "type": "string",
-            "description": "The tag value."
+            "description": "The tag key."
           }
         ]
       }
@@ -1182,22 +1202,25 @@ resources:
           tag_specifications:
             - resource_type: '{{ resource_type }}'
               tags:
-                - key: '{{ key }}'
-                  value: '{{ value }}'
+                - value: '{{ value }}'
+                  key: '{{ key }}'
           network_performance_options:
             bandwidth_weighting: '{{ bandwidth_weighting }}'
           user_data: '{{ user_data }}'
           block_device_mappings:
-            - device_name: '{{ device_name }}'
-              ebs:
-                delete_on_termination: '{{ delete_on_termination }}'
+            - ebs:
+                snapshot_id: '{{ snapshot_id }}'
+                volume_type: '{{ volume_type }}'
+                kms_key_id: '{{ kms_key_id }}'
                 encrypted: '{{ encrypted }}'
+                throughput: '{{ throughput }}'
                 iops: '{{ iops }}'
-                snapshot_id: '{{ snapshot_id }}'
+                volume_initialization_rate: '{{ volume_initialization_rate }}'
                 volume_size: '{{ volume_size }}'
-                volume_type: '{{ volume_type }}'
+                delete_on_termination: '{{ delete_on_termination }}'
               no_device: '{{ no_device }}'
               virtual_name: '{{ virtual_name }}'
+              device_name: '{{ device_name }}'
           maintenance_options:
             auto_recovery: '{{ auto_recovery }}'
           iam_instance_profile:
@@ -1219,26 +1242,34 @@ resources:
             - description: '{{ description }}'
               private_ip_address: '{{ private_ip_address }}'
               private_ip_addresses:
-                - primary: '{{ primary }}'
-                  private_ip_address: '{{ private_ip_address }}'
+                - private_ip_address: '{{ private_ip_address }}'
+                  primary: '{{ primary }}'
               secondary_private_ip_address_count: '{{ secondary_private_ip_address_count }}'
               ipv6_prefix_count: '{{ ipv6_prefix_count }}'
               ipv4_prefixes:
                 - ipv4_prefix: '{{ ipv4_prefix }}'
+              device_index: '{{ device_index }}'
+              primary_ipv6: '{{ primary_ipv6 }}'
               ipv4_prefix_count: '{{ ipv4_prefix_count }}'
-              enable_primary_ipv6: '{{ enable_primary_ipv6 }}'
-              group_set:
-                - '{{ group_set[0] }}'
-              ipv6_addresses:
-                - ipv6_address: '{{ ipv6_address }}'
+              ena_queue_count: '{{ ena_queue_count }}'
               ipv6_prefixes:
                 - ipv6_prefix: '{{ ipv6_prefix }}'
               subnet_id: '{{ subnet_id }}'
-              source_dest_check: '{{ source_dest_check }}'
+              ipv6_addresses:
+                - ipv6_address: '{{ ipv6_address }}'
+              associate_public_ip_address: '{{ associate_public_ip_address }}'
+              network_interface_id: '{{ network_interface_id }}'
+              network_card_index: '{{ network_card_index }}'
               interface_type: '{{ interface_type }}'
+              associate_carrier_ip_address: '{{ associate_carrier_ip_address }}'
+              ena_srd_specification:
+                ena_srd_enabled: '{{ ena_srd_enabled }}'
+                ena_srd_udp_specification:
+                  ena_srd_udp_enabled: '{{ ena_srd_udp_enabled }}'
               ipv6_address_count: '{{ ipv6_address_count }}'
-              tags:
-                - null
+              groups:
+                - '{{ groups[0] }}'
+              delete_on_termination: '{{ delete_on_termination }}'
               connection_tracking_specification:
                 udp_timeout: '{{ udp_timeout }}'
                 tcp_established_timeout: '{{ tcp_established_timeout }}'
diff --git a/website/docs/services/ec2/local_gateway_route_table_virtual_interface_group_associations/index.md b/website/docs/services/ec2/local_gateway_route_table_virtual_interface_group_associations/index.md
index 8645c4697..a4b2b562e 100644
--- a/website/docs/services/ec2/local_gateway_route_table_virtual_interface_group_associations/index.md
+++ b/website/docs/services/ec2/local_gateway_route_table_virtual_interface_group_associations/index.md
@@ -87,12 +87,12 @@ Creates, updates, deletes or gets a <code>local_gateway_route_table_virtual_inte
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/ec2/local_gateway_route_tables/index.md b/website/docs/services/ec2/local_gateway_route_tables/index.md
index 000b8c174..585449794 100644
--- a/website/docs/services/ec2/local_gateway_route_tables/index.md
+++ b/website/docs/services/ec2/local_gateway_route_tables/index.md
@@ -87,12 +87,12 @@ Creates, updates, deletes or gets a <code>local_gateway_route_table</code> resou
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/ec2/local_gateway_route_tablevpc_associations/index.md b/website/docs/services/ec2/local_gateway_route_tablevpc_associations/index.md
index a0dee691e..4ce6e2e8b 100644
--- a/website/docs/services/ec2/local_gateway_route_tablevpc_associations/index.md
+++ b/website/docs/services/ec2/local_gateway_route_tablevpc_associations/index.md
@@ -77,12 +77,12 @@ Creates, updates, deletes or gets a <code>local_gateway_route_tablevpc_associati
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/ec2/nat_gateways/index.md b/website/docs/services/ec2/nat_gateways/index.md
index b3e8d9201..8c5dbc8b4 100644
--- a/website/docs/services/ec2/nat_gateways/index.md
+++ b/website/docs/services/ec2/nat_gateways/index.md
@@ -90,14 +90,14 @@ Creates, updates, deletes or gets a <code>nat_gateway</code> resource or lists <
     "description": "The tags for the NAT gateway.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": "The tag value."
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": "The tag key."
       }
     ]
   },
@@ -345,8 +345,8 @@ resources:
           - '{{ secondary_private_ip_addresses[0] }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'
+          - value: '{{ value }}'
+            key: '{{ key }}'
       - name: max_drain_duration_seconds
         value: '{{ max_drain_duration_seconds }}'`}</CodeBlock>
 
diff --git a/website/docs/services/ec2/network_acls/index.md b/website/docs/services/ec2/network_acls/index.md
index a697278d1..4f0d27acf 100644
--- a/website/docs/services/ec2/network_acls/index.md
+++ b/website/docs/services/ec2/network_acls/index.md
@@ -60,14 +60,14 @@ Creates, updates, deletes or gets a <code>network_acl</code> resource or lists <
     "description": "The tags for the network ACL.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": "The tag value."
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": "The tag key."
       }
     ]
   },
@@ -259,8 +259,8 @@ resources:
         value: '{{ vpc_id }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/ec2/network_insights_access_scope_analyses/index.md b/website/docs/services/ec2/network_insights_access_scope_analyses/index.md
index eeeb6757a..bb4b69182 100644
--- a/website/docs/services/ec2/network_insights_access_scope_analyses/index.md
+++ b/website/docs/services/ec2/network_insights_access_scope_analyses/index.md
@@ -97,12 +97,12 @@ Creates, updates, deletes or gets a <code>network_insights_access_scope_analysis
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/ec2/network_insights_access_scopes/index.md b/website/docs/services/ec2/network_insights_access_scopes/index.md
index 1b9563ddf..fcbe59240 100644
--- a/website/docs/services/ec2/network_insights_access_scopes/index.md
+++ b/website/docs/services/ec2/network_insights_access_scopes/index.md
@@ -72,12 +72,12 @@ Creates, updates, deletes or gets a <code>network_insights_access_scope</code> r
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/ec2/network_insights_analyses/index.md b/website/docs/services/ec2/network_insights_analyses/index.md
index ecfc9bdda..d6b9a3454 100644
--- a/website/docs/services/ec2/network_insights_analyses/index.md
+++ b/website/docs/services/ec2/network_insights_analyses/index.md
@@ -99,14 +99,14 @@ Creates, updates, deletes or gets a <code>network_insights_analysis</code> resou
             "description": "",
             "children": [
               {
-                "name": "from_port",
+                "name": "from",
                 "type": "integer",
-                "description": "The first port in the range."
+                "description": ""
               },
               {
-                "name": "to_port",
+                "name": "to",
                 "type": "integer",
-                "description": "The last port in the range."
+                "description": ""
               }
             ]
           },
@@ -157,17 +157,17 @@ Creates, updates, deletes or gets a <code>network_insights_analysis</code> resou
           {
             "name": "port_range",
             "type": "object",
-            "description": "The IP port range.",
+            "description": "",
             "children": [
               {
-                "name": "from_port",
+                "name": "from",
                 "type": "integer",
-                "description": "The first port in the range."
+                "description": ""
               },
               {
-                "name": "to_port",
+                "name": "to",
                 "type": "integer",
-                "description": "The last port in the range."
+                "description": ""
               }
             ]
           },
@@ -412,14 +412,14 @@ Creates, updates, deletes or gets a <code>network_insights_analysis</code> resou
             "description": "",
             "children": [
               {
-                "name": "from_port",
+                "name": "from",
                 "type": "integer",
-                "description": "The first port in the range."
+                "description": ""
               },
               {
-                "name": "to_port",
+                "name": "to",
                 "type": "integer",
-                "description": "The last port in the range."
+                "description": ""
               }
             ]
           },
@@ -475,17 +475,17 @@ Creates, updates, deletes or gets a <code>network_insights_analysis</code> resou
           {
             "name": "port_range",
             "type": "object",
-            "description": "The IP port range.",
+            "description": "",
             "children": [
               {
-                "name": "from_port",
+                "name": "from",
                 "type": "integer",
-                "description": "The first port in the range."
+                "description": ""
               },
               {
-                "name": "to_port",
+                "name": "to",
                 "type": "integer",
-                "description": "The last port in the range."
+                "description": ""
               }
             ]
           },
@@ -915,14 +915,14 @@ Creates, updates, deletes or gets a <code>network_insights_analysis</code> resou
         "description": "",
         "children": [
           {
-            "name": "from_port",
+            "name": "from",
             "type": "integer",
-            "description": "The first port in the range."
+            "description": ""
           },
           {
-            "name": "to_port",
+            "name": "to",
             "type": "integer",
-            "description": "The last port in the range."
+            "description": ""
           }
         ]
       },
@@ -998,14 +998,14 @@ Creates, updates, deletes or gets a <code>network_insights_analysis</code> resou
     "description": "",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
@@ -1225,8 +1225,8 @@ resources:
           - '{{ additional_accounts[0] }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/ec2/network_insights_paths/index.md b/website/docs/services/ec2/network_insights_paths/index.md
index 97682d329..a9d634b3b 100644
--- a/website/docs/services/ec2/network_insights_paths/index.md
+++ b/website/docs/services/ec2/network_insights_paths/index.md
@@ -126,12 +126,12 @@ Creates, updates, deletes or gets a <code>network_insights_path</code> resource
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/ec2/network_interfaces/index.md b/website/docs/services/ec2/network_interfaces/index.md
index 0d7216b3d..803001c1f 100644
--- a/website/docs/services/ec2/network_interfaces/index.md
+++ b/website/docs/services/ec2/network_interfaces/index.md
@@ -65,13 +65,13 @@ Creates, updates, deletes or gets a <code>network_interface</code> resource or l
     "description": "Assigns a list of private IP addresses to the network interface. You can specify a primary private IP address by setting the value of the Primary property to true in the PrivateIpAddressSpecification property. If you want EC2 to automatically assign private IP addresses, use the SecondaryPrivateIpAddressCount property and do not specify this property.",
     "children": [
       {
-        "name": "primary",
-        "type": "boolean",
+        "name": "private_ip_address",
+        "type": "string",
         "description": ""
       },
       {
-        "name": "private_ip_address",
-        "type": "string",
+        "name": "primary",
+        "type": "boolean",
         "description": ""
       }
     ]
@@ -183,14 +183,14 @@ Creates, updates, deletes or gets a <code>network_interface</code> resource or l
     "description": "An arbitrary set of tags (key-value pairs) for this network interface.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
@@ -455,8 +455,8 @@ resources:
         value: '{{ private_ip_address }}'
       - name: private_ip_addresses
         value:
-          - primary: '{{ primary }}'
-            private_ip_address: '{{ private_ip_address }}'
+          - private_ip_address: '{{ private_ip_address }}'
+            primary: '{{ primary }}'
       - name: secondary_private_ip_address_count
         value: '{{ secondary_private_ip_address_count }}'
       - name: ipv6_prefix_count
@@ -487,8 +487,8 @@ resources:
         value: '{{ ipv6_address_count }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'
+          - value: '{{ value }}'
+            key: '{{ key }}'
       - name: connection_tracking_specification
         value:
           udp_timeout: '{{ udp_timeout }}'
diff --git a/website/docs/services/ec2/placement_groups/index.md b/website/docs/services/ec2/placement_groups/index.md
index b5960ce7c..5d530419a 100644
--- a/website/docs/services/ec2/placement_groups/index.md
+++ b/website/docs/services/ec2/placement_groups/index.md
@@ -72,12 +72,12 @@ Creates, updates, deletes or gets a <code>placement_group</code> resource or lis
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/ec2/prefix_lists/index.md b/website/docs/services/ec2/prefix_lists/index.md
index e066d68e4..ea4474db2 100644
--- a/website/docs/services/ec2/prefix_lists/index.md
+++ b/website/docs/services/ec2/prefix_lists/index.md
@@ -82,12 +82,12 @@ Creates, updates, deletes or gets a <code>prefix_list</code> resource or lists <
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/ec2/route_server_endpoints/index.md b/website/docs/services/ec2/route_server_endpoints/index.md
index caf1539a0..462e8a071 100644
--- a/website/docs/services/ec2/route_server_endpoints/index.md
+++ b/website/docs/services/ec2/route_server_endpoints/index.md
@@ -87,12 +87,12 @@ Creates, updates, deletes or gets a <code>route_server_endpoint</code> resource
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/ec2/route_server_peers/index.md b/website/docs/services/ec2/route_server_peers/index.md
index 138300847..0ba02be81 100644
--- a/website/docs/services/ec2/route_server_peers/index.md
+++ b/website/docs/services/ec2/route_server_peers/index.md
@@ -114,12 +114,12 @@ Creates, updates, deletes or gets a <code>route_server_peer</code> resource or l
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/ec2/route_servers/index.md b/website/docs/services/ec2/route_servers/index.md
index 76c152bd5..bd779aa3e 100644
--- a/website/docs/services/ec2/route_servers/index.md
+++ b/website/docs/services/ec2/route_servers/index.md
@@ -82,12 +82,12 @@ Creates, updates, deletes or gets a <code>route_server</code> resource or lists
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/ec2/route_tables/index.md b/website/docs/services/ec2/route_tables/index.md
index d9e025725..b605fe5b0 100644
--- a/website/docs/services/ec2/route_tables/index.md
+++ b/website/docs/services/ec2/route_tables/index.md
@@ -60,14 +60,14 @@ Creates, updates, deletes or gets a <code>route_table</code> resource or lists <
     "description": "Any tags assigned to the route table.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": "The tag value."
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": "The tag key."
       }
     ]
   },
@@ -259,8 +259,8 @@ resources:
         value: '{{ vpc_id }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/ec2/security_groups/index.md b/website/docs/services/ec2/security_groups/index.md
index 7451b5311..4517dca3c 100644
--- a/website/docs/services/ec2/security_groups/index.md
+++ b/website/docs/services/ec2/security_groups/index.md
@@ -174,14 +174,14 @@ Creates, updates, deletes or gets a <code>security_group</code> resource or list
     "description": "Any tags assigned to the security group.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
@@ -417,8 +417,8 @@ resources:
             destination_prefix_list_id: '{{ destination_prefix_list_id }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/ec2/spot_fleets/index.md b/website/docs/services/ec2/spot_fleets/index.md
index 5607a7c81..e96d99626 100644
--- a/website/docs/services/ec2/spot_fleets/index.md
+++ b/website/docs/services/ec2/spot_fleets/index.md
@@ -634,14 +634,14 @@ Creates, updates, deletes or gets a <code>spot_fleet</code> resource or lists <c
             "description": "",
             "children": [
               {
-                "name": "key",
+                "name": "value",
                 "type": "string",
-                "description": "The tag key."
+                "description": ""
               },
               {
-                "name": "value",
+                "name": "key",
                 "type": "string",
-                "description": "The tag value."
+                "description": ""
               }
             ]
           }
@@ -892,8 +892,8 @@ resources:
               tag_specifications:
                 - resource_type: '{{ resource_type }}'
                   tags:
-                    - key: '{{ key }}'
-                      value: '{{ value }}'
+                    - value: '{{ value }}'
+                      key: '{{ key }}'
               user_data: '{{ user_data }}'
               weighted_capacity: null
               instance_requirements:
diff --git a/website/docs/services/ec2/subnets/index.md b/website/docs/services/ec2/subnets/index.md
index ebfb658c9..d3e751f22 100644
--- a/website/docs/services/ec2/subnets/index.md
+++ b/website/docs/services/ec2/subnets/index.md
@@ -142,14 +142,14 @@ Creates, updates, deletes or gets a <code>subnet</code> resource or lists <code>
     "description": "Any tags assigned to the subnet.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": "The tag value."
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": "The tag key."
       }
     ]
   },
@@ -446,8 +446,8 @@ resources:
           enable_resource_name_dns_aa_aa_record: '{{ enable_resource_name_dns_aa_aa_record }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'
+          - value: '{{ value }}'
+            key: '{{ key }}'
       - name: ipv4_ipam_pool_id
         value: '{{ ipv4_ipam_pool_id }}'
       - name: ipv4_netmask_length
diff --git a/website/docs/services/ec2/traffic_mirror_filter_rules/index.md b/website/docs/services/ec2/traffic_mirror_filter_rules/index.md
index cc8a4174f..425212ef3 100644
--- a/website/docs/services/ec2/traffic_mirror_filter_rules/index.md
+++ b/website/docs/services/ec2/traffic_mirror_filter_rules/index.md
@@ -112,14 +112,14 @@ Creates, updates, deletes or gets a <code>traffic_mirror_filter_rule</code> reso
     "description": "Any tags assigned to the Traffic Mirror Filter rule.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
@@ -368,8 +368,8 @@ resources:
         value: '{{ protocol }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/ec2/traffic_mirror_filters/index.md b/website/docs/services/ec2/traffic_mirror_filters/index.md
index 81a901e6b..64edf31bc 100644
--- a/website/docs/services/ec2/traffic_mirror_filters/index.md
+++ b/website/docs/services/ec2/traffic_mirror_filters/index.md
@@ -67,12 +67,12 @@ Creates, updates, deletes or gets a <code>traffic_mirror_filter</code> resource
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/ec2/traffic_mirror_sessions/index.md b/website/docs/services/ec2/traffic_mirror_sessions/index.md
index 4b46f436b..e868b4983 100644
--- a/website/docs/services/ec2/traffic_mirror_sessions/index.md
+++ b/website/docs/services/ec2/traffic_mirror_sessions/index.md
@@ -97,12 +97,12 @@ Creates, updates, deletes or gets a <code>traffic_mirror_session</code> resource
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/ec2/traffic_mirror_targets/index.md b/website/docs/services/ec2/traffic_mirror_targets/index.md
index 7d3722b48..c7698adc8 100644
--- a/website/docs/services/ec2/traffic_mirror_targets/index.md
+++ b/website/docs/services/ec2/traffic_mirror_targets/index.md
@@ -75,14 +75,14 @@ Creates, updates, deletes or gets a <code>traffic_mirror_target</code> resource
     "description": "The tags to assign to the Traffic Mirror target.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
@@ -297,8 +297,8 @@ resources:
         value: '{{ gateway_load_balancer_endpoint_id }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/ec2/transit_gateway_attachments/index.md b/website/docs/services/ec2/transit_gateway_attachments/index.md
index eedd8fa22..153532010 100644
--- a/website/docs/services/ec2/transit_gateway_attachments/index.md
+++ b/website/docs/services/ec2/transit_gateway_attachments/index.md
@@ -97,14 +97,14 @@ Creates, updates, deletes or gets a <code>transit_gateway_attachment</code> reso
     "description": "",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
@@ -320,8 +320,8 @@ resources:
           - '{{ subnet_ids[0] }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/ec2/transit_gateway_connect_peers/index.md b/website/docs/services/ec2/transit_gateway_connect_peers/index.md
index 5bed4520f..277ecc081 100644
--- a/website/docs/services/ec2/transit_gateway_connect_peers/index.md
+++ b/website/docs/services/ec2/transit_gateway_connect_peers/index.md
@@ -129,14 +129,14 @@ Creates, updates, deletes or gets a <code>transit_gateway_connect_peer</code> re
     "description": "The tags for the Connect Peer.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": "The value of the tag. Constraints: Tag values are case-sensitive and accept a maximum of 256 Unicode characters."
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": "The key of the tag. Constraints: Tag keys are case-sensitive and accept a maximum of 127 Unicode characters. May not begin with aws: ."
       }
     ]
   },
@@ -348,8 +348,8 @@ resources:
               bgp_status: '{{ bgp_status }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/ec2/transit_gateway_connects/index.md b/website/docs/services/ec2/transit_gateway_connects/index.md
index 7fe7fb09e..1d858a12b 100644
--- a/website/docs/services/ec2/transit_gateway_connects/index.md
+++ b/website/docs/services/ec2/transit_gateway_connects/index.md
@@ -77,12 +77,12 @@ Creates, updates, deletes or gets a <code>transit_gateway_connect</code> resourc
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": "The key of the tag. Constraints: Tag keys are case-sensitive and accept a maximum of 127 Unicode characters. May not begin with aws:."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": "The value of the tag. Constraints: Tag values are case-sensitive and accept a maximum of 255 Unicode characters."
       }
     ]
   },
diff --git a/website/docs/services/ec2/transit_gateway_multicast_domains/index.md b/website/docs/services/ec2/transit_gateway_multicast_domains/index.md
index b72d5568a..47a7ba809 100644
--- a/website/docs/services/ec2/transit_gateway_multicast_domains/index.md
+++ b/website/docs/services/ec2/transit_gateway_multicast_domains/index.md
@@ -77,12 +77,12 @@ Creates, updates, deletes or gets a <code>transit_gateway_multicast_domain</code
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": "The key of the tag. Constraints: Tag keys are case-sensitive and accept a maximum of 127 Unicode characters. May not begin with aws:."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": "The value of the tag. Constraints: Tag values are case-sensitive and accept a maximum of 255 Unicode characters."
       }
     ]
   },
diff --git a/website/docs/services/ec2/transit_gateway_peering_attachments/index.md b/website/docs/services/ec2/transit_gateway_peering_attachments/index.md
index 5720f0386..7c2633e0a 100644
--- a/website/docs/services/ec2/transit_gateway_peering_attachments/index.md
+++ b/website/docs/services/ec2/transit_gateway_peering_attachments/index.md
@@ -97,14 +97,14 @@ Creates, updates, deletes or gets a <code>transit_gateway_peering_attachment</co
     "description": "The tags for the transit gateway peering attachment.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": "The value of the tag. Constraints: Tag values are case-sensitive and accept a maximum of 255 Unicode characters."
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": "The key of the tag. Constraints: Tag keys are case-sensitive and accept a maximum of 127 Unicode characters. May not begin with aws:."
       }
     ]
   },
@@ -325,8 +325,8 @@ resources:
         value: '{{ peer_region }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/ec2/transit_gateway_route_tables/index.md b/website/docs/services/ec2/transit_gateway_route_tables/index.md
index 11146fbe4..68452668d 100644
--- a/website/docs/services/ec2/transit_gateway_route_tables/index.md
+++ b/website/docs/services/ec2/transit_gateway_route_tables/index.md
@@ -60,14 +60,14 @@ Creates, updates, deletes or gets a <code>transit_gateway_route_table</code> res
     "description": "Tags are composed of a Key/Value pair. You can use tags to categorize and track each parameter group. The tag value null is permitted.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": "The value of the associated tag key-value pair"
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": "The key of the associated tag key-value pair"
       }
     ]
   },
@@ -259,8 +259,8 @@ resources:
         value: '{{ transit_gateway_id }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/ec2/transit_gateway_vpc_attachments/index.md b/website/docs/services/ec2/transit_gateway_vpc_attachments/index.md
index 8b9c57c5b..a3a253074 100644
--- a/website/docs/services/ec2/transit_gateway_vpc_attachments/index.md
+++ b/website/docs/services/ec2/transit_gateway_vpc_attachments/index.md
@@ -80,14 +80,14 @@ Creates, updates, deletes or gets a <code>transit_gateway_vpc_attachment</code>
     "description": "",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
@@ -336,8 +336,8 @@ resources:
           - '{{ remove_subnet_ids[0] }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'
+          - value: '{{ value }}'
+            key: '{{ key }}'
       - name: options
         value:
           dns_support: '{{ dns_support }}'
diff --git a/website/docs/services/ec2/transit_gateways/index.md b/website/docs/services/ec2/transit_gateways/index.md
index fae23bf51..98b9aa473 100644
--- a/website/docs/services/ec2/transit_gateways/index.md
+++ b/website/docs/services/ec2/transit_gateways/index.md
@@ -110,14 +110,14 @@ Creates, updates, deletes or gets a <code>transit_gateway</code> resource or lis
     "description": "",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
@@ -396,8 +396,8 @@ resources:
           - '{{ transit_gateway_cidr_blocks[0] }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'
+          - value: '{{ value }}'
+            key: '{{ key }}'
       - name: association_default_route_table_id
         value: '{{ association_default_route_table_id }}'
       - name: propagation_default_route_table_id
diff --git a/website/docs/services/ec2/verified_access_endpoints/index.md b/website/docs/services/ec2/verified_access_endpoints/index.md
index 752d11389..b47ca99a5 100644
--- a/website/docs/services/ec2/verified_access_endpoints/index.md
+++ b/website/docs/services/ec2/verified_access_endpoints/index.md
@@ -301,12 +301,12 @@ Creates, updates, deletes or gets a <code>verified_access_endpoint</code> resour
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/ec2/verified_access_groups/index.md b/website/docs/services/ec2/verified_access_groups/index.md
index 1ab77770a..ef2091427 100644
--- a/website/docs/services/ec2/verified_access_groups/index.md
+++ b/website/docs/services/ec2/verified_access_groups/index.md
@@ -97,12 +97,12 @@ Creates, updates, deletes or gets a <code>verified_access_group</code> resource
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/ec2/verified_access_instances/index.md b/website/docs/services/ec2/verified_access_instances/index.md
index dc4eb216a..4d0350046 100644
--- a/website/docs/services/ec2/verified_access_instances/index.md
+++ b/website/docs/services/ec2/verified_access_instances/index.md
@@ -55,184 +55,29 @@ Creates, updates, deletes or gets a <code>verified_access_instance</code> resour
     "description": "AWS Verified Access trust providers.",
     "children": [
       {
-        "name": "trust_provider_type",
-        "type": "string",
-        "description": "Type of trust provider. Possible values: user|device"
-      },
-      {
-        "name": "device_trust_provider_type",
-        "type": "string",
-        "description": "The type of device-based trust provider. Possible values: jamf|crowdstrike"
-      },
-      {
-        "name": "user_trust_provider_type",
-        "type": "string",
-        "description": "The type of device-based trust provider. Possible values: oidc|iam-identity-center"
-      },
-      {
-        "name": "oidc_options",
-        "type": "object",
-        "description": "The OpenID Connect details for an oidc -type, user-identity based trust provider.",
-        "children": [
-          {
-            "name": "issuer",
-            "type": "string",
-            "description": "The OIDC issuer."
-          },
-          {
-            "name": "authorization_endpoint",
-            "type": "string",
-            "description": "The OIDC authorization endpoint."
-          },
-          {
-            "name": "token_endpoint",
-            "type": "string",
-            "description": "The OIDC token endpoint."
-          },
-          {
-            "name": "user_info_endpoint",
-            "type": "string",
-            "description": "The OIDC user info endpoint."
-          },
-          {
-            "name": "client_id",
-            "type": "string",
-            "description": "The client identifier."
-          },
-          {
-            "name": "client_secret",
-            "type": "string",
-            "description": "The client secret."
-          },
-          {
-            "name": "scope",
-            "type": "string",
-            "description": "OpenID Connect (OIDC) scopes are used by an application during authentication to authorize access to details of a user. Each scope returns a specific set of user attributes."
-          }
-        ]
-      },
-      {
-        "name": "device_options",
-        "type": "object",
-        "description": "The options for device identity based trust providers.",
-        "children": [
-          {
-            "name": "tenant_id",
-            "type": "string",
-            "description": "The ID of the tenant application with the device-identity provider."
-          },
-          {
-            "name": "public_signing_key_url",
-            "type": "string",
-            "description": "URL Verified Access will use to verify authenticity of the device tokens."
-          }
-        ]
-      },
-      {
-        "name": "policy_reference_name",
+        "name": "verified_access_trust_provider_id",
         "type": "string",
-        "description": "The identifier to be used when working with policy rules."
+        "description": "The ID of the trust provider."
       },
       {
-        "name": "creation_time",
+        "name": "description",
         "type": "string",
-        "description": "The creation time."
+        "description": "The description of trust provider."
       },
       {
-        "name": "last_updated_time",
+        "name": "trust_provider_type",
         "type": "string",
-        "description": "The last updated time."
+        "description": "The type of trust provider (user- or device-based)."
       },
       {
-        "name": "verified_access_trust_provider_id",
+        "name": "user_trust_provider_type",
         "type": "string",
-        "description": "The ID of the Amazon Web Services Verified Access trust provider."
+        "description": "The type of user-based trust provider."
       },
       {
-        "name": "description",
+        "name": "device_trust_provider_type",
         "type": "string",
-        "description": "A description for the Amazon Web Services Verified Access trust provider."
-      },
-      {
-        "name": "tags",
-        "type": "array",
-        "description": "An array of key-value pairs to apply to this resource.",
-        "children": [
-          {
-            "name": "key",
-            "type": "string",
-            "description": "The tag key."
-          },
-          {
-            "name": "value",
-            "type": "string",
-            "description": "The tag value."
-          }
-        ]
-      },
-      {
-        "name": "sse_specification",
-        "type": "object",
-        "description": "The configuration options for customer provided KMS encryption.",
-        "children": [
-          {
-            "name": "kms_key_arn",
-            "type": "string",
-            "description": "KMS Key Arn used to encrypt the group policy"
-          },
-          {
-            "name": "customer_managed_key_enabled",
-            "type": "boolean",
-            "description": "Whether to encrypt the policy with the provided key or disable encryption"
-          }
-        ]
-      },
-      {
-        "name": "native_application_oidc_options",
-        "type": "object",
-        "description": "The OpenID Connect details for an oidc -type, user-identity based trust provider for L4.",
-        "children": [
-          {
-            "name": "issuer",
-            "type": "string",
-            "description": "The OIDC issuer."
-          },
-          {
-            "name": "authorization_endpoint",
-            "type": "string",
-            "description": "The OIDC authorization endpoint."
-          },
-          {
-            "name": "token_endpoint",
-            "type": "string",
-            "description": "The OIDC token endpoint."
-          },
-          {
-            "name": "user_info_endpoint",
-            "type": "string",
-            "description": "The OIDC user info endpoint."
-          },
-          {
-            "name": "client_id",
-            "type": "string",
-            "description": "The client identifier."
-          },
-          {
-            "name": "client_secret",
-            "type": "string",
-            "description": "The client secret."
-          },
-          {
-            "name": "scope",
-            "type": "string",
-            "description": "OpenID Connect (OIDC) scopes are used by an application during authentication to authorize access to details of a user. Each scope returns a specific set of user attributes."
-          },
-          {
-            "name": "public_signing_key_endpoint",
-            "type": "string",
-            "description": "The public signing key for endpoint"
-          }
-        ]
+        "description": "The type of device-based trust provider."
       }
     ]
   },
@@ -342,12 +187,12 @@ Creates, updates, deletes or gets a <code>verified_access_instance</code> resour
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -582,37 +427,11 @@ resources:
     props:
       - name: verified_access_trust_providers
         value:
-          - trust_provider_type: '{{ trust_provider_type }}'
-            device_trust_provider_type: '{{ device_trust_provider_type }}'
-            user_trust_provider_type: '{{ user_trust_provider_type }}'
-            oidc_options:
-              issuer: '{{ issuer }}'
-              authorization_endpoint: '{{ authorization_endpoint }}'
-              token_endpoint: '{{ token_endpoint }}'
-              user_info_endpoint: '{{ user_info_endpoint }}'
-              client_id: '{{ client_id }}'
-              client_secret: '{{ client_secret }}'
-              scope: '{{ scope }}'
-            device_options:
-              tenant_id: '{{ tenant_id }}'
-              public_signing_key_url: '{{ public_signing_key_url }}'
-            policy_reference_name: '{{ policy_reference_name }}'
+          - verified_access_trust_provider_id: '{{ verified_access_trust_provider_id }}'
             description: '{{ description }}'
-            tags:
-              - key: '{{ key }}'
-                value: '{{ value }}'
-            sse_specification:
-              kms_key_arn: '{{ kms_key_arn }}'
-              customer_managed_key_enabled: '{{ customer_managed_key_enabled }}'
-            native_application_oidc_options:
-              issuer: '{{ issuer }}'
-              authorization_endpoint: '{{ authorization_endpoint }}'
-              token_endpoint: '{{ token_endpoint }}'
-              user_info_endpoint: '{{ user_info_endpoint }}'
-              client_id: '{{ client_id }}'
-              client_secret: '{{ client_secret }}'
-              scope: '{{ scope }}'
-              public_signing_key_endpoint: '{{ public_signing_key_endpoint }}'
+            trust_provider_type: '{{ trust_provider_type }}'
+            user_trust_provider_type: '{{ user_trust_provider_type }}'
+            device_trust_provider_type: '{{ device_trust_provider_type }}'
       - name: verified_access_trust_provider_ids
         value:
           - '{{ verified_access_trust_provider_ids[0] }}'
@@ -635,7 +454,8 @@ resources:
             prefix: '{{ prefix }}'
       - name: tags
         value:
-          - null
+          - key: '{{ key }}'
+            value: '{{ value }}'
       - name: fips_enabled
         value: '{{ fips_enabled }}'
       - name: cidr_endpoints_custom_sub_domain
diff --git a/website/docs/services/ec2/verified_access_trust_providers/index.md b/website/docs/services/ec2/verified_access_trust_providers/index.md
index a6fbc1a6c..5c6bc0085 100644
--- a/website/docs/services/ec2/verified_access_trust_providers/index.md
+++ b/website/docs/services/ec2/verified_access_trust_providers/index.md
@@ -151,12 +151,12 @@ Creates, updates, deletes or gets a <code>verified_access_trust_provider</code>
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/ec2/volumes/index.md b/website/docs/services/ec2/volumes/index.md
index c0868f31e..c7899a367 100644
--- a/website/docs/services/ec2/volumes/index.md
+++ b/website/docs/services/ec2/volumes/index.md
@@ -115,14 +115,14 @@ Creates, updates, deletes or gets a <code>volume</code> resource or lists <code>
     "description": "The tags to apply to the volume during creation.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": "The tag value."
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": "The tag key."
       }
     ]
   },
@@ -369,8 +369,8 @@ resources:
         value: '{{ volume_type }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/ec2/vpc_block_public_access_exclusions/index.md b/website/docs/services/ec2/vpc_block_public_access_exclusions/index.md
index e6a3cfe57..b4de42722 100644
--- a/website/docs/services/ec2/vpc_block_public_access_exclusions/index.md
+++ b/website/docs/services/ec2/vpc_block_public_access_exclusions/index.md
@@ -72,12 +72,12 @@ Creates, updates, deletes or gets a <code>vpc_block_public_access_exclusion</cod
       {
         "name": "key",
         "type": "string",
-        "description": "The tag key."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The tag value."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/ec2/vpc_endpoint_services/index.md b/website/docs/services/ec2/vpc_endpoint_services/index.md
index db5e11bed..2c89d036e 100644
--- a/website/docs/services/ec2/vpc_endpoint_services/index.md
+++ b/website/docs/services/ec2/vpc_endpoint_services/index.md
@@ -80,14 +80,14 @@ Creates, updates, deletes or gets a <code>vpc_endpoint_service</code> resource o
     "description": "The tags to add to the VPC endpoint service.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": ""
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": ""
       }
     ]
   },
@@ -331,8 +331,8 @@ resources:
           - '{{ gateway_load_balancer_arns[0] }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'
+          - value: '{{ value }}'
+            key: '{{ key }}'
       - name: supported_ip_address_types
         value:
           - '{{ supported_ip_address_types[0] }}'
diff --git a/website/docs/services/ec2/vpc_endpoints/index.md b/website/docs/services/ec2/vpc_endpoints/index.md
index 160e8172c..e87f423d7 100644
--- a/website/docs/services/ec2/vpc_endpoints/index.md
+++ b/website/docs/services/ec2/vpc_endpoints/index.md
@@ -147,14 +147,14 @@ Creates, updates, deletes or gets a <code>vpc_endpoint</code> resource or lists
     "description": "The tags to associate with the endpoint.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": "<details><summary>The value of the tag.</summary>Constraints: Tag values are case-sensitive and accept a maximum of 256 Unicode characters.</details>"
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": "<details><summary>The key of the tag.</summary>Constraints: Tag keys are case-sensitive and accept a maximum of 127 Unicode characters. May not begin with <code>aws:</code>.</details>"
       }
     ]
   },
@@ -414,8 +414,8 @@ resources:
         value: '{{ vpc_endpoint_type }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/ec2/vpc_peering_connections/index.md b/website/docs/services/ec2/vpc_peering_connections/index.md
index 52473c229..a2e82feed 100644
--- a/website/docs/services/ec2/vpc_peering_connections/index.md
+++ b/website/docs/services/ec2/vpc_peering_connections/index.md
@@ -80,14 +80,14 @@ Creates, updates, deletes or gets a <code>vpc_peering_connection</code> resource
     "description": "",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -301,8 +301,8 @@ resources:
         value: '{{ peer_owner_id }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/ec2/vpcs/index.md b/website/docs/services/ec2/vpcs/index.md
index a4f9e46a0..903f705e8 100644
--- a/website/docs/services/ec2/vpcs/index.md
+++ b/website/docs/services/ec2/vpcs/index.md
@@ -105,14 +105,14 @@ Creates, updates, deletes or gets a <code>vpc</code> resource or lists <code>vpc
     "description": "The tags for the VPC.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": "The tag value."
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": "The tag key."
       }
     ]
   },
@@ -345,8 +345,8 @@ resources:
         value: '{{ enable_dns_hostnames }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/ec2/vpn_connections/index.md b/website/docs/services/ec2/vpn_connections/index.md
index 5e5423fd3..d9fb31f1e 100644
--- a/website/docs/services/ec2/vpn_connections/index.md
+++ b/website/docs/services/ec2/vpn_connections/index.md
@@ -305,14 +305,14 @@ Creates, updates, deletes or gets a <code>vpn_connection</code> resource or list
     "description": "Any tags assigned to the VPN connection.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The tag key."
+        "description": "The tag value."
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The tag value."
+        "description": "The tag key."
       }
     ]
   },
@@ -607,8 +607,8 @@ resources:
         value: '{{ tunnel_inside_ip_version }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/ecr/registry_policies/index.md b/website/docs/services/ecr/registry_policies/index.md
index 651355fb2..5b41e33ec 100644
--- a/website/docs/services/ecr/registry_policies/index.md
+++ b/website/docs/services/ecr/registry_policies/index.md
@@ -47,7 +47,7 @@ Creates, updates, deletes or gets a <code>registry_policy</code> resource or lis
   {
     "name": "registry_id",
     "type": "string",
-    "description": "The AWS account ID associated with the registry that contains the repository. If you do not specify a registry, the default registry is assumed."
+    "description": "The registry id."
   },
   {
     "name": "policy_text",
@@ -67,7 +67,7 @@ Creates, updates, deletes or gets a <code>registry_policy</code> resource or lis
   {
     "name": "registry_id",
     "type": "string",
-    "description": "The AWS account ID associated with the registry that contains the repository. If you do not specify a registry, the default registry is assumed."
+    "description": "The registry id."
   },
   {
     "name": "region",
diff --git a/website/docs/services/ecr/registry_scanning_configurations/index.md b/website/docs/services/ecr/registry_scanning_configurations/index.md
index 13e241327..55fc6047d 100644
--- a/website/docs/services/ecr/registry_scanning_configurations/index.md
+++ b/website/docs/services/ecr/registry_scanning_configurations/index.md
@@ -57,12 +57,12 @@ Creates, updates, deletes or gets a <code>registry_scanning_configuration</code>
           {
             "name": "filter",
             "type": "string",
-            "description": "The repository filter details. When the <code>PREFIX_MATCH</code> filter type is specified, this value is required and should be the repository name prefix to configure replication for."
+            "description": "The filter to use when scanning."
           },
           {
             "name": "filter_type",
             "type": "string",
-            "description": "The repository filter type. The only supported value is <code>PREFIX_MATCH</code>, which is a repository name prefix specified with the <code>filter</code> parameter."
+            "description": "The type associated with the filter."
           }
         ]
       },
@@ -81,7 +81,7 @@ Creates, updates, deletes or gets a <code>registry_scanning_configuration</code>
   {
     "name": "registry_id",
     "type": "string",
-    "description": "The AWS account ID associated with the registry that contains the repository. If you do not specify a registry, the default registry is assumed."
+    "description": "The registry id."
   },
   {
     "name": "region",
@@ -96,7 +96,7 @@ Creates, updates, deletes or gets a <code>registry_scanning_configuration</code>
   {
     "name": "registry_id",
     "type": "string",
-    "description": "The AWS account ID associated with the registry that contains the repository. If you do not specify a registry, the default registry is assumed."
+    "description": "The registry id."
   },
   {
     "name": "region",
diff --git a/website/docs/services/ecr/replication_configurations/index.md b/website/docs/services/ecr/replication_configurations/index.md
index abc18ee55..5f296902a 100644
--- a/website/docs/services/ecr/replication_configurations/index.md
+++ b/website/docs/services/ecr/replication_configurations/index.md
@@ -50,9 +50,45 @@ Creates, updates, deletes or gets a <code>replication_configuration</code> resou
     "description": "The replication configuration for a registry.",
     "children": [
       {
-        "name": "registry_id",
-        "type": "string",
-        "description": ""
+        "name": "rules",
+        "type": "array",
+        "description": "An array of objects representing the replication destinations and repository filters for a replication configuration.",
+        "children": [
+          {
+            "name": "repository_filters",
+            "type": "array",
+            "description": "An array of objects representing the filters for a replication rule. Specifying a repository filter for a replication rule provides a method for controlling which repositories in a private registry are replicated.",
+            "children": [
+              {
+                "name": "filter",
+                "type": "string",
+                "description": "The repository filter details. When the <code>PREFIX_MATCH</code> filter type is specified, this value is required and should be the repository name prefix to configure replication for."
+              },
+              {
+                "name": "filter_type",
+                "type": "string",
+                "description": "The repository filter type. The only supported value is <code>PREFIX_MATCH</code>, which is a repository name prefix specified with the <code>filter</code> parameter."
+              }
+            ]
+          },
+          {
+            "name": "destinations",
+            "type": "array",
+            "description": "An array of objects representing the destination for a replication rule.",
+            "children": [
+              {
+                "name": "region",
+                "type": "string",
+                "description": "The Region to replicate to."
+              },
+              {
+                "name": "registry_id",
+                "type": "string",
+                "description": "The AWS account ID of the Amazon ECR private registry to replicate to. When configuring cross-Region replication within your own registry, specify your own account ID."
+              }
+            ]
+          }
+        ]
       }
     ]
   },
@@ -244,7 +280,13 @@ resources:
     props:
       - name: replication_configuration
         value:
-          replication_configuration: null`}</CodeBlock>
+          rules:
+            - repository_filters:
+                - filter: '{{ filter }}'
+                  filter_type: '{{ filter_type }}'
+              destinations:
+                - region: '{{ region }}'
+                  registry_id: '{{ registry_id }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/ecr/repositories/index.md b/website/docs/services/ecr/repositories/index.md
index 8f3758342..563986245 100644
--- a/website/docs/services/ecr/repositories/index.md
+++ b/website/docs/services/ecr/repositories/index.md
@@ -116,12 +116,12 @@ Creates, updates, deletes or gets a <code>repository</code> resource or lists <c
       {
         "name": "image_tag_mutability_exclusion_filter_type",
         "type": "string",
-        "description": ""
+        "description": "Specifies the type of filter to use for excluding image tags from the repository's mutability setting."
       },
       {
         "name": "image_tag_mutability_exclusion_filter_value",
         "type": "string",
-        "description": ""
+        "description": "The value to use when filtering image tags."
       }
     ]
   },
diff --git a/website/docs/services/ecs/capacity_providers/index.md b/website/docs/services/ecs/capacity_providers/index.md
new file mode 100644
index 000000000..28eb9cadf
--- /dev/null
+++ b/website/docs/services/ecs/capacity_providers/index.md
@@ -0,0 +1,452 @@
+---
+title: capacity_providers
+hide_title: false
+hide_table_of_contents: false
+keywords:
+  - capacity_providers
+  - ecs
+  - aws
+  - stackql
+  - infrastructure-as-code
+  - configuration-as-data
+  - cloud inventory
+description: Query, deploy and manage AWS resources using SQL
+custom_edit_url: null
+image: /img/stackql-aws-provider-featured-image.png
+---
+
+import CodeBlock from '@theme/CodeBlock';
+import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
+
+Creates, updates, deletes or gets a <code>capacity_provider</code> resource or lists <code>capacity_providers</code> in a region
+
+## Overview
+<table>
+<tbody>
+<tr><td><b>Name</b></td><td><code>capacity_providers</code></td></tr>
+<tr><td><b>Type</b></td><td>Resource</td></tr>
+<tr><td><b>Description</b></td><td>Resource Type definition for AWS::ECS::CapacityProvider.</td></tr>
+<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ecs.capacity_providers" /></td></tr>
+</tbody>
+</table>
+
+## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "auto_scaling_group_provider",
+    "type": "object",
+    "description": "",
+    "children": [
+      {
+        "name": "managed_scaling",
+        "type": "object",
+        "description": "The managed scaling settings for the Auto Scaling group capacity provider.",
+        "children": [
+          {
+            "name": "status",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "minimum_scaling_step_size",
+            "type": "integer",
+            "description": ""
+          },
+          {
+            "name": "instance_warmup_period",
+            "type": "integer",
+            "description": ""
+          },
+          {
+            "name": "target_capacity",
+            "type": "integer",
+            "description": ""
+          },
+          {
+            "name": "maximum_scaling_step_size",
+            "type": "integer",
+            "description": ""
+          }
+        ]
+      },
+      {
+        "name": "auto_scaling_group_arn",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "managed_termination_protection",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "managed_draining",
+        "type": "string",
+        "description": ""
+      }
+    ]
+  },
+  {
+    "name": "tags",
+    "type": "array",
+    "description": "",
+    "children": [
+      {
+        "name": "value",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "key",
+        "type": "string",
+        "description": ""
+      }
+    ]
+  },
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
+
+For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-capacityprovider.html"><code>AWS::ECS::CapacityProvider</code></a>.
+
+## Methods
+
+<table>
+<tbody>
+  <tr>
+    <th>Name</th>
+    <th>Resource</th>
+    <th>Accessible by</th>
+    <th>Required Params</th>
+  </tr>
+  <tr>
+    <td><CopyableCode code="create_resource" /></td>
+    <td><code>capacity_providers</code></td>
+    <td><code>INSERT</code></td>
+    <td><CopyableCode code="region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="delete_resource" /></td>
+    <td><code>capacity_providers</code></td>
+    <td><code>DELETE</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="update_resource" /></td>
+    <td><code>capacity_providers</code></td>
+    <td><code>UPDATE</code></td>
+    <td><CopyableCode code="Identifier, PatchDocument, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="list_resources" /></td>
+    <td><code>capacity_providers_list_only</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="get_resource" /></td>
+    <td><code>capacity_providers</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+</tbody>
+</table>
+
+## `SELECT` examples
+
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+Gets all properties from an individual <code>capacity_provider</code>.
+```sql
+SELECT
+  region,
+  auto_scaling_group_provider,
+  tags,
+  name
+FROM awscc.ecs.capacity_providers
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ name }}';
+```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>capacity_providers</code> in a region.
+```sql
+SELECT
+  region,
+  name
+FROM awscc.ecs.capacity_providers_list_only
+WHERE
+  region = '{{ region }}';
+```
+</TabItem>
+</Tabs>
+
+## `INSERT` example
+
+Use the following StackQL query and manifest file to create a new <code>capacity_provider</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+<Tabs
+    defaultValue="required"
+    values={[
+      { label: 'Required Properties', value: 'required', },
+      { label: 'All Properties', value: 'all', },
+      { label: 'Manifest', value: 'manifest', },
+    ]
+}>
+<TabItem value="required">
+
+```sql
+/*+ create */
+INSERT INTO awscc.ecs.capacity_providers (
+  AutoScalingGroupProvider,
+  Tags,
+  Name,
+  region
+)
+SELECT
+  '{{ auto_scaling_group_provider }}',
+  '{{ tags }}',
+  '{{ name }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="all">
+
+```sql
+/*+ create */
+INSERT INTO awscc.ecs.capacity_providers (
+  AutoScalingGroupProvider,
+  Tags,
+  Name,
+  region
+)
+SELECT
+  '{{ auto_scaling_group_provider }}',
+  '{{ tags }}',
+  '{{ name }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="manifest">
+
+<CodeBlock language="yaml">{`version: 1
+name: stack name
+description: stack description
+providers:
+  - aws
+globals:
+  - name: region
+    value: '{{ vars.AWS_REGION }}'
+resources:
+  - name: capacity_provider
+    props:
+      - name: auto_scaling_group_provider
+        value:
+          managed_scaling:
+            status: '{{ status }}'
+            minimum_scaling_step_size: '{{ minimum_scaling_step_size }}'
+            instance_warmup_period: '{{ instance_warmup_period }}'
+            target_capacity: '{{ target_capacity }}'
+            maximum_scaling_step_size: '{{ maximum_scaling_step_size }}'
+          auto_scaling_group_arn: '{{ auto_scaling_group_arn }}'
+          managed_termination_protection: '{{ managed_termination_protection }}'
+          managed_draining: '{{ managed_draining }}'
+      - name: tags
+        value:
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: name
+        value: '{{ name }}'`}</CodeBlock>
+
+</TabItem>
+</Tabs>
+
+## `UPDATE` example
+
+Use the following StackQL query and manifest file to update a <code>capacity_provider</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+```sql
+/*+ update */
+UPDATE awscc.ecs.capacity_providers
+SET PatchDocument = string('{{ {
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ name }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## `DELETE` example
+
+```sql
+/*+ delete */
+DELETE FROM awscc.ecs.capacity_providers
+WHERE
+  Identifier = '{{ name }}' AND
+  region = '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## Additional Parameters
+
+Mutable resources in the Cloud Control provider support additional optional parameters which can be supplied with `INSERT`, `UPDATE`, or `DELETE` operations. These include:
+
+| Parameter | Description |
+|-----------|-------------|
+| <CopyableCode code="ClientToken" /> | <details><summary>A unique identifier to ensure the idempotency of the resource request.</summary>This allows the provider to accurately distinguish between retries and new requests.<br />A client token is valid for 36 hours once used.<br />After that, a resource request with the same client token is treated as a new request.<br />If you do not specify a client token, one is generated for inclusion in the request.</details> |
+| <CopyableCode code="RoleArn" /> | <details><summary>The ARN of the IAM role used to perform this resource operation.</summary>The role specified must have the permissions required for this operation.<br />If you do not specify a role, a temporary session is created using your AWS user credentials.</details> |
+| <CopyableCode code="TypeVersionId" /> | <details><summary>For private resource types, the type version to use in this resource operation.</summary>If you do not specify a resource version, the default version is used.</details> |
+
+## Permissions
+
+To operate on the <code>capacity_providers</code> resource, the following permissions are required:
+
+<Tabs
+    defaultValue="read"
+    values={[
+      { label: 'Read', value: 'read', },
+      { label: 'Create', value: 'create', },
+      { label: 'Update', value: 'update', },
+      { label: 'List', value: 'list', },
+      { label: 'Delete', value: 'delete', },
+    ]
+}>
+<TabItem value="read">
+
+```json
+ecs:DescribeCapacityProviders
+```
+
+</TabItem>
+<TabItem value="create">
+
+```json
+autoscaling:CreateOrUpdateTags,
+ecs:CreateCapacityProvider,
+ecs:DescribeCapacityProviders,
+ecs:TagResource
+```
+
+</TabItem>
+<TabItem value="update">
+
+```json
+ecs:UpdateCapacityProvider,
+ecs:DescribeCapacityProviders,
+ecs:ListTagsForResource,
+ecs:TagResource,
+ecs:UntagResource
+```
+
+</TabItem>
+<TabItem value="list">
+
+```json
+ecs:DescribeCapacityProviders
+```
+
+</TabItem>
+<TabItem value="delete">
+
+```json
+ecs:DescribeCapacityProviders,
+ecs:DeleteCapacityProvider
+```
+
+</TabItem>
+</Tabs>
\ No newline at end of file
diff --git a/website/docs/services/ecs/clusters/index.md b/website/docs/services/ecs/clusters/index.md
new file mode 100644
index 000000000..336480045
--- /dev/null
+++ b/website/docs/services/ecs/clusters/index.md
@@ -0,0 +1,585 @@
+---
+title: clusters
+hide_title: false
+hide_table_of_contents: false
+keywords:
+  - clusters
+  - ecs
+  - aws
+  - stackql
+  - infrastructure-as-code
+  - configuration-as-data
+  - cloud inventory
+description: Query, deploy and manage AWS resources using SQL
+custom_edit_url: null
+image: /img/stackql-aws-provider-featured-image.png
+---
+
+import CodeBlock from '@theme/CodeBlock';
+import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
+
+Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code>clusters</code> in a region
+
+## Overview
+<table>
+<tbody>
+<tr><td><b>Name</b></td><td><code>clusters</code></td></tr>
+<tr><td><b>Type</b></td><td>Resource</td></tr>
+<tr><td><b>Description</b></td><td>The <code>AWS::ECS::Cluster</code> resource creates an Amazon Elastic Container Service (Amazon ECS) cluster.</td></tr>
+<tr><td><b>Id</b></td><td><CopyableCode code="awscc.ecs.clusters" /></td></tr>
+</tbody>
+</table>
+
+## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "cluster_settings",
+    "type": "array",
+    "description": "<details><summary>The settings to use when creating a cluster. This parameter is used to turn on CloudWatch Container Insights with enhanced observability or CloudWatch Container Insights for a cluster.</summary>Container Insights with enhanced observability provides all the Container Insights metrics, plus additional task and container metrics. This version supports enhanced observability for Amazon ECS clusters using the Amazon EC2 and Fargate launch types. After you configure Container Insights with enhanced observability on Amazon ECS, Container Insights auto-collects detailed infrastructure telemetry from the cluster level down to the container level in your environment and displays these critical performance data in curated dashboards removing the heavy lifting in observability set-up.<br />For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/cloudwatch-container-insights.html\">Monitor Amazon ECS containers using Container Insights with enhanced observability</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</details>",
+    "children": [
+      {
+        "name": "value",
+        "type": "string",
+        "description": "<details><summary>The value to set for the cluster setting. The supported values are <code>enhanced</code>, <code>enabled</code>, and <code>disabled</code>.</summary>To use Container Insights with enhanced observability, set the <code>containerInsights</code> account setting to <code>enhanced</code>.<br />To use Container Insights, set the <code>containerInsights</code> account setting to <code>enabled</code>.<br />If a cluster value is specified, it will override the <code>containerInsights</code> value set with <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_PutAccountSetting.html\">PutAccountSetting</a> or <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_PutAccountSettingDefault.html\">PutAccountSettingDefault</a>.</details>"
+      },
+      {
+        "name": "name",
+        "type": "string",
+        "description": "The name of the cluster setting. The value is <code>containerInsights</code> ."
+      }
+    ]
+  },
+  {
+    "name": "default_capacity_provider_strategy",
+    "type": "array",
+    "description": "The default capacity provider strategy for the cluster. When services or tasks are run in the cluster with no launch type or capacity provider strategy specified, the default capacity provider strategy is used.",
+    "children": [
+      {
+        "name": "capacity_provider",
+        "type": "string",
+        "description": "The short name of the capacity provider."
+      },
+      {
+        "name": "weight",
+        "type": "integer",
+        "description": "<details><summary>The <i>weight</i> value designates the relative percentage of the total number of tasks launched that should use the specified capacity provider. The <code>weight</code> value is taken into consideration after the <code>base</code> value, if defined, is satisfied.</summary>If no <code>weight</code> value is specified, the default value of <code>0</code> is used. When multiple capacity providers are specified within a capacity provider strategy, at least one of the capacity providers must have a weight value greater than zero and any capacity providers with a weight of <code>0</code> can't be used to place tasks. If you specify multiple capacity providers in a strategy that all have a weight of <code>0</code>, any <code>RunTask</code> or <code>CreateService</code> actions using the capacity provider strategy will fail.<br />Weight value characteristics:<br />+  Weight is considered after the base value is satisfied<br />+  Default value is <code>0</code> if not specified<br />+  Valid range: 0 to 1,000<br />+  At least one capacity provider must have a weight greater than zero<br />+  Capacity providers with weight of <code>0</code> cannot place tasks<br />Task distribution logic:<ul><li>Base satisfaction: The minimum number of tasks specified by the base value are placed on that capacity provider</li><li>Weight distribution: After base requirements are met, additional tasks are distributed according to weight ratios</li></ul>Examples:<br />Equal Distribution: Two capacity providers both with weight <code>1</code> will split tasks evenly after base requirements are met.<br />Weighted Distribution: If capacityProviderA has weight <code>1</code> and capacityProviderB has weight <code>4</code>, then for every 1 task on A, 4 tasks will run on B.</details>"
+      },
+      {
+        "name": "base",
+        "type": "integer",
+        "description": "<details><summary>The <i>base</i> value designates how many tasks, at a minimum, to run on the specified capacity provider for each service. Only one capacity provider in a capacity provider strategy can have a <i>base</i> defined. If no value is specified, the default value of <code>0</code> is used.</summary>Base value characteristics:<br />+  Only one capacity provider in a strategy can have a base defined<br />+  Default value is <code>0</code> if not specified<br />+  Valid range: 0 to 100,000<br />+  Base requirements are satisfied first before weight distribution</details>"
+      }
+    ]
+  },
+  {
+    "name": "configuration",
+    "type": "object",
+    "description": "The execute command and managed storage configuration for the cluster.",
+    "children": [
+      {
+        "name": "managed_storage_configuration",
+        "type": "object",
+        "description": "The details of the managed storage configuration.",
+        "children": [
+          {
+            "name": "fargate_ephemeral_storage_kms_key_id",
+            "type": "string",
+            "description": "<details><summary>Specify the KMSlong key ID for Fargate ephemeral storage.</summary>When you specify a <code>fargateEphemeralStorageKmsKeyId</code>, AWS Fargate uses the key to encrypt data at rest in ephemeral storage. For more information about Fargate ephemeral storage encryption, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/fargate-storage-encryption.html\">Customer managed keys for Fargate ephemeral storage for Amazon ECS</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.<br />The key must be a single Region key.</details>"
+          },
+          {
+            "name": "kms_key_id",
+            "type": "string",
+            "description": "<details><summary>Specify a KMSlong key ID to encrypt Amazon ECS managed storage.</summary>When you specify a <code>kmsKeyId</code>, Amazon ECS uses the key to encrypt data volumes managed by Amazon ECS that are attached to tasks in the cluster. The following data volumes are managed by Amazon ECS: Amazon EBS. For more information about encryption of Amazon EBS volumes attached to Amazon ECS tasks, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ebs-kms-encryption.html\">Encrypt data stored in Amazon EBS volumes for Amazon ECS</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.<br />The key must be a single Region key.</details>"
+          }
+        ]
+      },
+      {
+        "name": "execute_command_configuration",
+        "type": "object",
+        "description": "The details of the execute command configuration.",
+        "children": [
+          {
+            "name": "logging",
+            "type": "string",
+            "description": "<details><summary>The log setting to use for redirecting logs for your execute command results. The following log settings are available.</summary>+  <code>NONE</code>: The execute command session is not logged.<br />+  <code>DEFAULT</code>: The <code>awslogs</code> configuration in the task definition is used. If no logging parameter is specified, it defaults to this value. If no <code>awslogs</code> log driver is configured in the task definition, the output won't be logged.<br />+  <code>OVERRIDE</code>: Specify the logging details as a part of <code>logConfiguration</code>. If the <code>OVERRIDE</code> logging option is specified, the <code>logConfiguration</code> is required.</details>"
+          },
+          {
+            "name": "kms_key_id",
+            "type": "string",
+            "description": "Specify an KMSlong key ID to encrypt the data between the local client and the container."
+          },
+          {
+            "name": "log_configuration",
+            "type": "object",
+            "description": "The log configuration for the results of the execute command actions. The logs can be sent to CloudWatch Logs or an Amazon S3 bucket. When <code>logging=OVERRIDE</code> is specified, a <code>logConfiguration</code> must be provided.",
+            "children": [
+              {
+                "name": "s3_encryption_enabled",
+                "type": "boolean",
+                "description": "Determines whether to use encryption on the S3 logs. If not specified, encryption is not used."
+              },
+              {
+                "name": "cloud_watch_encryption_enabled",
+                "type": "boolean",
+                "description": "Determines whether to use encryption on the CloudWatch logs. If not specified, encryption will be off."
+              },
+              {
+                "name": "cloud_watch_log_group_name",
+                "type": "string",
+                "description": "<details><summary>The name of the CloudWatch log group to send logs to.</summary>The CloudWatch log group must already be created.</details>"
+              },
+              {
+                "name": "s3_key_prefix",
+                "type": "string",
+                "description": "An optional folder in the S3 bucket to place logs in."
+              },
+              {
+                "name": "s3_bucket_name",
+                "type": "string",
+                "description": "<details><summary>The name of the S3 bucket to send logs to.</summary>The S3 bucket must already be created.</details>"
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "service_connect_defaults",
+    "type": "object",
+    "description": "<details><summary>Use this parameter to set a default Service Connect namespace. After you set a default Service Connect namespace, any new services with Service Connect turned on that are created in the cluster are added as client services in the namespace. This setting only applies to new services that set the <code>enabled</code> parameter to <code>true</code> in the <code>ServiceConnectConfiguration</code>. You can set the namespace of each service individually in the <code>ServiceConnectConfiguration</code> to override this default parameter.</summary>Tasks that run in a namespace can use short names to connect to services in the namespace. Tasks can connect to services across all of the clusters in the namespace. Tasks connect through a managed proxy container that collects logs and metrics for increased visibility. Only the tasks that Amazon ECS services create are supported with Service Connect. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/service-connect.html\">Service Connect</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</details>",
+    "children": [
+      {
+        "name": "namespace",
+        "type": "string",
+        "description": "<details><summary>The namespace name or full Amazon Resource Name (ARN) of the CMAPlong namespace that's used when you create a service and don't specify a Service Connect configuration. The namespace name can include up to 1024 characters. The name is case-sensitive. The name can't include greater than (>), less than (<), double quotation marks (\"), or slash (/).</summary>If you enter an existing namespace name or ARN, then that namespace will be used. Any namespace type is supported. The namespace must be in this account and this AWS Region.<br />If you enter a new name, a CMAPlong namespace will be created. Amazon ECS creates a CMAP namespace with the \"API calls\" method of instance discovery only. This instance discovery method is the \"HTTP\" namespace type in the CLIlong. Other types of instance discovery aren't used by Service Connect.<br />If you update the cluster with an empty string <code>\"\"</code> for the namespace name, the cluster configuration for Service Connect is removed. Note that the namespace will remain in CMAP and must be deleted separately.<br />For more information about CMAPlong, see <a href=\"https://docs.aws.amazon.com/cloud-map/latest/dg/working-with-services.html\">Working with Services</a> in the <i>Developer Guide</i>.</details>"
+      }
+    ]
+  },
+  {
+    "name": "capacity_providers",
+    "type": "array",
+    "description": "<details><summary>The short name of one or more capacity providers to associate with the cluster. A capacity provider must be associated with a cluster before it can be included as part of the default capacity provider strategy of the cluster or used in a capacity provider strategy when calling the <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_CreateService.html\">CreateService</a> or <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_RunTask.html\">RunTask</a> actions.</summary>If specifying a capacity provider that uses an Auto Scaling group, the capacity provider must be created but not associated with another cluster. New Auto Scaling group capacity providers can be created with the <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_CreateCapacityProvider.html\">CreateCapacityProvider</a> API operation.<br />To use a FARGATElong capacity provider, specify either the <code>FARGATE</code> or <code>FARGATE_SPOT</code> capacity providers. The FARGATElong capacity providers are available to all accounts and only need to be associated with a cluster to be used.<br />The <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_PutCapacityProvider.html\">PutCapacityProvider</a> API operation is used to update the list of available capacity providers for a cluster after the cluster is created.</details>"
+  },
+  {
+    "name": "cluster_name",
+    "type": "string",
+    "description": "A user-generated string that you use to identify your cluster. If you don't specify a name, CFNlong generates a unique physical ID for the name."
+  },
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "tags",
+    "type": "array",
+    "description": "<details><summary>The metadata that you apply to the cluster to help you categorize and organize them. Each tag consists of a key and an optional value. You define both.</summary>The following basic restrictions apply to tags:<br />+  Maximum number of tags per resource - 50<br />+  For each resource, each tag key must be unique, and each tag key can have only one value.<br />+  Maximum key length - 128 Unicode characters in UTF-8<br />+  Maximum value length - 256 Unicode characters in UTF-8<br />+  If your tagging schema is used across multiple services and resources, remember that other services may have restrictions on allowed characters. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following characters: + - = . _ : / @.<br />+  Tag keys and values are case-sensitive.<br />+  Do not use <code>aws:</code>, <code>AWS:</code>, or any upper or lowercase combination of such as a prefix for either keys or values as it is reserved for AWS use. You cannot edit or delete tag keys or values with this prefix. Tags with this prefix do not count against your tags per resource limit.</details>",
+    "children": [
+      {
+        "name": "value",
+        "type": "string",
+        "description": "The optional part of a key-value pair that make up a tag. A <code>value</code> acts as a descriptor within a tag category (key)."
+      },
+      {
+        "name": "key",
+        "type": "string",
+        "description": "One part of a key-value pair that make up a tag. A <code>key</code> is a general label that acts like a category for more specific tag values."
+      }
+    ]
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "cluster_name",
+    "type": "string",
+    "description": "A user-generated string that you use to identify your cluster. If you don't specify a name, CFNlong generates a unique physical ID for the name."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
+
+For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-cluster.html"><code>AWS::ECS::Cluster</code></a>.
+
+## Methods
+
+<table>
+<tbody>
+  <tr>
+    <th>Name</th>
+    <th>Resource</th>
+    <th>Accessible by</th>
+    <th>Required Params</th>
+  </tr>
+  <tr>
+    <td><CopyableCode code="create_resource" /></td>
+    <td><code>clusters</code></td>
+    <td><code>INSERT</code></td>
+    <td><CopyableCode code="region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="delete_resource" /></td>
+    <td><code>clusters</code></td>
+    <td><code>DELETE</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="update_resource" /></td>
+    <td><code>clusters</code></td>
+    <td><code>UPDATE</code></td>
+    <td><CopyableCode code="Identifier, PatchDocument, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="list_resources" /></td>
+    <td><code>clusters_list_only</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="get_resource" /></td>
+    <td><code>clusters</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+</tbody>
+</table>
+
+## `SELECT` examples
+
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+Gets all properties from an individual <code>cluster</code>.
+```sql
+SELECT
+  region,
+  cluster_settings,
+  default_capacity_provider_strategy,
+  configuration,
+  service_connect_defaults,
+  capacity_providers,
+  cluster_name,
+  arn,
+  tags
+FROM awscc.ecs.clusters
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ cluster_name }}';
+```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>clusters</code> in a region.
+```sql
+SELECT
+  region,
+  cluster_name
+FROM awscc.ecs.clusters_list_only
+WHERE
+  region = '{{ region }}';
+```
+</TabItem>
+</Tabs>
+
+## `INSERT` example
+
+Use the following StackQL query and manifest file to create a new <code>cluster</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+<Tabs
+    defaultValue="required"
+    values={[
+      { label: 'Required Properties', value: 'required', },
+      { label: 'All Properties', value: 'all', },
+      { label: 'Manifest', value: 'manifest', },
+    ]
+}>
+<TabItem value="required">
+
+```sql
+/*+ create */
+INSERT INTO awscc.ecs.clusters (
+  ClusterSettings,
+  DefaultCapacityProviderStrategy,
+  Configuration,
+  ServiceConnectDefaults,
+  CapacityProviders,
+  ClusterName,
+  Tags,
+  region
+)
+SELECT
+  '{{ cluster_settings }}',
+  '{{ default_capacity_provider_strategy }}',
+  '{{ configuration }}',
+  '{{ service_connect_defaults }}',
+  '{{ capacity_providers }}',
+  '{{ cluster_name }}',
+  '{{ tags }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="all">
+
+```sql
+/*+ create */
+INSERT INTO awscc.ecs.clusters (
+  ClusterSettings,
+  DefaultCapacityProviderStrategy,
+  Configuration,
+  ServiceConnectDefaults,
+  CapacityProviders,
+  ClusterName,
+  Tags,
+  region
+)
+SELECT
+  '{{ cluster_settings }}',
+  '{{ default_capacity_provider_strategy }}',
+  '{{ configuration }}',
+  '{{ service_connect_defaults }}',
+  '{{ capacity_providers }}',
+  '{{ cluster_name }}',
+  '{{ tags }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="manifest">
+
+<CodeBlock language="yaml">{`version: 1
+name: stack name
+description: stack description
+providers:
+  - aws
+globals:
+  - name: region
+    value: '{{ vars.AWS_REGION }}'
+resources:
+  - name: cluster
+    props:
+      - name: cluster_settings
+        value:
+          - value: '{{ value }}'
+            name: '{{ name }}'
+      - name: default_capacity_provider_strategy
+        value:
+          - capacity_provider: '{{ capacity_provider }}'
+            weight: '{{ weight }}'
+            base: '{{ base }}'
+      - name: configuration
+        value:
+          managed_storage_configuration:
+            fargate_ephemeral_storage_kms_key_id: '{{ fargate_ephemeral_storage_kms_key_id }}'
+            kms_key_id: '{{ kms_key_id }}'
+          execute_command_configuration:
+            logging: '{{ logging }}'
+            kms_key_id: '{{ kms_key_id }}'
+            log_configuration:
+              s3_encryption_enabled: '{{ s3_encryption_enabled }}'
+              cloud_watch_encryption_enabled: '{{ cloud_watch_encryption_enabled }}'
+              cloud_watch_log_group_name: '{{ cloud_watch_log_group_name }}'
+              s3_key_prefix: '{{ s3_key_prefix }}'
+              s3_bucket_name: '{{ s3_bucket_name }}'
+      - name: service_connect_defaults
+        value:
+          namespace: '{{ namespace }}'
+      - name: capacity_providers
+        value:
+          - '{{ capacity_providers[0] }}'
+      - name: cluster_name
+        value: '{{ cluster_name }}'
+      - name: tags
+        value:
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
+
+</TabItem>
+</Tabs>
+
+## `UPDATE` example
+
+Use the following StackQL query and manifest file to update a <code>cluster</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+```sql
+/*+ update */
+UPDATE awscc.ecs.clusters
+SET PatchDocument = string('{{ {
+    "ClusterSettings": cluster_settings,
+    "DefaultCapacityProviderStrategy": default_capacity_provider_strategy,
+    "Configuration": configuration,
+    "ServiceConnectDefaults": service_connect_defaults,
+    "CapacityProviders": capacity_providers,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ cluster_name }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## `DELETE` example
+
+```sql
+/*+ delete */
+DELETE FROM awscc.ecs.clusters
+WHERE
+  Identifier = '{{ cluster_name }}' AND
+  region = '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## Additional Parameters
+
+Mutable resources in the Cloud Control provider support additional optional parameters which can be supplied with `INSERT`, `UPDATE`, or `DELETE` operations. These include:
+
+| Parameter | Description |
+|-----------|-------------|
+| <CopyableCode code="ClientToken" /> | <details><summary>A unique identifier to ensure the idempotency of the resource request.</summary>This allows the provider to accurately distinguish between retries and new requests.<br />A client token is valid for 36 hours once used.<br />After that, a resource request with the same client token is treated as a new request.<br />If you do not specify a client token, one is generated for inclusion in the request.</details> |
+| <CopyableCode code="RoleArn" /> | <details><summary>The ARN of the IAM role used to perform this resource operation.</summary>The role specified must have the permissions required for this operation.<br />If you do not specify a role, a temporary session is created using your AWS user credentials.</details> |
+| <CopyableCode code="TypeVersionId" /> | <details><summary>For private resource types, the type version to use in this resource operation.</summary>If you do not specify a resource version, the default version is used.</details> |
+
+## Permissions
+
+To operate on the <code>clusters</code> resource, the following permissions are required:
+
+<Tabs
+    defaultValue="read"
+    values={[
+      { label: 'Read', value: 'read', },
+      { label: 'Create', value: 'create', },
+      { label: 'Update', value: 'update', },
+      { label: 'List', value: 'list', },
+      { label: 'Delete', value: 'delete', },
+    ]
+}>
+<TabItem value="read">
+
+```json
+ecs:DescribeClusters,
+kms:DescribeKey
+```
+
+</TabItem>
+<TabItem value="create">
+
+```json
+ecs:CreateCluster,
+ecs:DescribeClusters,
+iam:CreateServiceLinkedRole,
+ecs:TagResource,
+kms:DescribeKey
+```
+
+</TabItem>
+<TabItem value="update">
+
+```json
+ecs:PutAccountSettingDefault,
+ecs:DescribeClusters,
+ecs:TagResource,
+ecs:UntagResource,
+ecs:PutAccountSetting,
+ecs:ListTagsForResource,
+ecs:UpdateCluster,
+ecs:UpdateClusterSettings,
+ecs:PutClusterCapacityProviders,
+kms:DescribeKey
+```
+
+</TabItem>
+<TabItem value="list">
+
+```json
+ecs:DescribeClusters,
+ecs:ListClusters
+```
+
+</TabItem>
+<TabItem value="delete">
+
+```json
+ecs:DeleteCluster,
+ecs:DescribeClusters,
+kms:DescribeKey
+```
+
+</TabItem>
+</Tabs>
\ No newline at end of file
diff --git a/website/docs/services/ecs/index.md b/website/docs/services/ecs/index.md
index 2f4c38be9..1d7c009d9 100644
--- a/website/docs/services/ecs/index.md
+++ b/website/docs/services/ecs/index.md
@@ -20,7 +20,7 @@ The ecs service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>5</b></span><br />
+<span>total resources:&nbsp;<b>7</b></span><br />
 </div>
 </div>
 
@@ -29,11 +29,13 @@ The ecs service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
+<a href="/services/ecs/capacity_providers/">capacity_providers</a><br />
 <a href="/services/ecs/cluster_capacity_provider_associations/">cluster_capacity_provider_associations</a><br />
-<a href="/services/ecs/primary_task_sets/">primary_task_sets</a><br />
-<a href="/services/ecs/services/">services</a>
+<a href="/services/ecs/clusters/">clusters</a><br />
+<a href="/services/ecs/primary_task_sets/">primary_task_sets</a>
 </div>
 <div class="providerDocColumn">
+<a href="/services/ecs/services/">services</a><br />
 <a href="/services/ecs/task_definitions/">task_definitions</a><br />
 <a href="/services/ecs/task_sets/">task_sets</a>
 </div>
diff --git a/website/docs/services/ecs/services/index.md b/website/docs/services/ecs/services/index.md
index 4a7242a54..e5109cbea 100644
--- a/website/docs/services/ecs/services/index.md
+++ b/website/docs/services/ecs/services/index.md
@@ -84,22 +84,22 @@ Creates, updates, deletes or gets a <code>service</code> resource or lists <code
       {
         "name": "container_name",
         "type": "string",
-        "description": "The container name value, already specified in the task definition, to be used for your service discovery service. If the task definition that your service task specifies uses the bridge or host network mode, you must specify a containerName and containerPort combination from the task definition. If the task definition that your service task specifies uses the awsvpc network mode and a type SRV DNS record is used, you must specify either a containerName and containerPort combination or a port value, but not both."
+        "description": "The container name value to be used for your service discovery service. It's already specified in the task definition. If the task definition that your service task specifies uses the <code>bridge</code> or <code>host</code> network mode, you must specify a <code>containerName</code> and <code>containerPort</code> combination from the task definition. If the task definition that your service task specifies uses the <code>awsvpc</code> network mode and a type SRV DNS record is used, you must specify either a <code>containerName</code> and <code>containerPort</code> combination or a <code>port</code> value. However, you can't specify both."
       },
       {
         "name": "port",
         "type": "integer",
-        "description": "The port value used if your service discovery service specified an SRV record. This field may be used if both the awsvpc network mode and SRV records are used."
+        "description": "The port value used if your service discovery service specified an SRV record. This field might be used if both the <code>awsvpc</code> network mode and SRV records are used."
       },
       {
         "name": "container_port",
         "type": "integer",
-        "description": "The port value, already specified in the task definition, to be used for your service discovery service. If the task definition your service task specifies uses the bridge or host network mode, you must specify a containerName and containerPort combination from the task definition. If the task definition your service task specifies uses the awsvpc network mode and a type SRV DNS record is used, you must specify either a containerName and containerPort combination or a port value, but not both."
+        "description": "The port value to be used for your service discovery service. It's already specified in the task definition. If the task definition your service task specifies uses the <code>bridge</code> or <code>host</code> network mode, you must specify a <code>containerName</code> and <code>containerPort</code> combination from the task definition. If the task definition your service task specifies uses the <code>awsvpc</code> network mode and a type SRV DNS record is used, you must specify either a <code>containerName</code> and <code>containerPort</code> combination or a <code>port</code> value. However, you can't specify both."
       },
       {
         "name": "registry_arn",
         "type": "string",
-        "description": "The Amazon Resource Name (ARN) of the service registry. The currently supported service registry is AWS Cloud Map. For more information, see https://docs.aws.amazon.com/cloud-map/latest/api/API_CreateService.html"
+        "description": "The Amazon Resource Name (ARN) of the service registry. The currently supported service registry is CMAP. For more information, see <a href=\"https://docs.aws.amazon.com/cloud-map/latest/api/API_CreateService.html\">CreateService</a>."
       }
     ]
   },
@@ -202,17 +202,17 @@ Creates, updates, deletes or gets a <code>service</code> resource or lists <code
       {
         "name": "capacity_provider",
         "type": "string",
-        "description": ""
+        "description": "The short name of the capacity provider."
       },
       {
         "name": "base",
         "type": "integer",
-        "description": ""
+        "description": "<details><summary>The <i>base</i> value designates how many tasks, at a minimum, to run on the specified capacity provider for each service. Only one capacity provider in a capacity provider strategy can have a <i>base</i> defined. If no value is specified, the default value of <code>0</code> is used.</summary>Base value characteristics:<br />+  Only one capacity provider in a strategy can have a base defined<br />+  Default value is <code>0</code> if not specified<br />+  Valid range: 0 to 100,000<br />+  Base requirements are satisfied first before weight distribution</details>"
       },
       {
         "name": "weight",
         "type": "integer",
-        "description": ""
+        "description": "<details><summary>The <i>weight</i> value designates the relative percentage of the total number of tasks launched that should use the specified capacity provider. The <code>weight</code> value is taken into consideration after the <code>base</code> value, if defined, is satisfied.</summary>If no <code>weight</code> value is specified, the default value of <code>0</code> is used. When multiple capacity providers are specified within a capacity provider strategy, at least one of the capacity providers must have a weight value greater than zero and any capacity providers with a weight of <code>0</code> can't be used to place tasks. If you specify multiple capacity providers in a strategy that all have a weight of <code>0</code>, any <code>RunTask</code> or <code>CreateService</code> actions using the capacity provider strategy will fail.<br />Weight value characteristics:<br />+  Weight is considered after the base value is satisfied<br />+  Default value is <code>0</code> if not specified<br />+  Valid range: 0 to 1,000<br />+  At least one capacity provider must have a weight greater than zero<br />+  Capacity providers with weight of <code>0</code> cannot place tasks<br />Task distribution logic:<ul><li>Base satisfaction: The minimum number of tasks specified by the base value are placed on that capacity provider</li><li>Weight distribution: After base requirements are met, additional tasks are distributed according to weight ratios</li></ul>Examples:<br />Equal Distribution: Two capacity providers both with weight <code>1</code> will split tasks evenly after base requirements are met.<br />Weighted Distribution: If capacityProviderA has weight <code>1</code> and capacityProviderB has weight <code>4</code>, then for every 1 task on A, 4 tasks will run on B.</details>"
       }
     ]
   },
@@ -242,24 +242,24 @@ Creates, updates, deletes or gets a <code>service</code> resource or lists <code
     "description": "The network configuration for the service. This parameter is required for task definitions that use the <code>awsvpc</code> network mode to receive their own elastic network interface, and it is not supported for other network modes. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-networking.html\">Task Networking</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.",
     "children": [
       {
-        "name": "aws_vpc_configuration",
+        "name": "awsvpc_configuration",
         "type": "object",
-        "description": "The VPC subnets and security groups associated with a task. All specified subnets and security groups must be from the same VPC.",
+        "description": "<details><summary>The VPC subnets and security groups that are associated with a task.</summary>All specified subnets and security groups must be from the same VPC.</details>",
         "children": [
           {
             "name": "security_groups",
             "type": "array",
-            "description": "The security groups associated with the task or service. If you do not specify a security group, the default security group for the VPC is used. There is a limit of 5 security groups that can be specified per AwsVpcConfiguration."
+            "description": "<details><summary>The IDs of the security groups associated with the task or service. If you don't specify a security group, the default security group for the VPC is used. There's a limit of 5 security groups that can be specified.</summary>All specified security groups must be from the same VPC.</details>"
           },
           {
             "name": "subnets",
             "type": "array",
-            "description": "The subnets associated with the task or service. There is a limit of 16 subnets that can be specified per AwsVpcConfiguration."
+            "description": "<details><summary>The IDs of the subnets associated with the task or service. There's a limit of 16 subnets that can be specified.</summary>All specified subnets must be from the same VPC.</details>"
           },
           {
             "name": "assign_public_ip",
             "type": "string",
-            "description": "Whether the task's elastic network interface receives a public IP address. The default value is DISABLED."
+            "description": "<details><summary>Whether the task's elastic network interface receives a public IP address.</summary>Consider the following when you set this value:<br />+  When you use <code>create-service</code> or <code>update-service</code>, the default is <code>DISABLED</code>.<br />+  When the service <code>deploymentController</code> is <code>ECS</code>, the value must be <code>DISABLED</code>.</details>"
           }
         ]
       }
@@ -273,12 +273,12 @@ Creates, updates, deletes or gets a <code>service</code> resource or lists <code
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The optional part of a key-value pair that make up a tag. A <code>value</code> acts as a descriptor within a tag category (key)."
       },
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "One part of a key-value pair that make up a tag. A <code>key</code> is a general label that acts like a category for more specific tag values."
       }
     ]
   },
@@ -344,17 +344,49 @@ Creates, updates, deletes or gets a <code>service</code> resource or lists <code
       {
         "name": "target_group_arn",
         "type": "string",
-        "description": "The full Amazon Resource Name (ARN) of the Elastic Load Balancing target group or groups associated with a service or task set. A target group ARN is only specified when using an Application Load Balancer or Network Load Balancer. If you are using a Classic Load Balancer this should be omitted. For services using the ECS deployment controller, you can specify one or multiple target groups. For more information, see https://docs.aws.amazon.com/AmazonECS/latest/developerguide/register-multiple-targetgroups.html in the Amazon Elastic Container Service Developer Guide. For services using the CODE_DEPLOY deployment controller, you are required to define two target groups for the load balancer. For more information, see https://docs.aws.amazon.com/AmazonECS/latest/developerguide/deployment-type-bluegreen.html in the Amazon Elastic Container Service Developer Guide. If your service's task definition uses the awsvpc network mode (which is required for the Fargate launch type), you must choose ip as the target type, not instance, when creating your target groups because tasks that use the awsvpc network mode are associated with an elastic network interface, not an Amazon EC2 instance."
+        "description": "<details><summary>The full Amazon Resource Name (ARN) of the Elastic Load Balancing target group or groups associated with a service or task set.</summary>A target group ARN is only specified when using an Application Load Balancer or Network Load Balancer.<br />For services using the <code>ECS</code> deployment controller, you can specify one or multiple target groups. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/register-multiple-targetgroups.html\">Registering multiple target groups with a service</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.<br />For services using the <code>CODE_DEPLOY</code> deployment controller, you're required to define two target groups for the load balancer. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/deployment-type-bluegreen.html\">Blue/green deployment with CodeDeploy</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.<br />If your service's task definition uses the <code>awsvpc</code> network mode, you must choose <code>ip</code> as the target type, not <code>instance</code>. Do this when creating your target groups because tasks that use the <code>awsvpc</code> network mode are associated with an elastic network interface, not an Amazon EC2 instance. This network mode is required for the Fargate launch type.</details>"
+      },
+      {
+        "name": "load_balancer_name",
+        "type": "string",
+        "description": "<details><summary>The name of the load balancer to associate with the Amazon ECS service or task set.</summary>If you are using an Application Load Balancer or a Network Load Balancer the load balancer name parameter should be omitted.</details>"
       },
       {
         "name": "container_name",
         "type": "string",
-        "description": "The name of the container (as it appears in a container definition) to associate with the load balancer."
+        "description": "<details><summary>The name of the container (as it appears in a container definition) to associate with the load balancer.</summary>You need to specify the container name when configuring the target group for an Amazon ECS load balancer.</details>"
       },
       {
         "name": "container_port",
         "type": "integer",
-        "description": "The port on the container to associate with the load balancer. This port must correspond to a containerPort in the task definition the tasks in the service are using. For tasks that use the EC2 launch type, the container instance they are launched on must allow ingress traffic on the hostPort of the port mapping."
+        "description": "The port on the container to associate with the load balancer. This port must correspond to a <code>containerPort</code> in the task definition the tasks in the service are using. For tasks that use the EC2 launch type, the container instance they're launched on must allow ingress traffic on the <code>hostPort</code> of the port mapping."
+      },
+      {
+        "name": "advanced_configuration",
+        "type": "object",
+        "description": "The advanced settings for the load balancer used in blue/green deployments. Specify the alternate target group, listener rules, and IAM role required for traffic shifting during blue/green deployments.",
+        "children": [
+          {
+            "name": "test_listener_rule",
+            "type": "string",
+            "description": "The Amazon Resource Name (ARN) that identifies ) that identifies the test listener rule (in the case of an Application Load Balancer) or listener (in the case for an Network Load Balancer) for routing test traffic."
+          },
+          {
+            "name": "alternate_target_group_arn",
+            "type": "string",
+            "description": "The Amazon Resource Name (ARN) of the alternate target group for Amazon ECS blue/green deployments."
+          },
+          {
+            "name": "production_listener_rule",
+            "type": "string",
+            "description": "The Amazon Resource Name (ARN) that that identifies the production listener rule (in the case of an Application Load Balancer) or listener (in the case for an Network Load Balancer) for routing production traffic."
+          },
+          {
+            "name": "role_arn",
+            "type": "string",
+            "description": "The Amazon Resource Name (ARN) of the IAM role that grants Amazon ECS permission to call the Elastic Load Balancing APIs for you."
+          }
+        ]
       }
     ]
   },
@@ -994,7 +1026,7 @@ resources:
         value: '{{ scheduling_strategy }}'
       - name: network_configuration
         value:
-          aws_vpc_configuration:
+          awsvpc_configuration:
             security_groups:
               - '{{ security_groups[0] }}'
             subnets:
@@ -1022,8 +1054,14 @@ resources:
       - name: load_balancers
         value:
           - target_group_arn: '{{ target_group_arn }}'
+            load_balancer_name: '{{ load_balancer_name }}'
             container_name: '{{ container_name }}'
             container_port: '{{ container_port }}'
+            advanced_configuration:
+              test_listener_rule: '{{ test_listener_rule }}'
+              alternate_target_group_arn: '{{ alternate_target_group_arn }}'
+              production_listener_rule: '{{ production_listener_rule }}'
+              role_arn: '{{ role_arn }}'
       - name: service_connect_configuration
         value:
           services:
diff --git a/website/docs/services/ecs/task_definitions/index.md b/website/docs/services/ecs/task_definitions/index.md
index d7029e489..472fda6fa 100644
--- a/website/docs/services/ecs/task_definitions/index.md
+++ b/website/docs/services/ecs/task_definitions/index.md
@@ -880,12 +880,12 @@ Creates, updates, deletes or gets a <code>task_definition</code> resource or lis
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The optional part of a key-value pair that make up a tag. A <code>value</code> acts as a descriptor within a tag category (key)."
       },
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "One part of a key-value pair that make up a tag. A <code>key</code> is a general label that acts like a category for more specific tag values."
       }
     ]
   },
diff --git a/website/docs/services/eks/addons/index.md b/website/docs/services/eks/addons/index.md
index 25c8b5843..0c661389d 100644
--- a/website/docs/services/eks/addons/index.md
+++ b/website/docs/services/eks/addons/index.md
@@ -79,67 +79,15 @@ Creates, updates, deletes or gets an <code>addon</code> resource or lists <code>
     "type": "array",
     "description": "An array of pod identities to apply to this add-on.",
     "children": [
-      {
-        "name": "cluster_name",
-        "type": "string",
-        "description": "The cluster that the pod identity association is created for."
-      },
-      {
-        "name": "role_arn",
-        "type": "string",
-        "description": "The IAM role ARN that the pod identity association is created for."
-      },
-      {
-        "name": "namespace",
-        "type": "string",
-        "description": "The Kubernetes namespace that the pod identity association is created for."
-      },
       {
         "name": "service_account",
         "type": "string",
         "description": "The Kubernetes service account that the pod identity association is created for."
       },
       {
-        "name": "association_arn",
-        "type": "string",
-        "description": "The ARN of the pod identity association."
-      },
-      {
-        "name": "association_id",
-        "type": "string",
-        "description": "The ID of the pod identity association."
-      },
-      {
-        "name": "target_role_arn",
-        "type": "string",
-        "description": "The Target Role Arn of the pod identity association."
-      },
-      {
-        "name": "external_id",
+        "name": "role_arn",
         "type": "string",
-        "description": "The External Id of the pod identity association."
-      },
-      {
-        "name": "disable_session_tags",
-        "type": "boolean",
-        "description": "The Disable Session Tags of the pod identity association."
-      },
-      {
-        "name": "tags",
-        "type": "array",
-        "description": "An array of key-value pairs to apply to this resource.",
-        "children": [
-          {
-            "name": "key",
-            "type": "string",
-            "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
-          },
-          {
-            "name": "value",
-            "type": "string",
-            "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
-          }
-        ]
+        "description": "The IAM role ARN that the pod identity association is created for."
       }
     ]
   },
@@ -173,12 +121,12 @@ Creates, updates, deletes or gets an <code>addon</code> resource or lists <code>
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -412,15 +360,8 @@ resources:
         value: '{{ service_account_role_arn }}'
       - name: pod_identity_associations
         value:
-          - cluster_name: '{{ cluster_name }}'
+          - service_account: '{{ service_account }}'
             role_arn: '{{ role_arn }}'
-            namespace: '{{ namespace }}'
-            service_account: '{{ service_account }}'
-            target_role_arn: '{{ target_role_arn }}'
-            disable_session_tags: '{{ disable_session_tags }}'
-            tags:
-              - key: '{{ key }}'
-                value: '{{ value }}'
       - name: configuration_values
         value: '{{ configuration_values }}'
       - name: namespace_config
@@ -428,7 +369,8 @@ resources:
           namespace: '{{ namespace }}'
       - name: tags
         value:
-          - null`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/eks/fargate_profiles/index.md b/website/docs/services/eks/fargate_profiles/index.md
index f36ae96ee..326724ec2 100644
--- a/website/docs/services/eks/fargate_profiles/index.md
+++ b/website/docs/services/eks/fargate_profiles/index.md
@@ -106,12 +106,12 @@ Creates, updates, deletes or gets a <code>fargate_profile</code> resource or lis
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/elasticache/parameter_groups/index.md b/website/docs/services/elasticache/parameter_groups/index.md
index f3aadb909..ad05b313a 100644
--- a/website/docs/services/elasticache/parameter_groups/index.md
+++ b/website/docs/services/elasticache/parameter_groups/index.md
@@ -62,12 +62,12 @@ Creates, updates, deletes or gets a <code>parameter_group</code> resource or lis
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with 'aws:'. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/elasticache/subnet_groups/index.md b/website/docs/services/elasticache/subnet_groups/index.md
index cf7ad2a50..ab47132da 100644
--- a/website/docs/services/elasticache/subnet_groups/index.md
+++ b/website/docs/services/elasticache/subnet_groups/index.md
@@ -65,14 +65,14 @@ Creates, updates, deletes or gets a <code>subnet_group</code> resource or lists
     "description": "",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with 'aws:'. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": ""
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": ""
       }
     ]
   },
@@ -276,8 +276,8 @@ resources:
         value: '{{ cache_subnet_group_name }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/elasticloadbalancingv2/listeners/index.md b/website/docs/services/elasticloadbalancingv2/listeners/index.md
index e9bc47a23..690c87eff 100644
--- a/website/docs/services/elasticloadbalancingv2/listeners/index.md
+++ b/website/docs/services/elasticloadbalancingv2/listeners/index.md
@@ -167,7 +167,7 @@ Creates, updates, deletes or gets a <code>listener</code> resource or lists <cod
           },
           {
             "name": "session_timeout",
-            "type": "integer",
+            "type": "string",
             "description": "The maximum duration of the authentication session, in seconds. The default is 604800 seconds (7 days)."
           },
           {
@@ -297,7 +297,7 @@ Creates, updates, deletes or gets a <code>listener</code> resource or lists <cod
           },
           {
             "name": "session_timeout",
-            "type": "integer",
+            "type": "string",
             "description": "The maximum duration of the authentication session, in seconds. The default is 604800 seconds (7 days)."
           },
           {
diff --git a/website/docs/services/elasticloadbalancingv2/load_balancers/index.md b/website/docs/services/elasticloadbalancingv2/load_balancers/index.md
index 8ca7e462b..c0546d71a 100644
--- a/website/docs/services/elasticloadbalancingv2/load_balancers/index.md
+++ b/website/docs/services/elasticloadbalancingv2/load_balancers/index.md
@@ -136,12 +136,12 @@ Creates, updates, deletes or gets a <code>load_balancer</code> resource or lists
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value of the tag."
       },
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key of the tag."
       }
     ]
   },
diff --git a/website/docs/services/elasticloadbalancingv2/target_groups/index.md b/website/docs/services/elasticloadbalancingv2/target_groups/index.md
index 1081dc013..a83b32228 100644
--- a/website/docs/services/elasticloadbalancingv2/target_groups/index.md
+++ b/website/docs/services/elasticloadbalancingv2/target_groups/index.md
@@ -203,12 +203,12 @@ Creates, updates, deletes or gets a <code>target_group</code> resource or lists
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag."
       },
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag."
       }
     ]
   },
diff --git a/website/docs/services/elasticloadbalancingv2/trust_store_revocations/index.md b/website/docs/services/elasticloadbalancingv2/trust_store_revocations/index.md
index bd2a00d80..0907c5b9b 100644
--- a/website/docs/services/elasticloadbalancingv2/trust_store_revocations/index.md
+++ b/website/docs/services/elasticloadbalancingv2/trust_store_revocations/index.md
@@ -86,25 +86,25 @@ Creates, updates, deletes or gets a <code>trust_store_revocation</code> resource
     "type": "array",
     "description": "The data associated with a trust store revocation",
     "children": [
-      {
-        "name": "revocation_contents",
-        "type": "array",
-        "description": "The attributes required to create a trust store revocation."
-      },
       {
         "name": "trust_store_arn",
         "type": "string",
-        "description": "The Amazon Resource Name (ARN) of the trust store."
+        "description": ""
       },
       {
         "name": "revocation_id",
-        "type": "integer",
-        "description": "The ID associated with the revocation."
+        "type": "string",
+        "description": ""
       },
       {
-        "name": "trust_store_revocations",
-        "type": "array",
-        "description": "The data associated with a trust store revocation"
+        "name": "revocation_type",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "number_of_revoked_entries",
+        "type": "integer",
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/emr/studios/index.md b/website/docs/services/emr/studios/index.md
index 82a60c905..c1dc9e9c5 100644
--- a/website/docs/services/emr/studios/index.md
+++ b/website/docs/services/emr/studios/index.md
@@ -92,12 +92,12 @@ Creates, updates, deletes or gets a <code>studio</code> resource or lists <code>
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value for the tag. You can specify a value that is 0 to 255 Unicode characters in length. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/entityresolution/id_mapping_workflows/index.md b/website/docs/services/entityresolution/id_mapping_workflows/index.md
index d74df7838..5b8674512 100644
--- a/website/docs/services/entityresolution/id_mapping_workflows/index.md
+++ b/website/docs/services/entityresolution/id_mapping_workflows/index.md
@@ -120,16 +120,6 @@ Creates, updates, deletes or gets an <code>id_mapping_workflow</code> resource o
         "type": "object",
         "description": "",
         "children": [
-          {
-            "name": "provider_service_arn",
-            "type": "string",
-            "description": "Arn of the Provider service being used."
-          },
-          {
-            "name": "provider_configuration",
-            "type": "object",
-            "description": "Additional Provider configuration that would be required for the provider service. The Configuration must be in JSON string format"
-          },
           {
             "name": "intermediate_source_configuration",
             "type": "object",
@@ -141,6 +131,16 @@ Creates, updates, deletes or gets an <code>id_mapping_workflow</code> resource o
                 "description": "The s3 path that would be used to stage the intermediate data being generated during workflow execution."
               }
             ]
+          },
+          {
+            "name": "provider_service_arn",
+            "type": "string",
+            "description": "Arn of the Provider Service being used."
+          },
+          {
+            "name": "provider_configuration",
+            "type": "object",
+            "description": "Additional Provider configuration that would be required for the provider service. The Configuration must be in JSON string format"
           }
         ]
       },
@@ -159,7 +159,7 @@ Creates, updates, deletes or gets an <code>id_mapping_workflow</code> resource o
   {
     "name": "created_at",
     "type": "string",
-    "description": "The time of this SchemaMapping got created"
+    "description": "The time of this IdMappingWorkflow got created"
   },
   {
     "name": "output_source_config",
@@ -198,7 +198,7 @@ Creates, updates, deletes or gets an <code>id_mapping_workflow</code> resource o
   {
     "name": "updated_at",
     "type": "string",
-    "description": "The time of this SchemaMapping got last updated at"
+    "description": "The time of this IdMappingWorkflow got last updated at"
   },
   {
     "name": "role_arn",
@@ -450,10 +450,10 @@ resources:
                   - '{{ matching_keys[0] }}'
             record_matching_model: '{{ record_matching_model }}'
           provider_properties:
-            provider_service_arn: '{{ provider_service_arn }}'
-            provider_configuration: {}
             intermediate_source_configuration:
               intermediate_s3_path: '{{ intermediate_s3_path }}'
+            provider_service_arn: '{{ provider_service_arn }}'
+            provider_configuration: {}
           id_mapping_type: '{{ id_mapping_type }}'
       - name: workflow_name
         value: '{{ workflow_name }}'
diff --git a/website/docs/services/entityresolution/matching_workflows/index.md b/website/docs/services/entityresolution/matching_workflows/index.md
index 6a3a93b3a..e4aace7fe 100644
--- a/website/docs/services/entityresolution/matching_workflows/index.md
+++ b/website/docs/services/entityresolution/matching_workflows/index.md
@@ -244,12 +244,12 @@ Creates, updates, deletes or gets a <code>matching_workflow</code> resource or l
   {
     "name": "created_at",
     "type": "string",
-    "description": "The time of this SchemaMapping got created"
+    "description": "The time of this MatchingWorkflow got created"
   },
   {
     "name": "updated_at",
     "type": "string",
-    "description": "The time of this SchemaMapping got last updated at"
+    "description": "The time of this MatchingWorkflow got last updated at"
   },
   {
     "name": "incremental_run_config",
diff --git a/website/docs/services/events/event_buses/index.md b/website/docs/services/events/event_buses/index.md
index b937cdb61..8f8199de4 100644
--- a/website/docs/services/events/event_buses/index.md
+++ b/website/docs/services/events/event_buses/index.md
@@ -60,12 +60,12 @@ Creates, updates, deletes or gets an <code>event_bus</code> resource or lists <c
     "description": "Any tags assigned to the event bus.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
         "description": ""
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
         "description": ""
       }
@@ -328,8 +328,8 @@ resources:
         value: '{{ name }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'
+          - key: '{{ key }}'
+            value: '{{ value }}'
       - name: description
         value: '{{ description }}'
       - name: kms_key_identifier
diff --git a/website/docs/services/eventschemas/index.md b/website/docs/services/eventschemas/index.md
index 4834e9b6f..281ff9373 100644
--- a/website/docs/services/eventschemas/index.md
+++ b/website/docs/services/eventschemas/index.md
@@ -34,6 +34,6 @@ The eventschemas service documentation.
 </div>
 <div class="providerDocColumn">
 <a href="/services/eventschemas/registry_policies/">registry_policies</a><br />
-<a href="/services/eventschemas/schemata/">schemata</a>
+<a href="/services/eventschemas/schemas/">schemas</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/eventschemas/schemata/index.md b/website/docs/services/eventschemas/schemas/index.md
similarity index 93%
rename from website/docs/services/eventschemas/schemata/index.md
rename to website/docs/services/eventschemas/schemas/index.md
index 4f98dc6d9..b062f3159 100644
--- a/website/docs/services/eventschemas/schemata/index.md
+++ b/website/docs/services/eventschemas/schemas/index.md
@@ -1,9 +1,9 @@
 ---
-title: schemata
+title: schemas
 hide_title: false
 hide_table_of_contents: false
 keywords:
-  - schemata
+  - schemas
   - eventschemas
   - aws
   - stackql
@@ -21,15 +21,15 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
 
-Creates, updates, deletes or gets a <code>schema</code> resource or lists <code>schemata</code> in a region
+Creates, updates, deletes or gets a <code>schema</code> resource or lists <code>schemas</code> in a region
 
 ## Overview
 <table>
 <tbody>
-<tr><td><b>Name</b></td><td><code>schemata</code></td></tr>
+<tr><td><b>Name</b></td><td><code>schemas</code></td></tr>
 <tr><td><b>Type</b></td><td>Resource</td></tr>
 <tr><td><b>Description</b></td><td>Resource Type definition for AWS::EventSchemas::Schema</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.eventschemas.schemata" /></td></tr>
+<tr><td><b>Id</b></td><td><CopyableCode code="awscc.eventschemas.schemas" /></td></tr>
 </tbody>
 </table>
 
@@ -144,31 +144,31 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
-    <td><code>schemata</code></td>
+    <td><code>schemas</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Type, Content, RegistryName, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
-    <td><code>schemata</code></td>
+    <td><code>schemas</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="update_resource" /></td>
-    <td><code>schemata</code></td>
+    <td><code>schemas</code></td>
     <td><code>UPDATE</code></td>
     <td><CopyableCode code="Identifier, PatchDocument, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
-    <td><code>schemata_list_only</code></td>
+    <td><code>schemas_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
-    <td><code>schemata</code></td>
+    <td><code>schemas</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="Identifier, region" /></td>
   </tr>
@@ -200,7 +200,7 @@ SELECT
   last_modified,
   version_created_date,
   tags
-FROM awscc.eventschemas.schemata
+FROM awscc.eventschemas.schemas
 WHERE
   region = '{{ region }}' AND
   Identifier = '{{ schema_arn }}';
@@ -208,12 +208,12 @@ WHERE
 </TabItem>
 <TabItem value="list">
 
-Lists all <code>schemata</code> in a region.
+Lists all <code>schemas</code> in a region.
 ```sql
 SELECT
   region,
   schema_arn
-FROM awscc.eventschemas.schemata_list_only
+FROM awscc.eventschemas.schemas_list_only
 WHERE
   region = '{{ region }}';
 ```
@@ -236,7 +236,7 @@ Use the following StackQL query and manifest file to create a new <code>schema</
 
 ```sql
 /*+ create */
-INSERT INTO awscc.eventschemas.schemata (
+INSERT INTO awscc.eventschemas.schemas (
   Type,
   Content,
   RegistryName,
@@ -265,7 +265,7 @@ RETURNING
 
 ```sql
 /*+ create */
-INSERT INTO awscc.eventschemas.schemata (
+INSERT INTO awscc.eventschemas.schemas (
   Type,
   Description,
   Content,
@@ -333,7 +333,7 @@ Use the following StackQL query and manifest file to update a <code>schema</code
 
 ```sql
 /*+ update */
-UPDATE awscc.eventschemas.schemata
+UPDATE awscc.eventschemas.schemas
 SET PatchDocument = string('{{ {
     "Type": type,
     "Description": description,
@@ -362,7 +362,7 @@ RETURNING
 
 ```sql
 /*+ delete */
-DELETE FROM awscc.eventschemas.schemata
+DELETE FROM awscc.eventschemas.schemas
 WHERE
   Identifier = '{{ schema_arn }}' AND
   region = '{{ region }}'
@@ -393,7 +393,7 @@ Mutable resources in the Cloud Control provider support additional optional para
 
 ## Permissions
 
-To operate on the <code>schemata</code> resource, the following permissions are required:
+To operate on the <code>schemas</code> resource, the following permissions are required:
 
 <Tabs
     defaultValue="create"
diff --git a/website/docs/services/frauddetector/detectors/index.md b/website/docs/services/frauddetector/detectors/index.md
index e04ffe4d5..7c93dac0c 100644
--- a/website/docs/services/frauddetector/detectors/index.md
+++ b/website/docs/services/frauddetector/detectors/index.md
@@ -122,34 +122,39 @@ Creates, updates, deletes or gets a <code>detector</code> resource or lists <cod
         "description": "",
         "children": [
           {
-            "name": "name",
+            "name": "arn",
             "type": "string",
-            "description": "The name of the outcome."
+            "description": ""
           },
           {
-            "name": "tags",
-            "type": "array",
-            "description": "Tags associated with this outcome."
+            "name": "inline",
+            "type": "boolean",
+            "description": ""
           },
           {
-            "name": "description",
+            "name": "name",
             "type": "string",
-            "description": "The outcome description."
+            "description": ""
           },
           {
-            "name": "arn",
+            "name": "description",
             "type": "string",
-            "description": "The outcome ARN."
+            "description": "The description."
+          },
+          {
+            "name": "tags",
+            "type": "array",
+            "description": "Tags associated with this outcome."
           },
           {
             "name": "created_time",
             "type": "string",
-            "description": "The timestamp when the outcome was created."
+            "description": "The time when the outcome was created."
           },
           {
             "name": "last_updated_time",
             "type": "string",
-            "description": "The timestamp when the outcome was last updated."
+            "description": "The time when the outcome was last updated."
           }
         ]
       },
@@ -190,6 +195,11 @@ Creates, updates, deletes or gets a <code>detector</code> resource or lists <cod
         "type": "string",
         "description": "The name for the event type"
       },
+      {
+        "name": "inline",
+        "type": "boolean",
+        "description": ""
+      },
       {
         "name": "tags",
         "type": "array",
@@ -248,17 +258,17 @@ Creates, updates, deletes or gets a <code>detector</code> resource or lists <cod
           {
             "name": "tags",
             "type": "array",
-            "description": "Tags associated with this event type."
+            "description": "Tags associated with this event variable."
           },
           {
             "name": "created_time",
             "type": "string",
-            "description": "The time when the event type was created."
+            "description": "The time when the event variable was created."
           },
           {
             "name": "last_updated_time",
             "type": "string",
-            "description": "The time when the event type was last updated."
+            "description": "The time when the event variable was last updated."
           }
         ]
       },
@@ -268,34 +278,39 @@ Creates, updates, deletes or gets a <code>detector</code> resource or lists <cod
         "description": "",
         "children": [
           {
-            "name": "name",
+            "name": "arn",
             "type": "string",
-            "description": "The name of the label."
+            "description": ""
           },
           {
-            "name": "tags",
-            "type": "array",
-            "description": "Tags associated with this label."
+            "name": "inline",
+            "type": "boolean",
+            "description": ""
           },
           {
-            "name": "description",
+            "name": "name",
             "type": "string",
-            "description": "The label description."
+            "description": ""
           },
           {
-            "name": "arn",
+            "name": "description",
             "type": "string",
-            "description": "The label ARN."
+            "description": "The description."
+          },
+          {
+            "name": "tags",
+            "type": "array",
+            "description": "Tags associated with this label."
           },
           {
             "name": "created_time",
             "type": "string",
-            "description": "The timestamp when the label was created."
+            "description": "The time when the label was created."
           },
           {
             "name": "last_updated_time",
             "type": "string",
-            "description": "The timestamp when the label was last updated."
+            "description": "The time when the label was last updated."
           }
         ]
       },
@@ -327,17 +342,17 @@ Creates, updates, deletes or gets a <code>detector</code> resource or lists <cod
           {
             "name": "tags",
             "type": "array",
-            "description": "Tags associated with this event type."
+            "description": "Tags associated with this entity type."
           },
           {
             "name": "created_time",
             "type": "string",
-            "description": "The time when the event type was created."
+            "description": "The time when the entity type was created."
           },
           {
             "name": "last_updated_time",
             "type": "string",
-            "description": "The time when the event type was last updated."
+            "description": "The time when the entity type was last updated."
           }
         ]
       },
@@ -614,10 +629,14 @@ resources:
             expression: '{{ expression }}'
             language: '{{ language }}'
             outcomes:
-              - name: '{{ name }}'
+              - arn: '{{ arn }}'
+                inline: '{{ inline }}'
+                name: '{{ name }}'
+                description: '{{ description }}'
                 tags:
                   - null
-                description: '{{ description }}'
+                created_time: '{{ created_time }}'
+                last_updated_time: '{{ last_updated_time }}'
             arn: '{{ arn }}'
             description: '{{ description }}'
             tags:
@@ -627,6 +646,7 @@ resources:
       - name: event_type
         value:
           name: '{{ name }}'
+          inline: '{{ inline }}'
           tags:
             - null
           description: '{{ description }}'
@@ -644,10 +664,14 @@ resources:
               created_time: '{{ created_time }}'
               last_updated_time: '{{ last_updated_time }}'
           labels:
-            - name: '{{ name }}'
+            - arn: '{{ arn }}'
+              inline: '{{ inline }}'
+              name: '{{ name }}'
+              description: '{{ description }}'
               tags:
                 - null
-              description: '{{ description }}'
+              created_time: '{{ created_time }}'
+              last_updated_time: '{{ last_updated_time }}'
           entity_types:
             - arn: '{{ arn }}'
               inline: '{{ inline }}'
@@ -657,6 +681,9 @@ resources:
                 - null
               created_time: '{{ created_time }}'
               last_updated_time: '{{ last_updated_time }}'
+          arn: '{{ arn }}'
+          created_time: '{{ created_time }}'
+          last_updated_time: '{{ last_updated_time }}'
       - name: associated_models
         value:
           - arn: '{{ arn }}'`}</CodeBlock>
diff --git a/website/docs/services/frauddetector/entity_types/index.md b/website/docs/services/frauddetector/entity_types/index.md
new file mode 100644
index 000000000..f3f8a7031
--- /dev/null
+++ b/website/docs/services/frauddetector/entity_types/index.md
@@ -0,0 +1,411 @@
+---
+title: entity_types
+hide_title: false
+hide_table_of_contents: false
+keywords:
+  - entity_types
+  - frauddetector
+  - aws
+  - stackql
+  - infrastructure-as-code
+  - configuration-as-data
+  - cloud inventory
+description: Query, deploy and manage AWS resources using SQL
+custom_edit_url: null
+image: /img/stackql-aws-provider-featured-image.png
+---
+
+import CodeBlock from '@theme/CodeBlock';
+import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
+
+Creates, updates, deletes or gets an <code>entity_type</code> resource or lists <code>entity_types</code> in a region
+
+## Overview
+<table>
+<tbody>
+<tr><td><b>Name</b></td><td><code>entity_types</code></td></tr>
+<tr><td><b>Type</b></td><td>Resource</td></tr>
+<tr><td><b>Description</b></td><td>An entity type for fraud detector.</td></tr>
+<tr><td><b>Id</b></td><td><CopyableCode code="awscc.frauddetector.entity_types" /></td></tr>
+</tbody>
+</table>
+
+## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "name",
+    "type": "string",
+    "description": "The name of the entity type."
+  },
+  {
+    "name": "tags",
+    "type": "array",
+    "description": "Tags associated with this entity type.",
+    "children": [
+      {
+        "name": "key",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "value",
+        "type": "string",
+        "description": ""
+      }
+    ]
+  },
+  {
+    "name": "description",
+    "type": "string",
+    "description": "The entity type description."
+  },
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The entity type ARN."
+  },
+  {
+    "name": "created_time",
+    "type": "string",
+    "description": "The timestamp when the entity type was created."
+  },
+  {
+    "name": "last_updated_time",
+    "type": "string",
+    "description": "The timestamp when the entity type was last updated."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "The entity type ARN."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
+
+For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-entitytype.html"><code>AWS::FraudDetector::EntityType</code></a>.
+
+## Methods
+
+<table>
+<tbody>
+  <tr>
+    <th>Name</th>
+    <th>Resource</th>
+    <th>Accessible by</th>
+    <th>Required Params</th>
+  </tr>
+  <tr>
+    <td><CopyableCode code="create_resource" /></td>
+    <td><code>entity_types</code></td>
+    <td><code>INSERT</code></td>
+    <td><CopyableCode code="Name, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="delete_resource" /></td>
+    <td><code>entity_types</code></td>
+    <td><code>DELETE</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="update_resource" /></td>
+    <td><code>entity_types</code></td>
+    <td><code>UPDATE</code></td>
+    <td><CopyableCode code="Identifier, PatchDocument, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="list_resources" /></td>
+    <td><code>entity_types_list_only</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="get_resource" /></td>
+    <td><code>entity_types</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+</tbody>
+</table>
+
+## `SELECT` examples
+
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+Gets all properties from an individual <code>entity_type</code>.
+```sql
+SELECT
+  region,
+  name,
+  tags,
+  description,
+  arn,
+  created_time,
+  last_updated_time
+FROM awscc.frauddetector.entity_types
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ arn }}';
+```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>entity_types</code> in a region.
+```sql
+SELECT
+  region,
+  arn
+FROM awscc.frauddetector.entity_types_list_only
+WHERE
+  region = '{{ region }}';
+```
+</TabItem>
+</Tabs>
+
+## `INSERT` example
+
+Use the following StackQL query and manifest file to create a new <code>entity_type</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+<Tabs
+    defaultValue="required"
+    values={[
+      { label: 'Required Properties', value: 'required', },
+      { label: 'All Properties', value: 'all', },
+      { label: 'Manifest', value: 'manifest', },
+    ]
+}>
+<TabItem value="required">
+
+```sql
+/*+ create */
+INSERT INTO awscc.frauddetector.entity_types (
+  Name,
+  region
+)
+SELECT
+  '{{ name }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="all">
+
+```sql
+/*+ create */
+INSERT INTO awscc.frauddetector.entity_types (
+  Name,
+  Tags,
+  Description,
+  region
+)
+SELECT
+  '{{ name }}',
+  '{{ tags }}',
+  '{{ description }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="manifest">
+
+<CodeBlock language="yaml">{`version: 1
+name: stack name
+description: stack description
+providers:
+  - aws
+globals:
+  - name: region
+    value: '{{ vars.AWS_REGION }}'
+resources:
+  - name: entity_type
+    props:
+      - name: name
+        value: '{{ name }}'
+      - name: tags
+        value:
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: description
+        value: '{{ description }}'`}</CodeBlock>
+
+</TabItem>
+</Tabs>
+
+## `UPDATE` example
+
+Use the following StackQL query and manifest file to update a <code>entity_type</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+```sql
+/*+ update */
+UPDATE awscc.frauddetector.entity_types
+SET PatchDocument = string('{{ {
+    "Tags": tags,
+    "Description": description
+} | generate_patch_document }}')
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ arn }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## `DELETE` example
+
+```sql
+/*+ delete */
+DELETE FROM awscc.frauddetector.entity_types
+WHERE
+  Identifier = '{{ arn }}' AND
+  region = '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## Additional Parameters
+
+Mutable resources in the Cloud Control provider support additional optional parameters which can be supplied with `INSERT`, `UPDATE`, or `DELETE` operations. These include:
+
+| Parameter | Description |
+|-----------|-------------|
+| <CopyableCode code="ClientToken" /> | <details><summary>A unique identifier to ensure the idempotency of the resource request.</summary>This allows the provider to accurately distinguish between retries and new requests.<br />A client token is valid for 36 hours once used.<br />After that, a resource request with the same client token is treated as a new request.<br />If you do not specify a client token, one is generated for inclusion in the request.</details> |
+| <CopyableCode code="RoleArn" /> | <details><summary>The ARN of the IAM role used to perform this resource operation.</summary>The role specified must have the permissions required for this operation.<br />If you do not specify a role, a temporary session is created using your AWS user credentials.</details> |
+| <CopyableCode code="TypeVersionId" /> | <details><summary>For private resource types, the type version to use in this resource operation.</summary>If you do not specify a resource version, the default version is used.</details> |
+
+## Permissions
+
+To operate on the <code>entity_types</code> resource, the following permissions are required:
+
+<Tabs
+    defaultValue="create"
+    values={[
+      { label: 'Create', value: 'create', },
+      { label: 'Read', value: 'read', },
+      { label: 'Update', value: 'update', },
+      { label: 'Delete', value: 'delete', },
+      { label: 'List', value: 'list', },
+    ]
+}>
+<TabItem value="create">
+
+```json
+frauddetector:GetEntityTypes,
+frauddetector:PutEntityType,
+frauddetector:ListTagsForResource,
+frauddetector:TagResource
+```
+
+</TabItem>
+<TabItem value="read">
+
+```json
+frauddetector:GetEntityTypes,
+frauddetector:ListTagsForResource
+```
+
+</TabItem>
+<TabItem value="update">
+
+```json
+frauddetector:GetEntityTypes,
+frauddetector:PutEntityType,
+frauddetector:ListTagsForResource,
+frauddetector:TagResource,
+frauddetector:UntagResource
+```
+
+</TabItem>
+<TabItem value="delete">
+
+```json
+frauddetector:GetEntityTypes,
+frauddetector:DeleteEntityType
+```
+
+</TabItem>
+<TabItem value="list">
+
+```json
+frauddetector:GetEntityTypes,
+frauddetector:ListTagsForResource
+```
+
+</TabItem>
+</Tabs>
\ No newline at end of file
diff --git a/website/docs/services/frauddetector/event_types/index.md b/website/docs/services/frauddetector/event_types/index.md
index d2f6804f5..f3376665e 100644
--- a/website/docs/services/frauddetector/event_types/index.md
+++ b/website/docs/services/frauddetector/event_types/index.md
@@ -139,34 +139,39 @@ Creates, updates, deletes or gets an <code>event_type</code> resource or lists <
     "description": "",
     "children": [
       {
-        "name": "name",
+        "name": "arn",
         "type": "string",
-        "description": "The name of the label."
+        "description": ""
       },
       {
-        "name": "tags",
-        "type": "array",
-        "description": "Tags associated with this label."
+        "name": "inline",
+        "type": "boolean",
+        "description": ""
       },
       {
-        "name": "description",
+        "name": "name",
         "type": "string",
-        "description": "The label description."
+        "description": ""
       },
       {
-        "name": "arn",
+        "name": "description",
         "type": "string",
-        "description": "The label ARN."
+        "description": "The description."
+      },
+      {
+        "name": "tags",
+        "type": "array",
+        "description": "Tags associated with this event type."
       },
       {
         "name": "created_time",
         "type": "string",
-        "description": "The timestamp when the label was created."
+        "description": "The time when the event type was created."
       },
       {
         "name": "last_updated_time",
         "type": "string",
-        "description": "The timestamp when the label was last updated."
+        "description": "The time when the event type was last updated."
       }
     ]
   },
@@ -455,10 +460,14 @@ resources:
             last_updated_time: '{{ last_updated_time }}'
       - name: labels
         value:
-          - name: '{{ name }}'
+          - arn: '{{ arn }}'
+            inline: '{{ inline }}'
+            name: '{{ name }}'
+            description: '{{ description }}'
             tags:
               - null
-            description: '{{ description }}'
+            created_time: '{{ created_time }}'
+            last_updated_time: '{{ last_updated_time }}'
       - name: entity_types
         value:
           - arn: '{{ arn }}'
diff --git a/website/docs/services/frauddetector/index.md b/website/docs/services/frauddetector/index.md
index 092f393b1..e58844a92 100644
--- a/website/docs/services/frauddetector/index.md
+++ b/website/docs/services/frauddetector/index.md
@@ -20,7 +20,7 @@ The frauddetector service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>6</b></span><br />
+<span>total resources:&nbsp;<b>7</b></span><br />
 </div>
 </div>
 
@@ -30,6 +30,7 @@ The frauddetector service documentation.
 <div class="row">
 <div class="providerDocColumn">
 <a href="/services/frauddetector/detectors/">detectors</a><br />
+<a href="/services/frauddetector/entity_types/">entity_types</a><br />
 <a href="/services/frauddetector/event_types/">event_types</a><br />
 <a href="/services/frauddetector/labels/">labels</a>
 </div>
diff --git a/website/docs/services/frauddetector/lists/index.md b/website/docs/services/frauddetector/lists/index.md
index accf22ee2..f9a4a98b3 100644
--- a/website/docs/services/frauddetector/lists/index.md
+++ b/website/docs/services/frauddetector/lists/index.md
@@ -82,12 +82,12 @@ Creates, updates, deletes or gets a <code>list</code> resource or lists <code>li
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/gamelift/container_fleets/index.md b/website/docs/services/gamelift/container_fleets/index.md
index adb8c2821..9ba34081b 100644
--- a/website/docs/services/gamelift/container_fleets/index.md
+++ b/website/docs/services/gamelift/container_fleets/index.md
@@ -194,37 +194,8 @@ Creates, updates, deletes or gets a <code>container_fleet</code> resource or lis
     "children": [
       {
         "name": "location",
-        "type": "object",
-        "description": "The AWS::GameLift::Location resource creates an Amazon GameLift (GameLift) custom location.",
-        "children": [
-          {
-            "name": "location_name",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "location_arn",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "tags",
-            "type": "array",
-            "description": "An array of key-value pairs to apply to this resource.",
-            "children": [
-              {
-                "name": "key",
-                "type": "string",
-                "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length."
-              },
-              {
-                "name": "value",
-                "type": "string",
-                "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length."
-              }
-            ]
-          }
-        ]
+        "type": "string",
+        "description": ""
       },
       {
         "name": "location_capacity",
@@ -234,19 +205,24 @@ Creates, updates, deletes or gets a <code>container_fleet</code> resource or lis
           {
             "name": "desired_ec2_instances",
             "type": "integer",
-            "description": "The number of EC2 instances you want to maintain in the specified fleet location. This value must fall between the minimum and maximum size limits."
+            "description": "The number of EC2 instances you want to maintain in the specified fleet location. This value must fall between the minimum and maximum size limits. If any auto-scaling policy is defined for the container fleet, the desired instance will only be applied once during fleet creation and will be ignored in updates to avoid conflicts with auto-scaling. During updates with any auto-scaling policy defined, if current desired instance is lower than the new MinSize, it will be increased to the new MinSize; if current desired instance is larger than the new MaxSize, it will be decreased to the new MaxSize."
           },
           {
             "name": "min_size",
             "type": "integer",
-            "description": "The minimum value allowed for the fleet's instance count for a location. When creating a new fleet, GameLift automatically sets this value to \"0\". After the fleet is active, you can change this value."
+            "description": "The minimum value allowed for the fleet's instance count for a location."
           },
           {
             "name": "max_size",
             "type": "integer",
-            "description": "The maximum value that is allowed for the fleet's instance count for a location. When creating a new fleet, GameLift automatically sets this value to \"1\". Once the fleet is active, you can change this value."
+            "description": "The maximum value that is allowed for the fleet's instance count for a location."
           }
         ]
+      },
+      {
+        "name": "stopped_actions",
+        "type": "array",
+        "description": "A list of fleet actions that have been suspended in the fleet location."
       }
     ]
   },
@@ -265,40 +241,6 @@ Creates, updates, deletes or gets a <code>container_fleet</code> resource or lis
         "type": "integer",
         "description": "Length of time (in minutes) the metric must be at or beyond the threshold before a scaling event is triggered."
       },
-      {
-        "name": "location",
-        "type": "object",
-        "description": "The AWS::GameLift::Location resource creates an Amazon GameLift (GameLift) custom location.",
-        "children": [
-          {
-            "name": "location_name",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "location_arn",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "tags",
-            "type": "array",
-            "description": "An array of key-value pairs to apply to this resource.",
-            "children": [
-              {
-                "name": "key",
-                "type": "string",
-                "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length."
-              },
-              {
-                "name": "value",
-                "type": "string",
-                "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length."
-              }
-            ]
-          }
-        ]
-      },
       {
         "name": "metric_name",
         "type": "string",
@@ -324,11 +266,6 @@ Creates, updates, deletes or gets a <code>container_fleet</code> resource or lis
         "type": "string",
         "description": "The type of adjustment to make to a fleet's instance count."
       },
-      {
-        "name": "status",
-        "type": "string",
-        "description": "Current status of the scaling policy. The scaling policy can be in force only when in an ACTIVE status. Scaling policies can be suspended for individual fleets. If the policy is suspended for a fleet, the policy status does not change."
-      },
       {
         "name": "target_configuration",
         "type": "object",
@@ -345,11 +282,6 @@ Creates, updates, deletes or gets a <code>container_fleet</code> resource or lis
         "name": "threshold",
         "type": "number",
         "description": "Metric value used to trigger a scaling event."
-      },
-      {
-        "name": "update_status",
-        "type": "string",
-        "description": "The current status of the fleet's scaling policies in a requested fleet location. The status PENDING_UPDATE indicates that an update was requested for the fleet but has not yet been completed for the location."
       }
     ]
   },
@@ -691,30 +623,25 @@ resources:
         value: '{{ billing_type }}'
       - name: locations
         value:
-          - location:
-              location_name: '{{ location_name }}'
-              tags:
-                - key: '{{ key }}'
-                  value: '{{ value }}'
+          - location: '{{ location }}'
             location_capacity:
               desired_ec2_instances: '{{ desired_ec2_instances }}'
               min_size: '{{ min_size }}'
               max_size: '{{ max_size }}'
+            stopped_actions:
+              - '{{ stopped_actions[0] }}'
       - name: scaling_policies
         value:
           - comparison_operator: '{{ comparison_operator }}'
             evaluation_periods: '{{ evaluation_periods }}'
-            location: null
             metric_name: '{{ metric_name }}'
             name: '{{ name }}'
             policy_type: '{{ policy_type }}'
             scaling_adjustment: '{{ scaling_adjustment }}'
             scaling_adjustment_type: '{{ scaling_adjustment_type }}'
-            status: '{{ status }}'
             target_configuration:
               target_value: null
             threshold: null
-            update_status: '{{ update_status }}'
       - name: metric_groups
         value:
           - '{{ metric_groups[0] }}'
@@ -731,7 +658,8 @@ resources:
           s3_bucket_name: '{{ s3_bucket_name }}'
       - name: tags
         value:
-          - null`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/gamelift/fleets/index.md b/website/docs/services/gamelift/fleets/index.md
index 25f5840a2..b5058eb10 100644
--- a/website/docs/services/gamelift/fleets/index.md
+++ b/website/docs/services/gamelift/fleets/index.md
@@ -61,37 +61,8 @@ Creates, updates, deletes or gets a <code>fleet</code> resource or lists <code>f
       },
       {
         "name": "location",
-        "type": "object",
-        "description": "The AWS::GameLift::Location resource creates an Amazon GameLift (GameLift) custom location.",
-        "children": [
-          {
-            "name": "location_name",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "location_arn",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "tags",
-            "type": "array",
-            "description": "An array of key-value pairs to apply to this resource.",
-            "children": [
-              {
-                "name": "key",
-                "type": "string",
-                "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length."
-              },
-              {
-                "name": "value",
-                "type": "string",
-                "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length."
-              }
-            ]
-          }
-        ]
+        "type": "string",
+        "description": ""
       },
       {
         "name": "metric_name",
@@ -245,37 +216,8 @@ Creates, updates, deletes or gets a <code>fleet</code> resource or lists <code>f
     "children": [
       {
         "name": "location",
-        "type": "object",
-        "description": "The AWS::GameLift::Location resource creates an Amazon GameLift (GameLift) custom location.",
-        "children": [
-          {
-            "name": "location_name",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "location_arn",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "tags",
-            "type": "array",
-            "description": "An array of key-value pairs to apply to this resource.",
-            "children": [
-              {
-                "name": "key",
-                "type": "string",
-                "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length."
-              },
-              {
-                "name": "value",
-                "type": "string",
-                "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length."
-              }
-            ]
-          }
-        ]
+        "type": "string",
+        "description": ""
       },
       {
         "name": "location_capacity",
@@ -711,11 +653,7 @@ resources:
         value:
           - comparison_operator: '{{ comparison_operator }}'
             evaluation_periods: '{{ evaluation_periods }}'
-            location:
-              location_name: '{{ location_name }}'
-              tags:
-                - key: '{{ key }}'
-                  value: '{{ value }}'
+            location: '{{ location }}'
             metric_name: '{{ metric_name }}'
             name: '{{ name }}'
             policy_type: '{{ policy_type }}'
@@ -800,7 +738,8 @@ resources:
         value: '{{ server_launch_path }}'
       - name: tags
         value:
-          - null`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/gamelift/game_server_groups/index.md b/website/docs/services/gamelift/game_server_groups/index.md
index 2c3be0c3c..242dc133b 100644
--- a/website/docs/services/gamelift/game_server_groups/index.md
+++ b/website/docs/services/gamelift/game_server_groups/index.md
@@ -160,12 +160,12 @@ Creates, updates, deletes or gets a <code>game_server_group</code> resource or l
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length."
+        "description": "The key for a developer-defined key:value pair for tagging an AWS resource."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length."
+        "description": "The value for a developer-defined key:value pair for tagging an AWS resource."
       }
     ]
   },
diff --git a/website/docs/services/gamelift/game_session_queues/index.md b/website/docs/services/gamelift/game_session_queues/index.md
index 8e7dcae42..48b12d5ee 100644
--- a/website/docs/services/gamelift/game_session_queues/index.md
+++ b/website/docs/services/gamelift/game_session_queues/index.md
@@ -140,7 +140,7 @@ Creates, updates, deletes or gets a <code>game_session_queue</code> resource or
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length."
+        "description": "The value for the tag. You can specify a value that is 1 to 256 Unicode characters in length."
       }
     ]
   },
diff --git a/website/docs/services/gamelift/matchmaking_rule_sets/index.md b/website/docs/services/gamelift/matchmaking_rule_sets/index.md
index 87d625db5..fa9f11042 100644
--- a/website/docs/services/gamelift/matchmaking_rule_sets/index.md
+++ b/website/docs/services/gamelift/matchmaking_rule_sets/index.md
@@ -77,7 +77,7 @@ Creates, updates, deletes or gets a <code>matchmaking_rule_set</code> resource o
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length."
+        "description": "The value for the tag. You can specify a value that is 1 to 256 Unicode characters in length."
       }
     ]
   },
diff --git a/website/docs/services/glue/index.md b/website/docs/services/glue/index.md
index 6413a4d25..f9bb50db8 100644
--- a/website/docs/services/glue/index.md
+++ b/website/docs/services/glue/index.md
@@ -20,7 +20,7 @@ The glue service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>7</b></span><br />
+<span>total resources:&nbsp;<b>9</b></span><br />
 </div>
 </div>
 
@@ -32,10 +32,12 @@ The glue service documentation.
 <a href="/services/glue/crawlers/">crawlers</a><br />
 <a href="/services/glue/databases/">databases</a><br />
 <a href="/services/glue/jobs/">jobs</a><br />
+<a href="/services/glue/registries/">registries</a><br />
 <a href="/services/glue/schema_version_metadata/">schema_version_metadata</a>
 </div>
 <div class="providerDocColumn">
 <a href="/services/glue/schema_versions/">schema_versions</a><br />
+<a href="/services/glue/schemas/">schemas</a><br />
 <a href="/services/glue/triggers/">triggers</a><br />
 <a href="/services/glue/usage_profiles/">usage_profiles</a>
 </div>
diff --git a/website/docs/services/glue/jobs/index.md b/website/docs/services/glue/jobs/index.md
index 65ad1453f..7054ab1cc 100644
--- a/website/docs/services/glue/jobs/index.md
+++ b/website/docs/services/glue/jobs/index.md
@@ -99,7 +99,7 @@ Creates, updates, deletes or gets a <code>job</code> resource or lists <code>job
       {
         "name": "notify_delay_after",
         "type": "integer",
-        "description": "After a job run starts, the number of minutes to wait before sending a job run delay notification"
+        "description": "It is the number of minutes to wait before sending a job run delay notification after a job run starts"
       }
     ]
   },
diff --git a/website/docs/services/glue/registries/index.md b/website/docs/services/glue/registries/index.md
new file mode 100644
index 000000000..1a75e9954
--- /dev/null
+++ b/website/docs/services/glue/registries/index.md
@@ -0,0 +1,398 @@
+---
+title: registries
+hide_title: false
+hide_table_of_contents: false
+keywords:
+  - registries
+  - glue
+  - aws
+  - stackql
+  - infrastructure-as-code
+  - configuration-as-data
+  - cloud inventory
+description: Query, deploy and manage AWS resources using SQL
+custom_edit_url: null
+image: /img/stackql-aws-provider-featured-image.png
+---
+
+import CodeBlock from '@theme/CodeBlock';
+import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
+
+Creates, updates, deletes or gets a <code>registry</code> resource or lists <code>registries</code> in a region
+
+## Overview
+<table>
+<tbody>
+<tr><td><b>Name</b></td><td><code>registries</code></td></tr>
+<tr><td><b>Type</b></td><td>Resource</td></tr>
+<tr><td><b>Description</b></td><td>This resource creates a Registry for authoring schemas as part of Glue Schema Registry.</td></tr>
+<tr><td><b>Id</b></td><td><CopyableCode code="awscc.glue.registries" /></td></tr>
+</tbody>
+</table>
+
+## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Amazon Resource Name for the created Registry."
+  },
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Name of the registry to be created of max length of 255, and may only contain letters, numbers, hyphen, underscore, dollar sign, or hash mark.  No whitespace."
+  },
+  {
+    "name": "description",
+    "type": "string",
+    "description": "A description of the registry. If description is not provided, there will not be any default value for this."
+  },
+  {
+    "name": "tags",
+    "type": "array",
+    "description": "List of tags to tag the Registry",
+    "children": [
+      {
+        "name": "key",
+        "type": "string",
+        "description": "A key to identify the tag."
+      },
+      {
+        "name": "value",
+        "type": "string",
+        "description": "Corresponding tag value for the key."
+      }
+    ]
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Amazon Resource Name for the created Registry."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
+
+For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-registry.html"><code>AWS::Glue::Registry</code></a>.
+
+## Methods
+
+<table>
+<tbody>
+  <tr>
+    <th>Name</th>
+    <th>Resource</th>
+    <th>Accessible by</th>
+    <th>Required Params</th>
+  </tr>
+  <tr>
+    <td><CopyableCode code="create_resource" /></td>
+    <td><code>registries</code></td>
+    <td><code>INSERT</code></td>
+    <td><CopyableCode code="Name, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="delete_resource" /></td>
+    <td><code>registries</code></td>
+    <td><code>DELETE</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="update_resource" /></td>
+    <td><code>registries</code></td>
+    <td><code>UPDATE</code></td>
+    <td><CopyableCode code="Identifier, PatchDocument, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="list_resources" /></td>
+    <td><code>registries_list_only</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="get_resource" /></td>
+    <td><code>registries</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+</tbody>
+</table>
+
+## `SELECT` examples
+
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+Gets all properties from an individual <code>registry</code>.
+```sql
+SELECT
+  region,
+  arn,
+  name,
+  description,
+  tags
+FROM awscc.glue.registries
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ arn }}';
+```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>registries</code> in a region.
+```sql
+SELECT
+  region,
+  arn
+FROM awscc.glue.registries_list_only
+WHERE
+  region = '{{ region }}';
+```
+</TabItem>
+</Tabs>
+
+## `INSERT` example
+
+Use the following StackQL query and manifest file to create a new <code>registry</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+<Tabs
+    defaultValue="required"
+    values={[
+      { label: 'Required Properties', value: 'required', },
+      { label: 'All Properties', value: 'all', },
+      { label: 'Manifest', value: 'manifest', },
+    ]
+}>
+<TabItem value="required">
+
+```sql
+/*+ create */
+INSERT INTO awscc.glue.registries (
+  Name,
+  region
+)
+SELECT
+  '{{ name }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="all">
+
+```sql
+/*+ create */
+INSERT INTO awscc.glue.registries (
+  Name,
+  Description,
+  Tags,
+  region
+)
+SELECT
+  '{{ name }}',
+  '{{ description }}',
+  '{{ tags }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="manifest">
+
+<CodeBlock language="yaml">{`version: 1
+name: stack name
+description: stack description
+providers:
+  - aws
+globals:
+  - name: region
+    value: '{{ vars.AWS_REGION }}'
+resources:
+  - name: registry
+    props:
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: tags
+        value:
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
+
+</TabItem>
+</Tabs>
+
+## `UPDATE` example
+
+Use the following StackQL query and manifest file to update a <code>registry</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+```sql
+/*+ update */
+UPDATE awscc.glue.registries
+SET PatchDocument = string('{{ {
+    "Description": description,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ arn }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## `DELETE` example
+
+```sql
+/*+ delete */
+DELETE FROM awscc.glue.registries
+WHERE
+  Identifier = '{{ arn }}' AND
+  region = '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## Additional Parameters
+
+Mutable resources in the Cloud Control provider support additional optional parameters which can be supplied with `INSERT`, `UPDATE`, or `DELETE` operations. These include:
+
+| Parameter | Description |
+|-----------|-------------|
+| <CopyableCode code="ClientToken" /> | <details><summary>A unique identifier to ensure the idempotency of the resource request.</summary>This allows the provider to accurately distinguish between retries and new requests.<br />A client token is valid for 36 hours once used.<br />After that, a resource request with the same client token is treated as a new request.<br />If you do not specify a client token, one is generated for inclusion in the request.</details> |
+| <CopyableCode code="RoleArn" /> | <details><summary>The ARN of the IAM role used to perform this resource operation.</summary>The role specified must have the permissions required for this operation.<br />If you do not specify a role, a temporary session is created using your AWS user credentials.</details> |
+| <CopyableCode code="TypeVersionId" /> | <details><summary>For private resource types, the type version to use in this resource operation.</summary>If you do not specify a resource version, the default version is used.</details> |
+
+## Permissions
+
+To operate on the <code>registries</code> resource, the following permissions are required:
+
+<Tabs
+    defaultValue="create"
+    values={[
+      { label: 'Create', value: 'create', },
+      { label: 'Read', value: 'read', },
+      { label: 'Delete', value: 'delete', },
+      { label: 'Update', value: 'update', },
+      { label: 'List', value: 'list', },
+    ]
+}>
+<TabItem value="create">
+
+```json
+glue:CreateRegistry,
+glue:GetRegistry,
+glue:GetTags,
+glue:TagResource
+```
+
+</TabItem>
+<TabItem value="read">
+
+```json
+glue:GetRegistry,
+glue:GetTags
+```
+
+</TabItem>
+<TabItem value="delete">
+
+```json
+glue:GetRegistry,
+glue:DeleteRegistry
+```
+
+</TabItem>
+<TabItem value="update">
+
+```json
+glue:UpdateRegistry,
+glue:GetRegistry,
+glue:TagResource,
+glue:UntagResource,
+glue:GetTags
+```
+
+</TabItem>
+<TabItem value="list">
+
+```json
+glue:ListRegistries
+```
+
+</TabItem>
+</Tabs>
\ No newline at end of file
diff --git a/website/docs/services/glue/schemas/index.md b/website/docs/services/glue/schemas/index.md
new file mode 100644
index 000000000..073090eb8
--- /dev/null
+++ b/website/docs/services/glue/schemas/index.md
@@ -0,0 +1,488 @@
+---
+title: schemas
+hide_title: false
+hide_table_of_contents: false
+keywords:
+  - schemas
+  - glue
+  - aws
+  - stackql
+  - infrastructure-as-code
+  - configuration-as-data
+  - cloud inventory
+description: Query, deploy and manage AWS resources using SQL
+custom_edit_url: null
+image: /img/stackql-aws-provider-featured-image.png
+---
+
+import CodeBlock from '@theme/CodeBlock';
+import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
+
+Creates, updates, deletes or gets a <code>schema</code> resource or lists <code>schemas</code> in a region
+
+## Overview
+<table>
+<tbody>
+<tr><td><b>Name</b></td><td><code>schemas</code></td></tr>
+<tr><td><b>Type</b></td><td>Resource</td></tr>
+<tr><td><b>Description</b></td><td>This resource represents a schema of Glue Schema Registry.</td></tr>
+<tr><td><b>Id</b></td><td><CopyableCode code="awscc.glue.schemas" /></td></tr>
+</tbody>
+</table>
+
+## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Amazon Resource Name for the Schema."
+  },
+  {
+    "name": "registry",
+    "type": "object",
+    "description": "Identifier for the registry which the schema is part of.",
+    "children": [
+      {
+        "name": "name",
+        "type": "string",
+        "description": "Name of the registry in which the schema will be created."
+      },
+      {
+        "name": "arn",
+        "type": "string",
+        "description": "Amazon Resource Name for the Registry."
+      }
+    ]
+  },
+  {
+    "name": "name",
+    "type": "string",
+    "description": "Name of the schema."
+  },
+  {
+    "name": "description",
+    "type": "string",
+    "description": "A description of the schema. If description is not provided, there will not be any default value for this."
+  },
+  {
+    "name": "data_format",
+    "type": "string",
+    "description": "Data format name to use for the schema. Accepted values: 'AVRO', 'JSON', 'PROTOBUF'"
+  },
+  {
+    "name": "compatibility",
+    "type": "string",
+    "description": "Compatibility setting for the schema."
+  },
+  {
+    "name": "schema_definition",
+    "type": "string",
+    "description": "Definition for the initial schema version in plain-text."
+  },
+  {
+    "name": "checkpoint_version",
+    "type": "object",
+    "description": "Specify checkpoint version for update. This is only required to update the Compatibility.",
+    "children": [
+      {
+        "name": "is_latest",
+        "type": "boolean",
+        "description": "Indicates if the latest version needs to be updated."
+      },
+      {
+        "name": "version_number",
+        "type": "integer",
+        "description": "Indicates the version number in the schema to update."
+      }
+    ]
+  },
+  {
+    "name": "tags",
+    "type": "array",
+    "description": "List of tags to tag the schema",
+    "children": [
+      {
+        "name": "key",
+        "type": "string",
+        "description": "A key to identify the tag."
+      },
+      {
+        "name": "value",
+        "type": "string",
+        "description": "Corresponding tag value for the key."
+      }
+    ]
+  },
+  {
+    "name": "initial_schema_version_id",
+    "type": "string",
+    "description": "Represents the version ID associated with the initial schema version."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Amazon Resource Name for the Schema."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
+
+For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schema.html"><code>AWS::Glue::Schema</code></a>.
+
+## Methods
+
+<table>
+<tbody>
+  <tr>
+    <th>Name</th>
+    <th>Resource</th>
+    <th>Accessible by</th>
+    <th>Required Params</th>
+  </tr>
+  <tr>
+    <td><CopyableCode code="create_resource" /></td>
+    <td><code>schemas</code></td>
+    <td><code>INSERT</code></td>
+    <td><CopyableCode code="Name, DataFormat, Compatibility, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="delete_resource" /></td>
+    <td><code>schemas</code></td>
+    <td><code>DELETE</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="update_resource" /></td>
+    <td><code>schemas</code></td>
+    <td><code>UPDATE</code></td>
+    <td><CopyableCode code="Identifier, PatchDocument, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="list_resources" /></td>
+    <td><code>schemas_list_only</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="get_resource" /></td>
+    <td><code>schemas</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+</tbody>
+</table>
+
+## `SELECT` examples
+
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+Gets all properties from an individual <code>schema</code>.
+```sql
+SELECT
+  region,
+  arn,
+  registry,
+  name,
+  description,
+  data_format,
+  compatibility,
+  schema_definition,
+  checkpoint_version,
+  tags,
+  initial_schema_version_id
+FROM awscc.glue.schemas
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ arn }}';
+```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>schemas</code> in a region.
+```sql
+SELECT
+  region,
+  arn
+FROM awscc.glue.schemas_list_only
+WHERE
+  region = '{{ region }}';
+```
+</TabItem>
+</Tabs>
+
+## `INSERT` example
+
+Use the following StackQL query and manifest file to create a new <code>schema</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+<Tabs
+    defaultValue="required"
+    values={[
+      { label: 'Required Properties', value: 'required', },
+      { label: 'All Properties', value: 'all', },
+      { label: 'Manifest', value: 'manifest', },
+    ]
+}>
+<TabItem value="required">
+
+```sql
+/*+ create */
+INSERT INTO awscc.glue.schemas (
+  Name,
+  DataFormat,
+  Compatibility,
+  region
+)
+SELECT
+  '{{ name }}',
+  '{{ data_format }}',
+  '{{ compatibility }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="all">
+
+```sql
+/*+ create */
+INSERT INTO awscc.glue.schemas (
+  Registry,
+  Name,
+  Description,
+  DataFormat,
+  Compatibility,
+  SchemaDefinition,
+  CheckpointVersion,
+  Tags,
+  region
+)
+SELECT
+  '{{ registry }}',
+  '{{ name }}',
+  '{{ description }}',
+  '{{ data_format }}',
+  '{{ compatibility }}',
+  '{{ schema_definition }}',
+  '{{ checkpoint_version }}',
+  '{{ tags }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="manifest">
+
+<CodeBlock language="yaml">{`version: 1
+name: stack name
+description: stack description
+providers:
+  - aws
+globals:
+  - name: region
+    value: '{{ vars.AWS_REGION }}'
+resources:
+  - name: schema
+    props:
+      - name: registry
+        value:
+          name: '{{ name }}'
+          arn: '{{ arn }}'
+      - name: name
+        value: '{{ name }}'
+      - name: description
+        value: '{{ description }}'
+      - name: data_format
+        value: '{{ data_format }}'
+      - name: compatibility
+        value: '{{ compatibility }}'
+      - name: schema_definition
+        value: '{{ schema_definition }}'
+      - name: checkpoint_version
+        value:
+          is_latest: '{{ is_latest }}'
+          version_number: '{{ version_number }}'
+      - name: tags
+        value:
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
+
+</TabItem>
+</Tabs>
+
+## `UPDATE` example
+
+Use the following StackQL query and manifest file to update a <code>schema</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+```sql
+/*+ update */
+UPDATE awscc.glue.schemas
+SET PatchDocument = string('{{ {
+    "Description": description,
+    "Compatibility": compatibility,
+    "CheckpointVersion": checkpoint_version,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ arn }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## `DELETE` example
+
+```sql
+/*+ delete */
+DELETE FROM awscc.glue.schemas
+WHERE
+  Identifier = '{{ arn }}' AND
+  region = '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## Additional Parameters
+
+Mutable resources in the Cloud Control provider support additional optional parameters which can be supplied with `INSERT`, `UPDATE`, or `DELETE` operations. These include:
+
+| Parameter | Description |
+|-----------|-------------|
+| <CopyableCode code="ClientToken" /> | <details><summary>A unique identifier to ensure the idempotency of the resource request.</summary>This allows the provider to accurately distinguish between retries and new requests.<br />A client token is valid for 36 hours once used.<br />After that, a resource request with the same client token is treated as a new request.<br />If you do not specify a client token, one is generated for inclusion in the request.</details> |
+| <CopyableCode code="RoleArn" /> | <details><summary>The ARN of the IAM role used to perform this resource operation.</summary>The role specified must have the permissions required for this operation.<br />If you do not specify a role, a temporary session is created using your AWS user credentials.</details> |
+| <CopyableCode code="TypeVersionId" /> | <details><summary>For private resource types, the type version to use in this resource operation.</summary>If you do not specify a resource version, the default version is used.</details> |
+
+## Permissions
+
+To operate on the <code>schemas</code> resource, the following permissions are required:
+
+<Tabs
+    defaultValue="create"
+    values={[
+      { label: 'Create', value: 'create', },
+      { label: 'Read', value: 'read', },
+      { label: 'Delete', value: 'delete', },
+      { label: 'Update', value: 'update', },
+      { label: 'List', value: 'list', },
+    ]
+}>
+<TabItem value="create">
+
+```json
+glue:CreateSchema,
+glue:TagResource
+```
+
+</TabItem>
+<TabItem value="read">
+
+```json
+glue:GetSchemaVersion,
+glue:GetSchema,
+glue:GetTags
+```
+
+</TabItem>
+<TabItem value="delete">
+
+```json
+glue:DeleteSchema,
+glue:GetSchema
+```
+
+</TabItem>
+<TabItem value="update">
+
+```json
+glue:UpdateSchema,
+glue:GetSchemaVersion,
+glue:GetSchema,
+glue:GetTags,
+glue:TagResource,
+glue:UntagResource
+```
+
+</TabItem>
+<TabItem value="list">
+
+```json
+glue:ListSchemas
+```
+
+</TabItem>
+</Tabs>
\ No newline at end of file
diff --git a/website/docs/services/iam/groups/index.md b/website/docs/services/iam/groups/index.md
index 70f0e33a0..1acefdebf 100644
--- a/website/docs/services/iam/groups/index.md
+++ b/website/docs/services/iam/groups/index.md
@@ -72,7 +72,7 @@ Creates, updates, deletes or gets a <code>group</code> resource or lists <code>g
       {
         "name": "policy_document",
         "type": "object",
-        "description": "The entire contents of the policy that defines permissions. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#access_policies-json\">Overview of JSON policies</a>."
+        "description": "The policy document."
       },
       {
         "name": "policy_name",
diff --git a/website/docs/services/iam/roles/index.md b/website/docs/services/iam/roles/index.md
index 8ea3c6d50..fb04fb70e 100644
--- a/website/docs/services/iam/roles/index.md
+++ b/website/docs/services/iam/roles/index.md
@@ -112,14 +112,14 @@ Creates, updates, deletes or gets a <code>role</code> resource or lists <code>ro
     "description": "A list of tags that are attached to the role. For more information about tagging, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_tags.html\">Tagging IAM resources</a> in the <i>IAM User Guide</i>.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key name that can be used to look up or retrieve the associated value. For example, <code>Department</code> or <code>Cost Center</code> are common choices."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value associated with this tag. For example, tags with a key name of <code>Department</code> could have values such as <code>Human Resources</code>, <code>Accounting</code>, and <code>Support</code>. Tags with a key name of <code>Cost Center</code> might have values that consist of the number associated with the different cost centers in your company. Typically, many resources have tags with the same key name but with different values."
       }
     ]
   },
@@ -350,8 +350,8 @@ resources:
         value: '{{ role_name }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/iam/users/index.md b/website/docs/services/iam/users/index.md
index c1b3ffab0..5a3658b6c 100644
--- a/website/docs/services/iam/users/index.md
+++ b/website/docs/services/iam/users/index.md
@@ -109,14 +109,14 @@ Creates, updates, deletes or gets a <code>user</code> resource or lists <code>us
     "description": "<details><summary>A list of tags that you want to attach to the new user. Each tag consists of a key name and an associated value. For more information about tagging, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_tags.html\">Tagging IAM resources</a> in the <i>IAM User Guide</i>.</summary>If any one of the tags is invalid or if you exceed the allowed maximum number of tags, then the entire request fails and the resource is not created.</details>",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key name that can be used to look up or retrieve the associated value. For example, <code>Department</code> or <code>Cost Center</code> are common choices."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value associated with this tag. For example, tags with a key name of <code>Department</code> could have values such as <code>Human Resources</code>, <code>Accounting</code>, and <code>Support</code>. Tags with a key name of <code>Cost Center</code> might have values that consist of the number associated with the different cost centers in your company. Typically, many resources have tags with the same key name but with different values."
       }
     ]
   },
@@ -361,8 +361,8 @@ resources:
           password: '{{ password }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'
+          - key: '{{ key }}'
+            value: '{{ value }}'
       - name: permissions_boundary
         value: '{{ permissions_boundary }}'`}</CodeBlock>
 
diff --git a/website/docs/services/imagebuilder/container_recipes/index.md b/website/docs/services/imagebuilder/container_recipes/index.md
index 8e9327e1e..ca08daad5 100644
--- a/website/docs/services/imagebuilder/container_recipes/index.md
+++ b/website/docs/services/imagebuilder/container_recipes/index.md
@@ -207,12 +207,12 @@ Creates, updates, deletes or gets a <code>container_recipe</code> resource or li
       {
         "name": "service",
         "type": "string",
-        "description": "The service of target container repository."
+        "description": "Specifies the service in which this image was registered."
       },
       {
         "name": "repository_name",
         "type": "string",
-        "description": "The repository name of target container repository."
+        "description": "The name of the container repository where the output container image is stored. This name is prefixed by the repository location."
       }
     ]
   },
diff --git a/website/docs/services/imagebuilder/images/index.md b/website/docs/services/imagebuilder/images/index.md
index d4b0c80c1..70c0a530f 100644
--- a/website/docs/services/imagebuilder/images/index.md
+++ b/website/docs/services/imagebuilder/images/index.md
@@ -62,7 +62,7 @@ Creates, updates, deletes or gets an <code>image</code> resource or lists <code>
           {
             "name": "repository_name",
             "type": "string",
-            "description": "The name of the container repository that Amazon Inspector scans to identify findings for your container images. The name includes the path for the repository location. If you don't provide this information, Image Builder creates a repository in your account named image-builder-image-scanning-repository to use for vulnerability scans for your output container images."
+            "description": "The name of the container repository that Amazon Inspector scans to identify findings for your container images. The name includes the path for the repository location. If you don’t provide this information, Image Builder creates a repository in your account named image-builder-image-scanning-repository to use for vulnerability scans for your output container images."
           }
         ]
       },
@@ -152,15 +152,15 @@ Creates, updates, deletes or gets an <code>image</code> resource or lists <code>
     "type": "object",
     "description": "The image tests configuration used when creating this image.",
     "children": [
-      {
-        "name": "image_tests_enabled",
-        "type": "boolean",
-        "description": "Defines if tests should be executed when building this image."
-      },
       {
         "name": "timeout_minutes",
         "type": "integer",
-        "description": "The maximum time in minutes that tests are permitted to run."
+        "description": "TimeoutMinutes"
+      },
+      {
+        "name": "image_tests_enabled",
+        "type": "boolean",
+        "description": "ImageTestsEnabled"
       }
     ]
   },
@@ -439,8 +439,8 @@ resources:
         value: '{{ distribution_configuration_arn }}'
       - name: image_tests_configuration
         value:
-          image_tests_enabled: '{{ image_tests_enabled }}'
           timeout_minutes: '{{ timeout_minutes }}'
+          image_tests_enabled: '{{ image_tests_enabled }}'
       - name: enhanced_image_metadata_enabled
         value: '{{ enhanced_image_metadata_enabled }}'
       - name: execution_role
diff --git a/website/docs/services/inspectorv2/code_security_scan_configurations/index.md b/website/docs/services/inspectorv2/code_security_scan_configurations/index.md
index 88385019e..89413dced 100644
--- a/website/docs/services/inspectorv2/code_security_scan_configurations/index.md
+++ b/website/docs/services/inspectorv2/code_security_scan_configurations/index.md
@@ -60,30 +60,37 @@ Creates, updates, deletes or gets a <code>code_security_scan_configuration</code
     "description": "Code Security Scan Configuration",
     "children": [
       {
-        "name": "name",
-        "type": "string",
-        "description": "Code Security Scan Configuration name"
-      },
-      {
-        "name": "scope_settings",
+        "name": "periodic_scan_configuration",
         "type": "object",
-        "description": "Scope Settings",
+        "description": "",
         "children": [
           {
-            "name": "project_selection_scope",
+            "name": "frequency",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "frequency_expression",
             "type": "string",
             "description": ""
           }
         ]
       },
       {
-        "name": "arn",
-        "type": "string",
-        "description": "Code Security Scan Configuration ARN"
+        "name": "continuous_integration_scan_configuration",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "supported_events",
+            "type": "array",
+            "description": ""
+          }
+        ]
       },
       {
-        "name": "tags",
-        "type": "object",
+        "name": "rule_set_categories",
+        "type": "array",
         "description": ""
       }
     ]
@@ -317,16 +324,19 @@ resources:
         value: '{{ level }}'
       - name: configuration
         value:
-          name: '{{ name }}'
-          level: null
-          configuration: null
-          scope_settings:
-            project_selection_scope: '{{ project_selection_scope }}'
-          tags: {}
+          periodic_scan_configuration:
+            frequency: '{{ frequency }}'
+            frequency_expression: '{{ frequency_expression }}'
+          continuous_integration_scan_configuration:
+            supported_events:
+              - '{{ supported_events[0] }}'
+          rule_set_categories:
+            - '{{ rule_set_categories[0] }}'
       - name: scope_settings
-        value: null
+        value:
+          project_selection_scope: '{{ project_selection_scope }}'
       - name: tags
-        value: null`}</CodeBlock>
+        value: {}`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/iot/billing_groups/index.md b/website/docs/services/iot/billing_groups/index.md
index 8f88e30a7..02dab874e 100644
--- a/website/docs/services/iot/billing_groups/index.md
+++ b/website/docs/services/iot/billing_groups/index.md
@@ -67,12 +67,12 @@ Creates, updates, deletes or gets a <code>billing_group</code> resource or lists
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "Tag key (1-128 chars). No 'aws:' prefix. Allows: [A-Za-z0-9 _.:/=+-]"
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "Tag value (1-256 chars). No 'aws:' prefix. Allows: [A-Za-z0-9 _.:/=+-]"
       }
     ]
   },
diff --git a/website/docs/services/iot/ca_certificates/index.md b/website/docs/services/iot/ca_certificates/index.md
index 870f427da..09708c726 100644
--- a/website/docs/services/iot/ca_certificates/index.md
+++ b/website/docs/services/iot/ca_certificates/index.md
@@ -114,12 +114,12 @@ Creates, updates, deletes or gets a <code>ca_certificate</code> resource or list
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/iot/certificate_providers/index.md b/website/docs/services/iot/certificate_providers/index.md
index 62af76056..b9da18e2c 100644
--- a/website/docs/services/iot/certificate_providers/index.md
+++ b/website/docs/services/iot/certificate_providers/index.md
@@ -67,12 +67,12 @@ Creates, updates, deletes or gets a <code>certificate_provider</code> resource o
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/iot/commands/index.md b/website/docs/services/iot/commands/index.md
index 1bf95a73c..f5ada8d2c 100644
--- a/website/docs/services/iot/commands/index.md
+++ b/website/docs/services/iot/commands/index.md
@@ -178,12 +178,12 @@ Creates, updates, deletes or gets a <code>command</code> resource or lists <code
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The tag's key."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The tag's value."
       }
     ]
   },
diff --git a/website/docs/services/iot/custom_metrics/index.md b/website/docs/services/iot/custom_metrics/index.md
index 8efb3aa69..814bff684 100644
--- a/website/docs/services/iot/custom_metrics/index.md
+++ b/website/docs/services/iot/custom_metrics/index.md
@@ -72,12 +72,12 @@ Creates, updates, deletes or gets a <code>custom_metric</code> resource or lists
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The tag's key."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The tag's value."
       }
     ]
   },
diff --git a/website/docs/services/iot/dimensions/index.md b/website/docs/services/iot/dimensions/index.md
index e19790608..549fe75bc 100644
--- a/website/docs/services/iot/dimensions/index.md
+++ b/website/docs/services/iot/dimensions/index.md
@@ -67,12 +67,12 @@ Creates, updates, deletes or gets a <code>dimension</code> resource or lists <co
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The tag's key."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The tag's value."
       }
     ]
   },
diff --git a/website/docs/services/iot/fleet_metrics/index.md b/website/docs/services/iot/fleet_metrics/index.md
index 020f8f073..77071a04e 100644
--- a/website/docs/services/iot/fleet_metrics/index.md
+++ b/website/docs/services/iot/fleet_metrics/index.md
@@ -124,12 +124,12 @@ Creates, updates, deletes or gets a <code>fleet_metric</code> resource or lists
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The tag's key"
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The tag's value"
       }
     ]
   },
diff --git a/website/docs/services/iot/job_templates/index.md b/website/docs/services/iot/job_templates/index.md
index 363992e52..6f49c46e6 100644
--- a/website/docs/services/iot/job_templates/index.md
+++ b/website/docs/services/iot/job_templates/index.md
@@ -144,120 +144,8 @@ Creates, updates, deletes or gets a <code>job_template</code> resource or lists
         "children": [
           {
             "name": "action",
-            "type": "object",
-            "description": "The type of job action to take to initiate the job abort.",
-            "children": [
-              {
-                "name": "cloudwatch_alarm",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "cloudwatch_logs",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "cloudwatch_metric",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "dynamo_db",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "dynamo_dbv2",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "elasticsearch",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "firehose",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "http",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "iot_analytics",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "iot_events",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "iot_site_wise",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "kafka",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "kinesis",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "lambda",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "location",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "open_search",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "republish",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "s3",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "sns",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "sqs",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "step_functions",
-                "type": "object",
-                "description": ""
-              },
-              {
-                "name": "timestream",
-                "type": "object",
-                "description": ""
-              }
-            ]
+            "type": "string",
+            "description": "The type of job action to take to initiate the job abort."
           },
           {
             "name": "failure_type",
@@ -286,7 +174,7 @@ Creates, updates, deletes or gets a <code>job_template</code> resource or lists
       {
         "name": "role_arn",
         "type": "string",
-        "description": ""
+        "description": "The ARN of an IAM role that grants grants permission to download files from the S3 bucket where the job data/updates are stored. The role must also grant permission for IoT to download the files."
       },
       {
         "name": "expires_in_sec",
@@ -349,12 +237,12 @@ Creates, updates, deletes or gets a <code>job_template</code> resource or lists
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The tag's key."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The tag's value."
       }
     ]
   },
@@ -596,155 +484,7 @@ resources:
       - name: abort_config
         value:
           criteria_list:
-            - action:
-                cloudwatch_alarm:
-                  state_value: '{{ state_value }}'
-                  alarm_name: '{{ alarm_name }}'
-                  state_reason: '{{ state_reason }}'
-                  role_arn: '{{ role_arn }}'
-                cloudwatch_logs:
-                  log_group_name: '{{ log_group_name }}'
-                  role_arn: '{{ role_arn }}'
-                  batch_mode: '{{ batch_mode }}'
-                cloudwatch_metric:
-                  metric_name: '{{ metric_name }}'
-                  metric_value: '{{ metric_value }}'
-                  metric_namespace: '{{ metric_namespace }}'
-                  metric_unit: '{{ metric_unit }}'
-                  role_arn: '{{ role_arn }}'
-                  metric_timestamp: '{{ metric_timestamp }}'
-                dynamo_db:
-                  table_name: '{{ table_name }}'
-                  payload_field: '{{ payload_field }}'
-                  range_key_field: '{{ range_key_field }}'
-                  hash_key_field: '{{ hash_key_field }}'
-                  range_key_value: '{{ range_key_value }}'
-                  range_key_type: '{{ range_key_type }}'
-                  hash_key_type: '{{ hash_key_type }}'
-                  hash_key_value: '{{ hash_key_value }}'
-                  role_arn: '{{ role_arn }}'
-                dynamo_dbv2:
-                  put_item:
-                    table_name: '{{ table_name }}'
-                  role_arn: '{{ role_arn }}'
-                elasticsearch:
-                  type: '{{ type }}'
-                  index: '{{ index }}'
-                  id: '{{ id }}'
-                  endpoint: '{{ endpoint }}'
-                  role_arn: '{{ role_arn }}'
-                firehose:
-                  delivery_stream_name: '{{ delivery_stream_name }}'
-                  role_arn: '{{ role_arn }}'
-                  separator: '{{ separator }}'
-                  batch_mode: '{{ batch_mode }}'
-                http:
-                  confirmation_url: '{{ confirmation_url }}'
-                  headers:
-                    - value: '{{ value }}'
-                      key: '{{ key }}'
-                  url: '{{ url }}'
-                  auth:
-                    sigv4:
-                      service_name: '{{ service_name }}'
-                      signing_region: '{{ signing_region }}'
-                      role_arn: '{{ role_arn }}'
-                iot_analytics:
-                  role_arn: '{{ role_arn }}'
-                  channel_name: '{{ channel_name }}'
-                  batch_mode: '{{ batch_mode }}'
-                iot_events:
-                  input_name: '{{ input_name }}'
-                  role_arn: '{{ role_arn }}'
-                  message_id: '{{ message_id }}'
-                  batch_mode: '{{ batch_mode }}'
-                iot_site_wise:
-                  role_arn: '{{ role_arn }}'
-                  put_asset_property_value_entries:
-                    - property_alias: '{{ property_alias }}'
-                      property_values:
-                        - value:
-                            string_value: '{{ string_value }}'
-                            double_value: '{{ double_value }}'
-                            boolean_value: '{{ boolean_value }}'
-                            integer_value: '{{ integer_value }}'
-                          timestamp:
-                            time_in_seconds: '{{ time_in_seconds }}'
-                            offset_in_nanos: '{{ offset_in_nanos }}'
-                          quality: '{{ quality }}'
-                      asset_id: '{{ asset_id }}'
-                      entry_id: '{{ entry_id }}'
-                      property_id: '{{ property_id }}'
-                kafka:
-                  destination_arn: '{{ destination_arn }}'
-                  topic: '{{ topic }}'
-                  key: '{{ key }}'
-                  partition: '{{ partition }}'
-                  client_properties: {}
-                  headers:
-                    - value: '{{ value }}'
-                      key: '{{ key }}'
-                kinesis:
-                  partition_key: '{{ partition_key }}'
-                  stream_name: '{{ stream_name }}'
-                  role_arn: '{{ role_arn }}'
-                lambda:
-                  function_arn: '{{ function_arn }}'
-                location:
-                  role_arn: '{{ role_arn }}'
-                  tracker_name: '{{ tracker_name }}'
-                  device_id: '{{ device_id }}'
-                  latitude: '{{ latitude }}'
-                  longitude: '{{ longitude }}'
-                  timestamp:
-                    value: '{{ value }}'
-                    unit: '{{ unit }}'
-                open_search:
-                  type: '{{ type }}'
-                  index: '{{ index }}'
-                  id: '{{ id }}'
-                  endpoint: '{{ endpoint }}'
-                  role_arn: '{{ role_arn }}'
-                republish:
-                  qos: '{{ qos }}'
-                  topic: '{{ topic }}'
-                  role_arn: '{{ role_arn }}'
-                  headers:
-                    payload_format_indicator: '{{ payload_format_indicator }}'
-                    content_type: '{{ content_type }}'
-                    response_topic: '{{ response_topic }}'
-                    correlation_data: '{{ correlation_data }}'
-                    message_expiry: '{{ message_expiry }}'
-                    user_properties:
-                      - key: '{{ key }}'
-                        value: '{{ value }}'
-                s3:
-                  bucket_name: '{{ bucket_name }}'
-                  key: '{{ key }}'
-                  role_arn: '{{ role_arn }}'
-                  canned_acl: '{{ canned_acl }}'
-                sns:
-                  target_arn: '{{ target_arn }}'
-                  message_format: '{{ message_format }}'
-                  role_arn: '{{ role_arn }}'
-                sqs:
-                  role_arn: '{{ role_arn }}'
-                  use_base64: '{{ use_base64 }}'
-                  queue_url: '{{ queue_url }}'
-                step_functions:
-                  execution_name_prefix: '{{ execution_name_prefix }}'
-                  state_machine_name: '{{ state_machine_name }}'
-                  role_arn: '{{ role_arn }}'
-                timestream:
-                  role_arn: '{{ role_arn }}'
-                  database_name: '{{ database_name }}'
-                  table_name: '{{ table_name }}'
-                  dimensions:
-                    - name: '{{ name }}'
-                      value: '{{ value }}'
-                  timestamp:
-                    value: '{{ value }}'
-                    unit: '{{ unit }}'
+            - action: '{{ action }}'
               failure_type: '{{ failure_type }}'
               min_number_of_executed_things: '{{ min_number_of_executed_things }}'
               threshold_percentage: null
diff --git a/website/docs/services/iot/mitigation_actions/index.md b/website/docs/services/iot/mitigation_actions/index.md
index 394044ba5..f5b6468aa 100644
--- a/website/docs/services/iot/mitigation_actions/index.md
+++ b/website/docs/services/iot/mitigation_actions/index.md
@@ -62,12 +62,12 @@ Creates, updates, deletes or gets a <code>mitigation_action</code> resource or l
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The tag's key."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The tag's value."
       }
     ]
   },
diff --git a/website/docs/services/iot/role_aliases/index.md b/website/docs/services/iot/role_aliases/index.md
index 12d7511f8..2365c240c 100644
--- a/website/docs/services/iot/role_aliases/index.md
+++ b/website/docs/services/iot/role_aliases/index.md
@@ -72,12 +72,12 @@ Creates, updates, deletes or gets a <code>role_alias</code> resource or lists <c
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/iot/scheduled_audits/index.md b/website/docs/services/iot/scheduled_audits/index.md
index ec0b8544b..128e2dfd5 100644
--- a/website/docs/services/iot/scheduled_audits/index.md
+++ b/website/docs/services/iot/scheduled_audits/index.md
@@ -82,12 +82,12 @@ Creates, updates, deletes or gets a <code>scheduled_audit</code> resource or lis
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The tag's key."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The tag's value."
       }
     ]
   },
diff --git a/website/docs/services/iot/security_profiles/index.md b/website/docs/services/iot/security_profiles/index.md
index 4bbbf75e8..824d16a65 100644
--- a/website/docs/services/iot/security_profiles/index.md
+++ b/website/docs/services/iot/security_profiles/index.md
@@ -250,12 +250,12 @@ Creates, updates, deletes or gets a <code>security_profile</code> resource or li
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The tag's key."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The tag's value."
       }
     ]
   },
diff --git a/website/docs/services/iot/software_package_versions/index.md b/website/docs/services/iot/software_package_versions/index.md
index 7f33fd7fe..abbc66647 100644
--- a/website/docs/services/iot/software_package_versions/index.md
+++ b/website/docs/services/iot/software_package_versions/index.md
@@ -150,12 +150,12 @@ Creates, updates, deletes or gets a <code>software_package_version</code> resour
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 1 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/iot/software_packages/index.md b/website/docs/services/iot/software_packages/index.md
index 4670ae475..7b045c9b1 100644
--- a/website/docs/services/iot/software_packages/index.md
+++ b/website/docs/services/iot/software_packages/index.md
@@ -67,12 +67,12 @@ Creates, updates, deletes or gets a <code>software_package</code> resource or li
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 1 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/iot/thing_groups/index.md b/website/docs/services/iot/thing_groups/index.md
index 60392e86e..049c29875 100644
--- a/website/docs/services/iot/thing_groups/index.md
+++ b/website/docs/services/iot/thing_groups/index.md
@@ -101,12 +101,12 @@ Creates, updates, deletes or gets a <code>thing_group</code> resource or lists <
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "Tag key (1-128 chars). No 'aws:' prefix. Allows: [A-Za-z0-9 _.:/=+-]"
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "Tag value (1-256 chars). No 'aws:' prefix. Allows: [A-Za-z0-9 _.:/=+-]"
       }
     ]
   },
diff --git a/website/docs/services/iot/thing_types/index.md b/website/docs/services/iot/thing_types/index.md
index 07f9e48ca..1b2a5abb4 100644
--- a/website/docs/services/iot/thing_types/index.md
+++ b/website/docs/services/iot/thing_types/index.md
@@ -118,12 +118,12 @@ Creates, updates, deletes or gets a <code>thing_type</code> resource or lists <c
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "Tag key (1-128 chars). No 'aws:' prefix. Allows: [A-Za-z0-9 _.:/=+-]"
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "Tag value (1-256 chars). No 'aws:' prefix. Allows: [A-Za-z0-9 _.:/=+-]"
       }
     ]
   },
diff --git a/website/docs/services/iotanalytics/channels/index.md b/website/docs/services/iotanalytics/channels/index.md
new file mode 100644
index 000000000..e73e35ddb
--- /dev/null
+++ b/website/docs/services/iotanalytics/channels/index.md
@@ -0,0 +1,457 @@
+---
+title: channels
+hide_title: false
+hide_table_of_contents: false
+keywords:
+  - channels
+  - iotanalytics
+  - aws
+  - stackql
+  - infrastructure-as-code
+  - configuration-as-data
+  - cloud inventory
+description: Query, deploy and manage AWS resources using SQL
+custom_edit_url: null
+image: /img/stackql-aws-provider-featured-image.png
+---
+
+import CodeBlock from '@theme/CodeBlock';
+import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
+
+Creates, updates, deletes or gets a <code>channel</code> resource or lists <code>channels</code> in a region
+
+## Overview
+<table>
+<tbody>
+<tr><td><b>Name</b></td><td><code>channels</code></td></tr>
+<tr><td><b>Type</b></td><td>Resource</td></tr>
+<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IoTAnalytics::Channel</td></tr>
+<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotanalytics.channels" /></td></tr>
+</tbody>
+</table>
+
+## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "channel_storage",
+    "type": "object",
+    "description": "",
+    "children": [
+      {
+        "name": "service_managed_s3",
+        "type": "object",
+        "description": ""
+      },
+      {
+        "name": "customer_managed_s3",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "bucket",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "role_arn",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "key_prefix",
+            "type": "string",
+            "description": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "channel_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "retention_period",
+    "type": "object",
+    "description": "",
+    "children": [
+      {
+        "name": "number_of_days",
+        "type": "integer",
+        "description": ""
+      },
+      {
+        "name": "unlimited",
+        "type": "boolean",
+        "description": ""
+      }
+    ]
+  },
+  {
+    "name": "tags",
+    "type": "array",
+    "description": "",
+    "children": [
+      {
+        "name": "key",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "value",
+        "type": "string",
+        "description": ""
+      }
+    ]
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "channel_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
+
+For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-channel.html"><code>AWS::IoTAnalytics::Channel</code></a>.
+
+## Methods
+
+<table>
+<tbody>
+  <tr>
+    <th>Name</th>
+    <th>Resource</th>
+    <th>Accessible by</th>
+    <th>Required Params</th>
+  </tr>
+  <tr>
+    <td><CopyableCode code="create_resource" /></td>
+    <td><code>channels</code></td>
+    <td><code>INSERT</code></td>
+    <td><CopyableCode code="region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="delete_resource" /></td>
+    <td><code>channels</code></td>
+    <td><code>DELETE</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="update_resource" /></td>
+    <td><code>channels</code></td>
+    <td><code>UPDATE</code></td>
+    <td><CopyableCode code="Identifier, PatchDocument, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="list_resources" /></td>
+    <td><code>channels_list_only</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="get_resource" /></td>
+    <td><code>channels</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+</tbody>
+</table>
+
+## `SELECT` examples
+
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+Gets all properties from an individual <code>channel</code>.
+```sql
+SELECT
+  region,
+  channel_storage,
+  channel_name,
+  id,
+  retention_period,
+  tags
+FROM awscc.iotanalytics.channels
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ channel_name }}';
+```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>channels</code> in a region.
+```sql
+SELECT
+  region,
+  channel_name
+FROM awscc.iotanalytics.channels_list_only
+WHERE
+  region = '{{ region }}';
+```
+</TabItem>
+</Tabs>
+
+## `INSERT` example
+
+Use the following StackQL query and manifest file to create a new <code>channel</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+<Tabs
+    defaultValue="required"
+    values={[
+      { label: 'Required Properties', value: 'required', },
+      { label: 'All Properties', value: 'all', },
+      { label: 'Manifest', value: 'manifest', },
+    ]
+}>
+<TabItem value="required">
+
+```sql
+/*+ create */
+INSERT INTO awscc.iotanalytics.channels (
+  ChannelStorage,
+  ChannelName,
+  RetentionPeriod,
+  Tags,
+  region
+)
+SELECT
+  '{{ channel_storage }}',
+  '{{ channel_name }}',
+  '{{ retention_period }}',
+  '{{ tags }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="all">
+
+```sql
+/*+ create */
+INSERT INTO awscc.iotanalytics.channels (
+  ChannelStorage,
+  ChannelName,
+  RetentionPeriod,
+  Tags,
+  region
+)
+SELECT
+  '{{ channel_storage }}',
+  '{{ channel_name }}',
+  '{{ retention_period }}',
+  '{{ tags }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="manifest">
+
+<CodeBlock language="yaml">{`version: 1
+name: stack name
+description: stack description
+providers:
+  - aws
+globals:
+  - name: region
+    value: '{{ vars.AWS_REGION }}'
+resources:
+  - name: channel
+    props:
+      - name: channel_storage
+        value:
+          service_managed_s3: {}
+          customer_managed_s3:
+            bucket: '{{ bucket }}'
+            role_arn: '{{ role_arn }}'
+            key_prefix: '{{ key_prefix }}'
+      - name: channel_name
+        value: '{{ channel_name }}'
+      - name: retention_period
+        value:
+          number_of_days: '{{ number_of_days }}'
+          unlimited: '{{ unlimited }}'
+      - name: tags
+        value:
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
+
+</TabItem>
+</Tabs>
+
+## `UPDATE` example
+
+Use the following StackQL query and manifest file to update a <code>channel</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+```sql
+/*+ update */
+UPDATE awscc.iotanalytics.channels
+SET PatchDocument = string('{{ {
+    "ChannelStorage": channel_storage,
+    "RetentionPeriod": retention_period,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ channel_name }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## `DELETE` example
+
+```sql
+/*+ delete */
+DELETE FROM awscc.iotanalytics.channels
+WHERE
+  Identifier = '{{ channel_name }}' AND
+  region = '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## Additional Parameters
+
+Mutable resources in the Cloud Control provider support additional optional parameters which can be supplied with `INSERT`, `UPDATE`, or `DELETE` operations. These include:
+
+| Parameter | Description |
+|-----------|-------------|
+| <CopyableCode code="ClientToken" /> | <details><summary>A unique identifier to ensure the idempotency of the resource request.</summary>This allows the provider to accurately distinguish between retries and new requests.<br />A client token is valid for 36 hours once used.<br />After that, a resource request with the same client token is treated as a new request.<br />If you do not specify a client token, one is generated for inclusion in the request.</details> |
+| <CopyableCode code="RoleArn" /> | <details><summary>The ARN of the IAM role used to perform this resource operation.</summary>The role specified must have the permissions required for this operation.<br />If you do not specify a role, a temporary session is created using your AWS user credentials.</details> |
+| <CopyableCode code="TypeVersionId" /> | <details><summary>For private resource types, the type version to use in this resource operation.</summary>If you do not specify a resource version, the default version is used.</details> |
+
+## Permissions
+
+To operate on the <code>channels</code> resource, the following permissions are required:
+
+<Tabs
+    defaultValue="create"
+    values={[
+      { label: 'Create', value: 'create', },
+      { label: 'Read', value: 'read', },
+      { label: 'Update', value: 'update', },
+      { label: 'Delete', value: 'delete', },
+      { label: 'List', value: 'list', },
+    ]
+}>
+<TabItem value="create">
+
+```json
+iotanalytics:CreateChannel
+```
+
+</TabItem>
+<TabItem value="read">
+
+```json
+iotanalytics:DescribeChannel,
+iotanalytics:ListTagsForResource
+```
+
+</TabItem>
+<TabItem value="update">
+
+```json
+iotanalytics:UpdateChannel,
+iotanalytics:TagResource,
+iotanalytics:UntagResource
+```
+
+</TabItem>
+<TabItem value="delete">
+
+```json
+iotanalytics:DeleteChannel
+```
+
+</TabItem>
+<TabItem value="list">
+
+```json
+iotanalytics:ListChannels
+```
+
+</TabItem>
+</Tabs>
\ No newline at end of file
diff --git a/website/docs/services/iotanalytics/datasets/index.md b/website/docs/services/iotanalytics/datasets/index.md
index 66afc3086..417373fb5 100644
--- a/website/docs/services/iotanalytics/datasets/index.md
+++ b/website/docs/services/iotanalytics/datasets/index.md
@@ -131,18 +131,8 @@ Creates, updates, deletes or gets a <code>dataset</code> resource or lists <code
             "description": "",
             "children": [
               {
-                "name": "filter",
-                "type": "string",
-                "description": ""
-              },
-              {
-                "name": "next",
-                "type": "string",
-                "description": ""
-              },
-              {
-                "name": "name",
-                "type": "string",
+                "name": "delta_time",
+                "type": "object",
                 "description": ""
               }
             ]
@@ -563,9 +553,9 @@ resources:
                 compute_type: '{{ compute_type }}'
             query_action:
               filters:
-                - filter: '{{ filter }}'
-                  next: '{{ next }}'
-                  name: '{{ name }}'
+                - delta_time:
+                    offset_seconds: '{{ offset_seconds }}'
+                    time_expression: '{{ time_expression }}'
               sql_query: '{{ sql_query }}'
       - name: late_data_rules
         value:
diff --git a/website/docs/services/iotanalytics/datastores/index.md b/website/docs/services/iotanalytics/datastores/index.md
new file mode 100644
index 000000000..8ce11ac47
--- /dev/null
+++ b/website/docs/services/iotanalytics/datastores/index.md
@@ -0,0 +1,587 @@
+---
+title: datastores
+hide_title: false
+hide_table_of_contents: false
+keywords:
+  - datastores
+  - iotanalytics
+  - aws
+  - stackql
+  - infrastructure-as-code
+  - configuration-as-data
+  - cloud inventory
+description: Query, deploy and manage AWS resources using SQL
+custom_edit_url: null
+image: /img/stackql-aws-provider-featured-image.png
+---
+
+import CodeBlock from '@theme/CodeBlock';
+import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
+
+Creates, updates, deletes or gets a <code>datastore</code> resource or lists <code>datastores</code> in a region
+
+## Overview
+<table>
+<tbody>
+<tr><td><b>Name</b></td><td><code>datastores</code></td></tr>
+<tr><td><b>Type</b></td><td>Resource</td></tr>
+<tr><td><b>Description</b></td><td>Resource Type definition for AWS::IoTAnalytics::Datastore</td></tr>
+<tr><td><b>Id</b></td><td><CopyableCode code="awscc.iotanalytics.datastores" /></td></tr>
+</tbody>
+</table>
+
+## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "datastore_storage",
+    "type": "object",
+    "description": "",
+    "children": [
+      {
+        "name": "service_managed_s3",
+        "type": "object",
+        "description": ""
+      },
+      {
+        "name": "customer_managed_s3",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "bucket",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "role_arn",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "key_prefix",
+            "type": "string",
+            "description": ""
+          }
+        ]
+      },
+      {
+        "name": "iot_site_wise_multi_layer_storage",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "customer_managed_s3_storage",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "bucket",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "key_prefix",
+                "type": "string",
+                "description": ""
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "datastore_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "datastore_partitions",
+    "type": "object",
+    "description": "",
+    "children": [
+      {
+        "name": "partitions",
+        "type": "array",
+        "description": "",
+        "children": [
+          {
+            "name": "partition",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "attribute_name",
+                "type": "string",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "timestamp_partition",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "attribute_name",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "timestamp_format",
+                "type": "string",
+                "description": ""
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "id",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "file_format_configuration",
+    "type": "object",
+    "description": "",
+    "children": [
+      {
+        "name": "json_configuration",
+        "type": "object",
+        "description": ""
+      },
+      {
+        "name": "parquet_configuration",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "schema_definition",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "columns",
+                "type": "array",
+                "description": ""
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "retention_period",
+    "type": "object",
+    "description": "",
+    "children": [
+      {
+        "name": "number_of_days",
+        "type": "integer",
+        "description": ""
+      },
+      {
+        "name": "unlimited",
+        "type": "boolean",
+        "description": ""
+      }
+    ]
+  },
+  {
+    "name": "tags",
+    "type": "array",
+    "description": "",
+    "children": [
+      {
+        "name": "key",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "value",
+        "type": "string",
+        "description": ""
+      }
+    ]
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "datastore_name",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
+
+For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-datastore.html"><code>AWS::IoTAnalytics::Datastore</code></a>.
+
+## Methods
+
+<table>
+<tbody>
+  <tr>
+    <th>Name</th>
+    <th>Resource</th>
+    <th>Accessible by</th>
+    <th>Required Params</th>
+  </tr>
+  <tr>
+    <td><CopyableCode code="create_resource" /></td>
+    <td><code>datastores</code></td>
+    <td><code>INSERT</code></td>
+    <td><CopyableCode code="region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="delete_resource" /></td>
+    <td><code>datastores</code></td>
+    <td><code>DELETE</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="update_resource" /></td>
+    <td><code>datastores</code></td>
+    <td><code>UPDATE</code></td>
+    <td><CopyableCode code="Identifier, PatchDocument, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="list_resources" /></td>
+    <td><code>datastores_list_only</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="get_resource" /></td>
+    <td><code>datastores</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+</tbody>
+</table>
+
+## `SELECT` examples
+
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+Gets all properties from an individual <code>datastore</code>.
+```sql
+SELECT
+  region,
+  datastore_storage,
+  datastore_name,
+  datastore_partitions,
+  id,
+  file_format_configuration,
+  retention_period,
+  tags
+FROM awscc.iotanalytics.datastores
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ datastore_name }}';
+```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>datastores</code> in a region.
+```sql
+SELECT
+  region,
+  datastore_name
+FROM awscc.iotanalytics.datastores_list_only
+WHERE
+  region = '{{ region }}';
+```
+</TabItem>
+</Tabs>
+
+## `INSERT` example
+
+Use the following StackQL query and manifest file to create a new <code>datastore</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+<Tabs
+    defaultValue="required"
+    values={[
+      { label: 'Required Properties', value: 'required', },
+      { label: 'All Properties', value: 'all', },
+      { label: 'Manifest', value: 'manifest', },
+    ]
+}>
+<TabItem value="required">
+
+```sql
+/*+ create */
+INSERT INTO awscc.iotanalytics.datastores (
+  DatastoreStorage,
+  DatastoreName,
+  DatastorePartitions,
+  FileFormatConfiguration,
+  RetentionPeriod,
+  Tags,
+  region
+)
+SELECT
+  '{{ datastore_storage }}',
+  '{{ datastore_name }}',
+  '{{ datastore_partitions }}',
+  '{{ file_format_configuration }}',
+  '{{ retention_period }}',
+  '{{ tags }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="all">
+
+```sql
+/*+ create */
+INSERT INTO awscc.iotanalytics.datastores (
+  DatastoreStorage,
+  DatastoreName,
+  DatastorePartitions,
+  FileFormatConfiguration,
+  RetentionPeriod,
+  Tags,
+  region
+)
+SELECT
+  '{{ datastore_storage }}',
+  '{{ datastore_name }}',
+  '{{ datastore_partitions }}',
+  '{{ file_format_configuration }}',
+  '{{ retention_period }}',
+  '{{ tags }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="manifest">
+
+<CodeBlock language="yaml">{`version: 1
+name: stack name
+description: stack description
+providers:
+  - aws
+globals:
+  - name: region
+    value: '{{ vars.AWS_REGION }}'
+resources:
+  - name: datastore
+    props:
+      - name: datastore_storage
+        value:
+          service_managed_s3: {}
+          customer_managed_s3:
+            bucket: '{{ bucket }}'
+            role_arn: '{{ role_arn }}'
+            key_prefix: '{{ key_prefix }}'
+          iot_site_wise_multi_layer_storage:
+            customer_managed_s3_storage:
+              bucket: '{{ bucket }}'
+              key_prefix: '{{ key_prefix }}'
+      - name: datastore_name
+        value: '{{ datastore_name }}'
+      - name: datastore_partitions
+        value:
+          partitions:
+            - partition:
+                attribute_name: '{{ attribute_name }}'
+              timestamp_partition:
+                attribute_name: '{{ attribute_name }}'
+                timestamp_format: '{{ timestamp_format }}'
+      - name: file_format_configuration
+        value:
+          json_configuration: {}
+          parquet_configuration:
+            schema_definition:
+              columns:
+                - type: '{{ type }}'
+                  name: '{{ name }}'
+      - name: retention_period
+        value:
+          number_of_days: '{{ number_of_days }}'
+          unlimited: '{{ unlimited }}'
+      - name: tags
+        value:
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
+
+</TabItem>
+</Tabs>
+
+## `UPDATE` example
+
+Use the following StackQL query and manifest file to update a <code>datastore</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+```sql
+/*+ update */
+UPDATE awscc.iotanalytics.datastores
+SET PatchDocument = string('{{ {
+    "DatastoreStorage": datastore_storage,
+    "DatastorePartitions": datastore_partitions,
+    "FileFormatConfiguration": file_format_configuration,
+    "RetentionPeriod": retention_period,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ datastore_name }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## `DELETE` example
+
+```sql
+/*+ delete */
+DELETE FROM awscc.iotanalytics.datastores
+WHERE
+  Identifier = '{{ datastore_name }}' AND
+  region = '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## Additional Parameters
+
+Mutable resources in the Cloud Control provider support additional optional parameters which can be supplied with `INSERT`, `UPDATE`, or `DELETE` operations. These include:
+
+| Parameter | Description |
+|-----------|-------------|
+| <CopyableCode code="ClientToken" /> | <details><summary>A unique identifier to ensure the idempotency of the resource request.</summary>This allows the provider to accurately distinguish between retries and new requests.<br />A client token is valid for 36 hours once used.<br />After that, a resource request with the same client token is treated as a new request.<br />If you do not specify a client token, one is generated for inclusion in the request.</details> |
+| <CopyableCode code="RoleArn" /> | <details><summary>The ARN of the IAM role used to perform this resource operation.</summary>The role specified must have the permissions required for this operation.<br />If you do not specify a role, a temporary session is created using your AWS user credentials.</details> |
+| <CopyableCode code="TypeVersionId" /> | <details><summary>For private resource types, the type version to use in this resource operation.</summary>If you do not specify a resource version, the default version is used.</details> |
+
+## Permissions
+
+To operate on the <code>datastores</code> resource, the following permissions are required:
+
+<Tabs
+    defaultValue="create"
+    values={[
+      { label: 'Create', value: 'create', },
+      { label: 'Read', value: 'read', },
+      { label: 'Update', value: 'update', },
+      { label: 'Delete', value: 'delete', },
+      { label: 'List', value: 'list', },
+    ]
+}>
+<TabItem value="create">
+
+```json
+iotanalytics:CreateDatastore
+```
+
+</TabItem>
+<TabItem value="read">
+
+```json
+iotanalytics:DescribeDatastore,
+iotanalytics:ListTagsForResource
+```
+
+</TabItem>
+<TabItem value="update">
+
+```json
+iotanalytics:UpdateDatastore,
+iotanalytics:TagResource,
+iotanalytics:UntagResource
+```
+
+</TabItem>
+<TabItem value="delete">
+
+```json
+iotanalytics:DeleteDatastore
+```
+
+</TabItem>
+<TabItem value="list">
+
+```json
+iotanalytics:ListDatastores
+```
+
+</TabItem>
+</Tabs>
\ No newline at end of file
diff --git a/website/docs/services/iotanalytics/index.md b/website/docs/services/iotanalytics/index.md
index 07c979dab..1146fb23f 100644
--- a/website/docs/services/iotanalytics/index.md
+++ b/website/docs/services/iotanalytics/index.md
@@ -20,7 +20,7 @@ The iotanalytics service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -29,9 +29,11 @@ The iotanalytics service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
+<a href="/services/iotanalytics/channels/">channels</a><br />
 <a href="/services/iotanalytics/datasets/">datasets</a>
 </div>
 <div class="providerDocColumn">
+<a href="/services/iotanalytics/datastores/">datastores</a><br />
 <a href="/services/iotanalytics/pipelines/">pipelines</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/iotsitewise/access_policies/index.md b/website/docs/services/iotsitewise/access_policies/index.md
index 8db2c532c..0f90afef1 100644
--- a/website/docs/services/iotsitewise/access_policies/index.md
+++ b/website/docs/services/iotsitewise/access_policies/index.md
@@ -110,155 +110,24 @@ Creates, updates, deletes or gets an <code>access_policy</code> resource or list
       {
         "name": "portal",
         "type": "object",
-        "description": "Resource schema for AWS::IoTSiteWise::Portal",
+        "description": "A portal resource.",
         "children": [
           {
-            "name": "portal_auth_mode",
-            "type": "string",
-            "description": "The service to use to authenticate users to the portal. Choose from SSO or IAM. You can't change this value after you create a portal."
-          },
-          {
-            "name": "portal_arn",
-            "type": "string",
-            "description": "The ARN of the portal, which has the following format."
-          },
-          {
-            "name": "portal_client_id",
-            "type": "string",
-            "description": "The AWS SSO application generated client ID (used with AWS SSO APIs)."
-          },
-          {
-            "name": "portal_contact_email",
-            "type": "string",
-            "description": "The AWS administrator's contact email address."
-          },
-          {
-            "name": "portal_description",
-            "type": "string",
-            "description": "A description for the portal."
-          },
-          {
-            "name": "portal_id",
+            "name": "id",
             "type": "string",
             "description": "The ID of the portal."
-          },
-          {
-            "name": "portal_name",
-            "type": "string",
-            "description": "A friendly name for the portal."
-          },
-          {
-            "name": "portal_start_url",
-            "type": "string",
-            "description": "The public root URL for the AWS IoT AWS IoT SiteWise Monitor application portal."
-          },
-          {
-            "name": "portal_type",
-            "type": "string",
-            "description": "The type of portal"
-          },
-          {
-            "name": "portal_type_configuration",
-            "type": "object",
-            "description": "Map to associate detail of configuration related with a PortalType."
-          },
-          {
-            "name": "role_arn",
-            "type": "string",
-            "description": "The ARN of a service role that allows the portal's users to access your AWS IoT SiteWise resources on your behalf."
-          },
-          {
-            "name": "notification_sender_email",
-            "type": "string",
-            "description": "The email address that sends alarm notifications."
-          },
-          {
-            "name": "alarms",
-            "type": "object",
-            "description": "Contains the configuration information of an alarm created in an AWS IoT SiteWise Monitor portal. You can use the alarm to monitor an asset property and get notified when the asset property value is outside a specified range.",
-            "children": [
-              {
-                "name": "alarm_role_arn",
-                "type": "string",
-                "description": "The ARN of the IAM role that allows the alarm to perform actions and access AWS resources and services, such as AWS IoT Events."
-              },
-              {
-                "name": "notification_lambda_arn",
-                "type": "string",
-                "description": "The ARN of the AWS Lambda function that manages alarm notifications. For more information, see Managing alarm notifications in the AWS IoT Events Developer Guide."
-              }
-            ]
-          },
-          {
-            "name": "tags",
-            "type": "array",
-            "description": "A list of key-value pairs that contain metadata for the portal.",
-            "children": [
-              {
-                "name": "key",
-                "type": "string",
-                "description": ""
-              },
-              {
-                "name": "value",
-                "type": "string",
-                "description": ""
-              }
-            ]
           }
         ]
       },
       {
         "name": "project",
         "type": "object",
-        "description": "Resource schema for AWS::IoTSiteWise::Project",
+        "description": "A project resource.",
         "children": [
           {
-            "name": "portal_id",
-            "type": "string",
-            "description": "The ID of the portal in which to create the project."
-          },
-          {
-            "name": "project_id",
+            "name": "id",
             "type": "string",
             "description": "The ID of the project."
-          },
-          {
-            "name": "project_name",
-            "type": "string",
-            "description": "A friendly name for the project."
-          },
-          {
-            "name": "project_description",
-            "type": "string",
-            "description": "A description for the project."
-          },
-          {
-            "name": "project_arn",
-            "type": "string",
-            "description": "The ARN of the project."
-          },
-          {
-            "name": "asset_ids",
-            "type": "array",
-            "description": "The IDs of the assets to be associated to the project."
-          },
-          {
-            "name": "tags",
-            "type": "array",
-            "description": "A list of key-value pairs that contain metadata for the project.",
-            "children": [
-              {
-                "name": "key",
-                "type": "string",
-                "description": ""
-              },
-              {
-                "name": "value",
-                "type": "string",
-                "description": ""
-              }
-            ]
           }
         ]
       }
@@ -469,28 +338,9 @@ resources:
       - name: access_policy_resource
         value:
           portal:
-            portal_auth_mode: '{{ portal_auth_mode }}'
-            portal_contact_email: '{{ portal_contact_email }}'
-            portal_description: '{{ portal_description }}'
-            portal_name: '{{ portal_name }}'
-            portal_type: '{{ portal_type }}'
-            portal_type_configuration: {}
-            role_arn: '{{ role_arn }}'
-            notification_sender_email: '{{ notification_sender_email }}'
-            alarms:
-              alarm_role_arn: '{{ alarm_role_arn }}'
-              notification_lambda_arn: '{{ notification_lambda_arn }}'
-            tags:
-              - key: '{{ key }}'
-                value: '{{ value }}'
+            id: '{{ id }}'
           project:
-            portal_id: '{{ portal_id }}'
-            project_name: '{{ project_name }}'
-            project_description: '{{ project_description }}'
-            asset_ids:
-              - '{{ asset_ids[0] }}'
-            tags:
-              - null`}</CodeBlock>
+            id: '{{ id }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/iotwireless/fuota_tasks/index.md b/website/docs/services/iotwireless/fuota_tasks/index.md
index 73d51595f..f4acbc47d 100644
--- a/website/docs/services/iotwireless/fuota_tasks/index.md
+++ b/website/docs/services/iotwireless/fuota_tasks/index.md
@@ -60,24 +60,14 @@ Creates, updates, deletes or gets a <code>fuota_task</code> resource or lists <c
     "description": "FUOTA task LoRaWAN",
     "children": [
       {
-        "name": "rf_region",
+        "name": "start_time",
         "type": "string",
-        "description": "Multicast group LoRaWAN RF region"
+        "description": "FUOTA task LoRaWAN start time"
       },
       {
-        "name": "dl_class",
+        "name": "rf_region",
         "type": "string",
-        "description": "Multicast group LoRaWAN DL Class"
-      },
-      {
-        "name": "number_of_devices_requested",
-        "type": "integer",
-        "description": "Multicast group number of devices requested. Returned after successful read."
-      },
-      {
-        "name": "number_of_devices_in_group",
-        "type": "integer",
-        "description": "Multicast group number of devices in group. Returned after successful read."
+        "description": "FUOTA task LoRaWAN RF region"
       }
     ]
   },
@@ -363,10 +353,8 @@ resources:
         value: '{{ description }}'
       - name: lo_ra_wan
         value:
+          start_time: '{{ start_time }}'
           rf_region: '{{ rf_region }}'
-          dl_class: '{{ dl_class }}'
-          number_of_devices_requested: '{{ number_of_devices_requested }}'
-          number_of_devices_in_group: '{{ number_of_devices_in_group }}'
       - name: firmware_update_image
         value: '{{ firmware_update_image }}'
       - name: firmware_update_role
diff --git a/website/docs/services/iotwireless/network_analyzer_configurations/index.md b/website/docs/services/iotwireless/network_analyzer_configurations/index.md
index 7690dbcdf..885b3563e 100644
--- a/website/docs/services/iotwireless/network_analyzer_configurations/index.md
+++ b/website/docs/services/iotwireless/network_analyzer_configurations/index.md
@@ -94,12 +94,12 @@ Creates, updates, deletes or gets a <code>network_analyzer_configuration</code>
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/iotwireless/wireless_device_import_tasks/index.md b/website/docs/services/iotwireless/wireless_device_import_tasks/index.md
index c86a38547..365d50d6f 100644
--- a/website/docs/services/iotwireless/wireless_device_import_tasks/index.md
+++ b/website/docs/services/iotwireless/wireless_device_import_tasks/index.md
@@ -129,12 +129,12 @@ Creates, updates, deletes or gets a <code>wireless_device_import_task</code> res
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/ivs/playback_key_pairs/index.md b/website/docs/services/ivs/playback_key_pairs/index.md
index 6845afec7..12c623b12 100644
--- a/website/docs/services/ivs/playback_key_pairs/index.md
+++ b/website/docs/services/ivs/playback_key_pairs/index.md
@@ -72,12 +72,12 @@ Creates, updates, deletes or gets a <code>playback_key_pair</code> resource or l
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/ivs/public_keys/index.md b/website/docs/services/ivs/public_keys/index.md
index 983ea1b3e..06e66a30e 100644
--- a/website/docs/services/ivs/public_keys/index.md
+++ b/website/docs/services/ivs/public_keys/index.md
@@ -72,12 +72,12 @@ Creates, updates, deletes or gets a <code>public_key</code> resource or lists <c
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/ivs/recording_configurations/index.md b/website/docs/services/ivs/recording_configurations/index.md
index 1f8beb164..f382ed636 100644
--- a/website/docs/services/ivs/recording_configurations/index.md
+++ b/website/docs/services/ivs/recording_configurations/index.md
@@ -103,29 +103,27 @@ Creates, updates, deletes or gets a <code>recording_configuration</code> resourc
   {
     "name": "thumbnail_configuration",
     "type": "object",
-    "description": "A complex type that allows you to enable/disable the recording of thumbnails for individual participant recording and modify the interval at which thumbnails are generated for the live session.",
+    "description": "Recording Thumbnail Configuration.",
     "children": [
       {
-        "name": "participant_thumbnail_configuration",
-        "type": "object",
-        "description": "An object representing a configuration of thumbnails for recorded video from an individual participant.",
-        "children": [
-          {
-            "name": "recording_mode",
-            "type": "string",
-            "description": "Thumbnail recording mode. Default: DISABLED."
-          },
-          {
-            "name": "storage",
-            "type": "array",
-            "description": "Indicates the format in which thumbnails are recorded. SEQUENTIAL records all generated thumbnails in a serial manner, to the media/thumbnails/high directory. LATEST saves the latest thumbnail in media/latest_thumbnail/high/thumb.jpg and overwrites it at the interval specified by targetIntervalSeconds. You can enable both SEQUENTIAL and LATEST. Default: SEQUENTIAL."
-          },
-          {
-            "name": "target_interval_seconds",
-            "type": "integer",
-            "description": "The targeted thumbnail-generation interval in seconds. This is configurable only if recordingMode is INTERVAL. Default: 60."
-          }
-        ]
+        "name": "recording_mode",
+        "type": "string",
+        "description": "Thumbnail Recording Mode, which determines whether thumbnails are recorded at an interval or are disabled."
+      },
+      {
+        "name": "target_interval_seconds",
+        "type": "integer",
+        "description": "Target Interval Seconds defines the interval at which thumbnails are recorded. This field is required if RecordingMode is INTERVAL."
+      },
+      {
+        "name": "resolution",
+        "type": "string",
+        "description": "Resolution indicates the desired resolution of recorded thumbnails."
+      },
+      {
+        "name": "storage",
+        "type": "array",
+        "description": "Storage indicates the format in which thumbnails are recorded."
       }
     ]
   },
@@ -357,11 +355,11 @@ resources:
             value: '{{ value }}'
       - name: thumbnail_configuration
         value:
-          participant_thumbnail_configuration:
-            recording_mode: '{{ recording_mode }}'
-            storage:
-              - '{{ storage[0] }}'
-            target_interval_seconds: '{{ target_interval_seconds }}'
+          recording_mode: '{{ recording_mode }}'
+          target_interval_seconds: '{{ target_interval_seconds }}'
+          resolution: '{{ resolution }}'
+          storage:
+            - '{{ storage[0] }}'
       - name: rendition_configuration
         value:
           rendition_selection: '{{ rendition_selection }}'
diff --git a/website/docs/services/kafkaconnect/connectors/index.md b/website/docs/services/kafkaconnect/connectors/index.md
index e7f26e25e..b60b403ed 100644
--- a/website/docs/services/kafkaconnect/connectors/index.md
+++ b/website/docs/services/kafkaconnect/connectors/index.md
@@ -277,78 +277,17 @@ Creates, updates, deletes or gets a <code>connector</code> resource or lists <co
       {
         "name": "custom_plugin",
         "type": "object",
-        "description": "An example resource schema demonstrating some basic constructs and validation rules.",
+        "description": "Details about a custom plugin.",
         "children": [
-          {
-            "name": "name",
-            "type": "string",
-            "description": "The name of the custom plugin."
-          },
-          {
-            "name": "description",
-            "type": "string",
-            "description": "A summary description of the custom plugin."
-          },
           {
             "name": "custom_plugin_arn",
             "type": "string",
             "description": "The Amazon Resource Name (ARN) of the custom plugin to use."
           },
-          {
-            "name": "content_type",
-            "type": "string",
-            "description": "The type of the plugin file."
-          },
-          {
-            "name": "file_description",
-            "type": "object",
-            "description": "Details about the custom plugin file.",
-            "children": [
-              {
-                "name": "file_md5",
-                "type": "string",
-                "description": "The hex-encoded MD5 checksum of the custom plugin file. You can use it to validate the file."
-              },
-              {
-                "name": "file_size",
-                "type": "integer",
-                "description": "The size in bytes of the custom plugin file. You can use it to validate the file."
-              }
-            ]
-          },
-          {
-            "name": "location",
-            "type": "object",
-            "description": "Information about the location of a custom plugin.",
-            "children": [
-              {
-                "name": "s3_location",
-                "type": "object",
-                "description": "The S3 bucket Amazon Resource Name (ARN), file key, and object version of the plugin file stored in Amazon S3."
-              }
-            ]
-          },
           {
             "name": "revision",
             "type": "integer",
-            "description": "The revision of the custom plugin."
-          },
-          {
-            "name": "tags",
-            "type": "array",
-            "description": "An array of key-value pairs to apply to this resource.",
-            "children": [
-              {
-                "name": "key",
-                "type": "string",
-                "description": ""
-              },
-              {
-                "name": "value",
-                "type": "string",
-                "description": ""
-              }
-            ]
+            "description": "The revision of the custom plugin to use."
           }
         ]
       }
@@ -379,37 +318,17 @@ Creates, updates, deletes or gets a <code>connector</code> resource or lists <co
   {
     "name": "worker_configuration",
     "type": "object",
-    "description": "The configuration of the workers, which are the processes that run the connector logic.",
+    "description": "Specifies the worker configuration to use with the connector.",
     "children": [
-      {
-        "name": "name",
-        "type": "string",
-        "description": "The name of the worker configuration."
-      },
-      {
-        "name": "description",
-        "type": "string",
-        "description": "A summary description of the worker configuration."
-      },
-      {
-        "name": "worker_configuration_arn",
-        "type": "string",
-        "description": "The Amazon Resource Name (ARN) of the custom configuration."
-      },
-      {
-        "name": "properties_file_content",
-        "type": "string",
-        "description": "Base64 encoded contents of connect-distributed.properties file."
-      },
       {
         "name": "revision",
         "type": "integer",
-        "description": "The description of a revision of the worker configuration."
+        "description": "The revision of the worker configuration to use."
       },
       {
-        "name": "tags",
-        "type": "array",
-        "description": "A collection of tags associated with a resource"
+        "name": "worker_configuration_arn",
+        "type": "string",
+        "description": "The Amazon Resource Name (ARN) of the worker configuration to use."
       }
     ]
   },
@@ -698,29 +617,18 @@ resources:
       - name: plugins
         value:
           - custom_plugin:
-              name: '{{ name }}'
-              description: '{{ description }}'
-              content_type: '{{ content_type }}'
-              location:
-                s3_location:
-                  bucket_arn: '{{ bucket_arn }}'
-                  file_key: '{{ file_key }}'
-                  object_version: '{{ object_version }}'
-              tags:
-                - key: '{{ key }}'
-                  value: '{{ value }}'
+              custom_plugin_arn: '{{ custom_plugin_arn }}'
+              revision: '{{ revision }}'
       - name: service_execution_role_arn
         value: '{{ service_execution_role_arn }}'
       - name: tags
         value:
-          - null
+          - key: '{{ key }}'
+            value: '{{ value }}'
       - name: worker_configuration
         value:
-          name: '{{ name }}'
-          description: '{{ description }}'
-          properties_file_content: '{{ properties_file_content }}'
-          tags:
-            - null`}</CodeBlock>
+          revision: '{{ revision }}'
+          worker_configuration_arn: '{{ worker_configuration_arn }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/kafkaconnect/custom_plugins/index.md b/website/docs/services/kafkaconnect/custom_plugins/index.md
index 97d6204f8..6b1b4fa78 100644
--- a/website/docs/services/kafkaconnect/custom_plugins/index.md
+++ b/website/docs/services/kafkaconnect/custom_plugins/index.md
@@ -123,12 +123,12 @@ Creates, updates, deletes or gets a <code>custom_plugin</code> resource or lists
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/kendra/data_sources/index.md b/website/docs/services/kendra/data_sources/index.md
index 535445a55..6da1a4bb4 100644
--- a/website/docs/services/kendra/data_sources/index.md
+++ b/website/docs/services/kendra/data_sources/index.md
@@ -47,7 +47,7 @@ Creates, updates, deletes or gets a <code>data_source</code> resource or lists <
   {
     "name": "id",
     "type": "string",
-    "description": "Unique ID of index"
+    "description": "ID of data source"
   },
   {
     "name": "arn",
@@ -57,12 +57,12 @@ Creates, updates, deletes or gets a <code>data_source</code> resource or lists <
   {
     "name": "name",
     "type": "string",
-    "description": "Name of index"
+    "description": "Name of data source"
   },
   {
     "name": "index_id",
     "type": "string",
-    "description": "Unique ID of Index"
+    "description": "ID of Index"
   },
   {
     "name": "type",
@@ -902,7 +902,7 @@ Creates, updates, deletes or gets a <code>data_source</code> resource or lists <
   {
     "name": "description",
     "type": "string",
-    "description": ""
+    "description": "Description of data source"
   },
   {
     "name": "schedule",
@@ -912,7 +912,7 @@ Creates, updates, deletes or gets a <code>data_source</code> resource or lists <
   {
     "name": "role_arn",
     "type": "string",
-    "description": "Role Arn"
+    "description": "Role ARN"
   },
   {
     "name": "tags",
@@ -1051,12 +1051,12 @@ Creates, updates, deletes or gets a <code>data_source</code> resource or lists <
   {
     "name": "id",
     "type": "string",
-    "description": "Unique ID of index"
+    "description": "ID of data source"
   },
   {
     "name": "index_id",
     "type": "string",
-    "description": "Unique ID of Index"
+    "description": "ID of Index"
   },
   {
     "name": "region",
diff --git a/website/docs/services/kendra/faqs/index.md b/website/docs/services/kendra/faqs/index.md
index 8d54b9080..a26b386a5 100644
--- a/website/docs/services/kendra/faqs/index.md
+++ b/website/docs/services/kendra/faqs/index.md
@@ -47,7 +47,7 @@ Creates, updates, deletes or gets a <code>faq</code> resource or lists <code>faq
   {
     "name": "id",
     "type": "string",
-    "description": "Unique ID of index"
+    "description": "Unique ID of the FAQ"
   },
   {
     "name": "index_id",
@@ -131,7 +131,7 @@ Creates, updates, deletes or gets a <code>faq</code> resource or lists <code>faq
   {
     "name": "id",
     "type": "string",
-    "description": "Unique ID of index"
+    "description": "Unique ID of the FAQ"
   },
   {
     "name": "index_id",
diff --git a/website/docs/services/kinesis/streams/index.md b/website/docs/services/kinesis/streams/index.md
index ee8525d02..30a180c04 100644
--- a/website/docs/services/kinesis/streams/index.md
+++ b/website/docs/services/kinesis/streams/index.md
@@ -104,14 +104,14 @@ Creates, updates, deletes or gets a <code>stream</code> resource or lists <code>
     "description": "An arbitrary set of tags (key–value pairs) to associate with the Kinesis stream.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value for the tag. You can specify a value that is 0 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -344,8 +344,8 @@ resources:
           key_id: '{{ key_id }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/kinesisvideo/signaling_channels/index.md b/website/docs/services/kinesisvideo/signaling_channels/index.md
index 0c66df0c2..739506ada 100644
--- a/website/docs/services/kinesisvideo/signaling_channels/index.md
+++ b/website/docs/services/kinesisvideo/signaling_channels/index.md
@@ -77,7 +77,7 @@ Creates, updates, deletes or gets a <code>signaling_channel</code> resource or l
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. Specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. The following characters can be used: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value for the tag. Specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:.  The following characters can be used: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/kms/keys/index.md b/website/docs/services/kms/keys/index.md
index 4944bc8f9..419958ac2 100644
--- a/website/docs/services/kms/keys/index.md
+++ b/website/docs/services/kms/keys/index.md
@@ -95,14 +95,14 @@ Creates, updates, deletes or gets a <code>key</code> resource or lists <code>key
     "description": "<details><summary>Assigns one or more tags to the replica key.</summary>Tagging or untagging a KMS key can allow or deny permission to the KMS key. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/abac.html\">ABAC for</a> in the <i>Developer Guide</i>.<br />For information about tags in KMS, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/tagging-keys.html\">Tagging keys</a> in the <i>Developer Guide</i>. For information about tags in CloudFormation, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html\">Tag</a>.</details>",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "<details><summary>The key name of the tag. You can specify a value that's 1 to 128 Unicode characters in length and can't be prefixed with <code>aws:</code>. digits, whitespace, <code>_</code>, <code>.</code>, <code>:</code>, <code>/</code>, <code>=</code>, <code>+</code>, <code>@</code>, <code>-</code>, and <code>\"</code>.</summary>For more information, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html\">Tag</a>.</details>"
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "<details><summary>The value for the tag. You can specify a value that's 1 to 256 characters in length. You can use any of the following characters: the set of Unicode letters, digits, whitespace, <code>_</code>, <code>.</code>, <code>/</code>, <code>=</code>, <code>+</code>, and <code>-</code>.</summary>For more information, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html\">Tag</a>.</details>"
       }
     ]
   },
@@ -383,8 +383,8 @@ resources:
         value: '{{ pending_window_in_days }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'
+          - key: '{{ key }}'
+            value: '{{ value }}'
       - name: bypass_policy_lockout_safety_check
         value: '{{ bypass_policy_lockout_safety_check }}'
       - name: rotation_period_in_days
diff --git a/website/docs/services/lakeformation/principal_permissions/index.md b/website/docs/services/lakeformation/principal_permissions/index.md
index c03d95afe..340d567d0 100644
--- a/website/docs/services/lakeformation/principal_permissions/index.md
+++ b/website/docs/services/lakeformation/principal_permissions/index.md
@@ -48,7 +48,7 @@ Creates, updates, deletes or gets a <code>principal_permission</code> resource o
       {
         "name": "data_lake_principal_identifier",
         "type": "string",
-        "description": ""
+        "description": "An identifier for the LFlong principal."
       }
     ]
   },
@@ -60,51 +60,126 @@ Creates, updates, deletes or gets a <code>principal_permission</code> resource o
       {
         "name": "catalog",
         "type": "object",
-        "description": ""
+        "description": "The identifier for the Data Catalog. By default, the account ID. The Data Catalog is the persistent metadata store. It contains database definitions, table definitions, and other control information to manage your LFlong environment."
       },
       {
         "name": "database",
         "type": "object",
-        "description": "",
+        "description": "The database for the resource. Unique to the Data Catalog. A database is a set of associated table definitions organized into a logical group. You can Grant and Revoke database permissions to a principal.",
         "children": [
           {
             "name": "name",
             "type": "string",
-            "description": ""
+            "description": "The name of the database resource. Unique to the Data Catalog."
           }
         ]
       },
       {
         "name": "table",
         "type": "object",
-        "description": "",
+        "description": "The table for the resource. A table is a metadata definition that represents your data. You can Grant and Revoke table privileges to a principal.",
         "children": [
           {
             "name": "database_name",
             "type": "string",
-            "description": ""
+            "description": "The name of the database for the table. Unique to a Data Catalog. A database is a set of associated table definitions organized into a logical group. You can Grant and Revoke database privileges to a principal."
           },
           {
             "name": "table_wildcard",
             "type": "object",
-            "description": ""
+            "description": "<details><summary>A wildcard object representing every table under a database.</summary>At least one of <code>TableResource$Name</code> or <code>TableResource$TableWildcard</code> is required.</details>"
           }
         ]
       },
       {
         "name": "table_with_columns",
         "type": "object",
-        "description": "",
+        "description": "The table with columns for the resource. A principal with permissions to this resource can select metadata from the columns of a table in the Data Catalog and the underlying data in Amazon S3.",
         "children": [
           {
             "name": "database_name",
             "type": "string",
-            "description": ""
+            "description": "The name of the database for the table with columns resource. Unique to the Data Catalog. A database is a set of associated table definitions organized into a logical group. You can Grant and Revoke database privileges to a principal."
           },
           {
             "name": "column_names",
             "type": "array",
-            "description": ""
+            "description": "The list of column names for the table. At least one of <code>ColumnNames</code> or <code>ColumnWildcard</code> is required."
+          },
+          {
+            "name": "column_wildcard",
+            "type": "object",
+            "description": "A wildcard specified by a <code>ColumnWildcard</code> object. At least one of <code>ColumnNames</code> or <code>ColumnWildcard</code> is required."
+          }
+        ]
+      },
+      {
+        "name": "data_location",
+        "type": "object",
+        "description": "The location of an Amazon S3 path where permissions are granted or revoked.",
+        "children": [
+          {
+            "name": "resource_arn",
+            "type": "string",
+            "description": "The Amazon Resource Name (ARN) that uniquely identifies the data location resource."
+          }
+        ]
+      },
+      {
+        "name": "data_cells_filter",
+        "type": "object",
+        "description": "A data cell filter.",
+        "children": [
+          {
+            "name": "database_name",
+            "type": "string",
+            "description": "A database in the GLUDC."
+          }
+        ]
+      },
+      {
+        "name": "lf_tag",
+        "type": "object",
+        "description": "The LF-tag key and values attached to a resource.",
+        "children": [
+          {
+            "name": "tag_key",
+            "type": "string",
+            "description": "The key-name for the LF-tag."
+          },
+          {
+            "name": "tag_values",
+            "type": "array",
+            "description": "A list of possible values for the corresponding <code>TagKey</code> of an LF-tag key-value pair."
+          }
+        ]
+      },
+      {
+        "name": "lf_tag_policy",
+        "type": "object",
+        "description": "A list of LF-tag conditions that define a resource's LF-tag policy.",
+        "children": [
+          {
+            "name": "resource_type",
+            "type": "string",
+            "description": "The resource type for which the LF-tag policy applies."
+          },
+          {
+            "name": "expression",
+            "type": "array",
+            "description": "A list of LF-tag conditions that apply to the resource's LF-tag policy.",
+            "children": [
+              {
+                "name": "tag_key",
+                "type": "string",
+                "description": "The key-name for the LF-tag."
+              },
+              {
+                "name": "tag_values",
+                "type": "array",
+                "description": "A list of possible values of the corresponding <code>TagKey</code> of an LF-tag key-value pair."
+              }
+            ]
           }
         ]
       }
@@ -291,6 +366,27 @@ resources:
             name: null
             column_names:
               - null
+            column_wildcard:
+              excluded_column_names: null
+          data_location:
+            catalog_id: null
+            resource_arn: '{{ resource_arn }}'
+          data_cells_filter:
+            table_catalog_id: null
+            database_name: null
+            table_name: null
+            name: null
+          lf_tag:
+            catalog_id: null
+            tag_key: null
+            tag_values:
+              - '{{ tag_values[0] }}'
+          lf_tag_policy:
+            catalog_id: null
+            resource_type: '{{ resource_type }}'
+            expression:
+              - tag_key: '{{ tag_key }}'
+                tag_values: null
       - name: permissions
         value:
           - '{{ permissions[0] }}'
diff --git a/website/docs/services/lambda/aliases/index.md b/website/docs/services/lambda/aliases/index.md
index e480df750..5340e14d2 100644
--- a/website/docs/services/lambda/aliases/index.md
+++ b/website/docs/services/lambda/aliases/index.md
@@ -62,7 +62,7 @@ Creates, updates, deletes or gets an <code>alias</code> resource or lists <code>
       {
         "name": "provisioned_concurrent_executions",
         "type": "integer",
-        "description": "The amount of provisioned concurrency to allocate for the version."
+        "description": "The amount of provisioned concurrency to allocate for the alias."
       }
     ]
   },
diff --git a/website/docs/services/lambda/code_signing_configs/index.md b/website/docs/services/lambda/code_signing_configs/index.md
index 16c6e45f8..fd3a2030f 100644
--- a/website/docs/services/lambda/code_signing_configs/index.md
+++ b/website/docs/services/lambda/code_signing_configs/index.md
@@ -89,14 +89,14 @@ Creates, updates, deletes or gets a <code>code_signing_config</code> resource or
     "description": "A list of tags to apply to CodeSigningConfig resource",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The value for this tag."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The key for this tag."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -302,8 +302,8 @@ resources:
           untrusted_artifact_on_deployment: '{{ untrusted_artifact_on_deployment }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/lambda/event_invoke_configs/index.md b/website/docs/services/lambda/event_invoke_configs/index.md
index ce81fad6d..d27144571 100644
--- a/website/docs/services/lambda/event_invoke_configs/index.md
+++ b/website/docs/services/lambda/event_invoke_configs/index.md
@@ -47,7 +47,7 @@ Creates, updates, deletes or gets an <code>event_invoke_config</code> resource o
   {
     "name": "destination_config",
     "type": "object",
-    "description": "A configuration object that specifies the destination of an event after Lambda processes it. For more information, see <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/invocation-async-retain-records.html#invocation-async-destinations\">Adding a destination</a>.",
+    "description": "A destination for events after they have been sent to a function for processing.",
     "children": [
       {
         "name": "on_failure",
@@ -57,7 +57,19 @@ Creates, updates, deletes or gets an <code>event_invoke_config</code> resource o
           {
             "name": "destination",
             "type": "string",
-            "description": "<details><summary>The Amazon Resource Name (ARN) of the destination resource.</summary>To retain records of unsuccessful <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/invocation-async.html#invocation-async-destinations\">asynchronous invocations</a>, you can configure an Amazon SNS topic, Amazon SQS queue, Amazon S3 bucket, Lambda function, or Amazon EventBridge event bus as the destination.<br />To retain records of failed invocations from <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/with-kinesis.html\">Kinesis</a>, <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/with-ddb.html\">DynamoDB</a>, <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/with-kafka.html#services-smaa-onfailure-destination\">self-managed Kafka</a> or <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/with-msk.html#services-msk-onfailure-destination\">Amazon MSK</a>, you can configure an Amazon SNS topic, Amazon SQS queue, or Amazon S3 bucket as the destination.</details>"
+            "description": "The Amazon Resource Name (ARN) of the destination resource."
+          }
+        ]
+      },
+      {
+        "name": "on_success",
+        "type": "object",
+        "description": "The destination configuration for successful invocations.",
+        "children": [
+          {
+            "name": "destination",
+            "type": "string",
+            "description": "The Amazon Resource Name (ARN) of the destination resource."
           }
         ]
       }
@@ -287,6 +299,8 @@ resources:
         value:
           on_failure:
             destination: '{{ destination }}'
+          on_success:
+            destination: '{{ destination }}'
       - name: function_name
         value: '{{ function_name }}'
       - name: maximum_event_age_in_seconds
diff --git a/website/docs/services/lambda/event_source_mappings/index.md b/website/docs/services/lambda/event_source_mappings/index.md
index 35795755b..d471e4abd 100644
--- a/website/docs/services/lambda/event_source_mappings/index.md
+++ b/website/docs/services/lambda/event_source_mappings/index.md
@@ -158,14 +158,14 @@ Creates, updates, deletes or gets an <code>event_source_mapping</code> resource
     "description": "<details><summary>A list of tags to add to the event source mapping.</summary>You must have the <code>lambda:TagResource</code>, <code>lambda:UntagResource</code>, and <code>lambda:ListTags</code> permissions for your <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_terms-and-concepts.html\">principal</a> to manage the CFN stack. If you don't have these permissions, there might be unexpected behavior with stack-level tags propagating to the resource during resource creation and update.</details>",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The value for this tag."
+        "description": "The key for this tag."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The key for this tag."
+        "description": "The value for this tag."
       }
     ]
   },
@@ -698,8 +698,8 @@ resources:
         value: null
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'
+          - key: '{{ key }}'
+            value: '{{ value }}'
       - name: topics
         value:
           - '{{ topics[0] }}'
diff --git a/website/docs/services/lex/bot_aliases/index.md b/website/docs/services/lex/bot_aliases/index.md
index 8c1678e97..30cf4d0bd 100644
--- a/website/docs/services/lex/bot_aliases/index.md
+++ b/website/docs/services/lex/bot_aliases/index.md
@@ -102,32 +102,8 @@ Creates, updates, deletes or gets a <code>bot_alias</code> resource or lists <co
   },
   {
     "name": "bot_version",
-    "type": "object",
-    "description": "A version is a numbered snapshot of your work that you can publish for use in different parts of your workflow, such as development, beta deployment, and production.",
-    "children": [
-      {
-        "name": "description",
-        "type": "string",
-        "description": "A description of the version. Use the description to help identify the version in lists."
-      },
-      {
-        "name": "bot_version_locale_specification",
-        "type": "array",
-        "description": "Specifies the locales that Amazon Lex adds to this version. You can choose the Draft version or any other previously published version for each locale.",
-        "children": [
-          {
-            "name": "locale_id",
-            "type": "string",
-            "description": "The identifier of the language and locale that the bot will be used in."
-          },
-          {
-            "name": "bot_version_locale_details",
-            "type": "object",
-            "description": "The version of a bot used for a bot locale."
-          }
-        ]
-      }
-    ]
+    "type": "string",
+    "description": "The version of a bot."
   },
   {
     "name": "conversation_log_settings",
@@ -187,7 +163,7 @@ Creates, updates, deletes or gets a <code>bot_alias</code> resource or lists <co
   {
     "name": "description",
     "type": "string",
-    "description": "A description of the version. Use the description to help identify the version in lists."
+    "description": "A description of the bot alias. Use the description to help identify the bot alias in lists."
   },
   {
     "name": "sentiment_analysis_settings",
@@ -439,13 +415,7 @@ resources:
       - name: bot_alias_name
         value: '{{ bot_alias_name }}'
       - name: bot_version
-        value:
-          bot_id: null
-          description: '{{ description }}'
-          bot_version_locale_specification:
-            - locale_id: '{{ locale_id }}'
-              bot_version_locale_details:
-                source_bot_version: null
+        value: '{{ bot_version }}'
       - name: conversation_log_settings
         value:
           audio_log_settings:
@@ -462,7 +432,7 @@ resources:
                   log_prefix: '{{ log_prefix }}'
               enabled: '{{ enabled }}'
       - name: description
-        value: null
+        value: '{{ description }}'
       - name: sentiment_analysis_settings
         value:
           detect_sentiment: '{{ detect_sentiment }}'
diff --git a/website/docs/services/lex/bot_versions/index.md b/website/docs/services/lex/bot_versions/index.md
index a89fad39b..fbee7e34d 100644
--- a/website/docs/services/lex/bot_versions/index.md
+++ b/website/docs/services/lex/bot_versions/index.md
@@ -51,32 +51,8 @@ Creates, updates, deletes or gets a <code>bot_version</code> resource or lists <
   },
   {
     "name": "bot_version",
-    "type": "object",
-    "description": "A version is a numbered snapshot of your work that you can publish for use in different parts of your workflow, such as development, beta deployment, and production.",
-    "children": [
-      {
-        "name": "description",
-        "type": "string",
-        "description": "A description of the version. Use the description to help identify the version in lists."
-      },
-      {
-        "name": "bot_version_locale_specification",
-        "type": "array",
-        "description": "Specifies the locales that Amazon Lex adds to this version. You can choose the Draft version or any other previously published version for each locale.",
-        "children": [
-          {
-            "name": "locale_id",
-            "type": "string",
-            "description": "The identifier of the language and locale that the bot will be used in."
-          },
-          {
-            "name": "bot_version_locale_details",
-            "type": "object",
-            "description": "The version of a bot used for a bot locale."
-          }
-        ]
-      }
-    ]
+    "type": "string",
+    "description": "The version of a bot."
   },
   {
     "name": "description",
@@ -117,32 +93,8 @@ Creates, updates, deletes or gets a <code>bot_version</code> resource or lists <
   },
   {
     "name": "bot_version",
-    "type": "object",
-    "description": "A version is a numbered snapshot of your work that you can publish for use in different parts of your workflow, such as development, beta deployment, and production.",
-    "children": [
-      {
-        "name": "description",
-        "type": "string",
-        "description": "A description of the version. Use the description to help identify the version in lists."
-      },
-      {
-        "name": "bot_version_locale_specification",
-        "type": "array",
-        "description": "Specifies the locales that Amazon Lex adds to this version. You can choose the Draft version or any other previously published version for each locale.",
-        "children": [
-          {
-            "name": "locale_id",
-            "type": "string",
-            "description": "The identifier of the language and locale that the bot will be used in."
-          },
-          {
-            "name": "bot_version_locale_details",
-            "type": "object",
-            "description": "The version of a bot used for a bot locale."
-          }
-        ]
-      }
-    ]
+    "type": "string",
+    "description": "The version of a bot."
   },
   {
     "name": "region",
@@ -321,10 +273,7 @@ resources:
         value:
           - locale_id: '{{ locale_id }}'
             bot_version_locale_details:
-              source_bot_version:
-                bot_id: null
-                description: null
-                bot_version_locale_specification: null`}</CodeBlock>
+              source_bot_version: '{{ source_bot_version }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/lex/bots/index.md b/website/docs/services/lex/bots/index.md
index ffc94467f..18cd82c0a 100644
--- a/website/docs/services/lex/bots/index.md
+++ b/website/docs/services/lex/bots/index.md
@@ -47,7 +47,7 @@ Creates, updates, deletes or gets a <code>bot</code> resource or lists <code>bot
   {
     "name": "id",
     "type": "string",
-    "description": "Unique ID of resource"
+    "description": ""
   },
   {
     "name": "arn",
@@ -57,12 +57,12 @@ Creates, updates, deletes or gets a <code>bot</code> resource or lists <code>bot
   {
     "name": "name",
     "type": "string",
-    "description": "A unique identifier for a resource."
+    "description": ""
   },
   {
     "name": "description",
     "type": "string",
-    "description": "A description of the version. Use the description to help identify the version in lists."
+    "description": "A description of the resource"
   },
   {
     "name": "role_arn",
@@ -106,7 +106,7 @@ Creates, updates, deletes or gets a <code>bot</code> resource or lists <code>bot
       {
         "name": "locale_id",
         "type": "string",
-        "description": "The identifier of the language and locale that the bot will be used in."
+        "description": ""
       },
       {
         "name": "voice_settings",
@@ -600,12 +600,12 @@ Creates, updates, deletes or gets a <code>bot</code> resource or lists <code>bot
       {
         "name": "key",
         "type": "string",
-        "description": "A string used to identify this tag"
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "A string containing the value for the tag"
+        "description": ""
       }
     ]
   },
@@ -627,27 +627,27 @@ Creates, updates, deletes or gets a <code>bot</code> resource or lists <code>bot
       {
         "name": "bot_alias_locale_settings",
         "type": "array",
-        "description": "A list of bot alias locale settings to add to the bot alias.",
+        "description": "",
         "children": [
           {
             "name": "locale_id",
             "type": "string",
-            "description": "A string used to identify the locale"
+            "description": ""
           },
           {
             "name": "bot_alias_locale_setting",
             "type": "object",
-            "description": "You can use this parameter to specify a specific Lambda function to run different functions in different locales.",
+            "description": "",
             "children": [
               {
                 "name": "code_hook_specification",
                 "type": "object",
-                "description": "Contains information about code hooks that Amazon Lex calls during a conversation."
+                "description": ""
               },
               {
                 "name": "enabled",
                 "type": "boolean",
-                "description": "Whether the Lambda code hook is enabled"
+                "description": ""
               }
             ]
           }
@@ -656,17 +656,17 @@ Creates, updates, deletes or gets a <code>bot</code> resource or lists <code>bot
       {
         "name": "conversation_log_settings",
         "type": "object",
-        "description": "Contains information about code hooks that Amazon Lex calls during a conversation.",
+        "description": "",
         "children": [
           {
             "name": "audio_log_settings",
             "type": "array",
-            "description": "List of audio log settings",
+            "description": "",
             "children": [
               {
                 "name": "destination",
                 "type": "object",
-                "description": "The location of audio log files collected when conversation logging is enabled for a bot."
+                "description": ""
               },
               {
                 "name": "enabled",
@@ -678,12 +678,12 @@ Creates, updates, deletes or gets a <code>bot</code> resource or lists <code>bot
           {
             "name": "text_log_settings",
             "type": "array",
-            "description": "List of text log settings",
+            "description": "",
             "children": [
               {
                 "name": "destination",
                 "type": "object",
-                "description": "Defines the Amazon CloudWatch Logs destination log group for conversation text logs."
+                "description": ""
               },
               {
                 "name": "enabled",
@@ -733,7 +733,7 @@ Creates, updates, deletes or gets a <code>bot</code> resource or lists <code>bot
   {
     "name": "id",
     "type": "string",
-    "description": "Unique ID of resource"
+    "description": ""
   },
   {
     "name": "region",
diff --git a/website/docs/services/lightsail/containers/index.md b/website/docs/services/lightsail/containers/index.md
index 0613b403b..0bdca8a29 100644
--- a/website/docs/services/lightsail/containers/index.md
+++ b/website/docs/services/lightsail/containers/index.md
@@ -92,71 +92,51 @@ Creates, updates, deletes or gets a <code>container</code> resource or lists <co
         "description": "An object that describes the configuration for the containers of the deployment.",
         "children": [
           {
-            "name": "service_name",
-            "type": "string",
-            "description": "The name for the container service."
-          },
-          {
-            "name": "power",
-            "type": "string",
-            "description": "The power specification for the container service."
-          },
-          {
-            "name": "container_arn",
+            "name": "container_name",
             "type": "string",
-            "description": ""
+            "description": "The name of the container."
           },
           {
-            "name": "scale",
-            "type": "integer",
-            "description": "The scale specification for the container service."
-          },
-          {
-            "name": "public_domain_names",
+            "name": "command",
             "type": "array",
-            "description": "The public domain names to use with the container service, such as example.com and www.example.com."
-          },
-          {
-            "name": "is_disabled",
-            "type": "boolean",
-            "description": "A Boolean value to indicate whether the container service is disabled."
+            "description": "The launch command for the container."
           },
           {
-            "name": "private_registry_access",
-            "type": "object",
-            "description": "A Boolean value to indicate whether the container service has access to private container image repositories, such as Amazon Elastic Container Registry (Amazon ECR) private repositories.",
+            "name": "environment",
+            "type": "array",
+            "description": "The environment variables of the container.",
             "children": [
               {
-                "name": "ecr_image_puller_role",
-                "type": "object",
-                "description": "An object to describe a request to activate or deactivate the role that you can use to grant an Amazon Lightsail container service access to Amazon Elastic Container Registry (Amazon ECR) private repositories."
+                "name": "variable",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "value",
+                "type": "string",
+                "description": ""
               }
             ]
           },
           {
-            "name": "url",
+            "name": "image",
             "type": "string",
-            "description": "The publicly accessible URL of the container service."
+            "description": "The name of the image used for the container."
           },
           {
-            "name": "principal_arn",
-            "type": "string",
-            "description": "The principal ARN of the container service."
-          },
-          {
-            "name": "tags",
+            "name": "ports",
             "type": "array",
-            "description": "An array of key-value pairs to apply to this resource.",
+            "description": "The open firewall ports of the container.",
             "children": [
               {
-                "name": "key",
+                "name": "port",
                 "type": "string",
-                "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+                "description": ""
               },
               {
-                "name": "value",
+                "name": "protocol",
                 "type": "string",
-                "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+                "description": ""
               }
             ]
           }
@@ -496,20 +476,16 @@ resources:
       - name: container_service_deployment
         value:
           containers:
-            - service_name: '{{ service_name }}'
-              power: '{{ power }}'
-              scale: '{{ scale }}'
-              public_domain_names:
-                - null
-              container_service_deployment: null
-              is_disabled: '{{ is_disabled }}'
-              private_registry_access:
-                ecr_image_puller_role:
-                  is_active: '{{ is_active }}'
-                  principal_arn: '{{ principal_arn }}'
-              tags:
-                - key: '{{ key }}'
+            - container_name: '{{ container_name }}'
+              command:
+                - '{{ command[0] }}'
+              environment:
+                - variable: '{{ variable }}'
                   value: '{{ value }}'
+              image: '{{ image }}'
+              ports:
+                - port: '{{ port }}'
+                  protocol: '{{ protocol }}'
           public_endpoint:
             container_name: '{{ container_name }}'
             container_port: '{{ container_port }}'
@@ -523,10 +499,14 @@ resources:
       - name: is_disabled
         value: '{{ is_disabled }}'
       - name: private_registry_access
-        value: null
+        value:
+          ecr_image_puller_role:
+            is_active: '{{ is_active }}'
+            principal_arn: '{{ principal_arn }}'
       - name: tags
         value:
-          - null`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/lightsail/disks/index.md b/website/docs/services/lightsail/disks/index.md
new file mode 100644
index 000000000..794ecc6f0
--- /dev/null
+++ b/website/docs/services/lightsail/disks/index.md
@@ -0,0 +1,526 @@
+---
+title: disks
+hide_title: false
+hide_table_of_contents: false
+keywords:
+  - disks
+  - lightsail
+  - aws
+  - stackql
+  - infrastructure-as-code
+  - configuration-as-data
+  - cloud inventory
+description: Query, deploy and manage AWS resources using SQL
+custom_edit_url: null
+image: /img/stackql-aws-provider-featured-image.png
+---
+
+import CodeBlock from '@theme/CodeBlock';
+import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
+
+Creates, updates, deletes or gets a <code>disk</code> resource or lists <code>disks</code> in a region
+
+## Overview
+<table>
+<tbody>
+<tr><td><b>Name</b></td><td><code>disks</code></td></tr>
+<tr><td><b>Type</b></td><td>Resource</td></tr>
+<tr><td><b>Description</b></td><td>Resource Type definition for AWS::Lightsail::Disk</td></tr>
+<tr><td><b>Id</b></td><td><CopyableCode code="awscc.lightsail.disks" /></td></tr>
+</tbody>
+</table>
+
+## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "disk_name",
+    "type": "string",
+    "description": "The names to use for your new Lightsail disk."
+  },
+  {
+    "name": "disk_arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "support_code",
+    "type": "string",
+    "description": "Support code to help identify any issues"
+  },
+  {
+    "name": "availability_zone",
+    "type": "string",
+    "description": "The Availability Zone in which to create your instance. Use the following format: us-east-2a (case sensitive). Be sure to add the include Availability Zones parameter to your request."
+  },
+  {
+    "name": "location",
+    "type": "object",
+    "description": "Location of a resource.",
+    "children": [
+      {
+        "name": "availability_zone",
+        "type": "string",
+        "description": "The Availability Zone in which to create your disk. Use the following format: us-east-2a (case sensitive). Be sure to add the include Availability Zones parameter to your request."
+      },
+      {
+        "name": "region_name",
+        "type": "string",
+        "description": "The Region Name in which to create your disk."
+      }
+    ]
+  },
+  {
+    "name": "resource_type",
+    "type": "string",
+    "description": "Resource type of Lightsail instance."
+  },
+  {
+    "name": "tags",
+    "type": "array",
+    "description": "An array of key-value pairs to apply to this resource.",
+    "children": [
+      {
+        "name": "key",
+        "type": "string",
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+      },
+      {
+        "name": "value",
+        "type": "string",
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+      }
+    ]
+  },
+  {
+    "name": "add_ons",
+    "type": "array",
+    "description": "An array of objects representing the add-ons to enable for the new instance.",
+    "children": [
+      {
+        "name": "add_on_type",
+        "type": "string",
+        "description": "The add-on type"
+      },
+      {
+        "name": "status",
+        "type": "string",
+        "description": "Status of the Addon"
+      },
+      {
+        "name": "auto_snapshot_add_on_request",
+        "type": "object",
+        "description": "An object that represents additional parameters when enabling or modifying the automatic snapshot add-on",
+        "children": [
+          {
+            "name": "snapshot_time_of_day",
+            "type": "string",
+            "description": "The daily time when an automatic snapshot will be created."
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "state",
+    "type": "string",
+    "description": "State of the Lightsail disk"
+  },
+  {
+    "name": "attachment_state",
+    "type": "string",
+    "description": "Attachment State of the Lightsail disk"
+  },
+  {
+    "name": "size_in_gb",
+    "type": "integer",
+    "description": "Size of the Lightsail disk"
+  },
+  {
+    "name": "iops",
+    "type": "integer",
+    "description": "Iops of the Lightsail disk"
+  },
+  {
+    "name": "is_attached",
+    "type": "boolean",
+    "description": "Check is Disk is attached state"
+  },
+  {
+    "name": "path",
+    "type": "string",
+    "description": "Path of the  attached Disk"
+  },
+  {
+    "name": "attached_to",
+    "type": "string",
+    "description": "Name of the attached Lightsail Instance"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "disk_name",
+    "type": "string",
+    "description": "The names to use for your new Lightsail disk."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
+
+For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-disk.html"><code>AWS::Lightsail::Disk</code></a>.
+
+## Methods
+
+<table>
+<tbody>
+  <tr>
+    <th>Name</th>
+    <th>Resource</th>
+    <th>Accessible by</th>
+    <th>Required Params</th>
+  </tr>
+  <tr>
+    <td><CopyableCode code="create_resource" /></td>
+    <td><code>disks</code></td>
+    <td><code>INSERT</code></td>
+    <td><CopyableCode code="DiskName, SizeInGb, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="delete_resource" /></td>
+    <td><code>disks</code></td>
+    <td><code>DELETE</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="update_resource" /></td>
+    <td><code>disks</code></td>
+    <td><code>UPDATE</code></td>
+    <td><CopyableCode code="Identifier, PatchDocument, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="list_resources" /></td>
+    <td><code>disks_list_only</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="get_resource" /></td>
+    <td><code>disks</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+</tbody>
+</table>
+
+## `SELECT` examples
+
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+Gets all properties from an individual <code>disk</code>.
+```sql
+SELECT
+  region,
+  disk_name,
+  disk_arn,
+  support_code,
+  availability_zone,
+  location,
+  resource_type,
+  tags,
+  add_ons,
+  state,
+  attachment_state,
+  size_in_gb,
+  iops,
+  is_attached,
+  path,
+  attached_to
+FROM awscc.lightsail.disks
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ disk_name }}';
+```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>disks</code> in a region.
+```sql
+SELECT
+  region,
+  disk_name
+FROM awscc.lightsail.disks_list_only
+WHERE
+  region = '{{ region }}';
+```
+</TabItem>
+</Tabs>
+
+## `INSERT` example
+
+Use the following StackQL query and manifest file to create a new <code>disk</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+<Tabs
+    defaultValue="required"
+    values={[
+      { label: 'Required Properties', value: 'required', },
+      { label: 'All Properties', value: 'all', },
+      { label: 'Manifest', value: 'manifest', },
+    ]
+}>
+<TabItem value="required">
+
+```sql
+/*+ create */
+INSERT INTO awscc.lightsail.disks (
+  DiskName,
+  SizeInGb,
+  region
+)
+SELECT
+  '{{ disk_name }}',
+  '{{ size_in_gb }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="all">
+
+```sql
+/*+ create */
+INSERT INTO awscc.lightsail.disks (
+  DiskName,
+  AvailabilityZone,
+  Location,
+  Tags,
+  AddOns,
+  SizeInGb,
+  region
+)
+SELECT
+  '{{ disk_name }}',
+  '{{ availability_zone }}',
+  '{{ location }}',
+  '{{ tags }}',
+  '{{ add_ons }}',
+  '{{ size_in_gb }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="manifest">
+
+<CodeBlock language="yaml">{`version: 1
+name: stack name
+description: stack description
+providers:
+  - aws
+globals:
+  - name: region
+    value: '{{ vars.AWS_REGION }}'
+resources:
+  - name: disk
+    props:
+      - name: disk_name
+        value: '{{ disk_name }}'
+      - name: availability_zone
+        value: '{{ availability_zone }}'
+      - name: location
+        value:
+          availability_zone: '{{ availability_zone }}'
+          region_name: '{{ region_name }}'
+      - name: tags
+        value:
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: add_ons
+        value:
+          - add_on_type: '{{ add_on_type }}'
+            status: '{{ status }}'
+            auto_snapshot_add_on_request:
+              snapshot_time_of_day: '{{ snapshot_time_of_day }}'
+      - name: size_in_gb
+        value: '{{ size_in_gb }}'`}</CodeBlock>
+
+</TabItem>
+</Tabs>
+
+## `UPDATE` example
+
+Use the following StackQL query and manifest file to update a <code>disk</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+```sql
+/*+ update */
+UPDATE awscc.lightsail.disks
+SET PatchDocument = string('{{ {
+    "Tags": tags,
+    "AddOns": add_ons
+} | generate_patch_document }}')
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ disk_name }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## `DELETE` example
+
+```sql
+/*+ delete */
+DELETE FROM awscc.lightsail.disks
+WHERE
+  Identifier = '{{ disk_name }}' AND
+  region = '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## Additional Parameters
+
+Mutable resources in the Cloud Control provider support additional optional parameters which can be supplied with `INSERT`, `UPDATE`, or `DELETE` operations. These include:
+
+| Parameter | Description |
+|-----------|-------------|
+| <CopyableCode code="ClientToken" /> | <details><summary>A unique identifier to ensure the idempotency of the resource request.</summary>This allows the provider to accurately distinguish between retries and new requests.<br />A client token is valid for 36 hours once used.<br />After that, a resource request with the same client token is treated as a new request.<br />If you do not specify a client token, one is generated for inclusion in the request.</details> |
+| <CopyableCode code="RoleArn" /> | <details><summary>The ARN of the IAM role used to perform this resource operation.</summary>The role specified must have the permissions required for this operation.<br />If you do not specify a role, a temporary session is created using your AWS user credentials.</details> |
+| <CopyableCode code="TypeVersionId" /> | <details><summary>For private resource types, the type version to use in this resource operation.</summary>If you do not specify a resource version, the default version is used.</details> |
+
+## Permissions
+
+To operate on the <code>disks</code> resource, the following permissions are required:
+
+<Tabs
+    defaultValue="create"
+    values={[
+      { label: 'Create', value: 'create', },
+      { label: 'Read', value: 'read', },
+      { label: 'Delete', value: 'delete', },
+      { label: 'List', value: 'list', },
+      { label: 'Update', value: 'update', },
+    ]
+}>
+<TabItem value="create">
+
+```json
+lightsail:CreateDisk,
+lightsail:EnableAddOn,
+lightsail:DisableAddOn,
+lightsail:GetDisk,
+lightsail:GetDisks,
+lightsail:GetRegions,
+lightsail:TagResource,
+lightsail:UntagResource
+```
+
+</TabItem>
+<TabItem value="read">
+
+```json
+lightsail:GetDisk,
+lightsail:GetDisks
+```
+
+</TabItem>
+<TabItem value="delete">
+
+```json
+lightsail:GetDisk,
+lightsail:GetDisks,
+lightsail:DeleteDisk
+```
+
+</TabItem>
+<TabItem value="list">
+
+```json
+lightsail:GetDisks
+```
+
+</TabItem>
+<TabItem value="update">
+
+```json
+lightsail:GetDisk,
+lightsail:GetDisks,
+lightsail:EnableAddOn,
+lightsail:DisableAddOn,
+lightsail:TagResource,
+lightsail:UntagResource
+```
+
+</TabItem>
+</Tabs>
\ No newline at end of file
diff --git a/website/docs/services/lightsail/domains/index.md b/website/docs/services/lightsail/domains/index.md
index ead67f7d7..800f3da70 100644
--- a/website/docs/services/lightsail/domains/index.md
+++ b/website/docs/services/lightsail/domains/index.md
@@ -126,12 +126,12 @@ Creates, updates, deletes or gets a <code>domain</code> resource or lists <code>
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key name of the tag."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value for the tag."
       }
     ]
   },
diff --git a/website/docs/services/lightsail/index.md b/website/docs/services/lightsail/index.md
index bf75753c8..588467402 100644
--- a/website/docs/services/lightsail/index.md
+++ b/website/docs/services/lightsail/index.md
@@ -20,7 +20,7 @@ The lightsail service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>12</b></span><br />
+<span>total resources:&nbsp;<b>13</b></span><br />
 </div>
 </div>
 
@@ -34,6 +34,7 @@ The lightsail service documentation.
 <a href="/services/lightsail/certificates/">certificates</a><br />
 <a href="/services/lightsail/containers/">containers</a><br />
 <a href="/services/lightsail/databases/">databases</a><br />
+<a href="/services/lightsail/disks/">disks</a><br />
 <a href="/services/lightsail/distributions/">distributions</a>
 </div>
 <div class="providerDocColumn">
diff --git a/website/docs/services/lightsail/instances/index.md b/website/docs/services/lightsail/instances/index.md
index 67fbd40ce..d33af6f5e 100644
--- a/website/docs/services/lightsail/instances/index.md
+++ b/website/docs/services/lightsail/instances/index.md
@@ -77,17 +77,17 @@ Creates, updates, deletes or gets an <code>instance</code> resource or lists <co
   {
     "name": "location",
     "type": "object",
-    "description": "The region name and Availability Zone where you created the snapshot.",
+    "description": "Location of a resource.",
     "children": [
       {
         "name": "availability_zone",
         "type": "string",
-        "description": "The Availability Zone. Follows the format us-east-2a (case-sensitive)."
+        "description": "The Availability Zone in which to create your instance. Use the following format: us-east-2a (case sensitive). Be sure to add the include Availability Zones parameter to your request."
       },
       {
         "name": "region_name",
         "type": "string",
-        "description": "The AWS Region name."
+        "description": "The Region Name in which to create your instance."
       }
     ]
   },
diff --git a/website/docs/services/logs/deliveries/index.md b/website/docs/services/logs/deliveries/index.md
index e6025e012..05db3eaa5 100644
--- a/website/docs/services/logs/deliveries/index.md
+++ b/website/docs/services/logs/deliveries/index.md
@@ -72,12 +72,12 @@ Creates, updates, deletes or gets a <code>delivery</code> resource or lists <cod
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode"
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value of this key-value pair."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode"
       }
     ]
   },
diff --git a/website/docs/services/logs/delivery_destinations/index.md b/website/docs/services/logs/delivery_destinations/index.md
index ede6ab09c..d2c16145e 100644
--- a/website/docs/services/logs/delivery_destinations/index.md
+++ b/website/docs/services/logs/delivery_destinations/index.md
@@ -62,12 +62,12 @@ Creates, updates, deletes or gets a <code>delivery_destination</code> resource o
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value of this key-value pair."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/logs/delivery_sources/index.md b/website/docs/services/logs/delivery_sources/index.md
index 0518153b4..1136db970 100644
--- a/website/docs/services/logs/delivery_sources/index.md
+++ b/website/docs/services/logs/delivery_sources/index.md
@@ -77,12 +77,12 @@ Creates, updates, deletes or gets a <code>delivery_source</code> resource or lis
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode"
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value of this key-value pair."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode"
       }
     ]
   },
diff --git a/website/docs/services/logs/destinations/index.md b/website/docs/services/logs/destinations/index.md
index 739b6aec6..fef320bab 100644
--- a/website/docs/services/logs/destinations/index.md
+++ b/website/docs/services/logs/destinations/index.md
@@ -57,12 +57,12 @@ Creates, updates, deletes or gets a <code>destination</code> resource or lists <
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., :, /, =, +, - and @."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value of this key-value pair."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., :, /, =, +, - and @."
       }
     ]
   },
diff --git a/website/docs/services/logs/index.md b/website/docs/services/logs/index.md
index b20a161db..5d025f457 100644
--- a/website/docs/services/logs/index.md
+++ b/website/docs/services/logs/index.md
@@ -20,7 +20,7 @@ The logs service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>13</b></span><br />
+<span>total resources:&nbsp;<b>14</b></span><br />
 </div>
 </div>
 
@@ -38,6 +38,7 @@ The logs service documentation.
 <a href="/services/logs/log_anomaly_detectors/">log_anomaly_detectors</a>
 </div>
 <div class="providerDocColumn">
+<a href="/services/logs/log_groups/">log_groups</a><br />
 <a href="/services/logs/log_streams/">log_streams</a><br />
 <a href="/services/logs/metric_filters/">metric_filters</a><br />
 <a href="/services/logs/query_definitions/">query_definitions</a><br />
diff --git a/website/docs/services/logs/log_groups/index.md b/website/docs/services/logs/log_groups/index.md
new file mode 100644
index 000000000..9e83add44
--- /dev/null
+++ b/website/docs/services/logs/log_groups/index.md
@@ -0,0 +1,495 @@
+---
+title: log_groups
+hide_title: false
+hide_table_of_contents: false
+keywords:
+  - log_groups
+  - logs
+  - aws
+  - stackql
+  - infrastructure-as-code
+  - configuration-as-data
+  - cloud inventory
+description: Query, deploy and manage AWS resources using SQL
+custom_edit_url: null
+image: /img/stackql-aws-provider-featured-image.png
+---
+
+import CodeBlock from '@theme/CodeBlock';
+import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
+
+Creates, updates, deletes or gets a <code>log_group</code> resource or lists <code>log_groups</code> in a region
+
+## Overview
+<table>
+<tbody>
+<tr><td><b>Name</b></td><td><code>log_groups</code></td></tr>
+<tr><td><b>Type</b></td><td>Resource</td></tr>
+<tr><td><b>Description</b></td><td><details><summary>The <code>AWS::Logs::LogGroup</code> resource specifies a log group. A log group defines common properties for log streams, such as their retention and access control rules. Each log stream must belong to one log group.</summary>You can create up to 1,000,000 log groups per Region per account. You must use the following guidelines when naming a log group:<br />+  Log group names must be unique within a Region for an AWS account.<br />+  Log group names can be between 1 and 512 characters long.<br />+  Log group names consist of the following characters: a-z, A-Z, 0-9, '_' (underscore), '-' (hyphen), '/' (forward slash), and '.' (period).</details></td></tr>
+<tr><td><b>Id</b></td><td><CopyableCode code="awscc.logs.log_groups" /></td></tr>
+</tbody>
+</table>
+
+## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "log_group_name",
+    "type": "string",
+    "description": "The name of the log group. If you don't specify a name, CFNlong generates a unique ID for the log group."
+  },
+  {
+    "name": "kms_key_id",
+    "type": "string",
+    "description": "<details><summary>The Amazon Resource Name (ARN) of the KMS key to use when encrypting log data.</summary>To associate an KMS key with the log group, specify the ARN of that KMS key here. If you do so, ingested data is encrypted using this key. This association is stored as long as the data encrypted with the KMS key is still within CWL. This enables CWL to decrypt this data whenever it is requested.<br />If you attempt to associate a KMS key with the log group but the KMS key doesn't exist or is deactivated, you will receive an <code>InvalidParameterException</code> error.<br />Log group data is always encrypted in CWL. If you omit this key, the encryption does not use KMS. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/encrypt-log-data-kms.html\">Encrypt log data in using</a></details>"
+  },
+  {
+    "name": "data_protection_policy",
+    "type": "object",
+    "description": "<details><summary>Creates a data protection policy and assigns it to the log group. A data protection policy can help safeguard sensitive data that's ingested by the log group by auditing and masking the sensitive log data. When a user who does not have permission to view masked data views a log event that includes masked data, the sensitive data is replaced by asterisks.</summary>For more information, including a list of types of data that can be audited and masked, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/mask-sensitive-log-data.html\">Protect sensitive log data with masking</a>.</details>"
+  },
+  {
+    "name": "field_index_policies",
+    "type": "array",
+    "description": "<details><summary>Creates or updates a <i>field index policy</i> for the specified log group. Only log groups in the Standard log class support field index policies. For more information about log classes, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatch_Logs_Log_Classes.html\">Log classes</a>.</summary>You can use field index policies to create <i>field indexes</i> on fields found in log events in the log group. Creating field indexes lowers the costs for CWL Insights queries that reference those field indexes, because these queries attempt to skip the processing of log events that are known to not match the indexed field. Good fields to index are fields that you often need to query for and fields that have high cardinality of values Common examples of indexes include request ID, session ID, userID, and instance IDs. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatchLogs-Field-Indexing.html\">Create field indexes to improve query performance and reduce costs</a>.<br />Currently, this array supports only one field index policy object.</details>"
+  },
+  {
+    "name": "log_group_class",
+    "type": "string",
+    "description": "<details><summary>Specifies the log group class for this log group. There are two classes:</summary>+  The <code>Standard</code> log class supports all CWL features.<br />+  The <code>Infrequent Access</code> log class supports a subset of CWL features and incurs lower costs.<br />For details about the features supported by each class, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatch_Logs_Log_Classes.html\">Log classes</a></details>"
+  },
+  {
+    "name": "retention_in_days",
+    "type": "integer",
+    "description": "<details><summary>The number of days to retain the log events in the specified log group. Possible values are: 1, 3, 5, 7, 14, 30, 60, 90, 120, 150, 180, 365, 400, 545, 731, 1096, 1827, 2192, 2557, 2922, 3288, and 3653.</summary>To set a log group so that its log events do not expire, use <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_DeleteRetentionPolicy.html\">DeleteRetentionPolicy</a>.</details>"
+  },
+  {
+    "name": "tags",
+    "type": "array",
+    "description": "<details><summary>An array of key-value pairs to apply to the log group.</summary>For more information, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html\">Tag</a>.</details>",
+    "children": [
+      {
+        "name": "key",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "value",
+        "type": "string",
+        "description": "The value of this key-value pair."
+      }
+    ]
+  },
+  {
+    "name": "arn",
+    "type": "string",
+    "description": ""
+  },
+  {
+    "name": "resource_policy_document",
+    "type": "object",
+    "description": ""
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "log_group_name",
+    "type": "string",
+    "description": "The name of the log group. If you don't specify a name, CFNlong generates a unique ID for the log group."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
+
+For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html"><code>AWS::Logs::LogGroup</code></a>.
+
+## Methods
+
+<table>
+<tbody>
+  <tr>
+    <th>Name</th>
+    <th>Resource</th>
+    <th>Accessible by</th>
+    <th>Required Params</th>
+  </tr>
+  <tr>
+    <td><CopyableCode code="create_resource" /></td>
+    <td><code>log_groups</code></td>
+    <td><code>INSERT</code></td>
+    <td><CopyableCode code="region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="delete_resource" /></td>
+    <td><code>log_groups</code></td>
+    <td><code>DELETE</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="update_resource" /></td>
+    <td><code>log_groups</code></td>
+    <td><code>UPDATE</code></td>
+    <td><CopyableCode code="Identifier, PatchDocument, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="list_resources" /></td>
+    <td><code>log_groups_list_only</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="get_resource" /></td>
+    <td><code>log_groups</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+</tbody>
+</table>
+
+## `SELECT` examples
+
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+Gets all properties from an individual <code>log_group</code>.
+```sql
+SELECT
+  region,
+  log_group_name,
+  kms_key_id,
+  data_protection_policy,
+  field_index_policies,
+  log_group_class,
+  retention_in_days,
+  tags,
+  arn,
+  resource_policy_document
+FROM awscc.logs.log_groups
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ log_group_name }}';
+```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>log_groups</code> in a region.
+```sql
+SELECT
+  region,
+  log_group_name
+FROM awscc.logs.log_groups_list_only
+WHERE
+  region = '{{ region }}';
+```
+</TabItem>
+</Tabs>
+
+## `INSERT` example
+
+Use the following StackQL query and manifest file to create a new <code>log_group</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+<Tabs
+    defaultValue="required"
+    values={[
+      { label: 'Required Properties', value: 'required', },
+      { label: 'All Properties', value: 'all', },
+      { label: 'Manifest', value: 'manifest', },
+    ]
+}>
+<TabItem value="required">
+
+```sql
+/*+ create */
+INSERT INTO awscc.logs.log_groups (
+  LogGroupName,
+  KmsKeyId,
+  DataProtectionPolicy,
+  FieldIndexPolicies,
+  LogGroupClass,
+  RetentionInDays,
+  Tags,
+  ResourcePolicyDocument,
+  region
+)
+SELECT
+  '{{ log_group_name }}',
+  '{{ kms_key_id }}',
+  '{{ data_protection_policy }}',
+  '{{ field_index_policies }}',
+  '{{ log_group_class }}',
+  '{{ retention_in_days }}',
+  '{{ tags }}',
+  '{{ resource_policy_document }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="all">
+
+```sql
+/*+ create */
+INSERT INTO awscc.logs.log_groups (
+  LogGroupName,
+  KmsKeyId,
+  DataProtectionPolicy,
+  FieldIndexPolicies,
+  LogGroupClass,
+  RetentionInDays,
+  Tags,
+  ResourcePolicyDocument,
+  region
+)
+SELECT
+  '{{ log_group_name }}',
+  '{{ kms_key_id }}',
+  '{{ data_protection_policy }}',
+  '{{ field_index_policies }}',
+  '{{ log_group_class }}',
+  '{{ retention_in_days }}',
+  '{{ tags }}',
+  '{{ resource_policy_document }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="manifest">
+
+<CodeBlock language="yaml">{`version: 1
+name: stack name
+description: stack description
+providers:
+  - aws
+globals:
+  - name: region
+    value: '{{ vars.AWS_REGION }}'
+resources:
+  - name: log_group
+    props:
+      - name: log_group_name
+        value: '{{ log_group_name }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: data_protection_policy
+        value: {}
+      - name: field_index_policies
+        value:
+          - {}
+      - name: log_group_class
+        value: '{{ log_group_class }}'
+      - name: retention_in_days
+        value: '{{ retention_in_days }}'
+      - name: tags
+        value:
+          - key: '{{ key }}'
+            value: '{{ value }}'
+      - name: resource_policy_document
+        value: {}`}</CodeBlock>
+
+</TabItem>
+</Tabs>
+
+## `UPDATE` example
+
+Use the following StackQL query and manifest file to update a <code>log_group</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+```sql
+/*+ update */
+UPDATE awscc.logs.log_groups
+SET PatchDocument = string('{{ {
+    "KmsKeyId": kms_key_id,
+    "DataProtectionPolicy": data_protection_policy,
+    "FieldIndexPolicies": field_index_policies,
+    "LogGroupClass": log_group_class,
+    "RetentionInDays": retention_in_days,
+    "Tags": tags,
+    "ResourcePolicyDocument": resource_policy_document
+} | generate_patch_document }}')
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ log_group_name }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## `DELETE` example
+
+```sql
+/*+ delete */
+DELETE FROM awscc.logs.log_groups
+WHERE
+  Identifier = '{{ log_group_name }}' AND
+  region = '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## Additional Parameters
+
+Mutable resources in the Cloud Control provider support additional optional parameters which can be supplied with `INSERT`, `UPDATE`, or `DELETE` operations. These include:
+
+| Parameter | Description |
+|-----------|-------------|
+| <CopyableCode code="ClientToken" /> | <details><summary>A unique identifier to ensure the idempotency of the resource request.</summary>This allows the provider to accurately distinguish between retries and new requests.<br />A client token is valid for 36 hours once used.<br />After that, a resource request with the same client token is treated as a new request.<br />If you do not specify a client token, one is generated for inclusion in the request.</details> |
+| <CopyableCode code="RoleArn" /> | <details><summary>The ARN of the IAM role used to perform this resource operation.</summary>The role specified must have the permissions required for this operation.<br />If you do not specify a role, a temporary session is created using your AWS user credentials.</details> |
+| <CopyableCode code="TypeVersionId" /> | <details><summary>For private resource types, the type version to use in this resource operation.</summary>If you do not specify a resource version, the default version is used.</details> |
+
+## Permissions
+
+To operate on the <code>log_groups</code> resource, the following permissions are required:
+
+<Tabs
+    defaultValue="create"
+    values={[
+      { label: 'Create', value: 'create', },
+      { label: 'Read', value: 'read', },
+      { label: 'Update', value: 'update', },
+      { label: 'Delete', value: 'delete', },
+      { label: 'List', value: 'list', },
+    ]
+}>
+<TabItem value="create">
+
+```json
+logs:DescribeLogGroups,
+logs:CreateLogGroup,
+logs:PutRetentionPolicy,
+logs:TagResource,
+logs:GetDataProtectionPolicy,
+logs:PutDataProtectionPolicy,
+logs:CreateLogDelivery,
+s3:REST.PUT.OBJECT,
+firehose:TagDeliveryStream,
+logs:PutResourcePolicy,
+logs:DescribeResourcePolicies,
+logs:PutIndexPolicy,
+logs:DescribeIndexPolicies
+```
+
+</TabItem>
+<TabItem value="read">
+
+```json
+logs:DescribeLogGroups,
+logs:ListTagsForResource,
+logs:GetDataProtectionPolicy,
+logs:DescribeIndexPolicies,
+logs:DescribeResourcePolicies
+```
+
+</TabItem>
+<TabItem value="update">
+
+```json
+logs:DescribeLogGroups,
+logs:AssociateKmsKey,
+logs:DisassociateKmsKey,
+logs:PutRetentionPolicy,
+logs:DeleteRetentionPolicy,
+logs:TagResource,
+logs:UntagResource,
+logs:ListTagsForResource,
+logs:GetDataProtectionPolicy,
+logs:PutDataProtectionPolicy,
+logs:CreateLogDelivery,
+s3:REST.PUT.OBJECT,
+firehose:TagDeliveryStream,
+logs:PutIndexPolicy,
+logs:DeleteIndexPolicy,
+logs:PutResourcePolicy,
+logs:DescribeResourcePolicies,
+logs:DeleteResourcePolicy
+```
+
+</TabItem>
+<TabItem value="delete">
+
+```json
+logs:DescribeLogGroups,
+logs:DeleteLogGroup,
+logs:DeleteDataProtectionPolicy
+```
+
+</TabItem>
+<TabItem value="list">
+
+```json
+logs:DescribeLogGroups,
+logs:ListTagsForResource
+```
+
+</TabItem>
+</Tabs>
\ No newline at end of file
diff --git a/website/docs/services/m2/applications/index.md b/website/docs/services/m2/applications/index.md
index e8a18a197..afa33f62b 100644
--- a/website/docs/services/m2/applications/index.md
+++ b/website/docs/services/m2/applications/index.md
@@ -67,7 +67,7 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
   {
     "name": "engine_type",
     "type": "string",
-    "description": "The target platform for the environment."
+    "description": ""
   },
   {
     "name": "kms_key_id",
@@ -87,7 +87,7 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
   {
     "name": "tags",
     "type": "object",
-    "description": "Defines tags associated to an environment."
+    "description": ""
   },
   {
     "name": "region",
diff --git a/website/docs/services/mediaconnect/bridges/index.md b/website/docs/services/mediaconnect/bridges/index.md
index 25856e849..cf0ecd49b 100644
--- a/website/docs/services/mediaconnect/bridges/index.md
+++ b/website/docs/services/mediaconnect/bridges/index.md
@@ -67,22 +67,17 @@ Creates, updates, deletes or gets a <code>bridge</code> resource or lists <code>
   {
     "name": "source_failover_config",
     "type": "object",
-    "description": "The settings for source failover",
+    "description": "The settings for source failover.",
     "children": [
       {
         "name": "state",
         "type": "string",
         "description": ""
       },
-      {
-        "name": "recovery_window",
-        "type": "integer",
-        "description": "Search window time to look for dash-7 packets"
-      },
       {
         "name": "failover_mode",
         "type": "string",
-        "description": "The type of failover you choose for this flow. MERGE combines the source streams into a single stream, allowing graceful recovery from any single-source loss. FAILOVER allows switching between different streams."
+        "description": "The type of failover you choose for this flow. FAILOVER allows switching between different streams."
       },
       {
         "name": "source_priority",
@@ -103,16 +98,16 @@ Creates, updates, deletes or gets a <code>bridge</code> resource or lists <code>
     "type": "array",
     "description": "The outputs on this bridge.",
     "children": [
-      {
-        "name": "bridge_arn",
-        "type": "string",
-        "description": "The Amazon Resource Number (ARN) of the bridge."
-      },
       {
         "name": "network_output",
         "type": "object",
-        "description": "The output of the bridge.",
+        "description": "The output of the bridge. A network output is delivered to your premises.",
         "children": [
+          {
+            "name": "name",
+            "type": "string",
+            "description": "The network output name."
+          },
           {
             "name": "protocol",
             "type": "string",
@@ -139,11 +134,6 @@ Creates, updates, deletes or gets a <code>bridge</code> resource or lists <code>
             "description": "The network output TTL."
           }
         ]
-      },
-      {
-        "name": "name",
-        "type": "string",
-        "description": "The network output name."
       }
     ]
   },
@@ -152,21 +142,16 @@ Creates, updates, deletes or gets a <code>bridge</code> resource or lists <code>
     "type": "array",
     "description": "The sources on this bridge.",
     "children": [
-      {
-        "name": "name",
-        "type": "string",
-        "description": "The name of the source."
-      },
-      {
-        "name": "bridge_arn",
-        "type": "string",
-        "description": "The Amazon Resource Number (ARN) of the bridge."
-      },
       {
         "name": "flow_source",
         "type": "object",
         "description": "The source of the bridge. A flow source originates in MediaConnect as an existing cloud flow.",
         "children": [
+          {
+            "name": "name",
+            "type": "string",
+            "description": "The name of the flow source."
+          },
           {
             "name": "flow_arn",
             "type": "string",
@@ -191,6 +176,11 @@ Creates, updates, deletes or gets a <code>bridge</code> resource or lists <code>
         "type": "object",
         "description": "The source of the bridge. A network source originates at your premises.",
         "children": [
+          {
+            "name": "name",
+            "type": "string",
+            "description": "The name of the network source."
+          },
           {
             "name": "protocol",
             "type": "string",
@@ -467,30 +457,28 @@ resources:
       - name: source_failover_config
         value:
           state: '{{ state }}'
-          recovery_window: '{{ recovery_window }}'
           failover_mode: '{{ failover_mode }}'
           source_priority:
             primary_source: '{{ primary_source }}'
       - name: outputs
         value:
-          - bridge_arn: '{{ bridge_arn }}'
-            network_output:
+          - network_output:
+              name: '{{ name }}'
               protocol: '{{ protocol }}'
               ip_address: '{{ ip_address }}'
               port: '{{ port }}'
               network_name: '{{ network_name }}'
               ttl: '{{ ttl }}'
-            name: '{{ name }}'
       - name: sources
         value:
-          - name: '{{ name }}'
-            bridge_arn: '{{ bridge_arn }}'
-            flow_source:
+          - flow_source:
+              name: '{{ name }}'
               flow_arn: '{{ flow_arn }}'
               flow_vpc_interface_attachment:
                 vpc_interface_name: '{{ vpc_interface_name }}'
             network_source:
-              protocol: '{{ protocol }}'
+              name: '{{ name }}'
+              protocol: null
               multicast_ip: '{{ multicast_ip }}'
               multicast_source_settings:
                 multicast_source_ip: '{{ multicast_source_ip }}'
diff --git a/website/docs/services/mediaconnect/flow_outputs/index.md b/website/docs/services/mediaconnect/flow_outputs/index.md
index bab2302e2..5a8c41526 100644
--- a/website/docs/services/mediaconnect/flow_outputs/index.md
+++ b/website/docs/services/mediaconnect/flow_outputs/index.md
@@ -69,31 +69,11 @@ Creates, updates, deletes or gets a <code>flow_output</code> resource or lists <
         "type": "string",
         "description": "The type of algorithm that is used for the encryption (such as aes128, aes192, or aes256)."
       },
-      {
-        "name": "constant_initialization_vector",
-        "type": "string",
-        "description": "A 128-bit, 16-byte hex value represented by a 32-character string, to be used with the key for encrypting content. This parameter is not valid for static key encryption."
-      },
-      {
-        "name": "device_id",
-        "type": "string",
-        "description": "The value of one of the devices that you configured with your digital rights management (DRM) platform key provider. This parameter is required for SPEKE encryption and is not valid for static key encryption."
-      },
       {
         "name": "key_type",
         "type": "string",
         "description": "The type of key that is used for the encryption. If no keyType is provided, the service will use the default setting (static-key)."
       },
-      {
-        "name": "region",
-        "type": "string",
-        "description": "The AWS Region that the API Gateway proxy endpoint was created in. This parameter is required for SPEKE encryption and is not valid for static key encryption."
-      },
-      {
-        "name": "resource_id",
-        "type": "string",
-        "description": "An identifier for the content. The service sends this value to the key server to identify the current endpoint. The resource ID is also known as the content ID. This parameter is required for SPEKE encryption and is not valid for static key encryption."
-      },
       {
         "name": "role_arn",
         "type": "string",
@@ -103,11 +83,6 @@ Creates, updates, deletes or gets a <code>flow_output</code> resource or lists <
         "name": "secret_arn",
         "type": "string",
         "description": "The ARN of the secret that you created in AWS Secrets Manager to store the encryption key. This parameter is required for static key encryption and is not valid for SPEKE encryption."
-      },
-      {
-        "name": "url",
-        "type": "string",
-        "description": "The URL from the API Gateway proxy that you set up to talk to your key server. This parameter is required for SPEKE encryption and is not valid for static key encryption."
       }
     ]
   },
@@ -169,7 +144,7 @@ Creates, updates, deletes or gets a <code>flow_output</code> resource or lists <
       {
         "name": "vpc_interface_name",
         "type": "string",
-        "description": "The name of the VPC interface to use for this resource."
+        "description": "The name of the VPC interface to use for this output."
       }
     ]
   },
@@ -493,14 +468,9 @@ resources:
       - name: encryption
         value:
           algorithm: '{{ algorithm }}'
-          constant_initialization_vector: '{{ constant_initialization_vector }}'
-          device_id: '{{ device_id }}'
           key_type: '{{ key_type }}'
-          region: '{{ region }}'
-          resource_id: '{{ resource_id }}'
           role_arn: '{{ role_arn }}'
           secret_arn: '{{ secret_arn }}'
-          url: '{{ url }}'
       - name: description
         value: '{{ description }}'
       - name: destination
diff --git a/website/docs/services/mediapackage/channels/index.md b/website/docs/services/mediapackage/channels/index.md
index a0a85d2bc..426b08d1c 100644
--- a/website/docs/services/mediapackage/channels/index.md
+++ b/website/docs/services/mediapackage/channels/index.md
@@ -118,7 +118,7 @@ Creates, updates, deletes or gets a <code>channel</code> resource or lists <code
       {
         "name": "log_group_name",
         "type": "string",
-        "description": "Sets a custom AWS CloudWatch log group name for egress logs. If a log group name isn't specified, the default name is used: /aws/MediaPackage/VodEgressAccessLogs."
+        "description": "Sets a custom AWS CloudWatch log group name for access logs. If a log group name isn't specified, the defaults are used: /aws/MediaPackage/EgressAccessLogs for egress access logs and /aws/MediaPackage/IngressAccessLogs for ingress access logs."
       }
     ]
   },
diff --git a/website/docs/services/mediapackage/origin_endpoints/index.md b/website/docs/services/mediapackage/origin_endpoints/index.md
index c91561b5e..f744e1e72 100644
--- a/website/docs/services/mediapackage/origin_endpoints/index.md
+++ b/website/docs/services/mediapackage/origin_endpoints/index.md
@@ -97,17 +97,17 @@ Creates, updates, deletes or gets an <code>origin_endpoint</code> resource or li
   {
     "name": "authorization",
     "type": "object",
-    "description": "",
+    "description": "CDN Authorization credentials",
     "children": [
       {
-        "name": "cdn_identifier_secret",
+        "name": "secrets_role_arn",
         "type": "string",
-        "description": "The Amazon Resource Name (ARN) for the secret in AWS Secrets Manager that is used for CDN authorization."
+        "description": "The Amazon Resource Name (ARN) for the IAM role that allows MediaPackage to communicate with AWS Secrets Manager."
       },
       {
-        "name": "secrets_role_arn",
+        "name": "cdn_identifier_secret",
         "type": "string",
-        "description": "The Amazon Resource Name (ARN) for the IAM role that allows MediaPackage to communicate with AWS Secrets Manager."
+        "description": "The Amazon Resource Name (ARN) for the secret in Secrets Manager that your Content Distribution Network (CDN) uses for authorization to access your endpoint."
       }
     ]
   },
@@ -116,20 +116,80 @@ Creates, updates, deletes or gets an <code>origin_endpoint</code> resource or li
     "type": "object",
     "description": "An HTTP Live Streaming (HLS) packaging configuration.",
     "children": [
+      {
+        "name": "segment_duration_seconds",
+        "type": "integer",
+        "description": "Duration (in seconds) of each fragment. Actual fragments will be rounded to the nearest multiple of the source fragment duration."
+      },
+      {
+        "name": "playlist_window_seconds",
+        "type": "integer",
+        "description": "Time window (in seconds) contained in each parent manifest."
+      },
+      {
+        "name": "playlist_type",
+        "type": "string",
+        "description": "The HTTP Live Streaming (HLS) playlist type. When either \"EVENT\" or \"VOD\" is specified, a corresponding EXT-X-PLAYLIST-TYPE entry will be included in the media playlist."
+      },
+      {
+        "name": "ad_markers",
+        "type": "string",
+        "description": "This setting controls how ad markers are included in the packaged OriginEndpoint. \"NONE\" will omit all SCTE-35 ad markers from the output. \"PASSTHROUGH\" causes the manifest to contain a copy of the SCTE-35 ad markers (comments) taken directly from the input HTTP Live Streaming (HLS) manifest. \"SCTE35_ENHANCED\" generates ad markers and blackout tags based on SCTE-35 messages in the input source. \"DATERANGE\" inserts EXT-X-DATERANGE tags to signal ad and program transition events in HLS and CMAF manifests. For this option, you must set a programDateTimeIntervalSeconds value that is greater than 0."
+      },
+      {
+        "name": "ad_triggers",
+        "type": "array",
+        "description": "A list of SCTE-35 message types that are treated as ad markers in the output.  If empty, no ad markers are output.  Specify multiple items to create ad markers for all of the included message types."
+      },
+      {
+        "name": "ads_on_delivery_restrictions",
+        "type": "string",
+        "description": "This setting allows the delivery restriction flags on SCTE-35 segmentation descriptors to determine whether a message signals an ad.  Choosing \"NONE\" means no SCTE-35 messages become ads.  Choosing \"RESTRICTED\" means SCTE-35 messages of the types specified in AdTriggers that contain delivery restrictions will be treated as ads.  Choosing \"UNRESTRICTED\" means SCTE-35 messages of the types specified in AdTriggers that do not contain delivery restrictions will be treated as ads.  Choosing \"BOTH\" means all SCTE-35 messages of the types specified in AdTriggers will be treated as ads.  Note that Splice Insert messages do not have these flags and are always treated as ads if specified in AdTriggers."
+      },
+      {
+        "name": "program_date_time_interval_seconds",
+        "type": "integer",
+        "description": "The interval (in seconds) between each EXT-X-PROGRAM-DATE-TIME tag inserted into manifests. Additionally, when an interval is specified ID3Timed Metadata messages will be generated every 5 seconds using the ingest time of the content. If the interval is not specified, or set to 0, then no EXT-X-PROGRAM-DATE-TIME tags will be inserted into manifests and no ID3Timed Metadata messages will be generated. Note that irrespective of this parameter, if any ID3 Timed Metadata is found in HTTP Live Streaming (HLS) input, it will be passed through to HLS output."
+      },
+      {
+        "name": "include_iframe_only_stream",
+        "type": "boolean",
+        "description": "When enabled, an I-Frame only stream will be included in the output."
+      },
+      {
+        "name": "use_audio_rendition_group",
+        "type": "boolean",
+        "description": "When enabled, audio streams will be placed in rendition groups in the output."
+      },
+      {
+        "name": "include_dvb_subtitles",
+        "type": "boolean",
+        "description": "When enabled, MediaPackage passes through digital video broadcasting (DVB) subtitles into the output."
+      },
       {
         "name": "encryption",
         "type": "object",
         "description": "An HTTP Live Streaming (HLS) encryption configuration.",
         "children": [
           {
-            "name": "constant_initialization_vector",
+            "name": "encryption_method",
             "type": "string",
-            "description": "An HTTP Live Streaming (HLS) encryption configuration."
+            "description": "The encryption method to use."
           },
           {
-            "name": "encryption_method",
+            "name": "constant_initialization_vector",
             "type": "string",
-            "description": "The encryption method to use."
+            "description": "A constant initialization vector for encryption (optional). When not specified the initialization vector will be periodically rotated."
+          },
+          {
+            "name": "key_rotation_interval_seconds",
+            "type": "integer",
+            "description": "Interval (in seconds) between each encryption key rotation."
+          },
+          {
+            "name": "repeat_ext_xkey",
+            "type": "boolean",
+            "description": "When enabled, the EXT-X-KEY tag will be repeated in output manifests."
           },
           {
             "name": "speke_key_provider",
@@ -137,14 +197,9 @@ Creates, updates, deletes or gets an <code>origin_endpoint</code> resource or li
             "description": "A configuration for accessing an external Secure Packager and Encoder Key Exchange (SPEKE) service that will provide encryption keys.",
             "children": [
               {
-                "name": "encryption_contract_configuration",
-                "type": "object",
-                "description": "The configuration to use for encrypting one or more content tracks separately for endpoints that use SPEKE 2.0."
-              },
-              {
-                "name": "role_arn",
+                "name": "resource_id",
                 "type": "string",
-                "description": "An Amazon Resource Name (ARN) of an IAM role that AWS Elemental MediaPackage will assume when accessing the key provider service."
+                "description": "The resource ID to include in key requests."
               },
               {
                 "name": "system_ids",
@@ -155,79 +210,47 @@ Creates, updates, deletes or gets an <code>origin_endpoint</code> resource or li
                 "name": "url",
                 "type": "string",
                 "description": "The URL of the external key provider service."
+              },
+              {
+                "name": "role_arn",
+                "type": "string",
+                "description": "An Amazon Resource Name (ARN) of an IAM role that AWS Elemental MediaPackage will assume when accessing the key provider service."
+              },
+              {
+                "name": "certificate_arn",
+                "type": "string",
+                "description": "An Amazon Resource Name (ARN) of a Certificate Manager certificate that MediaPackage will use for enforcing secure end-to-end data transfer with the key provider service."
+              },
+              {
+                "name": "encryption_contract_configuration",
+                "type": "object",
+                "description": "The configuration to use for encrypting one or more content tracks separately for endpoints that use SPEKE 2.0."
               }
             ]
           }
         ]
       },
       {
-        "name": "hls_manifests",
-        "type": "array",
-        "description": "A list of HLS manifest configurations.",
+        "name": "stream_selection",
+        "type": "object",
+        "description": "A StreamSelection configuration.",
         "children": [
           {
-            "name": "ad_markers",
-            "type": "string",
-            "description": "This setting controls how ad markers are included in the packaged OriginEndpoint. \"NONE\" will omit all SCTE-35 ad markers from the output. \"PASSTHROUGH\" causes the manifest to contain a copy of the SCTE-35 ad markers (comments) taken directly from the input HTTP Live Streaming (HLS) manifest. \"SCTE35_ENHANCED\" generates ad markers and blackout tags based on SCTE-35 messages in the input source."
-          },
-          {
-            "name": "include_iframe_only_stream",
-            "type": "boolean",
-            "description": "When enabled, an I-Frame only stream will be included in the output."
-          },
-          {
-            "name": "manifest_name",
-            "type": "string",
-            "description": "An optional string to include in the name of the manifest."
-          },
-          {
-            "name": "program_date_time_interval_seconds",
+            "name": "max_video_bits_per_second",
             "type": "integer",
-            "description": "The interval (in seconds) between each EXT-X-PROGRAM-DATE-TIME tag inserted into manifests. Additionally, when an interval is specified ID3Timed Metadata messages will be generated every 5 seconds using the ingest time of the content. If the interval is not specified, or set to 0, then no EXT-X-PROGRAM-DATE-TIME tags will be inserted into manifests and no ID3Timed Metadata messages will be generated. Note that irrespective of this parameter, if any ID3 Timed Metadata is found in HTTP Live Streaming (HLS) input, it will be passed through to HLS output."
+            "description": "The maximum video bitrate (bps) to include in output."
           },
           {
-            "name": "repeat_ext_xkey",
-            "type": "boolean",
-            "description": "When enabled, the EXT-X-KEY tag will be repeated in output manifests."
+            "name": "min_video_bits_per_second",
+            "type": "integer",
+            "description": "The minimum video bitrate (bps) to include in output."
           },
           {
-            "name": "stream_selection",
-            "type": "object",
-            "description": "A StreamSelection configuration.",
-            "children": [
-              {
-                "name": "max_video_bits_per_second",
-                "type": "integer",
-                "description": "The maximum video bitrate (bps) to include in output."
-              },
-              {
-                "name": "min_video_bits_per_second",
-                "type": "integer",
-                "description": "The minimum video bitrate (bps) to include in output."
-              },
-              {
-                "name": "stream_order",
-                "type": "string",
-                "description": "A directive that determines the order of streams in the output."
-              }
-            ]
+            "name": "stream_order",
+            "type": "string",
+            "description": "A directive that determines the order of streams in the output."
           }
         ]
-      },
-      {
-        "name": "include_dvb_subtitles",
-        "type": "boolean",
-        "description": "When enabled, MediaPackage passes through digital video broadcasting (DVB) subtitles into the output."
-      },
-      {
-        "name": "segment_duration_seconds",
-        "type": "integer",
-        "description": "Duration (in seconds) of each fragment. Actual fragments will be rounded to the nearest multiple of the source fragment duration."
-      },
-      {
-        "name": "use_audio_rendition_group",
-        "type": "boolean",
-        "description": "When enabled, audio streams will be placed in rendition groups in the output."
       }
     ]
   },
@@ -237,78 +260,84 @@ Creates, updates, deletes or gets an <code>origin_endpoint</code> resource or li
     "description": "A Dynamic Adaptive Streaming over HTTP (DASH) packaging configuration.",
     "children": [
       {
-        "name": "dash_manifests",
+        "name": "segment_duration_seconds",
+        "type": "integer",
+        "description": "Duration (in seconds) of each segment. Actual segments will be rounded to the nearest multiple of the source segment duration."
+      },
+      {
+        "name": "manifest_window_seconds",
+        "type": "integer",
+        "description": "Time window (in seconds) contained in each manifest."
+      },
+      {
+        "name": "profile",
+        "type": "string",
+        "description": "The Dynamic Adaptive Streaming over HTTP (DASH) profile type.  When set to \"HBBTV_1_5\", HbbTV 1.5 compliant output is enabled."
+      },
+      {
+        "name": "min_update_period_seconds",
+        "type": "integer",
+        "description": "Minimum duration (in seconds) between potential changes to the Dynamic Adaptive Streaming over HTTP (DASH) Media Presentation Description (MPD)."
+      },
+      {
+        "name": "min_buffer_time_seconds",
+        "type": "integer",
+        "description": "Minimum duration (in seconds) that a player will buffer media before starting the presentation."
+      },
+      {
+        "name": "suggested_presentation_delay_seconds",
+        "type": "integer",
+        "description": "Duration (in seconds) to delay live content before presentation."
+      },
+      {
+        "name": "period_triggers",
         "type": "array",
-        "description": "A list of DASH manifest configurations.",
-        "children": [
-          {
-            "name": "manifest_layout",
-            "type": "string",
-            "description": "Determines the position of some tags in the Media Presentation Description (MPD). When set to FULL, elements like SegmentTemplate and ContentProtection are included in each Representation. When set to COMPACT, duplicate elements are combined and presented at the AdaptationSet level."
-          },
-          {
-            "name": "manifest_name",
-            "type": "string",
-            "description": "An optional string to include in the name of the manifest."
-          },
-          {
-            "name": "min_buffer_time_seconds",
-            "type": "integer",
-            "description": "Minimum duration (in seconds) that a player will buffer media before starting the presentation."
-          },
-          {
-            "name": "profile",
-            "type": "string",
-            "description": "The Dynamic Adaptive Streaming over HTTP (DASH) profile type. When set to \"HBBTV_1_5\", HbbTV 1.5 compliant output is enabled."
-          },
-          {
-            "name": "scte_markers_source",
-            "type": "string",
-            "description": "The source of scte markers used. When set to SEGMENTS, the scte markers are sourced from the segments of the ingested content. When set to MANIFEST, the scte markers are sourced from the manifest of the ingested content."
-          },
-          {
-            "name": "stream_selection",
-            "type": "object",
-            "description": "A StreamSelection configuration.",
-            "children": [
-              {
-                "name": "max_video_bits_per_second",
-                "type": "integer",
-                "description": "The maximum video bitrate (bps) to include in output."
-              },
-              {
-                "name": "min_video_bits_per_second",
-                "type": "integer",
-                "description": "The minimum video bitrate (bps) to include in output."
-              },
-              {
-                "name": "stream_order",
-                "type": "string",
-                "description": "A directive that determines the order of streams in the output."
-              }
-            ]
-          }
-        ]
+        "description": "A list of triggers that controls when the outgoing Dynamic Adaptive Streaming over HTTP (DASH) Media Presentation Description (MPD) will be partitioned into multiple periods. If empty, the content will not be partitioned into more than one period. If the list contains \"ADS\", new periods will be created where the Channel source contains SCTE-35 ad markers."
+      },
+      {
+        "name": "include_iframe_only_stream",
+        "type": "boolean",
+        "description": "When enabled, an I-Frame only stream will be included in the output."
+      },
+      {
+        "name": "manifest_layout",
+        "type": "string",
+        "description": "Determines the position of some tags in the Media Presentation Description (MPD).  When set to FULL, elements like SegmentTemplate and ContentProtection are included in each Representation.  When set to COMPACT, duplicate elements are combined and presented at the AdaptationSet level."
+      },
+      {
+        "name": "segment_template_format",
+        "type": "string",
+        "description": "Determines the type of SegmentTemplate included in the Media Presentation Description (MPD).  When set to NUMBER_WITH_TIMELINE, a full timeline is presented in each SegmentTemplate, with $Number$ media URLs.  When set to TIME_WITH_TIMELINE, a full timeline is presented in each SegmentTemplate, with $Time$ media URLs. When set to NUMBER_WITH_DURATION, only a duration is included in each SegmentTemplate, with $Number$ media URLs."
+      },
+      {
+        "name": "ad_triggers",
+        "type": "array",
+        "description": "A list of SCTE-35 message types that are treated as ad markers in the output.  If empty, no ad markers are output.  Specify multiple items to create ad markers for all of the included message types."
+      },
+      {
+        "name": "ads_on_delivery_restrictions",
+        "type": "string",
+        "description": "This setting allows the delivery restriction flags on SCTE-35 segmentation descriptors to determine whether a message signals an ad.  Choosing \"NONE\" means no SCTE-35 messages become ads.  Choosing \"RESTRICTED\" means SCTE-35 messages of the types specified in AdTriggers that contain delivery restrictions will be treated as ads.  Choosing \"UNRESTRICTED\" means SCTE-35 messages of the types specified in AdTriggers that do not contain delivery restrictions will be treated as ads.  Choosing \"BOTH\" means all SCTE-35 messages of the types specified in AdTriggers will be treated as ads.  Note that Splice Insert messages do not have these flags and are always treated as ads if specified in AdTriggers."
       },
       {
         "name": "encryption",
         "type": "object",
         "description": "A Dynamic Adaptive Streaming over HTTP (DASH) encryption configuration.",
         "children": [
+          {
+            "name": "key_rotation_interval_seconds",
+            "type": "integer",
+            "description": "Time (in seconds) between each encryption key rotation."
+          },
           {
             "name": "speke_key_provider",
             "type": "object",
             "description": "A configuration for accessing an external Secure Packager and Encoder Key Exchange (SPEKE) service that will provide encryption keys.",
             "children": [
               {
-                "name": "encryption_contract_configuration",
-                "type": "object",
-                "description": "The configuration to use for encrypting one or more content tracks separately for endpoints that use SPEKE 2.0."
-              },
-              {
-                "name": "role_arn",
+                "name": "resource_id",
                 "type": "string",
-                "description": "An Amazon Resource Name (ARN) of an IAM role that AWS Elemental MediaPackage will assume when accessing the key provider service."
+                "description": "The resource ID to include in key requests."
               },
               {
                 "name": "system_ids",
@@ -319,47 +348,79 @@ Creates, updates, deletes or gets an <code>origin_endpoint</code> resource or li
                 "name": "url",
                 "type": "string",
                 "description": "The URL of the external key provider service."
+              },
+              {
+                "name": "role_arn",
+                "type": "string",
+                "description": "An Amazon Resource Name (ARN) of an IAM role that AWS Elemental MediaPackage will assume when accessing the key provider service."
+              },
+              {
+                "name": "certificate_arn",
+                "type": "string",
+                "description": "An Amazon Resource Name (ARN) of a Certificate Manager certificate that MediaPackage will use for enforcing secure end-to-end data transfer with the key provider service."
+              },
+              {
+                "name": "encryption_contract_configuration",
+                "type": "object",
+                "description": "The configuration to use for encrypting one or more content tracks separately for endpoints that use SPEKE 2.0."
               }
             ]
           }
         ]
       },
       {
-        "name": "period_triggers",
-        "type": "array",
-        "description": "A list of triggers that controls when the outgoing Dynamic Adaptive Streaming over HTTP (DASH) Media Presentation Description (MPD) will be partitioned into multiple periods. If empty, the content will not be partitioned into more than one period. If the list contains \"ADS\", new periods will be created where the Asset contains SCTE-35 ad markers."
-      },
-      {
-        "name": "segment_duration_seconds",
-        "type": "integer",
-        "description": "Duration (in seconds) of each fragment. Actual fragments will be rounded to the nearest multiple of the source fragment duration."
+        "name": "stream_selection",
+        "type": "object",
+        "description": "A StreamSelection configuration.",
+        "children": [
+          {
+            "name": "max_video_bits_per_second",
+            "type": "integer",
+            "description": "The maximum video bitrate (bps) to include in output."
+          },
+          {
+            "name": "min_video_bits_per_second",
+            "type": "integer",
+            "description": "The minimum video bitrate (bps) to include in output."
+          },
+          {
+            "name": "stream_order",
+            "type": "string",
+            "description": "A directive that determines the order of streams in the output."
+          }
+        ]
       },
       {
-        "name": "segment_template_format",
+        "name": "utc_timing",
         "type": "string",
-        "description": "Determines the type of SegmentTemplate included in the Media Presentation Description (MPD). When set to NUMBER_WITH_TIMELINE, a full timeline is presented in each SegmentTemplate, with $Number$ media URLs. When set to TIME_WITH_TIMELINE, a full timeline is presented in each SegmentTemplate, with $Time$ media URLs. When set to NUMBER_WITH_DURATION, only a duration is included in each SegmentTemplate, with $Number$ media URLs."
-      },
-      {
-        "name": "include_encoder_configuration_in_segments",
-        "type": "boolean",
-        "description": "When includeEncoderConfigurationInSegments is set to true, MediaPackage places your encoder's Sequence Parameter Set (SPS), Picture Parameter Set (PPS), and Video Parameter Set (VPS) metadata in every video segment instead of in the init fragment. This lets you use different SPS/PPS/VPS settings for your assets during content playback."
+        "description": "Determines the type of UTCTiming included in the Media Presentation Description (MPD)"
       },
       {
-        "name": "include_iframe_only_stream",
-        "type": "boolean",
-        "description": "When enabled, an I-Frame only stream will be included in the output."
+        "name": "utc_timing_uri",
+        "type": "string",
+        "description": "Specifies the value attribute of the UTCTiming field when utcTiming is set to HTTP-ISO, HTTP-HEAD or HTTP-XSDATE"
       }
     ]
   },
   {
     "name": "mss_package",
     "type": "object",
-    "description": "A Microsoft Smooth Streaming (MSS) PackagingConfiguration.",
+    "description": "A Microsoft Smooth Streaming (MSS) packaging configuration.",
     "children": [
+      {
+        "name": "manifest_window_seconds",
+        "type": "integer",
+        "description": "The time window (in seconds) contained in each manifest."
+      },
+      {
+        "name": "segment_duration_seconds",
+        "type": "integer",
+        "description": "The duration (in seconds) of each segment."
+      },
       {
         "name": "encryption",
         "type": "object",
-        "description": "A CMAF encryption configuration.",
+        "description": "A Microsoft Smooth Streaming (MSS) encryption configuration.",
         "children": [
           {
             "name": "speke_key_provider",
@@ -367,14 +428,9 @@ Creates, updates, deletes or gets an <code>origin_endpoint</code> resource or li
             "description": "A configuration for accessing an external Secure Packager and Encoder Key Exchange (SPEKE) service that will provide encryption keys.",
             "children": [
               {
-                "name": "encryption_contract_configuration",
-                "type": "object",
-                "description": "The configuration to use for encrypting one or more content tracks separately for endpoints that use SPEKE 2.0."
-              },
-              {
-                "name": "role_arn",
+                "name": "resource_id",
                 "type": "string",
-                "description": "An Amazon Resource Name (ARN) of an IAM role that AWS Elemental MediaPackage will assume when accessing the key provider service."
+                "description": "The resource ID to include in key requests."
               },
               {
                 "name": "system_ids",
@@ -385,76 +441,84 @@ Creates, updates, deletes or gets an <code>origin_endpoint</code> resource or li
                 "name": "url",
                 "type": "string",
                 "description": "The URL of the external key provider service."
+              },
+              {
+                "name": "role_arn",
+                "type": "string",
+                "description": "An Amazon Resource Name (ARN) of an IAM role that AWS Elemental MediaPackage will assume when accessing the key provider service."
+              },
+              {
+                "name": "certificate_arn",
+                "type": "string",
+                "description": "An Amazon Resource Name (ARN) of a Certificate Manager certificate that MediaPackage will use for enforcing secure end-to-end data transfer with the key provider service."
+              },
+              {
+                "name": "encryption_contract_configuration",
+                "type": "object",
+                "description": "The configuration to use for encrypting one or more content tracks separately for endpoints that use SPEKE 2.0."
               }
             ]
           }
         ]
       },
       {
-        "name": "mss_manifests",
-        "type": "array",
-        "description": "A list of MSS manifest configurations.",
+        "name": "stream_selection",
+        "type": "object",
+        "description": "A StreamSelection configuration.",
         "children": [
           {
-            "name": "manifest_name",
-            "type": "string",
-            "description": "An optional string to include in the name of the manifest."
+            "name": "max_video_bits_per_second",
+            "type": "integer",
+            "description": "The maximum video bitrate (bps) to include in output."
           },
           {
-            "name": "stream_selection",
-            "type": "object",
-            "description": "A StreamSelection configuration.",
-            "children": [
-              {
-                "name": "max_video_bits_per_second",
-                "type": "integer",
-                "description": "The maximum video bitrate (bps) to include in output."
-              },
-              {
-                "name": "min_video_bits_per_second",
-                "type": "integer",
-                "description": "The minimum video bitrate (bps) to include in output."
-              },
-              {
-                "name": "stream_order",
-                "type": "string",
-                "description": "A directive that determines the order of streams in the output."
-              }
-            ]
+            "name": "min_video_bits_per_second",
+            "type": "integer",
+            "description": "The minimum video bitrate (bps) to include in output."
+          },
+          {
+            "name": "stream_order",
+            "type": "string",
+            "description": "A directive that determines the order of streams in the output."
           }
         ]
-      },
-      {
-        "name": "segment_duration_seconds",
-        "type": "integer",
-        "description": "Duration (in seconds) of each fragment. Actual fragments will be rounded to the nearest multiple of the source fragment duration."
       }
     ]
   },
   {
     "name": "cmaf_package",
     "type": "object",
-    "description": "A CMAF packaging configuration.",
+    "description": "A Common Media Application Format (CMAF) packaging configuration.",
     "children": [
+      {
+        "name": "segment_duration_seconds",
+        "type": "integer",
+        "description": "Duration (in seconds) of each segment. Actual segments will be rounded to the nearest multiple of the source segment duration."
+      },
+      {
+        "name": "segment_prefix",
+        "type": "string",
+        "description": "An optional custom string that is prepended to the name of each segment. If not specified, it defaults to the ChannelId."
+      },
       {
         "name": "encryption",
         "type": "object",
-        "description": "A CMAF encryption configuration.",
+        "description": "A Common Media Application Format (CMAF) encryption configuration.",
         "children": [
+          {
+            "name": "key_rotation_interval_seconds",
+            "type": "integer",
+            "description": "Time (in seconds) between each encryption key rotation."
+          },
           {
             "name": "speke_key_provider",
             "type": "object",
             "description": "A configuration for accessing an external Secure Packager and Encoder Key Exchange (SPEKE) service that will provide encryption keys.",
             "children": [
               {
-                "name": "encryption_contract_configuration",
-                "type": "object",
-                "description": "The configuration to use for encrypting one or more content tracks separately for endpoints that use SPEKE 2.0."
-              },
-              {
-                "name": "role_arn",
+                "name": "resource_id",
                 "type": "string",
-                "description": "An Amazon Resource Name (ARN) of an IAM role that AWS Elemental MediaPackage will assume when accessing the key provider service."
+                "description": "The resource ID to include in key requests."
               },
               {
                 "name": "system_ids",
@@ -465,30 +529,92 @@ Creates, updates, deletes or gets an <code>origin_endpoint</code> resource or li
                 "name": "url",
                 "type": "string",
                 "description": "The URL of the external key provider service."
+              },
+              {
+                "name": "role_arn",
+                "type": "string",
+                "description": "An Amazon Resource Name (ARN) of an IAM role that AWS Elemental MediaPackage will assume when accessing the key provider service."
+              },
+              {
+                "name": "certificate_arn",
+                "type": "string",
+                "description": "An Amazon Resource Name (ARN) of a Certificate Manager certificate that MediaPackage will use for enforcing secure end-to-end data transfer with the key provider service."
+              },
+              {
+                "name": "encryption_contract_configuration",
+                "type": "object",
+                "description": "The configuration to use for encrypting one or more content tracks separately for endpoints that use SPEKE 2.0."
               }
             ]
+          },
+          {
+            "name": "constant_initialization_vector",
+            "type": "string",
+            "description": "An optional 128-bit, 16-byte hex value represented by a 32-character string, used in conjunction with the key for encrypting blocks. If you don't specify a value, then MediaPackage creates the constant initialization vector (IV)."
+          },
+          {
+            "name": "encryption_method",
+            "type": "string",
+            "description": "The encryption method used"
+          }
+        ]
+      },
+      {
+        "name": "stream_selection",
+        "type": "object",
+        "description": "A StreamSelection configuration.",
+        "children": [
+          {
+            "name": "max_video_bits_per_second",
+            "type": "integer",
+            "description": "The maximum video bitrate (bps) to include in output."
+          },
+          {
+            "name": "min_video_bits_per_second",
+            "type": "integer",
+            "description": "The minimum video bitrate (bps) to include in output."
+          },
+          {
+            "name": "stream_order",
+            "type": "string",
+            "description": "A directive that determines the order of streams in the output."
           }
         ]
       },
       {
         "name": "hls_manifests",
         "type": "array",
-        "description": "A list of HLS manifest configurations.",
+        "description": "A list of HLS manifest configurations",
         "children": [
           {
-            "name": "ad_markers",
+            "name": "id",
             "type": "string",
-            "description": "This setting controls how ad markers are included in the packaged OriginEndpoint. \"NONE\" will omit all SCTE-35 ad markers from the output. \"PASSTHROUGH\" causes the manifest to contain a copy of the SCTE-35 ad markers (comments) taken directly from the input HTTP Live Streaming (HLS) manifest. \"SCTE35_ENHANCED\" generates ad markers and blackout tags based on SCTE-35 messages in the input source."
+            "description": "The ID of the manifest. The ID must be unique within the OriginEndpoint and it cannot be changed after it is created."
           },
           {
-            "name": "include_iframe_only_stream",
-            "type": "boolean",
-            "description": "When enabled, an I-Frame only stream will be included in the output."
+            "name": "manifest_name",
+            "type": "string",
+            "description": "An optional short string appended to the end of the OriginEndpoint URL. If not specified, defaults to the manifestName for the OriginEndpoint."
           },
           {
-            "name": "manifest_name",
+            "name": "url",
+            "type": "string",
+            "description": "The URL of the packaged OriginEndpoint for consumption."
+          },
+          {
+            "name": "playlist_window_seconds",
+            "type": "integer",
+            "description": "Time window (in seconds) contained in each parent manifest."
+          },
+          {
+            "name": "playlist_type",
+            "type": "string",
+            "description": "The HTTP Live Streaming (HLS) playlist type. When either \"EVENT\" or \"VOD\" is specified, a corresponding EXT-X-PLAYLIST-TYPE entry will be included in the media playlist."
+          },
+          {
+            "name": "ad_markers",
             "type": "string",
-            "description": "An optional string to include in the name of the manifest."
+            "description": "This setting controls how ad markers are included in the packaged OriginEndpoint. \"NONE\" will omit all SCTE-35 ad markers from the output. \"PASSTHROUGH\" causes the manifest to contain a copy of the SCTE-35 ad markers (comments) taken directly from the input HTTP Live Streaming (HLS) manifest. \"SCTE35_ENHANCED\" generates ad markers and blackout tags based on SCTE-35 messages in the input source. \"DATERANGE\" inserts EXT-X-DATERANGE tags to signal ad and program transition events in HLS and CMAF manifests. For this option, you must set a programDateTimeIntervalSeconds value that is greater than 0."
           },
           {
             "name": "program_date_time_interval_seconds",
@@ -496,43 +622,21 @@ Creates, updates, deletes or gets an <code>origin_endpoint</code> resource or li
             "description": "The interval (in seconds) between each EXT-X-PROGRAM-DATE-TIME tag inserted into manifests. Additionally, when an interval is specified ID3Timed Metadata messages will be generated every 5 seconds using the ingest time of the content. If the interval is not specified, or set to 0, then no EXT-X-PROGRAM-DATE-TIME tags will be inserted into manifests and no ID3Timed Metadata messages will be generated. Note that irrespective of this parameter, if any ID3 Timed Metadata is found in HTTP Live Streaming (HLS) input, it will be passed through to HLS output."
           },
           {
-            "name": "repeat_ext_xkey",
+            "name": "include_iframe_only_stream",
             "type": "boolean",
-            "description": "When enabled, the EXT-X-KEY tag will be repeated in output manifests."
+            "description": "When enabled, an I-Frame only stream will be included in the output."
           },
           {
-            "name": "stream_selection",
-            "type": "object",
-            "description": "A StreamSelection configuration.",
-            "children": [
-              {
-                "name": "max_video_bits_per_second",
-                "type": "integer",
-                "description": "The maximum video bitrate (bps) to include in output."
-              },
-              {
-                "name": "min_video_bits_per_second",
-                "type": "integer",
-                "description": "The minimum video bitrate (bps) to include in output."
-              },
-              {
-                "name": "stream_order",
-                "type": "string",
-                "description": "A directive that determines the order of streams in the output."
-              }
-            ]
+            "name": "ad_triggers",
+            "type": "array",
+            "description": "A list of SCTE-35 message types that are treated as ad markers in the output.  If empty, no ad markers are output.  Specify multiple items to create ad markers for all of the included message types."
+          },
+          {
+            "name": "ads_on_delivery_restrictions",
+            "type": "string",
+            "description": "This setting allows the delivery restriction flags on SCTE-35 segmentation descriptors to determine whether a message signals an ad.  Choosing \"NONE\" means no SCTE-35 messages become ads.  Choosing \"RESTRICTED\" means SCTE-35 messages of the types specified in AdTriggers that contain delivery restrictions will be treated as ads.  Choosing \"UNRESTRICTED\" means SCTE-35 messages of the types specified in AdTriggers that do not contain delivery restrictions will be treated as ads.  Choosing \"BOTH\" means all SCTE-35 messages of the types specified in AdTriggers will be treated as ads.  Note that Splice Insert messages do not have these flags and are always treated as ads if specified in AdTriggers."
           }
         ]
-      },
-      {
-        "name": "segment_duration_seconds",
-        "type": "integer",
-        "description": "Duration (in seconds) of each fragment. Actual fragments will be rounded to the nearest multiple of the source fragment duration."
-      },
-      {
-        "name": "include_encoder_configuration_in_segments",
-        "type": "boolean",
-        "description": "When includeEncoderConfigurationInSegments is set to true, MediaPackage places your encoder's Sequence Parameter Set (SPS), Picture Parameter Set (PPS), and Video Parameter Set (VPS) metadata in every video segment instead of in the init fragment. This lets you use different SPS/PPS/VPS settings for your assets during content playback."
       }
     ]
   },
@@ -795,67 +899,91 @@ resources:
         value: '{{ origination }}'
       - name: authorization
         value:
-          cdn_identifier_secret: '{{ cdn_identifier_secret }}'
           secrets_role_arn: '{{ secrets_role_arn }}'
+          cdn_identifier_secret: '{{ cdn_identifier_secret }}'
       - name: hls_package
         value:
+          segment_duration_seconds: '{{ segment_duration_seconds }}'
+          playlist_window_seconds: '{{ playlist_window_seconds }}'
+          playlist_type: '{{ playlist_type }}'
+          ad_markers: '{{ ad_markers }}'
+          ad_triggers:
+            - '{{ ad_triggers[0] }}'
+          ads_on_delivery_restrictions: '{{ ads_on_delivery_restrictions }}'
+          program_date_time_interval_seconds: '{{ program_date_time_interval_seconds }}'
+          include_iframe_only_stream: '{{ include_iframe_only_stream }}'
+          use_audio_rendition_group: '{{ use_audio_rendition_group }}'
+          include_dvb_subtitles: '{{ include_dvb_subtitles }}'
           encryption:
-            constant_initialization_vector: '{{ constant_initialization_vector }}'
             encryption_method: '{{ encryption_method }}'
+            constant_initialization_vector: '{{ constant_initialization_vector }}'
+            key_rotation_interval_seconds: '{{ key_rotation_interval_seconds }}'
+            repeat_ext_xkey: '{{ repeat_ext_xkey }}'
             speke_key_provider:
-              encryption_contract_configuration:
-                preset_speke20_audio: '{{ preset_speke20_audio }}'
-                preset_speke20_video: '{{ preset_speke20_video }}'
-              role_arn: '{{ role_arn }}'
+              resource_id: '{{ resource_id }}'
               system_ids:
                 - '{{ system_ids[0] }}'
               url: '{{ url }}'
-          hls_manifests:
-            - ad_markers: '{{ ad_markers }}'
-              include_iframe_only_stream: '{{ include_iframe_only_stream }}'
-              manifest_name: '{{ manifest_name }}'
-              program_date_time_interval_seconds: '{{ program_date_time_interval_seconds }}'
-              repeat_ext_xkey: '{{ repeat_ext_xkey }}'
-              stream_selection:
-                max_video_bits_per_second: '{{ max_video_bits_per_second }}'
-                min_video_bits_per_second: '{{ min_video_bits_per_second }}'
-                stream_order: '{{ stream_order }}'
-          include_dvb_subtitles: '{{ include_dvb_subtitles }}'
-          segment_duration_seconds: '{{ segment_duration_seconds }}'
-          use_audio_rendition_group: '{{ use_audio_rendition_group }}'
+              role_arn: '{{ role_arn }}'
+              certificate_arn: '{{ certificate_arn }}'
+              encryption_contract_configuration:
+                preset_speke20_audio: '{{ preset_speke20_audio }}'
+                preset_speke20_video: '{{ preset_speke20_video }}'
+          stream_selection:
+            max_video_bits_per_second: '{{ max_video_bits_per_second }}'
+            min_video_bits_per_second: '{{ min_video_bits_per_second }}'
+            stream_order: '{{ stream_order }}'
       - name: dash_package
         value:
-          dash_manifests:
-            - manifest_layout: '{{ manifest_layout }}'
-              manifest_name: null
-              min_buffer_time_seconds: '{{ min_buffer_time_seconds }}'
-              profile: '{{ profile }}'
-              scte_markers_source: '{{ scte_markers_source }}'
-              stream_selection: null
-          encryption:
-            speke_key_provider: null
+          segment_duration_seconds: '{{ segment_duration_seconds }}'
+          manifest_window_seconds: '{{ manifest_window_seconds }}'
+          profile: '{{ profile }}'
+          min_update_period_seconds: '{{ min_update_period_seconds }}'
+          min_buffer_time_seconds: '{{ min_buffer_time_seconds }}'
+          suggested_presentation_delay_seconds: '{{ suggested_presentation_delay_seconds }}'
           period_triggers:
             - '{{ period_triggers[0] }}'
-          segment_duration_seconds: null
-          segment_template_format: '{{ segment_template_format }}'
-          include_encoder_configuration_in_segments: '{{ include_encoder_configuration_in_segments }}'
           include_iframe_only_stream: '{{ include_iframe_only_stream }}'
+          manifest_layout: '{{ manifest_layout }}'
+          segment_template_format: '{{ segment_template_format }}'
+          ad_triggers:
+            - '{{ ad_triggers[0] }}'
+          ads_on_delivery_restrictions: null
+          encryption:
+            key_rotation_interval_seconds: '{{ key_rotation_interval_seconds }}'
+            speke_key_provider: null
+          stream_selection: null
+          utc_timing: '{{ utc_timing }}'
+          utc_timing_uri: '{{ utc_timing_uri }}'
       - name: mss_package
         value:
+          manifest_window_seconds: '{{ manifest_window_seconds }}'
+          segment_duration_seconds: '{{ segment_duration_seconds }}'
           encryption:
             speke_key_provider: null
-          mss_manifests:
-            - manifest_name: null
-              stream_selection: null
-          segment_duration_seconds: null
+          stream_selection: null
       - name: cmaf_package
         value:
+          segment_duration_seconds: '{{ segment_duration_seconds }}'
+          segment_prefix: '{{ segment_prefix }}'
           encryption:
+            key_rotation_interval_seconds: '{{ key_rotation_interval_seconds }}'
             speke_key_provider: null
+            constant_initialization_vector: '{{ constant_initialization_vector }}'
+            encryption_method: '{{ encryption_method }}'
+          stream_selection: null
           hls_manifests:
-            - null
-          segment_duration_seconds: null
-          include_encoder_configuration_in_segments: '{{ include_encoder_configuration_in_segments }}'
+            - id: '{{ id }}'
+              manifest_name: '{{ manifest_name }}'
+              url: '{{ url }}'
+              playlist_window_seconds: '{{ playlist_window_seconds }}'
+              playlist_type: '{{ playlist_type }}'
+              ad_markers: '{{ ad_markers }}'
+              program_date_time_interval_seconds: '{{ program_date_time_interval_seconds }}'
+              include_iframe_only_stream: '{{ include_iframe_only_stream }}'
+              ad_triggers:
+                - '{{ ad_triggers[0] }}'
+              ads_on_delivery_restrictions: null
       - name: tags
         value:
           - key: '{{ key }}'
diff --git a/website/docs/services/memorydb/clusters/index.md b/website/docs/services/memorydb/clusters/index.md
index 61d83daa8..a89f277e8 100644
--- a/website/docs/services/memorydb/clusters/index.md
+++ b/website/docs/services/memorydb/clusters/index.md
@@ -219,12 +219,12 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with 'aws:'. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key for the tag. May not be null."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The tag's value. May be null."
       }
     ]
   },
diff --git a/website/docs/services/memorydb/multi_region_clusters/index.md b/website/docs/services/memorydb/multi_region_clusters/index.md
index 6ee1d1114..25b8ac37e 100644
--- a/website/docs/services/memorydb/multi_region_clusters/index.md
+++ b/website/docs/services/memorydb/multi_region_clusters/index.md
@@ -107,12 +107,12 @@ Creates, updates, deletes or gets a <code>multi_region_cluster</code> resource o
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with 'aws:'. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key for the tag. May not be null."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The tag's value. May be null."
       }
     ]
   },
diff --git a/website/docs/services/memorydb/parameter_groups/index.md b/website/docs/services/memorydb/parameter_groups/index.md
index 795617421..6ce3aaa9f 100644
--- a/website/docs/services/memorydb/parameter_groups/index.md
+++ b/website/docs/services/memorydb/parameter_groups/index.md
@@ -67,12 +67,12 @@ Creates, updates, deletes or gets a <code>parameter_group</code> resource or lis
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with 'aws:'. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key for the tag. May not be null."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The tag's value. May be null."
       }
     ]
   },
diff --git a/website/docs/services/memorydb/subnet_groups/index.md b/website/docs/services/memorydb/subnet_groups/index.md
index 7cc4e415b..daf3158a7 100644
--- a/website/docs/services/memorydb/subnet_groups/index.md
+++ b/website/docs/services/memorydb/subnet_groups/index.md
@@ -67,12 +67,12 @@ Creates, updates, deletes or gets a <code>subnet_group</code> resource or lists
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with 'aws:'. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key for the tag. May not be null."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The tag's value. May be null."
       }
     ]
   },
diff --git a/website/docs/services/msk/clusters/index.md b/website/docs/services/msk/clusters/index.md
index c908a4046..a02bfd2b2 100644
--- a/website/docs/services/msk/clusters/index.md
+++ b/website/docs/services/msk/clusters/index.md
@@ -235,11 +235,40 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
     "type": "object",
     "description": "",
     "children": [
+      {
+        "name": "tls",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "certificate_authority_arn_list",
+            "type": "array",
+            "description": ""
+          },
+          {
+            "name": "enabled",
+            "type": "boolean",
+            "description": ""
+          }
+        ]
+      },
       {
         "name": "sasl",
         "type": "object",
         "description": "",
         "children": [
+          {
+            "name": "scram",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "enabled",
+                "type": "boolean",
+                "description": ""
+              }
+            ]
+          },
           {
             "name": "iam",
             "type": "object",
@@ -253,6 +282,18 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
             ]
           }
         ]
+      },
+      {
+        "name": "unauthenticated",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "enabled",
+            "type": "boolean",
+            "description": ""
+          }
+        ]
       }
     ]
   },
@@ -628,9 +669,17 @@ resources:
         value: '{{ current_version }}'
       - name: client_authentication
         value:
+          tls:
+            certificate_authority_arn_list:
+              - '{{ certificate_authority_arn_list[0] }}'
+            enabled: '{{ enabled }}'
           sasl:
+            scram:
+              enabled: '{{ enabled }}'
             iam:
               enabled: '{{ enabled }}'
+          unauthenticated:
+            enabled: '{{ enabled }}'
       - name: logging_info
         value:
           broker_logs:
diff --git a/website/docs/services/networkfirewall/firewall_policies/index.md b/website/docs/services/networkfirewall/firewall_policies/index.md
index 781a628e5..5980fe805 100644
--- a/website/docs/services/networkfirewall/firewall_policies/index.md
+++ b/website/docs/services/networkfirewall/firewall_policies/index.md
@@ -57,37 +57,126 @@ Creates, updates, deletes or gets a <code>firewall_policy</code> resource or lis
   {
     "name": "firewall_policy",
     "type": "object",
-    "description": "Resource type definition for AWS::NetworkFirewall::FirewallPolicy",
+    "description": "",
     "children": [
       {
-        "name": "firewall_policy_name",
-        "type": "string",
+        "name": "stateless_default_actions",
+        "type": "array",
         "description": ""
       },
       {
-        "name": "firewall_policy_id",
-        "type": "string",
+        "name": "stateless_fragment_default_actions",
+        "type": "array",
         "description": ""
       },
       {
-        "name": "description",
-        "type": "string",
-        "description": ""
+        "name": "stateless_custom_actions",
+        "type": "array",
+        "description": "",
+        "children": [
+          {
+            "name": "action_name",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "action_definition",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "publish_metric_action",
+                "type": "object",
+                "description": ""
+              }
+            ]
+          }
+        ]
       },
       {
-        "name": "tags",
+        "name": "stateless_rule_group_references",
         "type": "array",
         "description": "",
         "children": [
           {
-            "name": "key",
+            "name": "priority",
+            "type": "integer",
+            "description": ""
+          }
+        ]
+      },
+      {
+        "name": "stateful_rule_group_references",
+        "type": "array",
+        "description": "",
+        "children": [
+          {
+            "name": "priority",
+            "type": "integer",
+            "description": ""
+          },
+          {
+            "name": "override",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "action",
+                "type": "string",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "deep_threat_inspection",
+            "type": "boolean",
+            "description": ""
+          }
+        ]
+      },
+      {
+        "name": "stateful_default_actions",
+        "type": "array",
+        "description": ""
+      },
+      {
+        "name": "stateful_engine_options",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "rule_order",
             "type": "string",
             "description": ""
           },
           {
-            "name": "value",
+            "name": "stream_exception_policy",
             "type": "string",
             "description": ""
+          },
+          {
+            "name": "flow_timeouts",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "tcp_idle_timeout_seconds",
+                "type": "integer",
+                "description": ""
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "policy_variables",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "rule_variables",
+            "type": "object",
+            "description": ""
           }
         ]
       }
@@ -138,37 +227,126 @@ Creates, updates, deletes or gets a <code>firewall_policy</code> resource or lis
   {
     "name": "firewall_policy",
     "type": "object",
-    "description": "Resource type definition for AWS::NetworkFirewall::FirewallPolicy",
+    "description": "",
     "children": [
       {
-        "name": "firewall_policy_name",
-        "type": "string",
+        "name": "stateless_default_actions",
+        "type": "array",
         "description": ""
       },
       {
-        "name": "firewall_policy_id",
-        "type": "string",
+        "name": "stateless_fragment_default_actions",
+        "type": "array",
         "description": ""
       },
       {
-        "name": "description",
-        "type": "string",
-        "description": ""
+        "name": "stateless_custom_actions",
+        "type": "array",
+        "description": "",
+        "children": [
+          {
+            "name": "action_name",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "action_definition",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "publish_metric_action",
+                "type": "object",
+                "description": ""
+              }
+            ]
+          }
+        ]
       },
       {
-        "name": "tags",
+        "name": "stateless_rule_group_references",
         "type": "array",
         "description": "",
         "children": [
           {
-            "name": "key",
+            "name": "priority",
+            "type": "integer",
+            "description": ""
+          }
+        ]
+      },
+      {
+        "name": "stateful_rule_group_references",
+        "type": "array",
+        "description": "",
+        "children": [
+          {
+            "name": "priority",
+            "type": "integer",
+            "description": ""
+          },
+          {
+            "name": "override",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "action",
+                "type": "string",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "deep_threat_inspection",
+            "type": "boolean",
+            "description": ""
+          }
+        ]
+      },
+      {
+        "name": "stateful_default_actions",
+        "type": "array",
+        "description": ""
+      },
+      {
+        "name": "stateful_engine_options",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "rule_order",
             "type": "string",
             "description": ""
           },
           {
-            "name": "value",
+            "name": "stream_exception_policy",
             "type": "string",
             "description": ""
+          },
+          {
+            "name": "flow_timeouts",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "tcp_idle_timeout_seconds",
+                "type": "integer",
+                "description": ""
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "policy_variables",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "rule_variables",
+            "type": "object",
+            "description": ""
           }
         ]
       }
@@ -356,17 +534,41 @@ resources:
         value: '{{ firewall_policy_name }}'
       - name: firewall_policy
         value:
-          firewall_policy_name: '{{ firewall_policy_name }}'
-          firewall_policy: null
-          description: '{{ description }}'
-          tags:
-            - key: '{{ key }}'
-              value: '{{ value }}'
+          stateless_default_actions:
+            - '{{ stateless_default_actions[0] }}'
+          stateless_fragment_default_actions:
+            - '{{ stateless_fragment_default_actions[0] }}'
+          stateless_custom_actions:
+            - action_name: '{{ action_name }}'
+              action_definition:
+                publish_metric_action:
+                  dimensions:
+                    - value: '{{ value }}'
+          stateless_rule_group_references:
+            - resource_arn: '{{ resource_arn }}'
+              priority: '{{ priority }}'
+          stateful_rule_group_references:
+            - resource_arn: null
+              priority: null
+              override:
+                action: '{{ action }}'
+              deep_threat_inspection: '{{ deep_threat_inspection }}'
+          stateful_default_actions:
+            - '{{ stateful_default_actions[0] }}'
+          stateful_engine_options:
+            rule_order: '{{ rule_order }}'
+            stream_exception_policy: '{{ stream_exception_policy }}'
+            flow_timeouts:
+              tcp_idle_timeout_seconds: '{{ tcp_idle_timeout_seconds }}'
+          policy_variables:
+            rule_variables: {}
+          tls_inspection_configuration_arn: null
       - name: description
         value: '{{ description }}'
       - name: tags
         value:
-          - null`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/networkfirewall/logging_configurations/index.md b/website/docs/services/networkfirewall/logging_configurations/index.md
index 71e85a4f5..ed38b372c 100644
--- a/website/docs/services/networkfirewall/logging_configurations/index.md
+++ b/website/docs/services/networkfirewall/logging_configurations/index.md
@@ -48,17 +48,29 @@ Creates, updates, deletes or gets a <code>logging_configuration</code> resource
   {
     "name": "logging_configuration",
     "type": "object",
-    "description": "Resource type definition for AWS::NetworkFirewall::LoggingConfiguration",
+    "description": "",
     "children": [
       {
-        "name": "firewall_name",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "enable_monitoring_dashboard",
-        "type": "boolean",
-        "description": ""
+        "name": "log_destination_configs",
+        "type": "array",
+        "description": "",
+        "children": [
+          {
+            "name": "log_type",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "log_destination_type",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "log_destination",
+            "type": "object",
+            "description": "A key-value pair to configure the logDestinations."
+          }
+        ]
       }
     ]
   },
@@ -213,10 +225,10 @@ resources:
         value: '{{ firewall_arn }}'
       - name: logging_configuration
         value:
-          firewall_name: '{{ firewall_name }}'
-          firewall_arn: null
-          logging_configuration: null
-          enable_monitoring_dashboard: '{{ enable_monitoring_dashboard }}'
+          log_destination_configs:
+            - log_type: '{{ log_type }}'
+              log_destination_type: '{{ log_destination_type }}'
+              log_destination: {}
       - name: enable_monitoring_dashboard
         value: '{{ enable_monitoring_dashboard }}'`}</CodeBlock>
 
diff --git a/website/docs/services/networkfirewall/rule_groups/index.md b/website/docs/services/networkfirewall/rule_groups/index.md
index 3a5b6e125..3a3340ebb 100644
--- a/website/docs/services/networkfirewall/rule_groups/index.md
+++ b/website/docs/services/networkfirewall/rule_groups/index.md
@@ -62,57 +62,117 @@ Creates, updates, deletes or gets a <code>rule_group</code> resource or lists <c
   {
     "name": "rule_group",
     "type": "object",
-    "description": "Resource type definition for AWS::NetworkFirewall::RuleGroup",
+    "description": "",
     "children": [
       {
-        "name": "rule_group_name",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "rule_group_id",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "type",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "capacity",
-        "type": "integer",
-        "description": ""
-      },
-      {
-        "name": "summary_configuration",
+        "name": "rule_variables",
         "type": "object",
         "description": "",
         "children": [
           {
-            "name": "rule_options",
-            "type": "array",
+            "name": "ip_sets",
+            "type": "object",
+            "description": ""
+          },
+          {
+            "name": "port_sets",
+            "type": "object",
             "description": ""
           }
         ]
       },
       {
-        "name": "description",
-        "type": "string",
-        "description": ""
+        "name": "reference_sets",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "ip_set_references",
+            "type": "object",
+            "description": ""
+          }
+        ]
       },
       {
-        "name": "tags",
-        "type": "array",
+        "name": "rules_source",
+        "type": "object",
         "description": "",
         "children": [
           {
-            "name": "key",
+            "name": "rules_string",
             "type": "string",
             "description": ""
           },
           {
-            "name": "value",
+            "name": "rules_source_list",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "targets",
+                "type": "array",
+                "description": ""
+              },
+              {
+                "name": "target_types",
+                "type": "array",
+                "description": ""
+              },
+              {
+                "name": "generated_rules_type",
+                "type": "string",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "stateful_rules",
+            "type": "array",
+            "description": "",
+            "children": [
+              {
+                "name": "action",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "header",
+                "type": "object",
+                "description": ""
+              },
+              {
+                "name": "rule_options",
+                "type": "array",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "stateless_rules_and_custom_actions",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "stateless_rules",
+                "type": "array",
+                "description": ""
+              },
+              {
+                "name": "custom_actions",
+                "type": "array",
+                "description": ""
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "stateful_rule_options",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "rule_order",
             "type": "string",
             "description": ""
           }
@@ -182,57 +242,117 @@ Creates, updates, deletes or gets a <code>rule_group</code> resource or lists <c
   {
     "name": "rule_group",
     "type": "object",
-    "description": "Resource type definition for AWS::NetworkFirewall::RuleGroup",
+    "description": "",
     "children": [
       {
-        "name": "rule_group_name",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "rule_group_id",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "type",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "capacity",
-        "type": "integer",
-        "description": ""
-      },
-      {
-        "name": "summary_configuration",
+        "name": "rule_variables",
         "type": "object",
         "description": "",
         "children": [
           {
-            "name": "rule_options",
-            "type": "array",
+            "name": "ip_sets",
+            "type": "object",
+            "description": ""
+          },
+          {
+            "name": "port_sets",
+            "type": "object",
             "description": ""
           }
         ]
       },
       {
-        "name": "description",
-        "type": "string",
-        "description": ""
+        "name": "reference_sets",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "ip_set_references",
+            "type": "object",
+            "description": ""
+          }
+        ]
       },
       {
-        "name": "tags",
-        "type": "array",
+        "name": "rules_source",
+        "type": "object",
         "description": "",
         "children": [
           {
-            "name": "key",
+            "name": "rules_string",
             "type": "string",
             "description": ""
           },
           {
-            "name": "value",
+            "name": "rules_source_list",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "targets",
+                "type": "array",
+                "description": ""
+              },
+              {
+                "name": "target_types",
+                "type": "array",
+                "description": ""
+              },
+              {
+                "name": "generated_rules_type",
+                "type": "string",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "stateful_rules",
+            "type": "array",
+            "description": "",
+            "children": [
+              {
+                "name": "action",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "header",
+                "type": "object",
+                "description": ""
+              },
+              {
+                "name": "rule_options",
+                "type": "array",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "stateless_rules_and_custom_actions",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "stateless_rules",
+                "type": "array",
+                "description": ""
+              },
+              {
+                "name": "custom_actions",
+                "type": "array",
+                "description": ""
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "stateful_rule_options",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "rule_order",
             "type": "string",
             "description": ""
           }
@@ -433,17 +553,63 @@ resources:
         value: '{{ rule_group_name }}'
       - name: rule_group
         value:
-          rule_group_name: '{{ rule_group_name }}'
-          rule_group: null
-          type: '{{ type }}'
-          capacity: '{{ capacity }}'
-          summary_configuration:
-            rule_options:
-              - '{{ rule_options[0] }}'
-          description: '{{ description }}'
-          tags:
-            - key: '{{ key }}'
-              value: '{{ value }}'
+          rule_variables:
+            ip_sets: {}
+            port_sets: {}
+          reference_sets:
+            ip_set_references: {}
+          rules_source:
+            rules_string: '{{ rules_string }}'
+            rules_source_list:
+              targets:
+                - '{{ targets[0] }}'
+              target_types:
+                - '{{ target_types[0] }}'
+              generated_rules_type: '{{ generated_rules_type }}'
+            stateful_rules:
+              - action: '{{ action }}'
+                header:
+                  protocol: '{{ protocol }}'
+                  source: '{{ source }}'
+                  source_port: '{{ source_port }}'
+                  direction: '{{ direction }}'
+                  destination: '{{ destination }}'
+                  destination_port: null
+                rule_options:
+                  - keyword: '{{ keyword }}'
+                    settings:
+                      - '{{ settings[0] }}'
+            stateless_rules_and_custom_actions:
+              stateless_rules:
+                - rule_definition:
+                    match_attributes:
+                      sources:
+                        - address_definition: '{{ address_definition }}'
+                      destinations:
+                        - null
+                      source_ports:
+                        - from_port: '{{ from_port }}'
+                          to_port: null
+                      destination_ports:
+                        - null
+                      protocols:
+                        - '{{ protocols[0] }}'
+                      t_cp_flags:
+                        - flags:
+                            - '{{ flags[0] }}'
+                          masks:
+                            - null
+                    actions:
+                      - '{{ actions[0] }}'
+                  priority: '{{ priority }}'
+              custom_actions:
+                - action_name: '{{ action_name }}'
+                  action_definition:
+                    publish_metric_action:
+                      dimensions:
+                        - value: '{{ value }}'
+          stateful_rule_options:
+            rule_order: '{{ rule_order }}'
       - name: type
         value: '{{ type }}'
       - name: capacity
@@ -451,12 +617,13 @@ resources:
       - name: summary_configuration
         value:
           rule_options:
-            - null
+            - '{{ rule_options[0] }}'
       - name: description
         value: '{{ description }}'
       - name: tags
         value:
-          - null`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/networkfirewall/tls_inspection_configurations/index.md b/website/docs/services/networkfirewall/tls_inspection_configurations/index.md
index ac8b990c9..31161f6ab 100644
--- a/website/docs/services/networkfirewall/tls_inspection_configurations/index.md
+++ b/website/docs/services/networkfirewall/tls_inspection_configurations/index.md
@@ -57,37 +57,66 @@ Creates, updates, deletes or gets a <code>tls_inspection_configuration</code> re
   {
     "name": "tls_inspection_configuration",
     "type": "object",
-    "description": "Resource type definition for AWS::NetworkFirewall::TLSInspectionConfiguration",
+    "description": "",
     "children": [
       {
-        "name": "tls_inspection_configuration_name",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "tls_inspection_configuration_id",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "description",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "tags",
+        "name": "server_certificate_configurations",
         "type": "array",
         "description": "",
         "children": [
           {
-            "name": "key",
-            "type": "string",
+            "name": "server_certificates",
+            "type": "array",
             "description": ""
           },
           {
-            "name": "value",
-            "type": "string",
-            "description": ""
+            "name": "scopes",
+            "type": "array",
+            "description": "",
+            "children": [
+              {
+                "name": "sources",
+                "type": "array",
+                "description": ""
+              },
+              {
+                "name": "destinations",
+                "type": "array",
+                "description": ""
+              },
+              {
+                "name": "source_ports",
+                "type": "array",
+                "description": ""
+              },
+              {
+                "name": "destination_ports",
+                "type": "array",
+                "description": ""
+              },
+              {
+                "name": "protocols",
+                "type": "array",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "check_certificate_revocation_status",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "revoked_status_action",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "unknown_status_action",
+                "type": "string",
+                "description": ""
+              }
+            ]
           }
         ]
       }
@@ -138,37 +167,66 @@ Creates, updates, deletes or gets a <code>tls_inspection_configuration</code> re
   {
     "name": "tls_inspection_configuration",
     "type": "object",
-    "description": "Resource type definition for AWS::NetworkFirewall::TLSInspectionConfiguration",
+    "description": "",
     "children": [
       {
-        "name": "tls_inspection_configuration_name",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "tls_inspection_configuration_id",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "description",
-        "type": "string",
-        "description": ""
-      },
-      {
-        "name": "tags",
+        "name": "server_certificate_configurations",
         "type": "array",
         "description": "",
         "children": [
           {
-            "name": "key",
-            "type": "string",
+            "name": "server_certificates",
+            "type": "array",
             "description": ""
           },
           {
-            "name": "value",
-            "type": "string",
-            "description": ""
+            "name": "scopes",
+            "type": "array",
+            "description": "",
+            "children": [
+              {
+                "name": "sources",
+                "type": "array",
+                "description": ""
+              },
+              {
+                "name": "destinations",
+                "type": "array",
+                "description": ""
+              },
+              {
+                "name": "source_ports",
+                "type": "array",
+                "description": ""
+              },
+              {
+                "name": "destination_ports",
+                "type": "array",
+                "description": ""
+              },
+              {
+                "name": "protocols",
+                "type": "array",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "check_certificate_revocation_status",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "revoked_status_action",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "unknown_status_action",
+                "type": "string",
+                "description": ""
+              }
+            ]
           }
         ]
       }
@@ -356,17 +414,31 @@ resources:
         value: '{{ tls_inspection_configuration_name }}'
       - name: tls_inspection_configuration
         value:
-          tls_inspection_configuration_name: '{{ tls_inspection_configuration_name }}'
-          tls_inspection_configuration: null
-          description: '{{ description }}'
-          tags:
-            - key: '{{ key }}'
-              value: '{{ value }}'
+          server_certificate_configurations:
+            - server_certificates:
+                - resource_arn: '{{ resource_arn }}'
+              scopes:
+                - sources:
+                    - address_definition: '{{ address_definition }}'
+                  destinations:
+                    - null
+                  source_ports:
+                    - from_port: '{{ from_port }}'
+                      to_port: null
+                  destination_ports:
+                    - null
+                  protocols:
+                    - '{{ protocols[0] }}'
+              certificate_authority_arn: null
+              check_certificate_revocation_status:
+                revoked_status_action: '{{ revoked_status_action }}'
+                unknown_status_action: '{{ unknown_status_action }}'
       - name: description
         value: '{{ description }}'
       - name: tags
         value:
-          - null`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/networkmanager/connect_attachments/index.md b/website/docs/services/networkmanager/connect_attachments/index.md
index 8e34ff2d5..2cffb7d6f 100644
--- a/website/docs/services/networkmanager/connect_attachments/index.md
+++ b/website/docs/services/networkmanager/connect_attachments/index.md
@@ -102,7 +102,7 @@ Creates, updates, deletes or gets a <code>connect_attachment</code> resource or
       {
         "name": "tags",
         "type": "array",
-        "description": "The key-value tags that changed for the segment.",
+        "description": "The list of key-value tags that changed for the segment.",
         "children": [
           {
             "name": "key",
diff --git a/website/docs/services/notificationscontacts/email_contacts/index.md b/website/docs/services/notificationscontacts/email_contacts/index.md
index 8f404c96a..6fe99df84 100644
--- a/website/docs/services/notificationscontacts/email_contacts/index.md
+++ b/website/docs/services/notificationscontacts/email_contacts/index.md
@@ -62,7 +62,7 @@ Creates, updates, deletes or gets an <code>email_contact</code> resource or list
   {
     "name": "email_contact",
     "type": "object",
-    "description": "Definition of AWS::NotificationsContacts::EmailContact Resource Type",
+    "description": "",
     "children": [
       {
         "name": "arn",
@@ -70,31 +70,29 @@ Creates, updates, deletes or gets an <code>email_contact</code> resource or list
         "description": ""
       },
       {
-        "name": "email_address",
+        "name": "name",
         "type": "string",
         "description": ""
       },
       {
-        "name": "name",
+        "name": "address",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "status",
         "type": "string",
         "description": ""
       },
       {
-        "name": "tags",
-        "type": "array",
-        "description": "A list of tags that are attached to the role.",
-        "children": [
-          {
-            "name": "key",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "value",
-            "type": "string",
-            "description": ""
-          }
-        ]
+        "name": "creation_time",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "update_time",
+        "type": "string",
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/observabilityadmin/organization_telemetry_rules/index.md b/website/docs/services/observabilityadmin/organization_telemetry_rules/index.md
index 64b75e853..61ad50291 100644
--- a/website/docs/services/observabilityadmin/organization_telemetry_rules/index.md
+++ b/website/docs/services/observabilityadmin/organization_telemetry_rules/index.md
@@ -52,34 +52,71 @@ Creates, updates, deletes or gets an <code>organization_telemetry_rule</code> re
   {
     "name": "rule",
     "type": "object",
-    "description": "The AWS::ObservabilityAdmin::TelemetryRule resource defines a CloudWatch Observability Admin Telemetry Rule.",
+    "description": "The telemetry rule",
     "children": [
       {
-        "name": "rule_name",
+        "name": "resource_type",
         "type": "string",
-        "description": "The name of the telemetry rule"
+        "description": "Resource Type associated with the Organization Telemetry Rule"
       },
       {
-        "name": "rule_arn",
+        "name": "telemetry_type",
         "type": "string",
-        "description": "The arn of the telemetry rule"
+        "description": "Telemetry Type associated with the Organization Telemetry Rule"
       },
       {
-        "name": "tags",
-        "type": "array",
-        "description": "An array of key-value pairs to apply to this resource",
+        "name": "destination_configuration",
+        "type": "object",
+        "description": "The destination configuration for telemetry data",
         "children": [
           {
-            "name": "key",
+            "name": "destination_type",
             "type": "string",
-            "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+            "description": "Type of telemetry destination"
           },
           {
-            "name": "value",
+            "name": "destination_pattern",
             "type": "string",
-            "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+            "description": "Pattern for telemetry data destination"
+          },
+          {
+            "name": "retention_in_days",
+            "type": "integer",
+            "description": "Number of days to retain the telemetry data in the specified destination"
+          },
+          {
+            "name": "vpc_flow_log_parameters",
+            "type": "object",
+            "description": "Telemetry parameters for VPC Flow logs",
+            "children": [
+              {
+                "name": "log_format",
+                "type": "string",
+                "description": "The fields to include in the flow log record. If you omit this parameter, the flow log is created using the default format."
+              },
+              {
+                "name": "traffic_type",
+                "type": "string",
+                "description": "The type of traffic captured for the flow log. Default is ALL"
+              },
+              {
+                "name": "max_aggregation_interval",
+                "type": "integer",
+                "description": "The maximum interval of time, in seconds, during which a flow of packets is captured and aggregated into a flow log record. Default is 600s."
+              }
+            ]
           }
         ]
+      },
+      {
+        "name": "scope",
+        "type": "string",
+        "description": "Selection Criteria on scope level for rule application"
+      },
+      {
+        "name": "selection_criteria",
+        "type": "string",
+        "description": "Selection Criteria on resource level for rule application"
       }
     ]
   },
@@ -118,34 +155,71 @@ Creates, updates, deletes or gets an <code>organization_telemetry_rule</code> re
   {
     "name": "rule",
     "type": "object",
-    "description": "The AWS::ObservabilityAdmin::TelemetryRule resource defines a CloudWatch Observability Admin Telemetry Rule.",
+    "description": "The telemetry rule",
     "children": [
       {
-        "name": "rule_name",
+        "name": "resource_type",
         "type": "string",
-        "description": "The name of the telemetry rule"
+        "description": "Resource Type associated with the Organization Telemetry Rule"
       },
       {
-        "name": "rule_arn",
+        "name": "telemetry_type",
         "type": "string",
-        "description": "The arn of the telemetry rule"
+        "description": "Telemetry Type associated with the Organization Telemetry Rule"
       },
       {
-        "name": "tags",
-        "type": "array",
-        "description": "An array of key-value pairs to apply to this resource",
+        "name": "destination_configuration",
+        "type": "object",
+        "description": "The destination configuration for telemetry data",
         "children": [
           {
-            "name": "key",
+            "name": "destination_type",
             "type": "string",
-            "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+            "description": "Type of telemetry destination"
           },
           {
-            "name": "value",
+            "name": "destination_pattern",
             "type": "string",
-            "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+            "description": "Pattern for telemetry data destination"
+          },
+          {
+            "name": "retention_in_days",
+            "type": "integer",
+            "description": "Number of days to retain the telemetry data in the specified destination"
+          },
+          {
+            "name": "vpc_flow_log_parameters",
+            "type": "object",
+            "description": "Telemetry parameters for VPC Flow logs",
+            "children": [
+              {
+                "name": "log_format",
+                "type": "string",
+                "description": "The fields to include in the flow log record. If you omit this parameter, the flow log is created using the default format."
+              },
+              {
+                "name": "traffic_type",
+                "type": "string",
+                "description": "The type of traffic captured for the flow log. Default is ALL"
+              },
+              {
+                "name": "max_aggregation_interval",
+                "type": "integer",
+                "description": "The maximum interval of time, in seconds, during which a flow of packets is captured and aggregated into a flow log record. Default is 600s."
+              }
+            ]
           }
         ]
+      },
+      {
+        "name": "scope",
+        "type": "string",
+        "description": "Selection Criteria on scope level for rule application"
+      },
+      {
+        "name": "selection_criteria",
+        "type": "string",
+        "description": "Selection Criteria on resource level for rule application"
       }
     ]
   },
@@ -332,14 +406,22 @@ resources:
         value: '{{ rule_name }}'
       - name: rule
         value:
-          rule_name: '{{ rule_name }}'
-          rule: null
-          tags:
-            - key: '{{ key }}'
-              value: '{{ value }}'
+          resource_type: '{{ resource_type }}'
+          telemetry_type: '{{ telemetry_type }}'
+          destination_configuration:
+            destination_type: '{{ destination_type }}'
+            destination_pattern: '{{ destination_pattern }}'
+            retention_in_days: '{{ retention_in_days }}'
+            vpc_flow_log_parameters:
+              log_format: '{{ log_format }}'
+              traffic_type: '{{ traffic_type }}'
+              max_aggregation_interval: '{{ max_aggregation_interval }}'
+          scope: '{{ scope }}'
+          selection_criteria: '{{ selection_criteria }}'
       - name: tags
         value:
-          - null`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/observabilityadmin/telemetry_rules/index.md b/website/docs/services/observabilityadmin/telemetry_rules/index.md
index 01f73cf80..3481ac5ac 100644
--- a/website/docs/services/observabilityadmin/telemetry_rules/index.md
+++ b/website/docs/services/observabilityadmin/telemetry_rules/index.md
@@ -52,34 +52,66 @@ Creates, updates, deletes or gets a <code>telemetry_rule</code> resource or list
   {
     "name": "rule",
     "type": "object",
-    "description": "The AWS::ObservabilityAdmin::TelemetryRule resource defines a CloudWatch Observability Admin Telemetry Rule.",
+    "description": "The telemetry rule",
     "children": [
       {
-        "name": "rule_name",
+        "name": "resource_type",
         "type": "string",
-        "description": "The name of the telemetry rule"
+        "description": "Resource Type associated with the Telemetry Rule"
       },
       {
-        "name": "rule_arn",
+        "name": "telemetry_type",
         "type": "string",
-        "description": "The arn of the telemetry rule"
+        "description": "Telemetry Type associated with the Telemetry Rule"
       },
       {
-        "name": "tags",
-        "type": "array",
-        "description": "An array of key-value pairs to apply to this resource",
+        "name": "destination_configuration",
+        "type": "object",
+        "description": "The destination configuration for telemetry data",
         "children": [
           {
-            "name": "key",
+            "name": "destination_type",
             "type": "string",
-            "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+            "description": "Type of telemetry destination"
           },
           {
-            "name": "value",
+            "name": "destination_pattern",
             "type": "string",
-            "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+            "description": "Pattern for telemetry data destination"
+          },
+          {
+            "name": "retention_in_days",
+            "type": "integer",
+            "description": "Number of days to retain the telemetry data in the specified destination"
+          },
+          {
+            "name": "vpc_flow_log_parameters",
+            "type": "object",
+            "description": "Telemetry parameters for VPC Flow logs",
+            "children": [
+              {
+                "name": "log_format",
+                "type": "string",
+                "description": "The fields to include in the flow log record. If you omit this parameter, the flow log is created using the default format."
+              },
+              {
+                "name": "traffic_type",
+                "type": "string",
+                "description": "The type of traffic captured for the flow log. Default is ALL"
+              },
+              {
+                "name": "max_aggregation_interval",
+                "type": "integer",
+                "description": "The maximum interval of time, in seconds, during which a flow of packets is captured and aggregated into a flow log record. Default is 600s."
+              }
+            ]
           }
         ]
+      },
+      {
+        "name": "selection_criteria",
+        "type": "string",
+        "description": "Selection Criteria on resource level for rule application"
       }
     ]
   },
@@ -118,34 +150,66 @@ Creates, updates, deletes or gets a <code>telemetry_rule</code> resource or list
   {
     "name": "rule",
     "type": "object",
-    "description": "The AWS::ObservabilityAdmin::TelemetryRule resource defines a CloudWatch Observability Admin Telemetry Rule.",
+    "description": "The telemetry rule",
     "children": [
       {
-        "name": "rule_name",
+        "name": "resource_type",
         "type": "string",
-        "description": "The name of the telemetry rule"
+        "description": "Resource Type associated with the Telemetry Rule"
       },
       {
-        "name": "rule_arn",
+        "name": "telemetry_type",
         "type": "string",
-        "description": "The arn of the telemetry rule"
+        "description": "Telemetry Type associated with the Telemetry Rule"
       },
       {
-        "name": "tags",
-        "type": "array",
-        "description": "An array of key-value pairs to apply to this resource",
+        "name": "destination_configuration",
+        "type": "object",
+        "description": "The destination configuration for telemetry data",
         "children": [
           {
-            "name": "key",
+            "name": "destination_type",
             "type": "string",
-            "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+            "description": "Type of telemetry destination"
           },
           {
-            "name": "value",
+            "name": "destination_pattern",
             "type": "string",
-            "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+            "description": "Pattern for telemetry data destination"
+          },
+          {
+            "name": "retention_in_days",
+            "type": "integer",
+            "description": "Number of days to retain the telemetry data in the specified destination"
+          },
+          {
+            "name": "vpc_flow_log_parameters",
+            "type": "object",
+            "description": "Telemetry parameters for VPC Flow logs",
+            "children": [
+              {
+                "name": "log_format",
+                "type": "string",
+                "description": "The fields to include in the flow log record. If you omit this parameter, the flow log is created using the default format."
+              },
+              {
+                "name": "traffic_type",
+                "type": "string",
+                "description": "The type of traffic captured for the flow log. Default is ALL"
+              },
+              {
+                "name": "max_aggregation_interval",
+                "type": "integer",
+                "description": "The maximum interval of time, in seconds, during which a flow of packets is captured and aggregated into a flow log record. Default is 600s."
+              }
+            ]
           }
         ]
+      },
+      {
+        "name": "selection_criteria",
+        "type": "string",
+        "description": "Selection Criteria on resource level for rule application"
       }
     ]
   },
@@ -332,14 +396,21 @@ resources:
         value: '{{ rule_name }}'
       - name: rule
         value:
-          rule_name: '{{ rule_name }}'
-          rule: null
-          tags:
-            - key: '{{ key }}'
-              value: '{{ value }}'
+          resource_type: '{{ resource_type }}'
+          telemetry_type: '{{ telemetry_type }}'
+          destination_configuration:
+            destination_type: '{{ destination_type }}'
+            destination_pattern: '{{ destination_pattern }}'
+            retention_in_days: '{{ retention_in_days }}'
+            vpc_flow_log_parameters:
+              log_format: '{{ log_format }}'
+              traffic_type: '{{ traffic_type }}'
+              max_aggregation_interval: '{{ max_aggregation_interval }}'
+          selection_criteria: '{{ selection_criteria }}'
       - name: tags
         value:
-          - null`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/omics/annotation_stores/index.md b/website/docs/services/omics/annotation_stores/index.md
index 0e3fbedc2..96527247f 100644
--- a/website/docs/services/omics/annotation_stores/index.md
+++ b/website/docs/services/omics/annotation_stores/index.md
@@ -126,7 +126,7 @@ Creates, updates, deletes or gets an <code>annotation_store</code> resource or l
   {
     "name": "tags",
     "type": "object",
-    "description": "A map of resource tags"
+    "description": ""
   },
   {
     "name": "update_time",
diff --git a/website/docs/services/omics/reference_stores/index.md b/website/docs/services/omics/reference_stores/index.md
index 66a1efbe9..6218dc6ea 100644
--- a/website/docs/services/omics/reference_stores/index.md
+++ b/website/docs/services/omics/reference_stores/index.md
@@ -72,7 +72,7 @@ Creates, updates, deletes or gets a <code>reference_store</code> resource or lis
   {
     "name": "sse_config",
     "type": "object",
-    "description": "",
+    "description": "Server-side encryption (SSE) settings for a store.",
     "children": [
       {
         "name": "type",
@@ -82,14 +82,14 @@ Creates, updates, deletes or gets a <code>reference_store</code> resource or lis
       {
         "name": "key_arn",
         "type": "string",
-        "description": ""
+        "description": "An encryption key ARN."
       }
     ]
   },
   {
     "name": "tags",
     "type": "object",
-    "description": "A map of resource tags"
+    "description": ""
   },
   {
     "name": "region",
diff --git a/website/docs/services/omics/sequence_stores/index.md b/website/docs/services/omics/sequence_stores/index.md
index 3f6bbcc1a..0a2e69868 100644
--- a/website/docs/services/omics/sequence_stores/index.md
+++ b/website/docs/services/omics/sequence_stores/index.md
@@ -107,7 +107,7 @@ Creates, updates, deletes or gets a <code>sequence_store</code> resource or list
   {
     "name": "sse_config",
     "type": "object",
-    "description": "",
+    "description": "Server-side encryption (SSE) settings for a store.",
     "children": [
       {
         "name": "type",
@@ -117,7 +117,7 @@ Creates, updates, deletes or gets a <code>sequence_store</code> resource or list
       {
         "name": "key_arn",
         "type": "string",
-        "description": ""
+        "description": "An encryption key ARN."
       }
     ]
   },
@@ -134,7 +134,7 @@ Creates, updates, deletes or gets a <code>sequence_store</code> resource or list
   {
     "name": "tags",
     "type": "object",
-    "description": "A map of resource tags"
+    "description": ""
   },
   {
     "name": "update_time",
diff --git a/website/docs/services/omics/variant_stores/index.md b/website/docs/services/omics/variant_stores/index.md
index 6edb0647d..4c52f2093 100644
--- a/website/docs/services/omics/variant_stores/index.md
+++ b/website/docs/services/omics/variant_stores/index.md
@@ -116,7 +116,7 @@ Creates, updates, deletes or gets a <code>variant_store</code> resource or lists
   {
     "name": "tags",
     "type": "object",
-    "description": "A map of resource tags"
+    "description": ""
   },
   {
     "name": "update_time",
diff --git a/website/docs/services/opensearchservice/applications/index.md b/website/docs/services/opensearchservice/applications/index.md
index 94b4c77c3..75b0bdea9 100644
--- a/website/docs/services/opensearchservice/applications/index.md
+++ b/website/docs/services/opensearchservice/applications/index.md
@@ -126,14 +126,14 @@ Creates, updates, deletes or gets an <code>application</code> resource or lists
     "description": "An arbitrary set of tags (key-value pairs) for this application.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The key of the tag."
+        "description": "The key in the key-value pair"
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The value of the tag."
+        "description": "The value in the key-value pair"
       }
     ]
   },
@@ -353,8 +353,8 @@ resources:
             data_source_description: '{{ data_source_description }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/pcs/clusters/index.md b/website/docs/services/pcs/clusters/index.md
index 05d983c9b..a0519813d 100644
--- a/website/docs/services/pcs/clusters/index.md
+++ b/website/docs/services/pcs/clusters/index.md
@@ -202,14 +202,14 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
         "description": "Additional Slurm-specific configuration that directly maps to Slurm settings.",
         "children": [
           {
-            "name": "parameter_value",
+            "name": "parameter_name",
             "type": "string",
-            "description": "The value for the configured Slurm setting."
+            "description": "AWS PCS supports configuration of the following Slurm parameters for clusters: Prolog, Epilog, and SelectTypeParameters."
           },
           {
-            "name": "parameter_name",
+            "name": "parameter_value",
             "type": "string",
-            "description": "AWS PCS supports configuration of the following Slurm parameters for compute node groups: Weight and RealMemory."
+            "description": "The value for the configured Slurm setting."
           }
         ]
       }
@@ -454,8 +454,8 @@ resources:
             secret_version: '{{ secret_version }}'
           scale_down_idle_time_in_seconds: '{{ scale_down_idle_time_in_seconds }}'
           slurm_custom_settings:
-            - parameter_value: '{{ parameter_value }}'
-              parameter_name: '{{ parameter_name }}'
+            - parameter_name: '{{ parameter_name }}'
+              parameter_value: '{{ parameter_value }}'
       - name: tags
         value: null`}</CodeBlock>
 
diff --git a/website/docs/services/personalize/index.md b/website/docs/services/personalize/index.md
index 0c8699870..4ad87b5ef 100644
--- a/website/docs/services/personalize/index.md
+++ b/website/docs/services/personalize/index.md
@@ -33,7 +33,7 @@ The personalize service documentation.
 <a href="/services/personalize/datasets/">datasets</a>
 </div>
 <div class="providerDocColumn">
-<a href="/services/personalize/schemata/">schemata</a><br />
+<a href="/services/personalize/schemas/">schemas</a><br />
 <a href="/services/personalize/solutions/">solutions</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/personalize/schemata/index.md b/website/docs/services/personalize/schemas/index.md
similarity index 91%
rename from website/docs/services/personalize/schemata/index.md
rename to website/docs/services/personalize/schemas/index.md
index 2da0df0f8..652497162 100644
--- a/website/docs/services/personalize/schemata/index.md
+++ b/website/docs/services/personalize/schemas/index.md
@@ -1,9 +1,9 @@
 ---
-title: schemata
+title: schemas
 hide_title: false
 hide_table_of_contents: false
 keywords:
-  - schemata
+  - schemas
   - personalize
   - aws
   - stackql
@@ -21,15 +21,15 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
 
-Creates, updates, deletes or gets a <code>schema</code> resource or lists <code>schemata</code> in a region
+Creates, updates, deletes or gets a <code>schema</code> resource or lists <code>schemas</code> in a region
 
 ## Overview
 <table>
 <tbody>
-<tr><td><b>Name</b></td><td><code>schemata</code></td></tr>
+<tr><td><b>Name</b></td><td><code>schemas</code></td></tr>
 <tr><td><b>Type</b></td><td>Resource</td></tr>
 <tr><td><b>Description</b></td><td>Resource schema for AWS::Personalize::Schema.</td></tr>
-<tr><td><b>Id</b></td><td><CopyableCode code="awscc.personalize.schemata" /></td></tr>
+<tr><td><b>Id</b></td><td><CopyableCode code="awscc.personalize.schemas" /></td></tr>
 </tbody>
 </table>
 
@@ -107,25 +107,25 @@ For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation
   </tr>
   <tr>
     <td><CopyableCode code="create_resource" /></td>
-    <td><code>schemata</code></td>
+    <td><code>schemas</code></td>
     <td><code>INSERT</code></td>
     <td><CopyableCode code="Name, Schema, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="delete_resource" /></td>
-    <td><code>schemata</code></td>
+    <td><code>schemas</code></td>
     <td><code>DELETE</code></td>
     <td><CopyableCode code="Identifier, region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="list_resources" /></td>
-    <td><code>schemata_list_only</code></td>
+    <td><code>schemas_list_only</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="region" /></td>
   </tr>
   <tr>
     <td><CopyableCode code="get_resource" /></td>
-    <td><code>schemata</code></td>
+    <td><code>schemas</code></td>
     <td><code>SELECT</code></td>
     <td><CopyableCode code="Identifier, region" /></td>
   </tr>
@@ -151,7 +151,7 @@ SELECT
   schema_arn,
   schema,
   domain
-FROM awscc.personalize.schemata
+FROM awscc.personalize.schemas
 WHERE
   region = '{{ region }}' AND
   Identifier = '{{ schema_arn }}';
@@ -159,12 +159,12 @@ WHERE
 </TabItem>
 <TabItem value="list">
 
-Lists all <code>schemata</code> in a region.
+Lists all <code>schemas</code> in a region.
 ```sql
 SELECT
   region,
   schema_arn
-FROM awscc.personalize.schemata_list_only
+FROM awscc.personalize.schemas_list_only
 WHERE
   region = '{{ region }}';
 ```
@@ -187,7 +187,7 @@ Use the following StackQL query and manifest file to create a new <code>schema</
 
 ```sql
 /*+ create */
-INSERT INTO awscc.personalize.schemata (
+INSERT INTO awscc.personalize.schemas (
   Name,
   Schema,
   region
@@ -214,7 +214,7 @@ RETURNING
 
 ```sql
 /*+ create */
-INSERT INTO awscc.personalize.schemata (
+INSERT INTO awscc.personalize.schemas (
   Name,
   Schema,
   Domain,
@@ -267,7 +267,7 @@ resources:
 
 ```sql
 /*+ delete */
-DELETE FROM awscc.personalize.schemata
+DELETE FROM awscc.personalize.schemas
 WHERE
   Identifier = '{{ schema_arn }}' AND
   region = '{{ region }}'
@@ -298,7 +298,7 @@ Mutable resources in the Cloud Control provider support additional optional para
 
 ## Permissions
 
-To operate on the <code>schemata</code> resource, the following permissions are required:
+To operate on the <code>schemas</code> resource, the following permissions are required:
 
 <Tabs
     defaultValue="create"
diff --git a/website/docs/services/quicksight/analyses/index.md b/website/docs/services/quicksight/analyses/index.md
index 147c3c610..59836c2e0 100644
--- a/website/docs/services/quicksight/analyses/index.md
+++ b/website/docs/services/quicksight/analyses/index.md
@@ -679,6 +679,11 @@ Creates, updates, deletes or gets an <code>analysis</code> resource or lists <co
                 "type": "object",
                 "description": ""
               },
+              {
+                "name": "layer_map_visual",
+                "type": "object",
+                "description": ""
+              },
               {
                 "name": "geospatial_map_visual",
                 "type": "object",
@@ -1356,7 +1361,7 @@ resources:
                               display_options:
                                 title_options:
                                   custom_label: '{{ custom_label }}'
-                                  visibility: null
+                                  visibility: '{{ visibility }}'
                                   font_configuration:
                                     font_family: '{{ font_family }}'
                                     font_style: '{{ font_style }}'
@@ -2105,13 +2110,105 @@ resources:
                     visual_content_alt_text: '{{ visual_content_alt_text }}'
                     column_hierarchies:
                       - null
+                  layer_map_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      legend: null
+                      map_state:
+                        bounds:
+                          west: null
+                          south: null
+                          north: null
+                          east: null
+                        map_navigation: '{{ map_navigation }}'
+                      map_style:
+                        base_map_style: '{{ base_map_style }}'
+                        base_map_visibility: null
+                        background_color: '{{ background_color }}'
+                      interactions: null
+                      map_layers:
+                        - layer_id: '{{ layer_id }}'
+                          join_definition:
+                            color_field:
+                              color_values_fields:
+                                - null
+                              color_dimensions_fields:
+                                - null
+                            shape_key_field: '{{ shape_key_field }}'
+                            dataset_key_field:
+                              format_configuration: null
+                              column: null
+                              field_id: '{{ field_id }}'
+                          actions:
+                            - status: null
+                              trigger: '{{ trigger }}'
+                              custom_action_id: '{{ custom_action_id }}'
+                              name: '{{ name }}'
+                              action_operations:
+                                - navigation_operation: null
+                                  set_parameters_operation: null
+                                  filter_operation: null
+                                  url_operation: null
+                          layer_type: '{{ layer_type }}'
+                          layer_definition:
+                            point_layer:
+                              style:
+                                circle_symbol_style:
+                                  fill_color:
+                                    gradient:
+                                      default_opacity: null
+                                      step_colors:
+                                        - data_value: null
+                                          color: '{{ color }}'
+                                      null_data_visibility: null
+                                      null_data_settings:
+                                        symbol_style:
+                                          fill_color: '{{ fill_color }}'
+                                          stroke_width: null
+                                          stroke_color: '{{ stroke_color }}'
+                                    categorical:
+                                      category_data_colors:
+                                        - data_value: '{{ data_value }}'
+                                          color: '{{ color }}'
+                                      default_opacity: null
+                                      null_data_visibility: null
+                                      null_data_settings: null
+                                    solid:
+                                      state: '{{ state }}'
+                                      color: '{{ color }}'
+                                  stroke_width:
+                                    line_width: null
+                                  stroke_color: null
+                                  circle_radius:
+                                    radius: null
+                            polygon_layer:
+                              style:
+                                polygon_symbol_style:
+                                  fill_color: null
+                                  stroke_width: null
+                                  stroke_color: null
+                            line_layer:
+                              style:
+                                line_symbol_style:
+                                  fill_color: null
+                                  line_width: null
+                          tooltip: null
+                          label: '{{ label }}'
+                          visibility: null
+                          data_source:
+                            static_file_data_source:
+                              static_file_id: '{{ static_file_id }}'
+                    data_set_identifier: '{{ data_set_identifier }}'
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
                   geospatial_map_visual:
                     subtitle: null
                     visual_id: '{{ visual_id }}'
                     chart_configuration:
                       legend: null
                       map_style_options:
-                        base_map_style: '{{ base_map_style }}'
+                        base_map_style: null
                       field_wells:
                         geospatial_map_aggregated_field_wells:
                           colors:
@@ -2121,12 +2218,9 @@ resources:
                           geospatial:
                             - null
                       tooltip: null
+                      interactions: null
                       window_options:
-                        bounds:
-                          west: null
-                          south: null
-                          north: null
-                          east: null
+                        bounds: null
                         map_zoom_mode: '{{ map_zoom_mode }}'
                       point_style_options:
                         selected_point_style: '{{ selected_point_style }}'
@@ -2653,9 +2747,7 @@ resources:
                             name: '{{ name }}'
                       field_wells:
                         - unaggregated:
-                            - format_configuration: null
-                              column: null
-                              field_id: '{{ field_id }}'
+                            - null
                           axis_name: '{{ axis_name }}'
                           measures:
                             - null
diff --git a/website/docs/services/quicksight/dashboards/index.md b/website/docs/services/quicksight/dashboards/index.md
index dafcf8924..1b0ef578c 100644
--- a/website/docs/services/quicksight/dashboards/index.md
+++ b/website/docs/services/quicksight/dashboards/index.md
@@ -662,6 +662,11 @@ Creates, updates, deletes or gets a <code>dashboard</code> resource or lists <co
                 "type": "object",
                 "description": ""
               },
+              {
+                "name": "layer_map_visual",
+                "type": "object",
+                "description": ""
+              },
               {
                 "name": "geospatial_map_visual",
                 "type": "object",
@@ -1570,7 +1575,7 @@ resources:
                               display_options:
                                 title_options:
                                   custom_label: '{{ custom_label }}'
-                                  visibility: null
+                                  visibility: '{{ visibility }}'
                                   font_configuration:
                                     font_family: '{{ font_family }}'
                                     font_style: '{{ font_style }}'
@@ -2317,13 +2322,105 @@ resources:
                     visual_content_alt_text: '{{ visual_content_alt_text }}'
                     column_hierarchies:
                       - null
+                  layer_map_visual:
+                    subtitle: null
+                    visual_id: '{{ visual_id }}'
+                    chart_configuration:
+                      legend: null
+                      map_state:
+                        bounds:
+                          west: null
+                          south: null
+                          north: null
+                          east: null
+                        map_navigation: '{{ map_navigation }}'
+                      map_style:
+                        base_map_style: '{{ base_map_style }}'
+                        base_map_visibility: null
+                        background_color: '{{ background_color }}'
+                      interactions: null
+                      map_layers:
+                        - layer_id: '{{ layer_id }}'
+                          join_definition:
+                            color_field:
+                              color_values_fields:
+                                - null
+                              color_dimensions_fields:
+                                - null
+                            shape_key_field: '{{ shape_key_field }}'
+                            dataset_key_field:
+                              format_configuration: null
+                              column: null
+                              field_id: '{{ field_id }}'
+                          actions:
+                            - status: null
+                              trigger: '{{ trigger }}'
+                              custom_action_id: '{{ custom_action_id }}'
+                              name: '{{ name }}'
+                              action_operations:
+                                - navigation_operation: null
+                                  set_parameters_operation: null
+                                  filter_operation: null
+                                  url_operation: null
+                          layer_type: '{{ layer_type }}'
+                          layer_definition:
+                            point_layer:
+                              style:
+                                circle_symbol_style:
+                                  fill_color:
+                                    gradient:
+                                      default_opacity: null
+                                      step_colors:
+                                        - data_value: null
+                                          color: '{{ color }}'
+                                      null_data_visibility: null
+                                      null_data_settings:
+                                        symbol_style:
+                                          fill_color: '{{ fill_color }}'
+                                          stroke_width: null
+                                          stroke_color: '{{ stroke_color }}'
+                                    categorical:
+                                      category_data_colors:
+                                        - data_value: '{{ data_value }}'
+                                          color: '{{ color }}'
+                                      default_opacity: null
+                                      null_data_visibility: null
+                                      null_data_settings: null
+                                    solid:
+                                      state: '{{ state }}'
+                                      color: '{{ color }}'
+                                  stroke_width:
+                                    line_width: null
+                                  stroke_color: null
+                                  circle_radius:
+                                    radius: null
+                            polygon_layer:
+                              style:
+                                polygon_symbol_style:
+                                  fill_color: null
+                                  stroke_width: null
+                                  stroke_color: null
+                            line_layer:
+                              style:
+                                line_symbol_style:
+                                  fill_color: null
+                                  line_width: null
+                          tooltip: null
+                          label: '{{ label }}'
+                          visibility: null
+                          data_source:
+                            static_file_data_source:
+                              static_file_id: '{{ static_file_id }}'
+                    data_set_identifier: '{{ data_set_identifier }}'
+                    title: null
+                    visual_content_alt_text: '{{ visual_content_alt_text }}'
                   geospatial_map_visual:
                     subtitle: null
                     visual_id: '{{ visual_id }}'
                     chart_configuration:
                       legend: null
                       map_style_options:
-                        base_map_style: '{{ base_map_style }}'
+                        base_map_style: null
                       field_wells:
                         geospatial_map_aggregated_field_wells:
                           colors:
@@ -2333,12 +2430,9 @@ resources:
                           geospatial:
                             - null
                       tooltip: null
+                      interactions: null
                       window_options:
-                        bounds:
-                          west: null
-                          south: null
-                          north: null
-                          east: null
+                        bounds: null
                         map_zoom_mode: '{{ map_zoom_mode }}'
                       point_style_options:
                         selected_point_style: '{{ selected_point_style }}'
@@ -2865,9 +2959,7 @@ resources:
                             name: '{{ name }}'
                       field_wells:
                         - unaggregated:
-                            - format_configuration: null
-                              column: null
-                              field_id: '{{ field_id }}'
+                            - null
                           axis_name: '{{ axis_name }}'
                           measures:
                             - null
diff --git a/website/docs/services/quicksight/data_sources/index.md b/website/docs/services/quicksight/data_sources/index.md
index b29c95366..1385b71ce 100644
--- a/website/docs/services/quicksight/data_sources/index.md
+++ b/website/docs/services/quicksight/data_sources/index.md
@@ -677,15 +677,20 @@ Creates, updates, deletes or gets a <code>data_source</code> resource or lists <
     "type": "array",
     "description": "",
     "children": [
-      {
-        "name": "principal",
-        "type": "string",
-        "description": "<details><summary><p>The Amazon Resource Name (ARN) of the principal. This can be one of the</summary>following:</p><br /><ul><li><br /><p>The ARN of an Amazon QuickSight user or group associated with a data source or dataset. (This is common.)</p><br /></li><br /><li><br /><p>The ARN of an Amazon QuickSight user, group, or namespace associated with an analysis, dashboard, template, or theme. (This is common.)</p><br /></li><br /><li><br /><p>The ARN of an Amazon Web Services account root: This is an IAM ARN rather than a QuickSight<br />ARN. Use this option only to share resources (templates) across Amazon Web Services accounts.<br />(This is less common.) </p><br /></li><br /></ul></details>"
-      },
       {
         "name": "actions",
         "type": "array",
         "description": "<p>The IAM action to grant or revoke permissions on.</p>"
+      },
+      {
+        "name": "resource",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "principal",
+        "type": "string",
+        "description": "<details><summary><p>The Amazon Resource Name (ARN) of the principal. This can be one of the</summary>following:</p><br /><ul><li><br /><p>The ARN of an Amazon QuickSight user or group associated with a data source or dataset. (This is common.)</p><br /></li><br /><li><br /><p>The ARN of an Amazon QuickSight user, group, or namespace associated with an analysis, dashboard, template, or theme. (This is common.)</p><br /></li><br /><li><br /><p>The ARN of an Amazon Web Services account root: This is an IAM ARN rather than a QuickSight<br />ARN. Use this option only to share resources (templates) across Amazon Web Services accounts.<br />(This is less common.) </p><br /></li><br /></ul></details>"
       }
     ]
   },
@@ -1114,9 +1119,10 @@ resources:
         value: '{{ aws_account_id }}'
       - name: permissions
         value:
-          - principal: '{{ principal }}'
-            actions:
+          - actions:
               - '{{ actions[0] }}'
+            resource: '{{ resource }}'
+            principal: '{{ principal }}'
       - name: ssl_properties
         value:
           disable_ssl: '{{ disable_ssl }}'
diff --git a/website/docs/services/rds/db_clusters/index.md b/website/docs/services/rds/db_clusters/index.md
index ba33ee22f..5b3325385 100644
--- a/website/docs/services/rds/db_clusters/index.md
+++ b/website/docs/services/rds/db_clusters/index.md
@@ -47,22 +47,17 @@ Creates, updates, deletes or gets a <code>db_cluster</code> resource or lists <c
   {
     "name": "endpoint",
     "type": "object",
-    "description": "<details><summary>This data type represents the information you need to connect to an Amazon RDS DB instance. This data type is used as a response element in the following actions:</summary>+   <code>CreateDBInstance</code><br />+   <code>DescribeDBInstances</code><br />+   <code>DeleteDBInstance</code><br />For the data structure that represents Amazon Aurora DB cluster endpoints, see <code>DBClusterEndpoint</code>.</details>",
+    "description": "The <code>Endpoint</code> return value specifies the connection endpoint for the primary instance of the DB cluster.",
     "children": [
       {
         "name": "address",
         "type": "string",
-        "description": "Specifies the DNS address of the DB instance."
+        "description": "Specifies the connection endpoint for the primary instance of the DB cluster."
       },
       {
         "name": "port",
         "type": "string",
         "description": "Specifies the port that the database engine is listening on."
-      },
-      {
-        "name": "hosted_zone_id",
-        "type": "string",
-        "description": "Specifies the ID that Amazon Route 53 assigns when you create a hosted zone."
       }
     ]
   },
@@ -283,7 +278,7 @@ Creates, updates, deletes or gets a <code>db_cluster</code> resource or lists <c
       {
         "name": "secret_arn",
         "type": "string",
-        "description": "The Amazon Resource Name (ARN) of the secret. This parameter is a return value that you can retrieve using the <code>Fn::GetAtt</code> intrinsic function. For more information, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbinstance.html#aws-resource-rds-dbinstance-return-values\">Return values</a>."
+        "description": "The Amazon Resource Name (ARN) of the secret. This parameter is a return value that you can retrieve using the <code>Fn::GetAtt</code> intrinsic function. For more information, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#aws-resource-rds-dbcluster-return-values\">Return values</a>."
       },
       {
         "name": "kms_key_id",
diff --git a/website/docs/services/rds/global_clusters/index.md b/website/docs/services/rds/global_clusters/index.md
index 9e18520ca..4dee51563 100644
--- a/website/docs/services/rds/global_clusters/index.md
+++ b/website/docs/services/rds/global_clusters/index.md
@@ -57,12 +57,12 @@ Creates, updates, deletes or gets a <code>global_cluster</code> resource or list
       {
         "name": "key",
         "type": "string",
-        "description": "A key is the required name of the tag. The string value can be from 1 to 128 Unicode characters in length and can't be prefixed with <code>aws:</code> or <code>rds:</code>. The string can only contain only the set of Unicode letters, digits, white-space, '_', '.', ':', '/', '=', '+', '-', '@' (Java regex: \"^([\\\\p&#123;L&#125;\\\\p&#123;Z&#125;\\\\p&#123;N&#125;_.:/=+\\\\-@]*)$\")."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "A value is the optional value of the tag. The string value can be from 1 to 256 Unicode characters in length and can't be prefixed with <code>aws:</code> or <code>rds:</code>. The string can only contain only the set of Unicode letters, digits, white-space, '_', '.', ':', '/', '=', '+', '-', '@' (Java regex: \"^([\\\\p&#123;L&#125;\\\\p&#123;Z&#125;\\\\p&#123;N&#125;_.:/=+\\\\-@]*)$\")."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/redshift/cluster_subnet_groups/index.md b/website/docs/services/redshift/cluster_subnet_groups/index.md
index a78ffb946..61569d1e1 100644
--- a/website/docs/services/redshift/cluster_subnet_groups/index.md
+++ b/website/docs/services/redshift/cluster_subnet_groups/index.md
@@ -62,12 +62,12 @@ Creates, updates, deletes or gets a <code>cluster_subnet_group</code> resource o
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/redshift/clusters/index.md b/website/docs/services/redshift/clusters/index.md
index e9eff5b3d..9c3f62ae7 100644
--- a/website/docs/services/redshift/clusters/index.md
+++ b/website/docs/services/redshift/clusters/index.md
@@ -124,12 +124,12 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/redshift/event_subscriptions/index.md b/website/docs/services/redshift/event_subscriptions/index.md
index f3619d0c1..51fd96e77 100644
--- a/website/docs/services/redshift/event_subscriptions/index.md
+++ b/website/docs/services/redshift/event_subscriptions/index.md
@@ -115,14 +115,14 @@ Creates, updates, deletes or gets an <code>event_subscription</code> resource or
     "description": "An array of key-value pairs to apply to this resource.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -351,8 +351,8 @@ resources:
         value: '{{ sns_topic_arn }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/redshiftserverless/namespaces/index.md b/website/docs/services/redshiftserverless/namespaces/index.md
index 35e74133f..884660bd1 100644
--- a/website/docs/services/redshiftserverless/namespaces/index.md
+++ b/website/docs/services/redshiftserverless/namespaces/index.md
@@ -95,113 +95,69 @@ Creates, updates, deletes or gets a <code>namespace</code> resource or lists <co
     "description": "Definition of Namespace resource.",
     "children": [
       {
-        "name": "admin_password_secret_kms_key_id",
+        "name": "namespace_arn",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "namespace_id",
         "type": "string",
-        "description": "The ID of the AWS Key Management Service (KMS) key used to encrypt and store the namespace's admin credentials secret. You can only use this parameter if manageAdminPassword is true."
+        "description": ""
       },
       {
-        "name": "admin_user_password",
+        "name": "namespace_name",
         "type": "string",
-        "description": "The password associated with the admin user for the namespace that is being created. Password must be at least 8 characters in length, should be any printable ASCII character. Must contain at least one lowercase letter, one uppercase letter and one decimal digit. You can't use adminUserPassword if manageAdminPassword is true."
+        "description": ""
       },
       {
         "name": "admin_username",
         "type": "string",
-        "description": "The user name associated with the admin user for the namespace that is being created. Only alphanumeric characters and underscores are allowed. It should start with an alphabet."
+        "description": ""
       },
       {
         "name": "db_name",
         "type": "string",
-        "description": "The database name associated for the namespace that is being created. Only alphanumeric characters and underscores are allowed. It should start with an alphabet."
+        "description": ""
+      },
+      {
+        "name": "kms_key_id",
+        "type": "string",
+        "description": ""
       },
       {
         "name": "default_iam_role_arn",
         "type": "string",
-        "description": "The default IAM role ARN for the namespace that is being created."
+        "description": ""
       },
       {
         "name": "iam_roles",
         "type": "array",
-        "description": "A list of AWS Identity and Access Management (IAM) roles that can be used by the namespace to access other AWS services. You must supply the IAM roles in their Amazon Resource Name (ARN) format. The Default role limit for each request is 10."
-      },
-      {
-        "name": "kms_key_id",
-        "type": "string",
-        "description": "The AWS Key Management Service (KMS) key ID of the encryption key that you want to use to encrypt data in the namespace."
+        "description": ""
       },
       {
         "name": "log_exports",
         "type": "array",
-        "description": "The collection of log types to be exported provided by the customer. Should only be one of the three supported log types: userlog, useractivitylog and connectionlog"
-      },
-      {
-        "name": "manage_admin_password",
-        "type": "boolean",
-        "description": "If true, Amazon Redshift uses AWS Secrets Manager to manage the namespace's admin credentials. You can't use adminUserPassword if manageAdminPassword is true. If manageAdminPassword is false or not set, Amazon Redshift uses adminUserPassword for the admin user account's password."
+        "description": ""
       },
       {
-        "name": "namespace_name",
+        "name": "status",
         "type": "string",
-        "description": "A unique identifier for the namespace. You use this identifier to refer to the namespace for any subsequent namespace operations such as deleting or modifying. All alphabetical characters must be lower case. Namespace name should be unique for all namespaces within an AWS account."
-      },
-      {
-        "name": "tags",
-        "type": "array",
-        "description": "The list of tags for the namespace.",
-        "children": [
-          {
-            "name": "key",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "value",
-            "type": "string",
-            "description": ""
-          }
-        ]
+        "description": ""
       },
       {
-        "name": "final_snapshot_name",
+        "name": "creation_date",
         "type": "string",
-        "description": "The name of the namespace the source snapshot was created from. Please specify the name if needed before deleting namespace"
-      },
-      {
-        "name": "final_snapshot_retention_period",
-        "type": "integer",
-        "description": "The number of days to retain automated snapshot in the destination region after they are copied from the source region. If the value is -1, the manual snapshot is retained indefinitely. The value must be either -1 or an integer between 1 and 3,653."
-      },
-      {
-        "name": "namespace_resource_policy",
-        "type": "object",
-        "description": "The resource policy document that will be attached to the namespace."
+        "description": ""
       },
       {
-        "name": "redshift_idc_application_arn",
+        "name": "admin_password_secret_arn",
         "type": "string",
-        "description": "The ARN for the Redshift application that integrates with IAM Identity Center."
+        "description": ""
       },
       {
-        "name": "snapshot_copy_configurations",
-        "type": "array",
-        "description": "The snapshot copy configurations for the namespace.",
-        "children": [
-          {
-            "name": "destination_region",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "destination_kms_key_id",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "snapshot_retention_period",
-            "type": "integer",
-            "description": ""
-          }
-        ]
+        "name": "admin_password_secret_kms_key_id",
+        "type": "string",
+        "description": ""
       }
     ]
   },
@@ -285,113 +241,69 @@ Creates, updates, deletes or gets a <code>namespace</code> resource or lists <co
     "description": "Definition of Namespace resource.",
     "children": [
       {
-        "name": "admin_password_secret_kms_key_id",
+        "name": "namespace_arn",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "namespace_id",
         "type": "string",
-        "description": "The ID of the AWS Key Management Service (KMS) key used to encrypt and store the namespace's admin credentials secret. You can only use this parameter if manageAdminPassword is true."
+        "description": ""
       },
       {
-        "name": "admin_user_password",
+        "name": "namespace_name",
         "type": "string",
-        "description": "The password associated with the admin user for the namespace that is being created. Password must be at least 8 characters in length, should be any printable ASCII character. Must contain at least one lowercase letter, one uppercase letter and one decimal digit. You can't use adminUserPassword if manageAdminPassword is true."
+        "description": ""
       },
       {
         "name": "admin_username",
         "type": "string",
-        "description": "The user name associated with the admin user for the namespace that is being created. Only alphanumeric characters and underscores are allowed. It should start with an alphabet."
+        "description": ""
       },
       {
         "name": "db_name",
         "type": "string",
-        "description": "The database name associated for the namespace that is being created. Only alphanumeric characters and underscores are allowed. It should start with an alphabet."
+        "description": ""
+      },
+      {
+        "name": "kms_key_id",
+        "type": "string",
+        "description": ""
       },
       {
         "name": "default_iam_role_arn",
         "type": "string",
-        "description": "The default IAM role ARN for the namespace that is being created."
+        "description": ""
       },
       {
         "name": "iam_roles",
         "type": "array",
-        "description": "A list of AWS Identity and Access Management (IAM) roles that can be used by the namespace to access other AWS services. You must supply the IAM roles in their Amazon Resource Name (ARN) format. The Default role limit for each request is 10."
-      },
-      {
-        "name": "kms_key_id",
-        "type": "string",
-        "description": "The AWS Key Management Service (KMS) key ID of the encryption key that you want to use to encrypt data in the namespace."
+        "description": ""
       },
       {
         "name": "log_exports",
         "type": "array",
-        "description": "The collection of log types to be exported provided by the customer. Should only be one of the three supported log types: userlog, useractivitylog and connectionlog"
-      },
-      {
-        "name": "manage_admin_password",
-        "type": "boolean",
-        "description": "If true, Amazon Redshift uses AWS Secrets Manager to manage the namespace's admin credentials. You can't use adminUserPassword if manageAdminPassword is true. If manageAdminPassword is false or not set, Amazon Redshift uses adminUserPassword for the admin user account's password."
+        "description": ""
       },
       {
-        "name": "namespace_name",
+        "name": "status",
         "type": "string",
-        "description": "A unique identifier for the namespace. You use this identifier to refer to the namespace for any subsequent namespace operations such as deleting or modifying. All alphabetical characters must be lower case. Namespace name should be unique for all namespaces within an AWS account."
-      },
-      {
-        "name": "tags",
-        "type": "array",
-        "description": "The list of tags for the namespace.",
-        "children": [
-          {
-            "name": "key",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "value",
-            "type": "string",
-            "description": ""
-          }
-        ]
+        "description": ""
       },
       {
-        "name": "final_snapshot_name",
+        "name": "creation_date",
         "type": "string",
-        "description": "The name of the namespace the source snapshot was created from. Please specify the name if needed before deleting namespace"
-      },
-      {
-        "name": "final_snapshot_retention_period",
-        "type": "integer",
-        "description": "The number of days to retain automated snapshot in the destination region after they are copied from the source region. If the value is -1, the manual snapshot is retained indefinitely. The value must be either -1 or an integer between 1 and 3,653."
-      },
-      {
-        "name": "namespace_resource_policy",
-        "type": "object",
-        "description": "The resource policy document that will be attached to the namespace."
+        "description": ""
       },
       {
-        "name": "redshift_idc_application_arn",
+        "name": "admin_password_secret_arn",
         "type": "string",
-        "description": "The ARN for the Redshift application that integrates with IAM Identity Center."
+        "description": ""
       },
       {
-        "name": "snapshot_copy_configurations",
-        "type": "array",
-        "description": "The snapshot copy configurations for the namespace.",
-        "children": [
-          {
-            "name": "destination_region",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "destination_kms_key_id",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "snapshot_retention_period",
-            "type": "integer",
-            "description": ""
-          }
-        ]
+        "name": "admin_password_secret_kms_key_id",
+        "type": "string",
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/redshiftserverless/snapshots/index.md b/website/docs/services/redshiftserverless/snapshots/index.md
index c2059587f..c4709cfea 100644
--- a/website/docs/services/redshiftserverless/snapshots/index.md
+++ b/website/docs/services/redshiftserverless/snapshots/index.md
@@ -87,29 +87,54 @@ Creates, updates, deletes or gets a <code>snapshot</code> resource or lists <cod
     "description": "Definition for snapshot resource",
     "children": [
       {
-        "name": "snapshot_name",
+        "name": "namespace_arn",
         "type": "string",
-        "description": "The name of the snapshot."
+        "description": ""
       },
       {
         "name": "namespace_name",
         "type": "string",
-        "description": "The namespace the snapshot is associated with."
+        "description": ""
+      },
+      {
+        "name": "snapshot_name",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "snapshot_create_time",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "status",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "admin_username",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "kms_key_id",
+        "type": "string",
+        "description": ""
       },
       {
         "name": "owner_account",
         "type": "string",
-        "description": "The owner account of the snapshot."
+        "description": ""
       },
       {
         "name": "retention_period",
         "type": "integer",
-        "description": "The retention period of the snapshot."
+        "description": ""
       },
       {
-        "name": "tags",
-        "type": "array",
-        "description": "An array of key-value pairs to apply to this resource."
+        "name": "snapshot_arn",
+        "type": "string",
+        "description": ""
       }
     ]
   },
@@ -134,29 +159,54 @@ Creates, updates, deletes or gets a <code>snapshot</code> resource or lists <cod
     "description": "Definition for snapshot resource",
     "children": [
       {
-        "name": "snapshot_name",
+        "name": "namespace_arn",
         "type": "string",
-        "description": "The name of the snapshot."
+        "description": ""
       },
       {
         "name": "namespace_name",
         "type": "string",
-        "description": "The namespace the snapshot is associated with."
+        "description": ""
+      },
+      {
+        "name": "snapshot_name",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "snapshot_create_time",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "status",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "admin_username",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "kms_key_id",
+        "type": "string",
+        "description": ""
       },
       {
         "name": "owner_account",
         "type": "string",
-        "description": "The owner account of the snapshot."
+        "description": ""
       },
       {
         "name": "retention_period",
         "type": "integer",
-        "description": "The retention period of the snapshot."
+        "description": ""
       },
       {
-        "name": "tags",
-        "type": "array",
-        "description": "An array of key-value pairs to apply to this resource."
+        "name": "snapshot_arn",
+        "type": "string",
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/redshiftserverless/workgroups/index.md b/website/docs/services/redshiftserverless/workgroups/index.md
index 09bc14c44..d41095e80 100644
--- a/website/docs/services/redshiftserverless/workgroups/index.md
+++ b/website/docs/services/redshiftserverless/workgroups/index.md
@@ -170,80 +170,109 @@ Creates, updates, deletes or gets a <code>workgroup</code> resource or lists <co
     "type": "object",
     "description": "Definition for workgroup resource",
     "children": [
+      {
+        "name": "workgroup_id",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "workgroup_arn",
+        "type": "string",
+        "description": ""
+      },
       {
         "name": "workgroup_name",
         "type": "string",
-        "description": "The name of the workgroup."
+        "description": ""
       },
       {
         "name": "namespace_name",
         "type": "string",
-        "description": "The namespace the workgroup is associated with."
+        "description": ""
       },
       {
         "name": "base_capacity",
         "type": "integer",
-        "description": "The base compute capacity of the workgroup in Redshift Processing Units (RPUs)."
+        "description": ""
       },
       {
         "name": "max_capacity",
         "type": "integer",
-        "description": "The max compute capacity of the workgroup in Redshift Processing Units (RPUs)."
+        "description": ""
       },
       {
         "name": "enhanced_vpc_routing",
         "type": "boolean",
-        "description": "The value that specifies whether to enable enhanced virtual private cloud (VPC) routing, which forces Amazon Redshift Serverless to route traffic through your VPC."
+        "description": ""
       },
       {
         "name": "config_parameters",
         "type": "array",
-        "description": "A list of parameters to set for finer control over a database. Available options are datestyle, enable_user_activity_logging, query_group, search_path, max_query_execution_time, and require_ssl."
+        "description": ""
       },
       {
         "name": "security_group_ids",
         "type": "array",
-        "description": "A list of security group IDs to associate with the workgroup."
+        "description": ""
       },
       {
         "name": "subnet_ids",
         "type": "array",
-        "description": "A list of subnet IDs the workgroup is associated with."
-      },
-      {
-        "name": "publicly_accessible",
-        "type": "boolean",
-        "description": "A value that specifies whether the workgroup can be accessible from a public network."
-      },
-      {
-        "name": "port",
-        "type": "integer",
-        "description": "The custom port to use when connecting to a workgroup. Valid port ranges are 5431-5455 and 8191-8215. The default is 5439."
+        "description": ""
       },
       {
-        "name": "snapshot_arn",
+        "name": "status",
         "type": "string",
-        "description": "The Amazon Resource Name (ARN) of the snapshot to restore from."
+        "description": ""
       },
       {
-        "name": "snapshot_name",
-        "type": "string",
-        "description": "The snapshot name to restore from."
+        "name": "endpoint",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "address",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "port",
+            "type": "integer",
+            "description": ""
+          },
+          {
+            "name": "vpc_endpoints",
+            "type": "array",
+            "description": "",
+            "children": [
+              {
+                "name": "vpc_endpoint_id",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "vpc_id",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "network_interfaces",
+                "type": "array",
+                "description": ""
+              }
+            ]
+          }
+        ]
       },
       {
-        "name": "snapshot_owner_account",
-        "type": "string",
-        "description": "The Amazon Web Services account that owns the snapshot."
+        "name": "publicly_accessible",
+        "type": "boolean",
+        "description": ""
       },
       {
-        "name": "recovery_point_id",
+        "name": "creation_date",
         "type": "string",
-        "description": "The recovery point id to restore from."
-      },
-      {
-        "name": "tags",
-        "type": "array",
-        "description": "The map of the key-value pairs used to tag the workgroup."
+        "description": ""
       },
       {
         "name": "track_name",
@@ -272,80 +301,109 @@ Creates, updates, deletes or gets a <code>workgroup</code> resource or lists <co
     "type": "object",
     "description": "Definition for workgroup resource",
     "children": [
+      {
+        "name": "workgroup_id",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "workgroup_arn",
+        "type": "string",
+        "description": ""
+      },
       {
         "name": "workgroup_name",
         "type": "string",
-        "description": "The name of the workgroup."
+        "description": ""
       },
       {
         "name": "namespace_name",
         "type": "string",
-        "description": "The namespace the workgroup is associated with."
+        "description": ""
       },
       {
         "name": "base_capacity",
         "type": "integer",
-        "description": "The base compute capacity of the workgroup in Redshift Processing Units (RPUs)."
+        "description": ""
       },
       {
         "name": "max_capacity",
         "type": "integer",
-        "description": "The max compute capacity of the workgroup in Redshift Processing Units (RPUs)."
+        "description": ""
       },
       {
         "name": "enhanced_vpc_routing",
         "type": "boolean",
-        "description": "The value that specifies whether to enable enhanced virtual private cloud (VPC) routing, which forces Amazon Redshift Serverless to route traffic through your VPC."
+        "description": ""
       },
       {
         "name": "config_parameters",
         "type": "array",
-        "description": "A list of parameters to set for finer control over a database. Available options are datestyle, enable_user_activity_logging, query_group, search_path, max_query_execution_time, and require_ssl."
+        "description": ""
       },
       {
         "name": "security_group_ids",
         "type": "array",
-        "description": "A list of security group IDs to associate with the workgroup."
+        "description": ""
       },
       {
         "name": "subnet_ids",
         "type": "array",
-        "description": "A list of subnet IDs the workgroup is associated with."
-      },
-      {
-        "name": "publicly_accessible",
-        "type": "boolean",
-        "description": "A value that specifies whether the workgroup can be accessible from a public network."
-      },
-      {
-        "name": "port",
-        "type": "integer",
-        "description": "The custom port to use when connecting to a workgroup. Valid port ranges are 5431-5455 and 8191-8215. The default is 5439."
+        "description": ""
       },
       {
-        "name": "snapshot_arn",
+        "name": "status",
         "type": "string",
-        "description": "The Amazon Resource Name (ARN) of the snapshot to restore from."
+        "description": ""
       },
       {
-        "name": "snapshot_name",
-        "type": "string",
-        "description": "The snapshot name to restore from."
+        "name": "endpoint",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "address",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "port",
+            "type": "integer",
+            "description": ""
+          },
+          {
+            "name": "vpc_endpoints",
+            "type": "array",
+            "description": "",
+            "children": [
+              {
+                "name": "vpc_endpoint_id",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "vpc_id",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "network_interfaces",
+                "type": "array",
+                "description": ""
+              }
+            ]
+          }
+        ]
       },
       {
-        "name": "snapshot_owner_account",
-        "type": "string",
-        "description": "The Amazon Web Services account that owns the snapshot."
+        "name": "publicly_accessible",
+        "type": "boolean",
+        "description": ""
       },
       {
-        "name": "recovery_point_id",
+        "name": "creation_date",
         "type": "string",
-        "description": "The recovery point id to restore from."
-      },
-      {
-        "name": "tags",
-        "type": "array",
-        "description": "The map of the key-value pairs used to tag the workgroup."
+        "description": ""
       },
       {
         "name": "track_name",
@@ -614,6 +672,8 @@ resources:
         value: '{{ track_name }}'
       - name: workgroup
         value:
+          workgroup_id: '{{ workgroup_id }}'
+          workgroup_arn: '{{ workgroup_arn }}'
           workgroup_name: '{{ workgroup_name }}'
           namespace_name: '{{ namespace_name }}'
           base_capacity: '{{ base_capacity }}'
@@ -625,17 +685,22 @@ resources:
             - '{{ security_group_ids[0] }}'
           subnet_ids:
             - '{{ subnet_ids[0] }}'
+          status: '{{ status }}'
+          endpoint:
+            address: '{{ address }}'
+            port: '{{ port }}'
+            vpc_endpoints:
+              - vpc_endpoint_id: '{{ vpc_endpoint_id }}'
+                vpc_id: '{{ vpc_id }}'
+                network_interfaces:
+                  - network_interface_id: '{{ network_interface_id }}'
+                    subnet_id: '{{ subnet_id }}'
+                    private_ip_address: '{{ private_ip_address }}'
+                    availability_zone: '{{ availability_zone }}'
           publicly_accessible: '{{ publicly_accessible }}'
-          port: '{{ port }}'
+          creation_date: '{{ creation_date }}'
           price_performance_target: null
-          snapshot_arn: '{{ snapshot_arn }}'
-          snapshot_name: '{{ snapshot_name }}'
-          snapshot_owner_account: '{{ snapshot_owner_account }}'
-          recovery_point_id: '{{ recovery_point_id }}'
-          tags:
-            - null
-          track_name: '{{ track_name }}'
-          workgroup: null`}</CodeBlock>
+          track_name: '{{ track_name }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/rekognition/collections/index.md b/website/docs/services/rekognition/collections/index.md
index 613db4a88..b68d6e418 100644
--- a/website/docs/services/rekognition/collections/index.md
+++ b/website/docs/services/rekognition/collections/index.md
@@ -47,7 +47,7 @@ Creates, updates, deletes or gets a <code>collection</code> resource or lists <c
   {
     "name": "arn",
     "type": "string",
-    "description": "The ARN of the stream processor"
+    "description": ""
   },
   {
     "name": "collection_id",
diff --git a/website/docs/services/rekognition/projects/index.md b/website/docs/services/rekognition/projects/index.md
index ec2453cf5..5b632c230 100644
--- a/website/docs/services/rekognition/projects/index.md
+++ b/website/docs/services/rekognition/projects/index.md
@@ -47,7 +47,7 @@ Creates, updates, deletes or gets a <code>project</code> resource or lists <code
   {
     "name": "arn",
     "type": "string",
-    "description": "The ARN of the stream processor"
+    "description": ""
   },
   {
     "name": "project_name",
diff --git a/website/docs/services/robomaker/robot_applications/index.md b/website/docs/services/robomaker/robot_applications/index.md
index c839ef4cb..b96a50b42 100644
--- a/website/docs/services/robomaker/robot_applications/index.md
+++ b/website/docs/services/robomaker/robot_applications/index.md
@@ -57,17 +57,17 @@ Creates, updates, deletes or gets a <code>robot_application</code> resource or l
       {
         "name": "s3_bucket",
         "type": "string",
-        "description": "The Amazon S3 bucket name."
+        "description": "The Arn of the S3Bucket that stores the robot application source."
       },
       {
         "name": "s3_key",
         "type": "string",
-        "description": "The s3 object key."
+        "description": "The s3 key of robot application source."
       },
       {
         "name": "architecture",
         "type": "string",
-        "description": "The target processor architecture for the application."
+        "description": "The architecture of robot application."
       }
     ]
   },
@@ -79,17 +79,17 @@ Creates, updates, deletes or gets a <code>robot_application</code> resource or l
   {
     "name": "robot_software_suite",
     "type": "object",
-    "description": "Information about a robot software suite.",
+    "description": "The robot software suite used by the robot application.",
     "children": [
       {
         "name": "name",
         "type": "string",
-        "description": "The name of the robot software suite."
+        "description": "The name of robot software suite."
       },
       {
         "name": "version",
         "type": "string",
-        "description": "The version of the robot software suite."
+        "description": "The version of robot software suite."
       }
     ]
   },
diff --git a/website/docs/services/route53resolver/firewall_domain_lists/index.md b/website/docs/services/route53resolver/firewall_domain_lists/index.md
index 9d05881cf..6ea30f652 100644
--- a/website/docs/services/route53resolver/firewall_domain_lists/index.md
+++ b/website/docs/services/route53resolver/firewall_domain_lists/index.md
@@ -112,12 +112,12 @@ Creates, updates, deletes or gets a <code>firewall_domain_list</code> resource o
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/route53resolver/firewall_rule_group_associations/index.md b/website/docs/services/route53resolver/firewall_rule_group_associations/index.md
index 37a85e874..6756959eb 100644
--- a/website/docs/services/route53resolver/firewall_rule_group_associations/index.md
+++ b/website/docs/services/route53resolver/firewall_rule_group_associations/index.md
@@ -117,12 +117,12 @@ Creates, updates, deletes or gets a <code>firewall_rule_group_association</code>
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/route53resolver/firewall_rule_groups/index.md b/website/docs/services/route53resolver/firewall_rule_groups/index.md
index 9f96fb31d..d3ddb7a23 100644
--- a/website/docs/services/route53resolver/firewall_rule_groups/index.md
+++ b/website/docs/services/route53resolver/firewall_rule_groups/index.md
@@ -174,12 +174,12 @@ Creates, updates, deletes or gets a <code>firewall_rule_group</code> resource or
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/route53resolver/resolver_endpoints/index.md b/website/docs/services/route53resolver/resolver_endpoints/index.md
index 38ffd98de..69f742e25 100644
--- a/website/docs/services/route53resolver/resolver_endpoints/index.md
+++ b/website/docs/services/route53resolver/resolver_endpoints/index.md
@@ -129,12 +129,12 @@ Creates, updates, deletes or gets a <code>resolver_endpoint</code> resource or l
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The name for the tag. For example, if you want to associate Resolver resources with the account IDs of your customers for billing purposes, the value of Key might be account-id."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+        "description": "The value for the tag. For example, if Key is account-id, then Value might be the ID of the customer account that you're creating the resource for."
       }
     ]
   },
diff --git a/website/docs/services/s3/access_points/index.md b/website/docs/services/s3/access_points/index.md
index dca367a9a..219f743b2 100644
--- a/website/docs/services/s3/access_points/index.md
+++ b/website/docs/services/s3/access_points/index.md
@@ -82,24 +82,24 @@ Creates, updates, deletes or gets an <code>access_point</code> resource or lists
     "description": "The PublicAccessBlock configuration that you want to apply to this Access Point. You can enable the configuration options in any combination. For more information about when Amazon S3 considers a bucket or object public, see https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html#access-control-block-public-access-policy-status 'The Meaning of Public' in the Amazon Simple Storage Service Developer Guide.",
     "children": [
       {
-        "name": "restrict_public_buckets",
+        "name": "block_public_acls",
         "type": "boolean",
-        "description": "<details><summary>Specifies whether Amazon S3 should restrict public bucket policies for this bucket. Setting this element to TRUE restricts access to this bucket to only AWS services and authorized users within this account if the bucket has a public policy.</summary>Enabling this setting doesn't affect previously stored bucket policies, except that public and cross-account access within any public bucket policy, including non-public delegation to specific accounts, is blocked.</details>"
+        "description": "<details><summary>Specifies whether Amazon S3 should block public access control lists (ACLs) for buckets in this account. Setting this element to TRUE causes the following behavior:</summary>- PUT Bucket acl and PUT Object acl calls fail if the specified ACL is public.<br />- PUT Object calls fail if the request includes a public ACL.<br />. - PUT Bucket calls fail if the request includes a public ACL.<br />Enabling this setting doesn't affect existing policies or ACLs.</details>"
       },
       {
-        "name": "block_public_policy",
+        "name": "ignore_public_acls",
         "type": "boolean",
-        "description": "Specifies whether Amazon S3 should block public bucket policies for buckets in this account. Setting this element to TRUE causes Amazon S3 to reject calls to PUT Bucket policy if the specified bucket policy allows public access. Enabling this setting doesn't affect existing bucket policies."
+        "description": "Specifies whether Amazon S3 should ignore public ACLs for buckets in this account. Setting this element to TRUE causes Amazon S3 to ignore all public ACLs on buckets in this account and any objects that they contain. Enabling this setting doesn't affect the persistence of any existing ACLs and doesn't prevent new public ACLs from being set."
       },
       {
-        "name": "block_public_acls",
+        "name": "block_public_policy",
         "type": "boolean",
-        "description": "<details><summary>Specifies whether Amazon S3 should block public access control lists (ACLs) for buckets in this account. Setting this element to TRUE causes the following behavior:</summary>- PUT Bucket acl and PUT Object acl calls fail if the specified ACL is public.<br />- PUT Object calls fail if the request includes a public ACL.<br />. - PUT Bucket calls fail if the request includes a public ACL.<br />Enabling this setting doesn't affect existing policies or ACLs.</details>"
+        "description": "Specifies whether Amazon S3 should block public bucket policies for buckets in this account. Setting this element to TRUE causes Amazon S3 to reject calls to PUT Bucket policy if the specified bucket policy allows public access. Enabling this setting doesn't affect existing bucket policies."
       },
       {
-        "name": "ignore_public_acls",
+        "name": "restrict_public_buckets",
         "type": "boolean",
-        "description": "Specifies whether Amazon S3 should ignore public ACLs for buckets in this account. Setting this element to TRUE causes Amazon S3 to ignore all public ACLs on buckets in this account and any objects that they contain. Enabling this setting doesn't affect the persistence of any existing ACLs and doesn't prevent new public ACLs from being set."
+        "description": "<details><summary>Specifies whether Amazon S3 should restrict public bucket policies for this bucket. Setting this element to TRUE restricts access to this bucket to only AWS services and authorized users within this account if the bucket has a public policy.</summary>Enabling this setting doesn't affect previously stored bucket policies, except that public and cross-account access within any public bucket policy, including non-public delegation to specific accounts, is blocked.</details>"
       }
     ]
   },
@@ -347,10 +347,10 @@ resources:
           vpc_id: '{{ vpc_id }}'
       - name: public_access_block_configuration
         value:
-          restrict_public_buckets: '{{ restrict_public_buckets }}'
-          block_public_policy: '{{ block_public_policy }}'
           block_public_acls: '{{ block_public_acls }}'
           ignore_public_acls: '{{ ignore_public_acls }}'
+          block_public_policy: '{{ block_public_policy }}'
+          restrict_public_buckets: '{{ restrict_public_buckets }}'
       - name: policy
         value: {}
       - name: tags
diff --git a/website/docs/services/s3/buckets/index.md b/website/docs/services/s3/buckets/index.md
index 22f18c121..83b4f0fe6 100644
--- a/website/docs/services/s3/buckets/index.md
+++ b/website/docs/services/s3/buckets/index.md
@@ -94,14 +94,14 @@ Creates, updates, deletes or gets a <code>bucket</code> resource or lists <code>
             "description": "Specifies how data related to the storage class analysis for an Amazon S3 bucket should be exported.",
             "children": [
               {
-                "name": "s3_bucket_destination",
+                "name": "destination",
                 "type": "object",
-                "description": "S3 bucket destination settings for the Amazon S3 Storage Lens metrics export."
+                "description": "The place to store the data for an analysis."
               },
               {
-                "name": "cloud_watch_metrics",
-                "type": "object",
-                "description": "CloudWatch metrics settings for the Amazon S3 Storage Lens metrics export."
+                "name": "output_schema_version",
+                "type": "string",
+                "description": "The version of the output schema to use when exporting data. Must be <code>V_1</code>."
               }
             ]
           }
@@ -874,24 +874,24 @@ Creates, updates, deletes or gets a <code>bucket</code> resource or lists <code>
     "description": "Configuration that defines how Amazon S3 handles public access.",
     "children": [
       {
-        "name": "restrict_public_buckets",
+        "name": "block_public_acls",
         "type": "boolean",
-        "description": "<details><summary>Specifies whether Amazon S3 should restrict public bucket policies for this bucket. Setting this element to TRUE restricts access to this bucket to only AWS services and authorized users within this account if the bucket has a public policy.</summary>Enabling this setting doesn't affect previously stored bucket policies, except that public and cross-account access within any public bucket policy, including non-public delegation to specific accounts, is blocked.</details>"
+        "description": "<details><summary>Specifies whether Amazon S3 should block public access control lists (ACLs) for this bucket and objects in this bucket. Setting this element to <code>TRUE</code> causes the following behavior:</summary>+  PUT Bucket ACL and PUT Object ACL calls fail if the specified ACL is public.<br />+  PUT Object calls fail if the request includes a public ACL.<br />+  PUT Bucket calls fail if the request includes a public ACL.<br />Enabling this setting doesn't affect existing policies or ACLs.</details>"
       },
       {
         "name": "block_public_policy",
         "type": "boolean",
-        "description": "Specifies whether Amazon S3 should block public bucket policies for buckets in this account. Setting this element to TRUE causes Amazon S3 to reject calls to PUT Bucket policy if the specified bucket policy allows public access. Enabling this setting doesn't affect existing bucket policies."
+        "description": "<details><summary>Specifies whether Amazon S3 should block public bucket policies for this bucket. Setting this element to <code>TRUE</code> causes Amazon S3 to reject calls to PUT Bucket policy if the specified bucket policy allows public access.</summary>Enabling this setting doesn't affect existing bucket policies.</details>"
       },
       {
-        "name": "block_public_acls",
+        "name": "ignore_public_acls",
         "type": "boolean",
-        "description": "<details><summary>Specifies whether Amazon S3 should block public access control lists (ACLs) for buckets in this account. Setting this element to TRUE causes the following behavior:</summary>- PUT Bucket acl and PUT Object acl calls fail if the specified ACL is public.<br />- PUT Object calls fail if the request includes a public ACL.<br />. - PUT Bucket calls fail if the request includes a public ACL.<br />Enabling this setting doesn't affect existing policies or ACLs.</details>"
+        "description": "<details><summary>Specifies whether Amazon S3 should ignore public ACLs for this bucket and objects in this bucket. Setting this element to <code>TRUE</code> causes Amazon S3 to ignore all public ACLs on this bucket and objects in this bucket.</summary>Enabling this setting doesn't affect the persistence of any existing ACLs and doesn't prevent new public ACLs from being set.</details>"
       },
       {
-        "name": "ignore_public_acls",
+        "name": "restrict_public_buckets",
         "type": "boolean",
-        "description": "Specifies whether Amazon S3 should ignore public ACLs for buckets in this account. Setting this element to TRUE causes Amazon S3 to ignore all public ACLs on buckets in this account and any objects that they contain. Enabling this setting doesn't affect the persistence of any existing ACLs and doesn't prevent new public ACLs from being set."
+        "description": "<details><summary>Specifies whether Amazon S3 should restrict public bucket policies for this bucket. Setting this element to <code>TRUE</code> restricts access to this bucket to only AWS-service principals and authorized users within this account if the bucket has a public policy.</summary>Enabling this setting doesn't affect previously stored bucket policies, except that public and cross-account access within any public bucket policy, including non-public delegation to specific accounts, is blocked.</details>"
       }
     ]
   },
@@ -1035,12 +1035,12 @@ Creates, updates, deletes or gets a <code>bucket</code> resource or lists <code>
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "Name of the object key."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "Value of the tag."
       }
     ]
   },
@@ -1149,7 +1149,7 @@ Creates, updates, deletes or gets a <code>bucket</code> resource or lists <code>
   {
     "name": "arn",
     "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the specified resource."
+    "description": "the Amazon Resource Name (ARN) of the specified bucket."
   },
   {
     "name": "domain_name",
@@ -1431,15 +1431,12 @@ resources:
                 key: '{{ key }}'
             storage_class_analysis:
               data_export:
-                s3_bucket_destination:
-                  output_schema_version: '{{ output_schema_version }}'
+                destination:
+                  bucket_arn: '{{ bucket_arn }}'
+                  bucket_account_id: '{{ bucket_account_id }}'
                   format: '{{ format }}'
-                  account_id: '{{ account_id }}'
                   prefix: '{{ prefix }}'
-                  encryption: {}
-                  arn: '{{ arn }}'
-                cloud_watch_metrics:
-                  is_enabled: '{{ is_enabled }}'
+                output_schema_version: '{{ output_schema_version }}'
             id: '{{ id }}'
             prefix: '{{ prefix }}'
       - name: bucket_encryption
@@ -1476,11 +1473,7 @@ resources:
                 days: '{{ days }}'
       - name: inventory_configurations
         value:
-          - destination:
-              bucket_arn: '{{ bucket_arn }}'
-              bucket_account_id: '{{ bucket_account_id }}'
-              format: '{{ format }}'
-              prefix: '{{ prefix }}'
+          - destination: null
             enabled: '{{ enabled }}'
             id: '{{ id }}'
             included_object_versions: '{{ included_object_versions }}'
@@ -1595,10 +1588,10 @@ resources:
             - object_ownership: '{{ object_ownership }}'
       - name: public_access_block_configuration
         value:
-          restrict_public_buckets: '{{ restrict_public_buckets }}'
-          block_public_policy: '{{ block_public_policy }}'
           block_public_acls: '{{ block_public_acls }}'
+          block_public_policy: '{{ block_public_policy }}'
           ignore_public_acls: '{{ ignore_public_acls }}'
+          restrict_public_buckets: '{{ restrict_public_buckets }}'
       - name: replication_configuration
         value:
           role: '{{ role }}'
diff --git a/website/docs/services/s3/storage_lens/index.md b/website/docs/services/s3/storage_lens/index.md
index fdf4b05f8..b7fdb2e4e 100644
--- a/website/docs/services/s3/storage_lens/index.md
+++ b/website/docs/services/s3/storage_lens/index.md
@@ -246,12 +246,12 @@ Creates, updates, deletes or gets a <code>storage_len</code> resource or lists <
     "description": "A set of tags (key-value pairs) for this Amazon S3 Storage Lens configuration.",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
         "description": ""
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
         "description": ""
       }
@@ -683,8 +683,8 @@ resources:
               is_enabled: '{{ is_enabled }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'`}</CodeBlock>
+          - value: '{{ value }}'
+            key: '{{ key }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/s3tables/index.md b/website/docs/services/s3tables/index.md
index 495f8fd01..7b48e21f0 100644
--- a/website/docs/services/s3tables/index.md
+++ b/website/docs/services/s3tables/index.md
@@ -20,7 +20,7 @@ The s3tables service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>4</b></span><br />
+<span>total resources:&nbsp;<b>5</b></span><br />
 </div>
 </div>
 
@@ -29,6 +29,7 @@ The s3tables service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
+<a href="/services/s3tables/namespaces/">namespaces</a><br />
 <a href="/services/s3tables/table_bucket_policies/">table_bucket_policies</a><br />
 <a href="/services/s3tables/table_buckets/">table_buckets</a>
 </div>
diff --git a/website/docs/services/s3tables/namespaces/index.md b/website/docs/services/s3tables/namespaces/index.md
new file mode 100644
index 000000000..71d8e0d41
--- /dev/null
+++ b/website/docs/services/s3tables/namespaces/index.md
@@ -0,0 +1,326 @@
+---
+title: namespaces
+hide_title: false
+hide_table_of_contents: false
+keywords:
+  - namespaces
+  - s3tables
+  - aws
+  - stackql
+  - infrastructure-as-code
+  - configuration-as-data
+  - cloud inventory
+description: Query, deploy and manage AWS resources using SQL
+custom_edit_url: null
+image: /img/stackql-aws-provider-featured-image.png
+---
+
+import CodeBlock from '@theme/CodeBlock';
+import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
+
+Creates, updates, deletes or gets a <code>namespace</code> resource or lists <code>namespaces</code> in a region
+
+## Overview
+<table>
+<tbody>
+<tr><td><b>Name</b></td><td><code>namespaces</code></td></tr>
+<tr><td><b>Type</b></td><td>Resource</td></tr>
+<tr><td><b>Description</b></td><td>Resource Type definition for AWS::S3Tables::Namespace</td></tr>
+<tr><td><b>Id</b></td><td><CopyableCode code="awscc.s3tables.namespaces" /></td></tr>
+</tbody>
+</table>
+
+## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "table_bucket_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the specified table bucket."
+  },
+  {
+    "name": "namespace",
+    "type": "string",
+    "description": "A name for the namespace."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "table_bucket_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the specified table bucket."
+  },
+  {
+    "name": "namespace",
+    "type": "string",
+    "description": "A name for the namespace."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
+
+For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3tables-namespace.html"><code>AWS::S3Tables::Namespace</code></a>.
+
+## Methods
+
+<table>
+<tbody>
+  <tr>
+    <th>Name</th>
+    <th>Resource</th>
+    <th>Accessible by</th>
+    <th>Required Params</th>
+  </tr>
+  <tr>
+    <td><CopyableCode code="create_resource" /></td>
+    <td><code>namespaces</code></td>
+    <td><code>INSERT</code></td>
+    <td><CopyableCode code="Namespace, TableBucketARN, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="delete_resource" /></td>
+    <td><code>namespaces</code></td>
+    <td><code>DELETE</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="list_resources" /></td>
+    <td><code>namespaces_list_only</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="get_resource" /></td>
+    <td><code>namespaces</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+</tbody>
+</table>
+
+## `SELECT` examples
+
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+Gets all properties from an individual <code>namespace</code>.
+```sql
+SELECT
+  region,
+  table_bucket_arn,
+  namespace
+FROM awscc.s3tables.namespaces
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ table_bucket_arn }}|{{ namespace }}';
+```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>namespaces</code> in a region.
+```sql
+SELECT
+  region,
+  table_bucket_arn,
+  namespace
+FROM awscc.s3tables.namespaces_list_only
+WHERE
+  region = '{{ region }}';
+```
+</TabItem>
+</Tabs>
+
+## `INSERT` example
+
+Use the following StackQL query and manifest file to create a new <code>namespace</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+<Tabs
+    defaultValue="required"
+    values={[
+      { label: 'Required Properties', value: 'required', },
+      { label: 'All Properties', value: 'all', },
+      { label: 'Manifest', value: 'manifest', },
+    ]
+}>
+<TabItem value="required">
+
+```sql
+/*+ create */
+INSERT INTO awscc.s3tables.namespaces (
+  TableBucketARN,
+  Namespace,
+  region
+)
+SELECT
+  '{{ table_bucket_arn }}',
+  '{{ namespace }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="all">
+
+```sql
+/*+ create */
+INSERT INTO awscc.s3tables.namespaces (
+  TableBucketARN,
+  Namespace,
+  region
+)
+SELECT
+  '{{ table_bucket_arn }}',
+  '{{ namespace }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="manifest">
+
+<CodeBlock language="yaml">{`version: 1
+name: stack name
+description: stack description
+providers:
+  - aws
+globals:
+  - name: region
+    value: '{{ vars.AWS_REGION }}'
+resources:
+  - name: namespace
+    props:
+      - name: table_bucket_arn
+        value: '{{ table_bucket_arn }}'
+      - name: namespace
+        value: '{{ namespace }}'`}</CodeBlock>
+
+</TabItem>
+</Tabs>
+
+
+## `DELETE` example
+
+```sql
+/*+ delete */
+DELETE FROM awscc.s3tables.namespaces
+WHERE
+  Identifier = '{{ table_bucket_arn }}|{{ namespace }}' AND
+  region = '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## Additional Parameters
+
+Mutable resources in the Cloud Control provider support additional optional parameters which can be supplied with `INSERT`, `UPDATE`, or `DELETE` operations. These include:
+
+| Parameter | Description |
+|-----------|-------------|
+| <CopyableCode code="ClientToken" /> | <details><summary>A unique identifier to ensure the idempotency of the resource request.</summary>This allows the provider to accurately distinguish between retries and new requests.<br />A client token is valid for 36 hours once used.<br />After that, a resource request with the same client token is treated as a new request.<br />If you do not specify a client token, one is generated for inclusion in the request.</details> |
+| <CopyableCode code="RoleArn" /> | <details><summary>The ARN of the IAM role used to perform this resource operation.</summary>The role specified must have the permissions required for this operation.<br />If you do not specify a role, a temporary session is created using your AWS user credentials.</details> |
+| <CopyableCode code="TypeVersionId" /> | <details><summary>For private resource types, the type version to use in this resource operation.</summary>If you do not specify a resource version, the default version is used.</details> |
+
+## Permissions
+
+To operate on the <code>namespaces</code> resource, the following permissions are required:
+
+<Tabs
+    defaultValue="create"
+    values={[
+      { label: 'Create', value: 'create', },
+      { label: 'Read', value: 'read', },
+      { label: 'Delete', value: 'delete', },
+      { label: 'List', value: 'list', },
+    ]
+}>
+<TabItem value="create">
+
+```json
+s3tables:CreateNamespace
+```
+
+</TabItem>
+<TabItem value="read">
+
+```json
+s3tables:GetNamespace
+```
+
+</TabItem>
+<TabItem value="delete">
+
+```json
+s3tables:DeleteNamespace
+```
+
+</TabItem>
+<TabItem value="list">
+
+```json
+s3tables:ListNamespaces,
+s3tables:ListTableBuckets
+```
+
+</TabItem>
+</Tabs>
\ No newline at end of file
diff --git a/website/docs/services/s3tables/table_bucket_policies/index.md b/website/docs/services/s3tables/table_bucket_policies/index.md
index fb7a11005..890ec509c 100644
--- a/website/docs/services/s3tables/table_bucket_policies/index.md
+++ b/website/docs/services/s3tables/table_bucket_policies/index.md
@@ -47,12 +47,12 @@ Creates, updates, deletes or gets a <code>table_bucket_policy</code> resource or
   {
     "name": "resource_policy",
     "type": "object",
-    "description": "A policy document containing permissions to add to the specified table. In IAM, you must provide policy documents in JSON format. However, in CloudFormation you can provide the policy in JSON or YAML format because CloudFormation converts YAML to JSON before submitting it to IAM."
+    "description": "A policy document containing permissions to add to the specified table bucket. In IAM, you must provide policy documents in JSON format. However, in CloudFormation you can provide the policy in JSON or YAML format because CloudFormation converts YAML to JSON before submitting it to IAM."
   },
   {
     "name": "table_bucket_arn",
     "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the specified table bucket."
+    "description": "The Amazon Resource Name (ARN) of the table bucket to which the policy applies."
   },
   {
     "name": "region",
@@ -67,7 +67,7 @@ Creates, updates, deletes or gets a <code>table_bucket_policy</code> resource or
   {
     "name": "table_bucket_arn",
     "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the specified table bucket."
+    "description": "The Amazon Resource Name (ARN) of the table bucket to which the policy applies."
   },
   {
     "name": "region",
diff --git a/website/docs/services/sagemaker/clusters/index.md b/website/docs/services/sagemaker/clusters/index.md
index dc5e58fc2..195243295 100644
--- a/website/docs/services/sagemaker/clusters/index.md
+++ b/website/docs/services/sagemaker/clusters/index.md
@@ -52,17 +52,17 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
   {
     "name": "vpc_config",
     "type": "object",
-    "description": "Specifies an Amazon Virtual Private Cloud (VPC) that your SageMaker jobs, hosted models, and compute resources have access to. You can control access to and from your resources by configuring a VPC. For more information, see https://docs.aws.amazon.com/sagemaker/latest/dg/infrastructure-give-access.html",
+    "description": "Specifies an Amazon Virtual Private Cloud (VPC) that your SageMaker jobs, hosted models, and compute resources have access to. You can control access to and from your resources by configuring a VPC.",
     "children": [
       {
-        "name": "security_group_ids",
+        "name": "subnets",
         "type": "array",
-        "description": "The VPC security group IDs, in the form 'sg-xxxxxxxx'. Specify the security groups for the VPC that is specified in the 'Subnets' field."
+        "description": "The ID of the subnets in the VPC to which you want to connect your training job or model."
       },
       {
-        "name": "subnets",
+        "name": "security_group_ids",
         "type": "array",
-        "description": "The ID of the subnets in the VPC to which you want to connect your training job or model. For information about the availability of specific instance types, see https://docs.aws.amazon.com/sagemaker/latest/dg/regions-quotas.html"
+        "description": "The VPC security group IDs, in the form sg-xxxxxxxx. Specify the security groups for the VPC that is specified in the Subnets field."
       }
     ]
   },
@@ -146,22 +146,22 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
           {
             "name": "deployment_config",
             "type": "object",
-            "description": "",
+            "description": "The configuration to use when updating the AMI versions.",
             "children": [
               {
                 "name": "auto_rollback_configuration",
-                "type": "object",
-                "description": "Configuration for automatic rollback if an error occurs during deployment."
+                "type": "array",
+                "description": "An array that contains the alarms that SageMaker monitors to know whether to roll back the AMI update."
               },
               {
-                "name": "blue_green_update_policy",
+                "name": "rolling_update_policy",
                 "type": "object",
-                "description": "Configuration for blue-green update deployment policies."
+                "description": "The policy that SageMaker uses when updating the AMI versions of the cluster."
               },
               {
-                "name": "rolling_update_policy",
-                "type": "object",
-                "description": "Configuration for rolling update deployment policies."
+                "name": "wait_interval_in_seconds",
+                "type": "integer",
+                "description": "The duration in seconds that SageMaker waits before updating more instances in the cluster."
               }
             ]
           }
@@ -329,12 +329,12 @@ Creates, updates, deletes or gets a <code>cluster</code> resource or lists <code
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -551,10 +551,10 @@ resources:
     props:
       - name: vpc_config
         value:
-          security_group_ids:
-            - '{{ security_group_ids[0] }}'
           subnets:
             - '{{ subnets[0] }}'
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
       - name: node_recovery
         value: '{{ node_recovery }}'
       - name: instance_groups
@@ -577,23 +577,13 @@ resources:
               schedule_expression: '{{ schedule_expression }}'
               deployment_config:
                 auto_rollback_configuration:
-                  alarms:
-                    - alarm_name: '{{ alarm_name }}'
-                blue_green_update_policy:
-                  maximum_execution_timeout_in_seconds: '{{ maximum_execution_timeout_in_seconds }}'
-                  termination_wait_in_seconds: '{{ termination_wait_in_seconds }}'
-                  traffic_routing_configuration:
-                    canary_size:
-                      type: '{{ type }}'
-                      value: '{{ value }}'
-                    linear_step_size: null
-                    type: '{{ type }}'
-                    wait_interval_in_seconds: '{{ wait_interval_in_seconds }}'
+                  - alarm_name: '{{ alarm_name }}'
                 rolling_update_policy:
-                  maximum_batch_size: null
-                  maximum_execution_timeout_in_seconds: '{{ maximum_execution_timeout_in_seconds }}'
+                  maximum_batch_size:
+                    type: '{{ type }}'
+                    value: '{{ value }}'
                   rollback_maximum_batch_size: null
-                  wait_interval_in_seconds: '{{ wait_interval_in_seconds }}'
+                wait_interval_in_seconds: '{{ wait_interval_in_seconds }}'
             instance_type: '{{ instance_type }}'
             execution_role: '{{ execution_role }}'
       - name: restricted_instance_groups
diff --git a/website/docs/services/sagemaker/data_quality_job_definitions/index.md b/website/docs/services/sagemaker/data_quality_job_definitions/index.md
index 2d406f138..90087ed48 100644
--- a/website/docs/services/sagemaker/data_quality_job_definitions/index.md
+++ b/website/docs/services/sagemaker/data_quality_job_definitions/index.md
@@ -187,7 +187,7 @@ Creates, updates, deletes or gets a <code>data_quality_job_definition</code> res
               {
                 "name": "parquet",
                 "type": "boolean",
-                "description": "A flag indicating if the dataset format is Parquet"
+                "description": "A flag indicate if the dataset format is Parquet"
               }
             ]
           },
@@ -233,22 +233,22 @@ Creates, updates, deletes or gets a <code>data_quality_job_definition</code> res
           {
             "name": "s3_output",
             "type": "object",
-            "description": "Configuration for uploading output data to Amazon S3 from the processing container.",
+            "description": "Information about where and how to store the results of a monitoring job.",
             "children": [
               {
                 "name": "local_path",
                 "type": "string",
-                "description": "The local path of a directory where you want Amazon SageMaker to upload its contents to Amazon S3. LocalPath is an absolute path to a directory containing output files. This directory will be created by the platform and exist when your container's entrypoint is invoked."
+                "description": "The local path to the Amazon S3 storage location where Amazon SageMaker saves the results of a monitoring job. LocalPath is an absolute path for the output data."
               },
               {
                 "name": "s3_upload_mode",
                 "type": "string",
-                "description": "Whether to upload the results of the processing job continuously or after the job completes."
+                "description": "Whether to upload the results of the monitoring job continuously or after the job completes."
               },
               {
                 "name": "s3_uri",
                 "type": "string",
-                "description": "A URI that identifies the Amazon S3 bucket where you want Amazon SageMaker to save the results of a processing job."
+                "description": "A URI that identifies the Amazon S3 storage location where Amazon SageMaker saves the results of a monitoring job."
               }
             ]
           }
@@ -264,27 +264,27 @@ Creates, updates, deletes or gets a <code>data_quality_job_definition</code> res
       {
         "name": "cluster_config",
         "type": "object",
-        "description": "Configuration for the cluster used to run a processing job.",
+        "description": "Configuration for the cluster used to run model monitoring jobs.",
         "children": [
           {
             "name": "instance_count",
             "type": "integer",
-            "description": "The number of ML compute instances to use in the processing job. For distributed processing jobs, specify a value greater than 1. The default value is 1."
+            "description": "The number of ML compute instances to use in the model monitoring job. For distributed processing jobs, specify a value greater than 1. The default value is 1."
           },
           {
             "name": "instance_type",
             "type": "string",
             "description": "The ML compute instance type for the processing job."
           },
-          {
-            "name": "volume_size_in_gb",
-            "type": "integer",
-            "description": "The size of the ML storage volume in gigabytes that you want to provision. You must specify sufficient ML storage for your scenario."
-          },
           {
             "name": "volume_kms_key_id",
             "type": "string",
-            "description": "The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt data on the storage volume attached to the ML compute instance(s) that run the processing job."
+            "description": "The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt data on the storage volume attached to the ML compute instance(s) that run the model monitoring job."
+          },
+          {
+            "name": "volume_size_in_gb",
+            "type": "integer",
+            "description": "The size of the ML storage volume, in gigabytes, that you want to provision. You must specify sufficient ML storage for your scenario."
           }
         ]
       }
@@ -308,17 +308,17 @@ Creates, updates, deletes or gets a <code>data_quality_job_definition</code> res
       {
         "name": "vpc_config",
         "type": "object",
-        "description": "Specifies an Amazon Virtual Private Cloud (VPC) that your SageMaker jobs, hosted models, and compute resources have access to. You can control access to and from your resources by configuring a VPC. For more information, see https://docs.aws.amazon.com/sagemaker/latest/dg/infrastructure-give-access.html",
+        "description": "Specifies a VPC that your training jobs and hosted models have access to. Control access to and from your training and model containers by configuring the VPC.",
         "children": [
           {
             "name": "security_group_ids",
             "type": "array",
-            "description": "The VPC security group IDs, in the form 'sg-xxxxxxxx'. Specify the security groups for the VPC that is specified in the 'Subnets' field."
+            "description": "The VPC security group IDs, in the form sg-xxxxxxxx. Specify the security groups for the VPC that is specified in the Subnets field."
           },
           {
             "name": "subnets",
             "type": "array",
-            "description": "The ID of the subnets in the VPC to which you want to connect your training job or model. For information about the availability of specific instance types, see https://docs.aws.amazon.com/sagemaker/latest/dg/regions-quotas.html"
+            "description": "The ID of the subnets in the VPC to which you want to connect to your monitoring jobs."
           }
         ]
       }
@@ -337,12 +337,12 @@ Creates, updates, deletes or gets a <code>data_quality_job_definition</code> res
   {
     "name": "stopping_condition",
     "type": "object",
-    "description": "Configures conditions under which the processing job should be stopped, such as how long the processing job has been running. After the condition is met, the processing job is stopped.",
+    "description": "Specifies a time limit for how long the monitoring job is allowed to run.",
     "children": [
       {
         "name": "max_runtime_in_seconds",
         "type": "integer",
-        "description": "Specifies the maximum runtime in seconds."
+        "description": "The maximum runtime allowed in seconds."
       }
     ]
   },
@@ -352,14 +352,14 @@ Creates, updates, deletes or gets a <code>data_quality_job_definition</code> res
     "description": "An array of key-value pairs to apply to this resource.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -634,8 +634,8 @@ resources:
           cluster_config:
             instance_count: '{{ instance_count }}'
             instance_type: '{{ instance_type }}'
-            volume_size_in_gb: '{{ volume_size_in_gb }}'
             volume_kms_key_id: '{{ volume_kms_key_id }}'
+            volume_size_in_gb: '{{ volume_size_in_gb }}'
       - name: network_config
         value:
           enable_inter_container_traffic_encryption: '{{ enable_inter_container_traffic_encryption }}'
@@ -654,8 +654,8 @@ resources:
           max_runtime_in_seconds: '{{ max_runtime_in_seconds }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/sagemaker/device_fleets/index.md b/website/docs/services/sagemaker/device_fleets/index.md
index 0c53f2b0e..1ed73d154 100644
--- a/website/docs/services/sagemaker/device_fleets/index.md
+++ b/website/docs/services/sagemaker/device_fleets/index.md
@@ -73,14 +73,14 @@ Creates, updates, deletes or gets a <code>device_fleet</code> resource or lists
     "description": "Associate tags with the resource",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The key value of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -241,8 +241,8 @@ resources:
         value: '{{ role_arn }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/sagemaker/devices/index.md b/website/docs/services/sagemaker/devices/index.md
index 138e1c0d5..d094b9cb3 100644
--- a/website/docs/services/sagemaker/devices/index.md
+++ b/website/docs/services/sagemaker/devices/index.md
@@ -46,26 +46,19 @@ Creates, updates, deletes or gets a <code>device</code> resource or lists <code>
     "description": "The Edge Device you want to register against a device fleet",
     "children": [
       {
-        "name": "device_fleet_name",
+        "name": "description",
         "type": "string",
-        "description": "The name of the edge device fleet"
+        "description": "Description of the device"
       },
       {
-        "name": "tags",
-        "type": "array",
-        "description": "Associate tags with the resource",
-        "children": [
-          {
-            "name": "value",
-            "type": "string",
-            "description": ""
-          },
-          {
-            "name": "key",
-            "type": "string",
-            "description": ""
-          }
-        ]
+        "name": "device_name",
+        "type": "string",
+        "description": "The name of the device"
+      },
+      {
+        "name": "iot_thing_name",
+        "type": "string",
+        "description": "AWS Internet of Things (IoT) object name."
       }
     ]
   },
@@ -75,14 +68,14 @@ Creates, updates, deletes or gets a <code>device</code> resource or lists <code>
     "description": "Associate tags with the resource",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The key value of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -225,14 +218,13 @@ resources:
         value: '{{ device_fleet_name }}'
       - name: device
         value:
-          device_fleet_name: '{{ device_fleet_name }}'
-          device: null
-          tags:
-            - value: '{{ value }}'
-              key: '{{ key }}'
+          description: '{{ description }}'
+          device_name: '{{ device_name }}'
+          iot_thing_name: '{{ iot_thing_name }}'
       - name: tags
         value:
-          - null`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/sagemaker/domains/index.md b/website/docs/services/sagemaker/domains/index.md
new file mode 100644
index 000000000..f2079820e
--- /dev/null
+++ b/website/docs/services/sagemaker/domains/index.md
@@ -0,0 +1,1595 @@
+---
+title: domains
+hide_title: false
+hide_table_of_contents: false
+keywords:
+  - domains
+  - sagemaker
+  - aws
+  - stackql
+  - infrastructure-as-code
+  - configuration-as-data
+  - cloud inventory
+description: Query, deploy and manage AWS resources using SQL
+custom_edit_url: null
+image: /img/stackql-aws-provider-featured-image.png
+---
+
+import CodeBlock from '@theme/CodeBlock';
+import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
+
+Creates, updates, deletes or gets a <code>domain</code> resource or lists <code>domains</code> in a region
+
+## Overview
+<table>
+<tbody>
+<tr><td><b>Name</b></td><td><code>domains</code></td></tr>
+<tr><td><b>Type</b></td><td>Resource</td></tr>
+<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::Domain</td></tr>
+<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.domains" /></td></tr>
+</tbody>
+</table>
+
+## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the created domain."
+  },
+  {
+    "name": "url",
+    "type": "string",
+    "description": "The URL to the created domain."
+  },
+  {
+    "name": "app_network_access_type",
+    "type": "string",
+    "description": "Specifies the VPC used for non-EFS traffic. The default value is PublicInternetOnly."
+  },
+  {
+    "name": "auth_mode",
+    "type": "string",
+    "description": "The mode of authentication that members use to access the domain."
+  },
+  {
+    "name": "default_user_settings",
+    "type": "object",
+    "description": "The default user settings.",
+    "children": [
+      {
+        "name": "execution_role",
+        "type": "string",
+        "description": "The execution role for the user."
+      },
+      {
+        "name": "auto_mount_home_ef_s",
+        "type": "string",
+        "description": "Indicates whether auto-mounting of an EFS volume is supported for the user profile."
+      },
+      {
+        "name": "jupyter_server_app_settings",
+        "type": "object",
+        "description": "The Jupyter server's app settings.",
+        "children": [
+          {
+            "name": "default_resource_spec",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "instance_type",
+                "type": "string",
+                "description": "The instance type that the image version runs on."
+              },
+              {
+                "name": "sage_maker_image_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the SageMaker image that the image version belongs to."
+              },
+              {
+                "name": "sage_maker_image_version_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the image version created on the instance."
+              },
+              {
+                "name": "lifecycle_config_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the Lifecycle Configuration to attach to the Resource."
+              }
+            ]
+          },
+          {
+            "name": "lifecycle_config_arns",
+            "type": "array",
+            "description": "A list of LifecycleConfigArns available for use with JupyterServer apps."
+          }
+        ]
+      },
+      {
+        "name": "kernel_gateway_app_settings",
+        "type": "object",
+        "description": "The kernel gateway app settings.",
+        "children": [
+          {
+            "name": "custom_images",
+            "type": "array",
+            "description": "A list of custom SageMaker images that are configured to run as a KernelGateway app.",
+            "children": [
+              {
+                "name": "app_image_config_name",
+                "type": "string",
+                "description": "The Name of the AppImageConfig."
+              },
+              {
+                "name": "image_name",
+                "type": "string",
+                "description": "The name of the CustomImage. Must be unique to your account."
+              },
+              {
+                "name": "image_version_number",
+                "type": "integer",
+                "description": "The version number of the CustomImage."
+              }
+            ]
+          },
+          {
+            "name": "default_resource_spec",
+            "type": "object",
+            "description": "The default instance type and the Amazon Resource Name (ARN) of the default SageMaker image used by the KernelGateway app.",
+            "children": [
+              {
+                "name": "instance_type",
+                "type": "string",
+                "description": "The instance type that the image version runs on."
+              },
+              {
+                "name": "sage_maker_image_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the SageMaker image that the image version belongs to."
+              },
+              {
+                "name": "sage_maker_image_version_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the image version created on the instance."
+              },
+              {
+                "name": "lifecycle_config_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the Lifecycle Configuration to attach to the Resource."
+              }
+            ]
+          },
+          {
+            "name": "lifecycle_config_arns",
+            "type": "array",
+            "description": "A list of LifecycleConfigArns available for use with KernelGateway apps."
+          }
+        ]
+      },
+      {
+        "name": "r_studio_server_pro_app_settings",
+        "type": "object",
+        "description": "A collection of settings that configure user interaction with the RStudioServerPro app.",
+        "children": [
+          {
+            "name": "access_status",
+            "type": "string",
+            "description": "Indicates whether the current user has access to the RStudioServerPro app."
+          },
+          {
+            "name": "user_group",
+            "type": "string",
+            "description": "The level of permissions that the user has within the RStudioServerPro app. This value defaults to User. The Admin value allows the user access to the RStudio Administrative Dashboard."
+          }
+        ]
+      },
+      {
+        "name": "r_session_app_settings",
+        "type": "object",
+        "description": "A collection of settings that apply to an RSessionGateway app.",
+        "children": [
+          {
+            "name": "custom_images",
+            "type": "array",
+            "description": "A list of custom SageMaker images that are configured to run as a KernelGateway app.",
+            "children": [
+              {
+                "name": "app_image_config_name",
+                "type": "string",
+                "description": "The Name of the AppImageConfig."
+              },
+              {
+                "name": "image_name",
+                "type": "string",
+                "description": "The name of the CustomImage. Must be unique to your account."
+              },
+              {
+                "name": "image_version_number",
+                "type": "integer",
+                "description": "The version number of the CustomImage."
+              }
+            ]
+          },
+          {
+            "name": "default_resource_spec",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "instance_type",
+                "type": "string",
+                "description": "The instance type that the image version runs on."
+              },
+              {
+                "name": "sage_maker_image_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the SageMaker image that the image version belongs to."
+              },
+              {
+                "name": "sage_maker_image_version_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the image version created on the instance."
+              },
+              {
+                "name": "lifecycle_config_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the Lifecycle Configuration to attach to the Resource."
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "jupyter_lab_app_settings",
+        "type": "object",
+        "description": "The JupyterLab app settings.",
+        "children": [
+          {
+            "name": "default_resource_spec",
+            "type": "object",
+            "description": "The default instance type and the Amazon Resource Name (ARN) of the default SageMaker image used by the JupyterLab app.",
+            "children": [
+              {
+                "name": "instance_type",
+                "type": "string",
+                "description": "The instance type that the image version runs on."
+              },
+              {
+                "name": "sage_maker_image_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the SageMaker image that the image version belongs to."
+              },
+              {
+                "name": "sage_maker_image_version_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the image version created on the instance."
+              },
+              {
+                "name": "lifecycle_config_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the Lifecycle Configuration to attach to the Resource."
+              }
+            ]
+          },
+          {
+            "name": "lifecycle_config_arns",
+            "type": "array",
+            "description": "A list of LifecycleConfigArns available for use with JupyterLab apps."
+          },
+          {
+            "name": "code_repositories",
+            "type": "array",
+            "description": "A list of CodeRepositories available for use with JupyterLab apps.",
+            "children": [
+              {
+                "name": "repository_url",
+                "type": "string",
+                "description": "A CodeRepository (valid URL) to be used within Jupyter's Git extension."
+              }
+            ]
+          },
+          {
+            "name": "custom_images",
+            "type": "array",
+            "description": "A list of custom images for use for JupyterLab apps.",
+            "children": [
+              {
+                "name": "app_image_config_name",
+                "type": "string",
+                "description": "The Name of the AppImageConfig."
+              },
+              {
+                "name": "image_name",
+                "type": "string",
+                "description": "The name of the CustomImage. Must be unique to your account."
+              },
+              {
+                "name": "image_version_number",
+                "type": "integer",
+                "description": "The version number of the CustomImage."
+              }
+            ]
+          },
+          {
+            "name": "app_lifecycle_management",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "idle_settings",
+                "type": "object",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "built_in_lifecycle_config_arn",
+            "type": "string",
+            "description": "The lifecycle configuration that runs before the default lifecycle configuration."
+          }
+        ]
+      },
+      {
+        "name": "space_storage_settings",
+        "type": "object",
+        "description": "Default storage settings for a space.",
+        "children": [
+          {
+            "name": "default_ebs_storage_settings",
+            "type": "object",
+            "description": "Properties related to the Amazon Elastic Block Store volume. Must be provided if storage type is Amazon EBS and must not be provided if storage type is not Amazon EBS",
+            "children": [
+              {
+                "name": "default_ebs_volume_size_in_gb",
+                "type": "integer",
+                "description": "Default size of the Amazon EBS volume in Gb"
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "code_editor_app_settings",
+        "type": "object",
+        "description": "The CodeEditor app settings.",
+        "children": [
+          {
+            "name": "default_resource_spec",
+            "type": "object",
+            "description": "The default instance type and the Amazon Resource Name (ARN) of the default SageMaker image used by the CodeEditor app.",
+            "children": [
+              {
+                "name": "instance_type",
+                "type": "string",
+                "description": "The instance type that the image version runs on."
+              },
+              {
+                "name": "sage_maker_image_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the SageMaker image that the image version belongs to."
+              },
+              {
+                "name": "sage_maker_image_version_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the image version created on the instance."
+              },
+              {
+                "name": "lifecycle_config_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the Lifecycle Configuration to attach to the Resource."
+              }
+            ]
+          },
+          {
+            "name": "lifecycle_config_arns",
+            "type": "array",
+            "description": "A list of LifecycleConfigArns available for use with CodeEditor apps."
+          },
+          {
+            "name": "custom_images",
+            "type": "array",
+            "description": "A list of custom images for use for CodeEditor apps.",
+            "children": [
+              {
+                "name": "app_image_config_name",
+                "type": "string",
+                "description": "The Name of the AppImageConfig."
+              },
+              {
+                "name": "image_name",
+                "type": "string",
+                "description": "The name of the CustomImage. Must be unique to your account."
+              },
+              {
+                "name": "image_version_number",
+                "type": "integer",
+                "description": "The version number of the CustomImage."
+              }
+            ]
+          },
+          {
+            "name": "app_lifecycle_management",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "idle_settings",
+                "type": "object",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "built_in_lifecycle_config_arn",
+            "type": "string",
+            "description": "The lifecycle configuration that runs before the default lifecycle configuration."
+          }
+        ]
+      },
+      {
+        "name": "studio_web_portal_settings",
+        "type": "object",
+        "description": "Studio settings. If these settings are applied on a user level, they take priority over the settings applied on a domain level.",
+        "children": [
+          {
+            "name": "hidden_ml_tools",
+            "type": "array",
+            "description": "The machine learning tools that are hidden from the Studio left navigation pane."
+          },
+          {
+            "name": "hidden_app_types",
+            "type": "array",
+            "description": "Applications supported in Studio that are hidden from the Studio left navigation pane."
+          },
+          {
+            "name": "hidden_instance_types",
+            "type": "array",
+            "description": "The instance types you are hiding from the Studio user interface."
+          },
+          {
+            "name": "hidden_sage_maker_image_version_aliases",
+            "type": "array",
+            "description": "The version aliases you are hiding from the Studio user interface.",
+            "children": [
+              {
+                "name": "sage_maker_image_name",
+                "type": "string",
+                "description": "The SageMaker image name that you are hiding from the Studio user interface."
+              },
+              {
+                "name": "version_aliases",
+                "type": "array",
+                "description": ""
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "default_landing_uri",
+        "type": "string",
+        "description": "Defines which Amazon SageMaker application users are directed to by default."
+      },
+      {
+        "name": "studio_web_portal",
+        "type": "string",
+        "description": "Indicates whether the Studio experience is available to users. If not, users cannot access Studio."
+      },
+      {
+        "name": "custom_posix_user_config",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "uid",
+            "type": "integer",
+            "description": ""
+          },
+          {
+            "name": "gid",
+            "type": "integer",
+            "description": ""
+          }
+        ]
+      },
+      {
+        "name": "custom_file_system_configs",
+        "type": "array",
+        "description": "",
+        "children": [
+          {
+            "name": "e_fs_file_system_config",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "file_system_path",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "file_system_id",
+                "type": "string",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "f_sx_lustre_file_system_config",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "file_system_path",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "file_system_id",
+                "type": "string",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "s3_file_system_config",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "mount_path",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "s3_uri",
+                "type": "string",
+                "description": ""
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "security_groups",
+        "type": "array",
+        "description": "The security groups for the Amazon Virtual Private Cloud (VPC) that Studio uses for communication."
+      },
+      {
+        "name": "sharing_settings",
+        "type": "object",
+        "description": "The sharing settings.",
+        "children": [
+          {
+            "name": "notebook_output_option",
+            "type": "string",
+            "description": "Whether to include the notebook cell output when sharing the notebook. The default is Disabled."
+          },
+          {
+            "name": "s3_kms_key_id",
+            "type": "string",
+            "description": "When NotebookOutputOption is Allowed, the AWS Key Management Service (KMS) encryption key ID used to encrypt the notebook cell output in the Amazon S3 bucket."
+          },
+          {
+            "name": "s3_output_path",
+            "type": "string",
+            "description": "When NotebookOutputOption is Allowed, the Amazon S3 bucket used to store the shared notebook snapshots."
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "default_space_settings",
+    "type": "object",
+    "description": "The default space settings.",
+    "children": [
+      {
+        "name": "execution_role",
+        "type": "string",
+        "description": "The execution role for the space."
+      },
+      {
+        "name": "jupyter_server_app_settings",
+        "type": "object",
+        "description": "The Jupyter server's app settings.",
+        "children": [
+          {
+            "name": "default_resource_spec",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "instance_type",
+                "type": "string",
+                "description": "The instance type that the image version runs on."
+              },
+              {
+                "name": "sage_maker_image_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the SageMaker image that the image version belongs to."
+              },
+              {
+                "name": "sage_maker_image_version_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the image version created on the instance."
+              },
+              {
+                "name": "lifecycle_config_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the Lifecycle Configuration to attach to the Resource."
+              }
+            ]
+          },
+          {
+            "name": "lifecycle_config_arns",
+            "type": "array",
+            "description": "A list of LifecycleConfigArns available for use with JupyterServer apps."
+          }
+        ]
+      },
+      {
+        "name": "kernel_gateway_app_settings",
+        "type": "object",
+        "description": "The kernel gateway app settings.",
+        "children": [
+          {
+            "name": "custom_images",
+            "type": "array",
+            "description": "A list of custom SageMaker images that are configured to run as a KernelGateway app.",
+            "children": [
+              {
+                "name": "app_image_config_name",
+                "type": "string",
+                "description": "The Name of the AppImageConfig."
+              },
+              {
+                "name": "image_name",
+                "type": "string",
+                "description": "The name of the CustomImage. Must be unique to your account."
+              },
+              {
+                "name": "image_version_number",
+                "type": "integer",
+                "description": "The version number of the CustomImage."
+              }
+            ]
+          },
+          {
+            "name": "default_resource_spec",
+            "type": "object",
+            "description": "The default instance type and the Amazon Resource Name (ARN) of the default SageMaker image used by the KernelGateway app.",
+            "children": [
+              {
+                "name": "instance_type",
+                "type": "string",
+                "description": "The instance type that the image version runs on."
+              },
+              {
+                "name": "sage_maker_image_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the SageMaker image that the image version belongs to."
+              },
+              {
+                "name": "sage_maker_image_version_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the image version created on the instance."
+              },
+              {
+                "name": "lifecycle_config_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the Lifecycle Configuration to attach to the Resource."
+              }
+            ]
+          },
+          {
+            "name": "lifecycle_config_arns",
+            "type": "array",
+            "description": "A list of LifecycleConfigArns available for use with KernelGateway apps."
+          }
+        ]
+      },
+      {
+        "name": "security_groups",
+        "type": "array",
+        "description": "The security groups for the Amazon Virtual Private Cloud (VPC) that Studio uses for communication."
+      },
+      {
+        "name": "jupyter_lab_app_settings",
+        "type": "object",
+        "description": "The Jupyter lab's app settings.",
+        "children": [
+          {
+            "name": "default_resource_spec",
+            "type": "object",
+            "description": "The default instance type and the Amazon Resource Name (ARN) of the default SageMaker image used by the JupyterLab app.",
+            "children": [
+              {
+                "name": "instance_type",
+                "type": "string",
+                "description": "The instance type that the image version runs on."
+              },
+              {
+                "name": "sage_maker_image_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the SageMaker image that the image version belongs to."
+              },
+              {
+                "name": "sage_maker_image_version_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the image version created on the instance."
+              },
+              {
+                "name": "lifecycle_config_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the Lifecycle Configuration to attach to the Resource."
+              }
+            ]
+          },
+          {
+            "name": "lifecycle_config_arns",
+            "type": "array",
+            "description": "A list of LifecycleConfigArns available for use with JupyterLab apps."
+          },
+          {
+            "name": "code_repositories",
+            "type": "array",
+            "description": "A list of CodeRepositories available for use with JupyterLab apps.",
+            "children": [
+              {
+                "name": "repository_url",
+                "type": "string",
+                "description": "A CodeRepository (valid URL) to be used within Jupyter's Git extension."
+              }
+            ]
+          },
+          {
+            "name": "custom_images",
+            "type": "array",
+            "description": "A list of custom images for use for JupyterLab apps.",
+            "children": [
+              {
+                "name": "app_image_config_name",
+                "type": "string",
+                "description": "The Name of the AppImageConfig."
+              },
+              {
+                "name": "image_name",
+                "type": "string",
+                "description": "The name of the CustomImage. Must be unique to your account."
+              },
+              {
+                "name": "image_version_number",
+                "type": "integer",
+                "description": "The version number of the CustomImage."
+              }
+            ]
+          },
+          {
+            "name": "app_lifecycle_management",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "idle_settings",
+                "type": "object",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "built_in_lifecycle_config_arn",
+            "type": "string",
+            "description": "The lifecycle configuration that runs before the default lifecycle configuration."
+          }
+        ]
+      },
+      {
+        "name": "space_storage_settings",
+        "type": "object",
+        "description": "The Jupyter lab's space storage settings.",
+        "children": [
+          {
+            "name": "default_ebs_storage_settings",
+            "type": "object",
+            "description": "Properties related to the Amazon Elastic Block Store volume. Must be provided if storage type is Amazon EBS and must not be provided if storage type is not Amazon EBS",
+            "children": [
+              {
+                "name": "default_ebs_volume_size_in_gb",
+                "type": "integer",
+                "description": "Default size of the Amazon EBS volume in Gb"
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "custom_posix_user_config",
+        "type": "object",
+        "description": "The Jupyter lab's custom posix user configurations.",
+        "children": [
+          {
+            "name": "uid",
+            "type": "integer",
+            "description": ""
+          },
+          {
+            "name": "gid",
+            "type": "integer",
+            "description": ""
+          }
+        ]
+      },
+      {
+        "name": "custom_file_system_configs",
+        "type": "array",
+        "description": "",
+        "children": [
+          {
+            "name": "e_fs_file_system_config",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "file_system_path",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "file_system_id",
+                "type": "string",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "f_sx_lustre_file_system_config",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "file_system_path",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "file_system_id",
+                "type": "string",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "s3_file_system_config",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "mount_path",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "s3_uri",
+                "type": "string",
+                "description": ""
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "domain_name",
+    "type": "string",
+    "description": "A name for the domain."
+  },
+  {
+    "name": "kms_key_id",
+    "type": "string",
+    "description": "SageMaker uses AWS KMS to encrypt the EFS volume attached to the domain with an AWS managed customer master key (CMK) by default."
+  },
+  {
+    "name": "subnet_ids",
+    "type": "array",
+    "description": "The VPC subnets that Studio uses for communication."
+  },
+  {
+    "name": "tags",
+    "type": "array",
+    "description": "A list of tags to apply to the user profile.",
+    "children": [
+      {
+        "name": "value",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "key",
+        "type": "string",
+        "description": ""
+      }
+    ]
+  },
+  {
+    "name": "vpc_id",
+    "type": "string",
+    "description": "The ID of the Amazon Virtual Private Cloud (VPC) that Studio uses for communication."
+  },
+  {
+    "name": "domain_id",
+    "type": "string",
+    "description": "The domain name."
+  },
+  {
+    "name": "home_efs_file_system_id",
+    "type": "string",
+    "description": "The ID of the Amazon Elastic File System (EFS) managed by this Domain."
+  },
+  {
+    "name": "single_sign_on_managed_application_instance_id",
+    "type": "string",
+    "description": "The SSO managed application instance ID."
+  },
+  {
+    "name": "single_sign_on_application_arn",
+    "type": "string",
+    "description": "The ARN of the application managed by SageMaker in IAM Identity Center. This value is only returned for domains created after October 1, 2023."
+  },
+  {
+    "name": "domain_settings",
+    "type": "object",
+    "description": "A collection of Domain settings.",
+    "children": [
+      {
+        "name": "security_group_ids",
+        "type": "array",
+        "description": "The security groups for the Amazon Virtual Private Cloud that the Domain uses for communication between Domain-level apps and user apps."
+      },
+      {
+        "name": "r_studio_server_pro_domain_settings",
+        "type": "object",
+        "description": "A collection of settings that update the current configuration for the RStudioServerPro Domain-level app.",
+        "children": [
+          {
+            "name": "domain_execution_role_arn",
+            "type": "string",
+            "description": "The ARN of the execution role for the RStudioServerPro Domain-level app."
+          },
+          {
+            "name": "r_studio_connect_url",
+            "type": "string",
+            "description": "A URL pointing to an RStudio Connect server."
+          },
+          {
+            "name": "r_studio_package_manager_url",
+            "type": "string",
+            "description": "A URL pointing to an RStudio Package Manager server."
+          },
+          {
+            "name": "default_resource_spec",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "instance_type",
+                "type": "string",
+                "description": "The instance type that the image version runs on."
+              },
+              {
+                "name": "sage_maker_image_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the SageMaker image that the image version belongs to."
+              },
+              {
+                "name": "sage_maker_image_version_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the image version created on the instance."
+              },
+              {
+                "name": "lifecycle_config_arn",
+                "type": "string",
+                "description": "The Amazon Resource Name (ARN) of the Lifecycle Configuration to attach to the Resource."
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "docker_settings",
+        "type": "object",
+        "description": "A collection of settings that are required to start docker-proxy server.",
+        "children": [
+          {
+            "name": "enable_docker_access",
+            "type": "string",
+            "description": "The flag to enable/disable docker-proxy server"
+          },
+          {
+            "name": "vpc_only_trusted_accounts",
+            "type": "array",
+            "description": "A list of account id's that would be used to pull images from in VpcOnly mode"
+          }
+        ]
+      },
+      {
+        "name": "execution_role_identity_config",
+        "type": "string",
+        "description": "The configuration for attaching a SageMaker user profile name to the execution role as a sts:SourceIdentity key."
+      },
+      {
+        "name": "unified_studio_settings",
+        "type": "object",
+        "description": "A collection of settings that apply to an Amazon SageMaker AI domain when you use it in Amazon SageMaker Unified Studio.",
+        "children": [
+          {
+            "name": "studio_web_portal_access",
+            "type": "string",
+            "description": "<details><summary>Sets whether you can access the domain in Amazon SageMaker Studio:</summary>ENABLED<br />You can access the domain in Amazon SageMaker Studio. If you migrate the domain to Amazon SageMaker Unified Studio, you can access it in both studio interfaces.<br />DISABLED<br />You can't access the domain in Amazon SageMaker Studio. If you migrate the domain to Amazon SageMaker Unified Studio, you can access it only in that studio interface.</details>"
+          },
+          {
+            "name": "domain_account_id",
+            "type": "string",
+            "description": "The ID of the AWS account that has the Amazon SageMaker Unified Studio domain. The default value, if you don't specify an ID, is the ID of the account that has the Amazon SageMaker AI domain."
+          },
+          {
+            "name": "domain_region",
+            "type": "string",
+            "description": "The AWS Region where the domain is located in Amazon SageMaker Unified Studio. The default value, if you don't specify a Region, is the Region where the Amazon SageMaker AI domain is located."
+          },
+          {
+            "name": "domain_id",
+            "type": "string",
+            "description": "The ID of the Amazon SageMaker Unified Studio domain associated with this domain."
+          },
+          {
+            "name": "project_id",
+            "type": "string",
+            "description": "The ID of the Amazon SageMaker Unified Studio project that corresponds to the domain."
+          },
+          {
+            "name": "environment_id",
+            "type": "string",
+            "description": "The ID of the environment that Amazon SageMaker Unified Studio associates with the domain."
+          },
+          {
+            "name": "project_s3_path",
+            "type": "string",
+            "description": "The location where Amazon S3 stores temporary execution data and other artifacts for the project that corresponds to the domain."
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "app_security_group_management",
+    "type": "string",
+    "description": "The entity that creates and manages the required security groups for inter-app communication in VPCOnly mode. Required when CreateDomain.AppNetworkAccessType is VPCOnly and DomainSettings.RStudioServerProDomainSettings.DomainExecutionRoleArn is provided."
+  },
+  {
+    "name": "security_group_id_for_domain_boundary",
+    "type": "string",
+    "description": "The ID of the security group that authorizes traffic between the RSessionGateway apps and the RStudioServerPro app."
+  },
+  {
+    "name": "tag_propagation",
+    "type": "string",
+    "description": "Indicates whether the tags added to Domain, User Profile and Space entity is propagated to all SageMaker resources."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "domain_id",
+    "type": "string",
+    "description": "The domain name."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
+
+For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-domain.html"><code>AWS::SageMaker::Domain</code></a>.
+
+## Methods
+
+<table>
+<tbody>
+  <tr>
+    <th>Name</th>
+    <th>Resource</th>
+    <th>Accessible by</th>
+    <th>Required Params</th>
+  </tr>
+  <tr>
+    <td><CopyableCode code="create_resource" /></td>
+    <td><code>domains</code></td>
+    <td><code>INSERT</code></td>
+    <td><CopyableCode code="AuthMode, DefaultUserSettings, DomainName, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="delete_resource" /></td>
+    <td><code>domains</code></td>
+    <td><code>DELETE</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="update_resource" /></td>
+    <td><code>domains</code></td>
+    <td><code>UPDATE</code></td>
+    <td><CopyableCode code="Identifier, PatchDocument, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="list_resources" /></td>
+    <td><code>domains_list_only</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="get_resource" /></td>
+    <td><code>domains</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+</tbody>
+</table>
+
+## `SELECT` examples
+
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+Gets all properties from an individual <code>domain</code>.
+```sql
+SELECT
+  region,
+  domain_arn,
+  url,
+  app_network_access_type,
+  auth_mode,
+  default_user_settings,
+  default_space_settings,
+  domain_name,
+  kms_key_id,
+  subnet_ids,
+  tags,
+  vpc_id,
+  domain_id,
+  home_efs_file_system_id,
+  single_sign_on_managed_application_instance_id,
+  single_sign_on_application_arn,
+  domain_settings,
+  app_security_group_management,
+  security_group_id_for_domain_boundary,
+  tag_propagation
+FROM awscc.sagemaker.domains
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ domain_id }}';
+```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>domains</code> in a region.
+```sql
+SELECT
+  region,
+  domain_id
+FROM awscc.sagemaker.domains_list_only
+WHERE
+  region = '{{ region }}';
+```
+</TabItem>
+</Tabs>
+
+## `INSERT` example
+
+Use the following StackQL query and manifest file to create a new <code>domain</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+<Tabs
+    defaultValue="required"
+    values={[
+      { label: 'Required Properties', value: 'required', },
+      { label: 'All Properties', value: 'all', },
+      { label: 'Manifest', value: 'manifest', },
+    ]
+}>
+<TabItem value="required">
+
+```sql
+/*+ create */
+INSERT INTO awscc.sagemaker.domains (
+  AuthMode,
+  DefaultUserSettings,
+  DomainName,
+  region
+)
+SELECT
+  '{{ auth_mode }}',
+  '{{ default_user_settings }}',
+  '{{ domain_name }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="all">
+
+```sql
+/*+ create */
+INSERT INTO awscc.sagemaker.domains (
+  AppNetworkAccessType,
+  AuthMode,
+  DefaultUserSettings,
+  DefaultSpaceSettings,
+  DomainName,
+  KmsKeyId,
+  SubnetIds,
+  Tags,
+  VpcId,
+  DomainSettings,
+  AppSecurityGroupManagement,
+  TagPropagation,
+  region
+)
+SELECT
+  '{{ app_network_access_type }}',
+  '{{ auth_mode }}',
+  '{{ default_user_settings }}',
+  '{{ default_space_settings }}',
+  '{{ domain_name }}',
+  '{{ kms_key_id }}',
+  '{{ subnet_ids }}',
+  '{{ tags }}',
+  '{{ vpc_id }}',
+  '{{ domain_settings }}',
+  '{{ app_security_group_management }}',
+  '{{ tag_propagation }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="manifest">
+
+<CodeBlock language="yaml">{`version: 1
+name: stack name
+description: stack description
+providers:
+  - aws
+globals:
+  - name: region
+    value: '{{ vars.AWS_REGION }}'
+resources:
+  - name: domain
+    props:
+      - name: app_network_access_type
+        value: '{{ app_network_access_type }}'
+      - name: auth_mode
+        value: '{{ auth_mode }}'
+      - name: default_user_settings
+        value:
+          execution_role: '{{ execution_role }}'
+          auto_mount_home_ef_s: '{{ auto_mount_home_ef_s }}'
+          jupyter_server_app_settings:
+            default_resource_spec:
+              instance_type: '{{ instance_type }}'
+              sage_maker_image_arn: '{{ sage_maker_image_arn }}'
+              sage_maker_image_version_arn: '{{ sage_maker_image_version_arn }}'
+              lifecycle_config_arn: '{{ lifecycle_config_arn }}'
+            lifecycle_config_arns:
+              - '{{ lifecycle_config_arns[0] }}'
+          kernel_gateway_app_settings:
+            custom_images:
+              - app_image_config_name: '{{ app_image_config_name }}'
+                image_name: '{{ image_name }}'
+                image_version_number: '{{ image_version_number }}'
+            default_resource_spec: null
+            lifecycle_config_arns:
+              - null
+          r_studio_server_pro_app_settings:
+            access_status: '{{ access_status }}'
+            user_group: '{{ user_group }}'
+          r_session_app_settings:
+            custom_images:
+              - null
+            default_resource_spec: null
+          jupyter_lab_app_settings:
+            default_resource_spec: null
+            lifecycle_config_arns:
+              - null
+            code_repositories:
+              - repository_url: '{{ repository_url }}'
+            custom_images:
+              - null
+            app_lifecycle_management:
+              idle_settings:
+                lifecycle_management: '{{ lifecycle_management }}'
+                idle_timeout_in_minutes: '{{ idle_timeout_in_minutes }}'
+                min_idle_timeout_in_minutes: '{{ min_idle_timeout_in_minutes }}'
+                max_idle_timeout_in_minutes: '{{ max_idle_timeout_in_minutes }}'
+            built_in_lifecycle_config_arn: '{{ built_in_lifecycle_config_arn }}'
+          space_storage_settings:
+            default_ebs_storage_settings:
+              default_ebs_volume_size_in_gb: '{{ default_ebs_volume_size_in_gb }}'
+              maximum_ebs_volume_size_in_gb: null
+          code_editor_app_settings:
+            default_resource_spec: null
+            lifecycle_config_arns:
+              - null
+            custom_images:
+              - null
+            app_lifecycle_management: null
+            built_in_lifecycle_config_arn: '{{ built_in_lifecycle_config_arn }}'
+          studio_web_portal_settings:
+            hidden_ml_tools:
+              - '{{ hidden_ml_tools[0] }}'
+            hidden_app_types:
+              - '{{ hidden_app_types[0] }}'
+            hidden_instance_types:
+              - '{{ hidden_instance_types[0] }}'
+            hidden_sage_maker_image_version_aliases:
+              - sage_maker_image_name: '{{ sage_maker_image_name }}'
+                version_aliases:
+                  - '{{ version_aliases[0] }}'
+          default_landing_uri: '{{ default_landing_uri }}'
+          studio_web_portal: '{{ studio_web_portal }}'
+          custom_posix_user_config:
+            uid: '{{ uid }}'
+            gid: '{{ gid }}'
+          custom_file_system_configs:
+            - e_fs_file_system_config:
+                file_system_path: '{{ file_system_path }}'
+                file_system_id: '{{ file_system_id }}'
+              f_sx_lustre_file_system_config:
+                file_system_path: '{{ file_system_path }}'
+                file_system_id: '{{ file_system_id }}'
+              s3_file_system_config:
+                mount_path: '{{ mount_path }}'
+                s3_uri: '{{ s3_uri }}'
+          security_groups:
+            - '{{ security_groups[0] }}'
+          sharing_settings:
+            notebook_output_option: '{{ notebook_output_option }}'
+            s3_kms_key_id: '{{ s3_kms_key_id }}'
+            s3_output_path: '{{ s3_output_path }}'
+      - name: default_space_settings
+        value:
+          execution_role: '{{ execution_role }}'
+          jupyter_server_app_settings: null
+          kernel_gateway_app_settings: null
+          security_groups:
+            - '{{ security_groups[0] }}'
+          jupyter_lab_app_settings: null
+          space_storage_settings: null
+          custom_posix_user_config: null
+          custom_file_system_configs:
+            - null
+      - name: domain_name
+        value: '{{ domain_name }}'
+      - name: kms_key_id
+        value: '{{ kms_key_id }}'
+      - name: subnet_ids
+        value:
+          - '{{ subnet_ids[0] }}'
+      - name: tags
+        value:
+          - value: '{{ value }}'
+            key: '{{ key }}'
+      - name: vpc_id
+        value: '{{ vpc_id }}'
+      - name: domain_settings
+        value:
+          security_group_ids:
+            - '{{ security_group_ids[0] }}'
+          r_studio_server_pro_domain_settings:
+            domain_execution_role_arn: '{{ domain_execution_role_arn }}'
+            r_studio_connect_url: '{{ r_studio_connect_url }}'
+            r_studio_package_manager_url: '{{ r_studio_package_manager_url }}'
+            default_resource_spec: null
+          docker_settings:
+            enable_docker_access: '{{ enable_docker_access }}'
+            vpc_only_trusted_accounts:
+              - '{{ vpc_only_trusted_accounts[0] }}'
+          execution_role_identity_config: '{{ execution_role_identity_config }}'
+          unified_studio_settings:
+            studio_web_portal_access: '{{ studio_web_portal_access }}'
+            domain_account_id: '{{ domain_account_id }}'
+            domain_region: '{{ domain_region }}'
+            domain_id: '{{ domain_id }}'
+            project_id: '{{ project_id }}'
+            environment_id: '{{ environment_id }}'
+            project_s3_path: '{{ project_s3_path }}'
+      - name: app_security_group_management
+        value: '{{ app_security_group_management }}'
+      - name: tag_propagation
+        value: '{{ tag_propagation }}'`}</CodeBlock>
+
+</TabItem>
+</Tabs>
+
+## `UPDATE` example
+
+Use the following StackQL query and manifest file to update a <code>domain</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.domains
+SET PatchDocument = string('{{ {
+    "AppNetworkAccessType": app_network_access_type,
+    "DefaultUserSettings": default_user_settings,
+    "DefaultSpaceSettings": default_space_settings,
+    "SubnetIds": subnet_ids,
+    "AppSecurityGroupManagement": app_security_group_management,
+    "TagPropagation": tag_propagation
+} | generate_patch_document }}')
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ domain_id }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## `DELETE` example
+
+```sql
+/*+ delete */
+DELETE FROM awscc.sagemaker.domains
+WHERE
+  Identifier = '{{ domain_id }}' AND
+  region = '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## Additional Parameters
+
+Mutable resources in the Cloud Control provider support additional optional parameters which can be supplied with `INSERT`, `UPDATE`, or `DELETE` operations. These include:
+
+| Parameter | Description |
+|-----------|-------------|
+| <CopyableCode code="ClientToken" /> | <details><summary>A unique identifier to ensure the idempotency of the resource request.</summary>This allows the provider to accurately distinguish between retries and new requests.<br />A client token is valid for 36 hours once used.<br />After that, a resource request with the same client token is treated as a new request.<br />If you do not specify a client token, one is generated for inclusion in the request.</details> |
+| <CopyableCode code="RoleArn" /> | <details><summary>The ARN of the IAM role used to perform this resource operation.</summary>The role specified must have the permissions required for this operation.<br />If you do not specify a role, a temporary session is created using your AWS user credentials.</details> |
+| <CopyableCode code="TypeVersionId" /> | <details><summary>For private resource types, the type version to use in this resource operation.</summary>If you do not specify a resource version, the default version is used.</details> |
+
+## Permissions
+
+To operate on the <code>domains</code> resource, the following permissions are required:
+
+<Tabs
+    defaultValue="create"
+    values={[
+      { label: 'Create', value: 'create', },
+      { label: 'Read', value: 'read', },
+      { label: 'Update', value: 'update', },
+      { label: 'Delete', value: 'delete', },
+      { label: 'List', value: 'list', },
+    ]
+}>
+<TabItem value="create">
+
+```json
+sagemaker:CreateApp,
+sagemaker:CreateDomain,
+sagemaker:DescribeDomain,
+sagemaker:DescribeImage,
+sagemaker:DescribeImageVersion,
+iam:CreateServiceLinkedRole,
+iam:PassRole,
+efs:CreateFileSystem,
+kms:CreateGrant,
+kms:Decrypt,
+kms:DescribeKey,
+kms:GenerateDataKeyWithoutPlainText
+```
+
+</TabItem>
+<TabItem value="read">
+
+```json
+sagemaker:DescribeDomain
+```
+
+</TabItem>
+<TabItem value="update">
+
+```json
+sagemaker:CreateApp,
+sagemaker:UpdateDomain,
+sagemaker:DescribeDomain,
+sagemaker:DescribeImage,
+sagemaker:DescribeImageVersion,
+iam:PassRole
+```
+
+</TabItem>
+<TabItem value="delete">
+
+```json
+sagemaker:DeleteApp,
+sagemaker:DeleteDomain,
+sagemaker:DescribeDomain
+```
+
+</TabItem>
+<TabItem value="list">
+
+```json
+sagemaker:ListDomains
+```
+
+</TabItem>
+</Tabs>
\ No newline at end of file
diff --git a/website/docs/services/sagemaker/endpoints/index.md b/website/docs/services/sagemaker/endpoints/index.md
index faafe63e8..d2ef74ff4 100644
--- a/website/docs/services/sagemaker/endpoints/index.md
+++ b/website/docs/services/sagemaker/endpoints/index.md
@@ -62,7 +62,7 @@ Creates, updates, deletes or gets an <code>endpoint</code> resource or lists <co
               {
                 "name": "alarm_name",
                 "type": "string",
-                "description": ""
+                "description": "The name of the CloudWatch alarm."
               }
             ]
           }
@@ -186,14 +186,14 @@ Creates, updates, deletes or gets an <code>endpoint</code> resource or lists <co
     "description": "An array of key-value pairs to apply to this resource.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key of the tag."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value of the tag."
       }
     ]
   },
@@ -425,8 +425,8 @@ resources:
         value: '{{ retain_deployment_config }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/sagemaker/image_versions/index.md b/website/docs/services/sagemaker/image_versions/index.md
index 00bc677cc..b5c537650 100644
--- a/website/docs/services/sagemaker/image_versions/index.md
+++ b/website/docs/services/sagemaker/image_versions/index.md
@@ -67,7 +67,7 @@ Creates, updates, deletes or gets an <code>image_version</code> resource or list
   {
     "name": "container_image",
     "type": "string",
-    "description": "The image to use for the container that will be materialized for the inference component"
+    "description": "The registry path of the container image that contains this image version."
   },
   {
     "name": "version",
diff --git a/website/docs/services/sagemaker/images/index.md b/website/docs/services/sagemaker/images/index.md
index 528d35053..ad9be392f 100644
--- a/website/docs/services/sagemaker/images/index.md
+++ b/website/docs/services/sagemaker/images/index.md
@@ -47,12 +47,12 @@ Creates, updates, deletes or gets an <code>image</code> resource or lists <code>
   {
     "name": "image_name",
     "type": "string",
-    "description": "The name of the image this version belongs to."
+    "description": "The name of the image."
   },
   {
     "name": "image_arn",
     "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the parent image."
+    "description": "The Amazon Resource Name (ARN) of the image."
   },
   {
     "name": "image_role_arn",
@@ -75,14 +75,14 @@ Creates, updates, deletes or gets an <code>image</code> resource or lists <code>
     "description": "An array of key-value pairs to apply to this resource.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -99,7 +99,7 @@ Creates, updates, deletes or gets an <code>image</code> resource or lists <code>
   {
     "name": "image_arn",
     "type": "string",
-    "description": "The Amazon Resource Name (ARN) of the parent image."
+    "description": "The Amazon Resource Name (ARN) of the image."
   },
   {
     "name": "region",
@@ -291,8 +291,8 @@ resources:
         value: '{{ image_description }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/sagemaker/index.md b/website/docs/services/sagemaker/index.md
index 6e094aec2..7ac590d36 100644
--- a/website/docs/services/sagemaker/index.md
+++ b/website/docs/services/sagemaker/index.md
@@ -20,7 +20,7 @@ The sagemaker service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>26</b></span><br />
+<span>total resources:&nbsp;<b>28</b></span><br />
 </div>
 </div>
 
@@ -35,6 +35,7 @@ The sagemaker service documentation.
 <a href="/services/sagemaker/data_quality_job_definitions/">data_quality_job_definitions</a><br />
 <a href="/services/sagemaker/device_fleets/">device_fleets</a><br />
 <a href="/services/sagemaker/devices/">devices</a><br />
+<a href="/services/sagemaker/domains/">domains</a><br />
 <a href="/services/sagemaker/endpoints/">endpoints</a><br />
 <a href="/services/sagemaker/feature_groups/">feature_groups</a><br />
 <a href="/services/sagemaker/image_versions/">image_versions</a><br />
@@ -45,6 +46,7 @@ The sagemaker service documentation.
 </div>
 <div class="providerDocColumn">
 <a href="/services/sagemaker/model_bias_job_definitions/">model_bias_job_definitions</a><br />
+<a href="/services/sagemaker/model_cards/">model_cards</a><br />
 <a href="/services/sagemaker/model_explainability_job_definitions/">model_explainability_job_definitions</a><br />
 <a href="/services/sagemaker/model_package_groups/">model_package_groups</a><br />
 <a href="/services/sagemaker/model_packages/">model_packages</a><br />
diff --git a/website/docs/services/sagemaker/inference_components/index.md b/website/docs/services/sagemaker/inference_components/index.md
index 81aa9cc5a..b9335bf4b 100644
--- a/website/docs/services/sagemaker/inference_components/index.md
+++ b/website/docs/services/sagemaker/inference_components/index.md
@@ -62,7 +62,7 @@ Creates, updates, deletes or gets an <code>inference_component</code> resource o
   {
     "name": "endpoint_name",
     "type": "string",
-    "description": "The name of the endpoint used to run the monitoring job."
+    "description": "The name of the endpoint the inference component is associated with"
   },
   {
     "name": "variant_name",
@@ -252,14 +252,14 @@ Creates, updates, deletes or gets an <code>inference_component</code> resource o
     "description": "An array of tags to apply to the resource",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -"
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -"
       }
     ]
   },
@@ -518,8 +518,8 @@ resources:
               - alarm_name: '{{ alarm_name }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/sagemaker/inference_experiments/index.md b/website/docs/services/sagemaker/inference_experiments/index.md
index cd3464fb4..c49eb5a98 100644
--- a/website/docs/services/sagemaker/inference_experiments/index.md
+++ b/website/docs/services/sagemaker/inference_experiments/index.md
@@ -72,7 +72,7 @@ Creates, updates, deletes or gets an <code>inference_experiment</code> resource
   {
     "name": "endpoint_name",
     "type": "string",
-    "description": "The name of the endpoint used to run the monitoring job."
+    "description": "The name of the endpoint used to run the inference experiment."
   },
   {
     "name": "endpoint_metadata",
@@ -228,14 +228,14 @@ Creates, updates, deletes or gets an <code>inference_experiment</code> resource
     "description": "An array of key-value pairs to apply to this resource.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -535,8 +535,8 @@ resources:
               sampling_percentage: '{{ sampling_percentage }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'
+          - key: '{{ key }}'
+            value: '{{ value }}'
       - name: status_reason
         value: '{{ status_reason }}'
       - name: desired_state
diff --git a/website/docs/services/sagemaker/mlflow_tracking_servers/index.md b/website/docs/services/sagemaker/mlflow_tracking_servers/index.md
index 8ba4fe978..98f3303cb 100644
--- a/website/docs/services/sagemaker/mlflow_tracking_servers/index.md
+++ b/website/docs/services/sagemaker/mlflow_tracking_servers/index.md
@@ -92,12 +92,12 @@ Creates, updates, deletes or gets a <code>mlflow_tracking_server</code> resource
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/sagemaker/model_bias_job_definitions/index.md b/website/docs/services/sagemaker/model_bias_job_definitions/index.md
index f3b4fb887..80f57936b 100644
--- a/website/docs/services/sagemaker/model_bias_job_definitions/index.md
+++ b/website/docs/services/sagemaker/model_bias_job_definitions/index.md
@@ -131,9 +131,29 @@ Creates, updates, deletes or gets a <code>model_bias_job_definition</code> resou
             "description": "Whether the Pipe or File is used as the input mode for transfering data for the monitoring job. Pipe mode is recommended for large datasets. File mode is useful for small files that fit in memory. Defaults to File."
           },
           {
-            "name": "exclude_features_attribute",
+            "name": "start_time_offset",
             "type": "string",
-            "description": "Indexes or names of the features to be excluded from analysis"
+            "description": "Monitoring start time offset, e.g. -PT1H"
+          },
+          {
+            "name": "features_attribute",
+            "type": "string",
+            "description": "JSONpath to locate features in JSONlines dataset"
+          },
+          {
+            "name": "inference_attribute",
+            "type": "string",
+            "description": "Index or JSONpath to locate predicted label(s)"
+          },
+          {
+            "name": "probability_attribute",
+            "type": "string",
+            "description": "Index or JSONpath to locate probabilities"
+          },
+          {
+            "name": "probability_threshold_attribute",
+            "type": "number",
+            "description": ""
           }
         ]
       },
@@ -165,7 +185,7 @@ Creates, updates, deletes or gets a <code>model_bias_job_definition</code> resou
               {
                 "name": "parquet",
                 "type": "boolean",
-                "description": "A flag indicating if the dataset format is Parquet"
+                "description": "A flag indicate if the dataset format is Parquet"
               }
             ]
           },
@@ -185,9 +205,29 @@ Creates, updates, deletes or gets a <code>model_bias_job_definition</code> resou
             "description": "Whether the Pipe or File is used as the input mode for transfering data for the monitoring job. Pipe mode is recommended for large datasets. File mode is useful for small files that fit in memory. Defaults to File."
           },
           {
-            "name": "exclude_features_attribute",
+            "name": "start_time_offset",
+            "type": "string",
+            "description": "Monitoring start time offset, e.g. -PT1H"
+          },
+          {
+            "name": "features_attribute",
+            "type": "string",
+            "description": "JSONpath to locate features in JSONlines dataset"
+          },
+          {
+            "name": "inference_attribute",
+            "type": "string",
+            "description": "Index or JSONpath to locate predicted label(s)"
+          },
+          {
+            "name": "probability_attribute",
             "type": "string",
-            "description": "Indexes or names of the features to be excluded from analysis"
+            "description": "Index or JSONpath to locate probabilities"
+          },
+          {
+            "name": "probability_threshold_attribute",
+            "type": "number",
+            "description": ""
           }
         ]
       },
@@ -223,22 +263,22 @@ Creates, updates, deletes or gets a <code>model_bias_job_definition</code> resou
           {
             "name": "s3_output",
             "type": "object",
-            "description": "Configuration for uploading output data to Amazon S3 from the processing container.",
+            "description": "Information about where and how to store the results of a monitoring job.",
             "children": [
               {
                 "name": "local_path",
                 "type": "string",
-                "description": "The local path of a directory where you want Amazon SageMaker to upload its contents to Amazon S3. LocalPath is an absolute path to a directory containing output files. This directory will be created by the platform and exist when your container's entrypoint is invoked."
+                "description": "The local path to the Amazon S3 storage location where Amazon SageMaker saves the results of a monitoring job. LocalPath is an absolute path for the output data."
               },
               {
                 "name": "s3_upload_mode",
                 "type": "string",
-                "description": "Whether to upload the results of the processing job continuously or after the job completes."
+                "description": "Whether to upload the results of the monitoring job continuously or after the job completes."
               },
               {
                 "name": "s3_uri",
                 "type": "string",
-                "description": "A URI that identifies the Amazon S3 bucket where you want Amazon SageMaker to save the results of a processing job."
+                "description": "A URI that identifies the Amazon S3 storage location where Amazon SageMaker saves the results of a monitoring job."
               }
             ]
           }
@@ -254,27 +294,27 @@ Creates, updates, deletes or gets a <code>model_bias_job_definition</code> resou
       {
         "name": "cluster_config",
         "type": "object",
-        "description": "Configuration for the cluster used to run a processing job.",
+        "description": "Configuration for the cluster used to run model monitoring jobs.",
         "children": [
           {
             "name": "instance_count",
             "type": "integer",
-            "description": "The number of ML compute instances to use in the processing job. For distributed processing jobs, specify a value greater than 1. The default value is 1."
+            "description": "The number of ML compute instances to use in the model monitoring job. For distributed processing jobs, specify a value greater than 1. The default value is 1."
           },
           {
             "name": "instance_type",
             "type": "string",
             "description": "The ML compute instance type for the processing job."
           },
-          {
-            "name": "volume_size_in_gb",
-            "type": "integer",
-            "description": "The size of the ML storage volume in gigabytes that you want to provision. You must specify sufficient ML storage for your scenario."
-          },
           {
             "name": "volume_kms_key_id",
             "type": "string",
-            "description": "The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt data on the storage volume attached to the ML compute instance(s) that run the processing job."
+            "description": "The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt data on the storage volume attached to the ML compute instance(s) that run the model monitoring job."
+          },
+          {
+            "name": "volume_size_in_gb",
+            "type": "integer",
+            "description": "The size of the ML storage volume, in gigabytes, that you want to provision. You must specify sufficient ML storage for your scenario."
           }
         ]
       }
@@ -298,17 +338,17 @@ Creates, updates, deletes or gets a <code>model_bias_job_definition</code> resou
       {
         "name": "vpc_config",
         "type": "object",
-        "description": "Specifies an Amazon Virtual Private Cloud (VPC) that your SageMaker jobs, hosted models, and compute resources have access to. You can control access to and from your resources by configuring a VPC. For more information, see https://docs.aws.amazon.com/sagemaker/latest/dg/infrastructure-give-access.html",
+        "description": "Specifies a VPC that your training jobs and hosted models have access to. Control access to and from your training and model containers by configuring the VPC.",
         "children": [
           {
             "name": "security_group_ids",
             "type": "array",
-            "description": "The VPC security group IDs, in the form 'sg-xxxxxxxx'. Specify the security groups for the VPC that is specified in the 'Subnets' field."
+            "description": "The VPC security group IDs, in the form sg-xxxxxxxx. Specify the security groups for the VPC that is specified in the Subnets field."
           },
           {
             "name": "subnets",
             "type": "array",
-            "description": "The ID of the subnets in the VPC to which you want to connect your training job or model. For information about the availability of specific instance types, see https://docs.aws.amazon.com/sagemaker/latest/dg/regions-quotas.html"
+            "description": "The ID of the subnets in the VPC to which you want to connect to your monitoring jobs."
           }
         ]
       }
@@ -327,12 +367,12 @@ Creates, updates, deletes or gets a <code>model_bias_job_definition</code> resou
   {
     "name": "stopping_condition",
     "type": "object",
-    "description": "Configures conditions under which the processing job should be stopped, such as how long the processing job has been running. After the condition is met, the processing job is stopped.",
+    "description": "Specifies a time limit for how long the monitoring job is allowed to run.",
     "children": [
       {
         "name": "max_runtime_in_seconds",
         "type": "integer",
-        "description": "Specifies the maximum runtime in seconds."
+        "description": "The maximum runtime allowed in seconds."
       }
     ]
   },
@@ -342,14 +382,14 @@ Creates, updates, deletes or gets a <code>model_bias_job_definition</code> resou
     "description": "An array of key-value pairs to apply to this resource.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -591,7 +631,12 @@ resources:
             local_path: '{{ local_path }}'
             s3_data_distribution_type: '{{ s3_data_distribution_type }}'
             s3_input_mode: '{{ s3_input_mode }}'
-            exclude_features_attribute: '{{ exclude_features_attribute }}'
+            start_time_offset: '{{ start_time_offset }}'
+            end_time_offset: null
+            features_attribute: '{{ features_attribute }}'
+            inference_attribute: '{{ inference_attribute }}'
+            probability_attribute: '{{ probability_attribute }}'
+            probability_threshold_attribute: null
           batch_transform_input:
             data_captured_destination_s3_uri: '{{ data_captured_destination_s3_uri }}'
             dataset_format:
@@ -603,7 +648,12 @@ resources:
             local_path: '{{ local_path }}'
             s3_data_distribution_type: '{{ s3_data_distribution_type }}'
             s3_input_mode: '{{ s3_input_mode }}'
-            exclude_features_attribute: '{{ exclude_features_attribute }}'
+            start_time_offset: null
+            end_time_offset: null
+            features_attribute: '{{ features_attribute }}'
+            inference_attribute: '{{ inference_attribute }}'
+            probability_attribute: '{{ probability_attribute }}'
+            probability_threshold_attribute: null
           ground_truth_s3_input:
             s3_uri: '{{ s3_uri }}'
       - name: model_bias_job_output_config
@@ -619,8 +669,8 @@ resources:
           cluster_config:
             instance_count: '{{ instance_count }}'
             instance_type: '{{ instance_type }}'
-            volume_size_in_gb: '{{ volume_size_in_gb }}'
             volume_kms_key_id: '{{ volume_kms_key_id }}'
+            volume_size_in_gb: '{{ volume_size_in_gb }}'
       - name: network_config
         value:
           enable_inter_container_traffic_encryption: '{{ enable_inter_container_traffic_encryption }}'
@@ -639,8 +689,8 @@ resources:
           max_runtime_in_seconds: '{{ max_runtime_in_seconds }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/sagemaker/model_cards/index.md b/website/docs/services/sagemaker/model_cards/index.md
new file mode 100644
index 000000000..4a30a1b06
--- /dev/null
+++ b/website/docs/services/sagemaker/model_cards/index.md
@@ -0,0 +1,955 @@
+---
+title: model_cards
+hide_title: false
+hide_table_of_contents: false
+keywords:
+  - model_cards
+  - sagemaker
+  - aws
+  - stackql
+  - infrastructure-as-code
+  - configuration-as-data
+  - cloud inventory
+description: Query, deploy and manage AWS resources using SQL
+custom_edit_url: null
+image: /img/stackql-aws-provider-featured-image.png
+---
+
+import CodeBlock from '@theme/CodeBlock';
+import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
+
+Creates, updates, deletes or gets a <code>model_card</code> resource or lists <code>model_cards</code> in a region
+
+## Overview
+<table>
+<tbody>
+<tr><td><b>Name</b></td><td><code>model_cards</code></td></tr>
+<tr><td><b>Type</b></td><td>Resource</td></tr>
+<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SageMaker::ModelCard.</td></tr>
+<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sagemaker.model_cards" /></td></tr>
+</tbody>
+</table>
+
+## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "model_card_arn",
+    "type": "string",
+    "description": "The Amazon Resource Name (ARN) of the successfully created model card."
+  },
+  {
+    "name": "model_card_version",
+    "type": "integer",
+    "description": "A version of the model card."
+  },
+  {
+    "name": "model_card_name",
+    "type": "string",
+    "description": "The unique name of the model card."
+  },
+  {
+    "name": "security_config",
+    "type": "object",
+    "description": "An optional Key Management Service key to encrypt, decrypt, and re-encrypt model card content for regulated workloads with highly sensitive data.",
+    "children": [
+      {
+        "name": "kms_key_id",
+        "type": "string",
+        "description": "A Key Management Service key ID to use for encrypting a model card."
+      }
+    ]
+  },
+  {
+    "name": "model_card_status",
+    "type": "string",
+    "description": "The approval status of the model card within your organization. Different organizations might have different criteria for model card review and approval."
+  },
+  {
+    "name": "content",
+    "type": "object",
+    "description": "The content of the model card.",
+    "children": [
+      {
+        "name": "model_overview",
+        "type": "object",
+        "description": "Overview about the model.",
+        "children": [
+          {
+            "name": "model_description",
+            "type": "string",
+            "description": "description of model."
+          },
+          {
+            "name": "model_owner",
+            "type": "string",
+            "description": "Owner of model."
+          },
+          {
+            "name": "model_creator",
+            "type": "string",
+            "description": "Creator of model."
+          },
+          {
+            "name": "problem_type",
+            "type": "string",
+            "description": "Problem being solved with the model."
+          },
+          {
+            "name": "algorithm_type",
+            "type": "string",
+            "description": "Algorithm used to solve the problem."
+          },
+          {
+            "name": "model_id",
+            "type": "string",
+            "description": "SageMaker Model Arn or Non SageMaker Model id."
+          },
+          {
+            "name": "model_artifact",
+            "type": "array",
+            "description": "Location of the model artifact."
+          },
+          {
+            "name": "model_name",
+            "type": "string",
+            "description": "Name of the model."
+          },
+          {
+            "name": "model_version",
+            "type": "number",
+            "description": "Version of the model."
+          },
+          {
+            "name": "inference_environment",
+            "type": "object",
+            "description": "Overview about the inference.",
+            "children": [
+              {
+                "name": "container_image",
+                "type": "array",
+                "description": "SageMaker inference image uri."
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "model_package_details",
+        "type": "object",
+        "description": "Metadata information related to model package version",
+        "children": [
+          {
+            "name": "model_package_description",
+            "type": "string",
+            "description": "A brief summary of the model package"
+          },
+          {
+            "name": "model_package_arn",
+            "type": "string",
+            "description": "The Amazon Resource Name (ARN) of the model package"
+          },
+          {
+            "name": "created_by",
+            "type": "object",
+            "description": "Information about the user who created model package.",
+            "children": [
+              {
+                "name": "user_profile_name",
+                "type": "string",
+                "description": "The name of the user's profile in Studio"
+              }
+            ]
+          },
+          {
+            "name": "model_package_status",
+            "type": "string",
+            "description": "Current status of model package"
+          },
+          {
+            "name": "model_approval_status",
+            "type": "string",
+            "description": "Current approval status of model package"
+          },
+          {
+            "name": "approval_description",
+            "type": "string",
+            "description": "A description provided for the model approval"
+          },
+          {
+            "name": "model_package_group_name",
+            "type": "string",
+            "description": "If the model is a versioned model, the name of the model group that the versioned model belongs to."
+          },
+          {
+            "name": "model_package_name",
+            "type": "string",
+            "description": "Name of the model package"
+          },
+          {
+            "name": "model_package_version",
+            "type": "number",
+            "description": "Version of the model package"
+          },
+          {
+            "name": "domain",
+            "type": "string",
+            "description": "The machine learning domain of the model package you specified. Common machine learning domains include computer vision and natural language processing."
+          },
+          {
+            "name": "task",
+            "type": "string",
+            "description": "The machine learning task you specified that your model package accomplishes. Common machine learning tasks include object detection and image classification."
+          },
+          {
+            "name": "source_algorithms",
+            "type": "array",
+            "description": "A list of algorithms that were used to create a model package.",
+            "children": [
+              {
+                "name": "algorithm_name",
+                "type": "string",
+                "description": "The name of an algorithm that was used to create the model package. The algorithm must be either an algorithm resource in your SageMaker account or an algorithm in AWS Marketplace that you are subscribed to."
+              },
+              {
+                "name": "model_data_url",
+                "type": "string",
+                "description": "The Amazon S3 path where the model artifacts, which result from model training, are stored."
+              }
+            ]
+          },
+          {
+            "name": "inference_specification",
+            "type": "object",
+            "description": "Details about inference jobs that can be run with models based on this model package.",
+            "children": [
+              {
+                "name": "containers",
+                "type": "array",
+                "description": "Contains inference related information which were used to create model package."
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "intended_uses",
+        "type": "object",
+        "description": "Intended usage of model.",
+        "children": [
+          {
+            "name": "purpose_of_model",
+            "type": "string",
+            "description": "Why the model was developed?"
+          },
+          {
+            "name": "intended_uses",
+            "type": "string",
+            "description": "intended use cases."
+          },
+          {
+            "name": "factors_affecting_model_efficiency",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "risk_rating",
+            "type": "string",
+            "description": "Risk rating of model."
+          },
+          {
+            "name": "explanations_for_risk_rating",
+            "type": "string",
+            "description": ""
+          }
+        ]
+      },
+      {
+        "name": "business_details",
+        "type": "object",
+        "description": "Business details.",
+        "children": [
+          {
+            "name": "business_problem",
+            "type": "string",
+            "description": "What business problem does the model solve?"
+          },
+          {
+            "name": "business_stakeholders",
+            "type": "string",
+            "description": "Business stakeholders."
+          },
+          {
+            "name": "line_of_business",
+            "type": "string",
+            "description": "Line of business."
+          }
+        ]
+      },
+      {
+        "name": "training_details",
+        "type": "object",
+        "description": "Overview about the training.",
+        "children": [
+          {
+            "name": "objective_function",
+            "type": "object",
+            "description": "the objective function the model will optimize for.",
+            "children": [
+              {
+                "name": "function",
+                "type": "object",
+                "description": "objective function that training job is optimized for."
+              },
+              {
+                "name": "notes",
+                "type": "string",
+                "description": ""
+              }
+            ]
+          },
+          {
+            "name": "training_observations",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "training_job_details",
+            "type": "object",
+            "description": "",
+            "children": [
+              {
+                "name": "training_arn",
+                "type": "string",
+                "description": "SageMaker Training job arn."
+              },
+              {
+                "name": "training_datasets",
+                "type": "array",
+                "description": "Location of the model datasets."
+              },
+              {
+                "name": "training_environment",
+                "type": "object",
+                "description": ""
+              },
+              {
+                "name": "training_metrics",
+                "type": "array",
+                "description": ""
+              },
+              {
+                "name": "user_provided_training_metrics",
+                "type": "array",
+                "description": ""
+              },
+              {
+                "name": "hyper_parameters",
+                "type": "array",
+                "description": ""
+              },
+              {
+                "name": "user_provided_hyper_parameters",
+                "type": "array",
+                "description": ""
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "evaluation_details",
+        "type": "array",
+        "description": "",
+        "children": [
+          {
+            "name": "name",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "evaluation_observation",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "evaluation_job_arn",
+            "type": "string",
+            "description": ""
+          },
+          {
+            "name": "datasets",
+            "type": "array",
+            "description": ""
+          },
+          {
+            "name": "metadata",
+            "type": "object",
+            "description": "additional attributes associated with the evaluation results."
+          },
+          {
+            "name": "metric_groups",
+            "type": "array",
+            "description": "",
+            "children": [
+              {
+                "name": "name",
+                "type": "string",
+                "description": ""
+              },
+              {
+                "name": "metric_data",
+                "type": "array",
+                "description": ""
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "additional_information",
+        "type": "object",
+        "description": "",
+        "children": [
+          {
+            "name": "ethical_considerations",
+            "type": "string",
+            "description": "Any ethical considerations that the author wants to provide."
+          },
+          {
+            "name": "caveats_and_recommendations",
+            "type": "string",
+            "description": "Caveats and recommendations for people who might use this model in their applications."
+          },
+          {
+            "name": "custom_details",
+            "type": "object",
+            "description": "customer details."
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "creation_time",
+    "type": "string",
+    "description": "The date and time the model card was created."
+  },
+  {
+    "name": "created_by",
+    "type": "object",
+    "description": "Information about the user who created or modified an experiment, trial, trial component, lineage group, project, or model card.",
+    "children": [
+      {
+        "name": "user_profile_arn",
+        "type": "string",
+        "description": "The Amazon Resource Name (ARN) of the user's profile."
+      },
+      {
+        "name": "user_profile_name",
+        "type": "string",
+        "description": "The name of the user's profile."
+      },
+      {
+        "name": "domain_id",
+        "type": "string",
+        "description": "The domain associated with the user."
+      }
+    ]
+  },
+  {
+    "name": "last_modified_time",
+    "type": "string",
+    "description": "The date and time the model card was last modified."
+  },
+  {
+    "name": "model_card_processing_status",
+    "type": "string",
+    "description": "The processing status of model card deletion. The ModelCardProcessingStatus updates throughout the different deletion steps."
+  },
+  {
+    "name": "tags",
+    "type": "array",
+    "description": "Key-value pairs used to manage metadata for model cards.",
+    "children": [
+      {
+        "name": "key",
+        "type": "string",
+        "description": "The tag key. Tag keys must be unique per resource."
+      },
+      {
+        "name": "value",
+        "type": "string",
+        "description": "The tag value."
+      }
+    ]
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "model_card_name",
+    "type": "string",
+    "description": "The unique name of the model card."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
+
+For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelcard.html"><code>AWS::SageMaker::ModelCard</code></a>.
+
+## Methods
+
+<table>
+<tbody>
+  <tr>
+    <th>Name</th>
+    <th>Resource</th>
+    <th>Accessible by</th>
+    <th>Required Params</th>
+  </tr>
+  <tr>
+    <td><CopyableCode code="create_resource" /></td>
+    <td><code>model_cards</code></td>
+    <td><code>INSERT</code></td>
+    <td><CopyableCode code="ModelCardName, Content, ModelCardStatus, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="delete_resource" /></td>
+    <td><code>model_cards</code></td>
+    <td><code>DELETE</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="update_resource" /></td>
+    <td><code>model_cards</code></td>
+    <td><code>UPDATE</code></td>
+    <td><CopyableCode code="Identifier, PatchDocument, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="list_resources" /></td>
+    <td><code>model_cards_list_only</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="get_resource" /></td>
+    <td><code>model_cards</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+</tbody>
+</table>
+
+## `SELECT` examples
+
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+Gets all properties from an individual <code>model_card</code>.
+```sql
+SELECT
+  region,
+  model_card_arn,
+  model_card_version,
+  model_card_name,
+  security_config,
+  model_card_status,
+  content,
+  creation_time,
+  created_by,
+  last_modified_time,
+  last_modified_by,
+  model_card_processing_status,
+  tags
+FROM awscc.sagemaker.model_cards
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ model_card_name }}';
+```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>model_cards</code> in a region.
+```sql
+SELECT
+  region,
+  model_card_name
+FROM awscc.sagemaker.model_cards_list_only
+WHERE
+  region = '{{ region }}';
+```
+</TabItem>
+</Tabs>
+
+## `INSERT` example
+
+Use the following StackQL query and manifest file to create a new <code>model_card</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+<Tabs
+    defaultValue="required"
+    values={[
+      { label: 'Required Properties', value: 'required', },
+      { label: 'All Properties', value: 'all', },
+      { label: 'Manifest', value: 'manifest', },
+    ]
+}>
+<TabItem value="required">
+
+```sql
+/*+ create */
+INSERT INTO awscc.sagemaker.model_cards (
+  ModelCardName,
+  ModelCardStatus,
+  Content,
+  region
+)
+SELECT
+  '{{ model_card_name }}',
+  '{{ model_card_status }}',
+  '{{ content }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="all">
+
+```sql
+/*+ create */
+INSERT INTO awscc.sagemaker.model_cards (
+  ModelCardName,
+  SecurityConfig,
+  ModelCardStatus,
+  Content,
+  CreatedBy,
+  LastModifiedBy,
+  Tags,
+  region
+)
+SELECT
+  '{{ model_card_name }}',
+  '{{ security_config }}',
+  '{{ model_card_status }}',
+  '{{ content }}',
+  '{{ created_by }}',
+  '{{ last_modified_by }}',
+  '{{ tags }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="manifest">
+
+<CodeBlock language="yaml">{`version: 1
+name: stack name
+description: stack description
+providers:
+  - aws
+globals:
+  - name: region
+    value: '{{ vars.AWS_REGION }}'
+resources:
+  - name: model_card
+    props:
+      - name: model_card_name
+        value: '{{ model_card_name }}'
+      - name: security_config
+        value:
+          kms_key_id: '{{ kms_key_id }}'
+      - name: model_card_status
+        value: '{{ model_card_status }}'
+      - name: content
+        value:
+          model_overview:
+            model_description: '{{ model_description }}'
+            model_owner: '{{ model_owner }}'
+            model_creator: '{{ model_creator }}'
+            problem_type: '{{ problem_type }}'
+            algorithm_type: '{{ algorithm_type }}'
+            model_id: '{{ model_id }}'
+            model_artifact:
+              - '{{ model_artifact[0] }}'
+            model_name: '{{ model_name }}'
+            model_version: null
+            inference_environment:
+              container_image:
+                - '{{ container_image[0] }}'
+          model_package_details:
+            model_package_description: '{{ model_package_description }}'
+            model_package_arn: '{{ model_package_arn }}'
+            created_by:
+              user_profile_name: '{{ user_profile_name }}'
+            model_package_status: '{{ model_package_status }}'
+            model_approval_status: '{{ model_approval_status }}'
+            approval_description: '{{ approval_description }}'
+            model_package_group_name: '{{ model_package_group_name }}'
+            model_package_name: '{{ model_package_name }}'
+            model_package_version: null
+            domain: '{{ domain }}'
+            task: '{{ task }}'
+            source_algorithms:
+              - algorithm_name: '{{ algorithm_name }}'
+                model_data_url: '{{ model_data_url }}'
+            inference_specification:
+              containers:
+                - model_data_url: '{{ model_data_url }}'
+                  image: '{{ image }}'
+                  nearest_model_name: '{{ nearest_model_name }}'
+          intended_uses:
+            purpose_of_model: '{{ purpose_of_model }}'
+            intended_uses: '{{ intended_uses }}'
+            factors_affecting_model_efficiency: '{{ factors_affecting_model_efficiency }}'
+            risk_rating: '{{ risk_rating }}'
+            explanations_for_risk_rating: '{{ explanations_for_risk_rating }}'
+          business_details:
+            business_problem: '{{ business_problem }}'
+            business_stakeholders: '{{ business_stakeholders }}'
+            line_of_business: '{{ line_of_business }}'
+          training_details:
+            objective_function:
+              function:
+                function: '{{ function }}'
+                facet: '{{ facet }}'
+                condition: '{{ condition }}'
+              notes: '{{ notes }}'
+            training_observations: '{{ training_observations }}'
+            training_job_details:
+              training_arn: '{{ training_arn }}'
+              training_datasets:
+                - '{{ training_datasets[0] }}'
+              training_environment:
+                container_image:
+                  - '{{ container_image[0] }}'
+              training_metrics:
+                - name: '{{ name }}'
+                  notes: '{{ notes }}'
+                  value: null
+              user_provided_training_metrics:
+                - null
+              hyper_parameters:
+                - name: '{{ name }}'
+                  value: '{{ value }}'
+              user_provided_hyper_parameters:
+                - null
+          evaluation_details:
+            - name: '{{ name }}'
+              evaluation_observation: '{{ evaluation_observation }}'
+              evaluation_job_arn: '{{ evaluation_job_arn }}'
+              datasets:
+                - '{{ datasets[0] }}'
+              metadata: {}
+              metric_groups:
+                - name: '{{ name }}'
+                  metric_data:
+                    - null
+          additional_information:
+            ethical_considerations: '{{ ethical_considerations }}'
+            caveats_and_recommendations: '{{ caveats_and_recommendations }}'
+            custom_details: {}
+      - name: created_by
+        value:
+          user_profile_arn: '{{ user_profile_arn }}'
+          user_profile_name: '{{ user_profile_name }}'
+          domain_id: '{{ domain_id }}'
+      - name: last_modified_by
+        value: null
+      - name: tags
+        value:
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
+
+</TabItem>
+</Tabs>
+
+## `UPDATE` example
+
+Use the following StackQL query and manifest file to update a <code>model_card</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+```sql
+/*+ update */
+UPDATE awscc.sagemaker.model_cards
+SET PatchDocument = string('{{ {
+    "ModelCardStatus": model_card_status,
+    "Content": content,
+    "Tags": tags
+} | generate_patch_document }}')
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ model_card_name }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## `DELETE` example
+
+```sql
+/*+ delete */
+DELETE FROM awscc.sagemaker.model_cards
+WHERE
+  Identifier = '{{ model_card_name }}' AND
+  region = '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## Additional Parameters
+
+Mutable resources in the Cloud Control provider support additional optional parameters which can be supplied with `INSERT`, `UPDATE`, or `DELETE` operations. These include:
+
+| Parameter | Description |
+|-----------|-------------|
+| <CopyableCode code="ClientToken" /> | <details><summary>A unique identifier to ensure the idempotency of the resource request.</summary>This allows the provider to accurately distinguish between retries and new requests.<br />A client token is valid for 36 hours once used.<br />After that, a resource request with the same client token is treated as a new request.<br />If you do not specify a client token, one is generated for inclusion in the request.</details> |
+| <CopyableCode code="RoleArn" /> | <details><summary>The ARN of the IAM role used to perform this resource operation.</summary>The role specified must have the permissions required for this operation.<br />If you do not specify a role, a temporary session is created using your AWS user credentials.</details> |
+| <CopyableCode code="TypeVersionId" /> | <details><summary>For private resource types, the type version to use in this resource operation.</summary>If you do not specify a resource version, the default version is used.</details> |
+
+## Permissions
+
+To operate on the <code>model_cards</code> resource, the following permissions are required:
+
+<Tabs
+    defaultValue="create"
+    values={[
+      { label: 'Create', value: 'create', },
+      { label: 'Read', value: 'read', },
+      { label: 'Update', value: 'update', },
+      { label: 'Delete', value: 'delete', },
+      { label: 'List', value: 'list', },
+    ]
+}>
+<TabItem value="create">
+
+```json
+sagemaker:CreateModelCard,
+sagemaker:DescribeModel,
+kms:DescribeKey,
+kms:GenerateDataKey,
+kms:CreateGrant,
+sagemaker:DescribeModelPackageGroup,
+sagemaker:DescribeModelPackage,
+sagemaker:AddTags
+```
+
+</TabItem>
+<TabItem value="read">
+
+```json
+sagemaker:DescribeModelCard,
+sagemaker:DescribeModelPackageGroup,
+sagemaker:DescribeModelPackage,
+kms:Decrypt,
+sagemaker:ListTags
+```
+
+</TabItem>
+<TabItem value="update">
+
+```json
+sagemaker:UpdateModelCard,
+sagemaker:DescribeModelCard,
+sagemaker:DescribeModel,
+kms:GenerateDataKey,
+kms:Decrypt,
+sagemaker:DescribeModelPackageGroup,
+sagemaker:DescribeModelPackage,
+sagemaker:ListTags,
+sagemaker:AddTags,
+sagemaker:DeleteTags
+```
+
+</TabItem>
+<TabItem value="delete">
+
+```json
+sagemaker:DescribeModelCard,
+sagemaker:DeleteModelCard,
+sagemaker:DescribeModelPackageGroup,
+sagemaker:DescribeModelPackage,
+kms:RetireGrant,
+kms:Decrypt,
+sagemaker:ListTags,
+sagemaker:DeleteTags
+```
+
+</TabItem>
+<TabItem value="list">
+
+```json
+sagemaker:ListModelCards,
+sagemaker:ListModelCardVersions
+```
+
+</TabItem>
+</Tabs>
\ No newline at end of file
diff --git a/website/docs/services/sagemaker/model_explainability_job_definitions/index.md b/website/docs/services/sagemaker/model_explainability_job_definitions/index.md
index ac99874d0..c4b4d5c20 100644
--- a/website/docs/services/sagemaker/model_explainability_job_definitions/index.md
+++ b/website/docs/services/sagemaker/model_explainability_job_definitions/index.md
@@ -131,9 +131,19 @@ Creates, updates, deletes or gets a <code>model_explainability_job_definition</c
             "description": "Whether the Pipe or File is used as the input mode for transfering data for the monitoring job. Pipe mode is recommended for large datasets. File mode is useful for small files that fit in memory. Defaults to File."
           },
           {
-            "name": "exclude_features_attribute",
+            "name": "features_attribute",
             "type": "string",
-            "description": "Indexes or names of the features to be excluded from analysis"
+            "description": "JSONpath to locate features in JSONlines dataset"
+          },
+          {
+            "name": "inference_attribute",
+            "type": "string",
+            "description": "Index or JSONpath to locate predicted label(s)"
+          },
+          {
+            "name": "probability_attribute",
+            "type": "string",
+            "description": "Index or JSONpath to locate probabilities"
           }
         ]
       },
@@ -185,9 +195,19 @@ Creates, updates, deletes or gets a <code>model_explainability_job_definition</c
             "description": "Whether the Pipe or File is used as the input mode for transfering data for the monitoring job. Pipe mode is recommended for large datasets. File mode is useful for small files that fit in memory. Defaults to File."
           },
           {
-            "name": "exclude_features_attribute",
+            "name": "features_attribute",
             "type": "string",
-            "description": "Indexes or names of the features to be excluded from analysis"
+            "description": "JSONpath to locate features in JSONlines dataset"
+          },
+          {
+            "name": "inference_attribute",
+            "type": "string",
+            "description": "Index or JSONpath to locate predicted label(s)"
+          },
+          {
+            "name": "probability_attribute",
+            "type": "string",
+            "description": "Index or JSONpath to locate probabilities"
           }
         ]
       }
@@ -211,22 +231,22 @@ Creates, updates, deletes or gets a <code>model_explainability_job_definition</c
           {
             "name": "s3_output",
             "type": "object",
-            "description": "Configuration for uploading output data to Amazon S3 from the processing container.",
+            "description": "Information about where and how to store the results of a monitoring job.",
             "children": [
               {
                 "name": "local_path",
                 "type": "string",
-                "description": "The local path of a directory where you want Amazon SageMaker to upload its contents to Amazon S3. LocalPath is an absolute path to a directory containing output files. This directory will be created by the platform and exist when your container's entrypoint is invoked."
+                "description": "The local path to the Amazon S3 storage location where Amazon SageMaker saves the results of a monitoring job. LocalPath is an absolute path for the output data."
               },
               {
                 "name": "s3_upload_mode",
                 "type": "string",
-                "description": "Whether to upload the results of the processing job continuously or after the job completes."
+                "description": "Whether to upload the results of the monitoring job continuously or after the job completes."
               },
               {
                 "name": "s3_uri",
                 "type": "string",
-                "description": "A URI that identifies the Amazon S3 bucket where you want Amazon SageMaker to save the results of a processing job."
+                "description": "A URI that identifies the Amazon S3 storage location where Amazon SageMaker saves the results of a monitoring job."
               }
             ]
           }
@@ -242,27 +262,27 @@ Creates, updates, deletes or gets a <code>model_explainability_job_definition</c
       {
         "name": "cluster_config",
         "type": "object",
-        "description": "Configuration for the cluster used to run a processing job.",
+        "description": "Configuration for the cluster used to run model monitoring jobs.",
         "children": [
           {
             "name": "instance_count",
             "type": "integer",
-            "description": "The number of ML compute instances to use in the processing job. For distributed processing jobs, specify a value greater than 1. The default value is 1."
+            "description": "The number of ML compute instances to use in the model monitoring job. For distributed processing jobs, specify a value greater than 1. The default value is 1."
           },
           {
             "name": "instance_type",
             "type": "string",
             "description": "The ML compute instance type for the processing job."
           },
-          {
-            "name": "volume_size_in_gb",
-            "type": "integer",
-            "description": "The size of the ML storage volume in gigabytes that you want to provision. You must specify sufficient ML storage for your scenario."
-          },
           {
             "name": "volume_kms_key_id",
             "type": "string",
-            "description": "The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt data on the storage volume attached to the ML compute instance(s) that run the processing job."
+            "description": "The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt data on the storage volume attached to the ML compute instance(s) that run the model monitoring job."
+          },
+          {
+            "name": "volume_size_in_gb",
+            "type": "integer",
+            "description": "The size of the ML storage volume, in gigabytes, that you want to provision. You must specify sufficient ML storage for your scenario."
           }
         ]
       }
@@ -286,17 +306,17 @@ Creates, updates, deletes or gets a <code>model_explainability_job_definition</c
       {
         "name": "vpc_config",
         "type": "object",
-        "description": "Specifies an Amazon Virtual Private Cloud (VPC) that your SageMaker jobs, hosted models, and compute resources have access to. You can control access to and from your resources by configuring a VPC. For more information, see https://docs.aws.amazon.com/sagemaker/latest/dg/infrastructure-give-access.html",
+        "description": "Specifies a VPC that your training jobs and hosted models have access to. Control access to and from your training and model containers by configuring the VPC.",
         "children": [
           {
             "name": "security_group_ids",
             "type": "array",
-            "description": "The VPC security group IDs, in the form 'sg-xxxxxxxx'. Specify the security groups for the VPC that is specified in the 'Subnets' field."
+            "description": "The VPC security group IDs, in the form sg-xxxxxxxx. Specify the security groups for the VPC that is specified in the Subnets field."
           },
           {
             "name": "subnets",
             "type": "array",
-            "description": "The ID of the subnets in the VPC to which you want to connect your training job or model. For information about the availability of specific instance types, see https://docs.aws.amazon.com/sagemaker/latest/dg/regions-quotas.html"
+            "description": "The ID of the subnets in the VPC to which you want to connect to your monitoring jobs."
           }
         ]
       }
@@ -315,12 +335,12 @@ Creates, updates, deletes or gets a <code>model_explainability_job_definition</c
   {
     "name": "stopping_condition",
     "type": "object",
-    "description": "Configures conditions under which the processing job should be stopped, such as how long the processing job has been running. After the condition is met, the processing job is stopped.",
+    "description": "Specifies a time limit for how long the monitoring job is allowed to run.",
     "children": [
       {
         "name": "max_runtime_in_seconds",
         "type": "integer",
-        "description": "Specifies the maximum runtime in seconds."
+        "description": "The maximum runtime allowed in seconds."
       }
     ]
   },
@@ -330,14 +350,14 @@ Creates, updates, deletes or gets a <code>model_explainability_job_definition</c
     "description": "An array of key-value pairs to apply to this resource.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -579,7 +599,9 @@ resources:
             local_path: '{{ local_path }}'
             s3_data_distribution_type: '{{ s3_data_distribution_type }}'
             s3_input_mode: '{{ s3_input_mode }}'
-            exclude_features_attribute: '{{ exclude_features_attribute }}'
+            features_attribute: '{{ features_attribute }}'
+            inference_attribute: '{{ inference_attribute }}'
+            probability_attribute: '{{ probability_attribute }}'
           batch_transform_input:
             data_captured_destination_s3_uri: '{{ data_captured_destination_s3_uri }}'
             dataset_format:
@@ -591,7 +613,9 @@ resources:
             local_path: '{{ local_path }}'
             s3_data_distribution_type: '{{ s3_data_distribution_type }}'
             s3_input_mode: '{{ s3_input_mode }}'
-            exclude_features_attribute: '{{ exclude_features_attribute }}'
+            features_attribute: '{{ features_attribute }}'
+            inference_attribute: '{{ inference_attribute }}'
+            probability_attribute: '{{ probability_attribute }}'
       - name: model_explainability_job_output_config
         value:
           kms_key_id: '{{ kms_key_id }}'
@@ -605,8 +629,8 @@ resources:
           cluster_config:
             instance_count: '{{ instance_count }}'
             instance_type: '{{ instance_type }}'
-            volume_size_in_gb: '{{ volume_size_in_gb }}'
             volume_kms_key_id: '{{ volume_kms_key_id }}'
+            volume_size_in_gb: '{{ volume_size_in_gb }}'
       - name: network_config
         value:
           enable_inter_container_traffic_encryption: '{{ enable_inter_container_traffic_encryption }}'
@@ -625,8 +649,8 @@ resources:
           max_runtime_in_seconds: '{{ max_runtime_in_seconds }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/sagemaker/model_package_groups/index.md b/website/docs/services/sagemaker/model_package_groups/index.md
index cdb3df34a..32f9932e2 100644
--- a/website/docs/services/sagemaker/model_package_groups/index.md
+++ b/website/docs/services/sagemaker/model_package_groups/index.md
@@ -50,14 +50,14 @@ Creates, updates, deletes or gets a <code>model_package_group</code> resource or
     "description": "An array of key-value pairs to apply to this resource.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -285,8 +285,8 @@ resources:
     props:
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'
+          - key: '{{ key }}'
+            value: '{{ value }}'
       - name: model_package_group_name
         value: '{{ model_package_group_name }}'
       - name: model_package_group_description
diff --git a/website/docs/services/sagemaker/model_packages/index.md b/website/docs/services/sagemaker/model_packages/index.md
index 2a62f0d16..ecda7e736 100644
--- a/website/docs/services/sagemaker/model_packages/index.md
+++ b/website/docs/services/sagemaker/model_packages/index.md
@@ -50,14 +50,14 @@ Creates, updates, deletes or gets a <code>model_package</code> resource or lists
     "description": "An array of key-value pairs to apply to this resource.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -1137,8 +1137,8 @@ resources:
     props:
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'
+          - key: '{{ key }}'
+            value: '{{ value }}'
       - name: additional_inference_specifications
         value:
           - containers:
diff --git a/website/docs/services/sagemaker/model_quality_job_definitions/index.md b/website/docs/services/sagemaker/model_quality_job_definitions/index.md
index 1db6ea30b..2915ec57a 100644
--- a/website/docs/services/sagemaker/model_quality_job_definitions/index.md
+++ b/website/docs/services/sagemaker/model_quality_job_definitions/index.md
@@ -146,9 +146,24 @@ Creates, updates, deletes or gets a <code>model_quality_job_definition</code> re
             "description": "Whether the Pipe or File is used as the input mode for transfering data for the monitoring job. Pipe mode is recommended for large datasets. File mode is useful for small files that fit in memory. Defaults to File."
           },
           {
-            "name": "exclude_features_attribute",
+            "name": "start_time_offset",
             "type": "string",
-            "description": "Indexes or names of the features to be excluded from analysis"
+            "description": "Monitoring start time offset, e.g. -PT1H"
+          },
+          {
+            "name": "inference_attribute",
+            "type": "string",
+            "description": "Index or JSONpath to locate predicted label(s)"
+          },
+          {
+            "name": "probability_attribute",
+            "type": "string",
+            "description": "Index or JSONpath to locate probabilities"
+          },
+          {
+            "name": "probability_threshold_attribute",
+            "type": "number",
+            "description": ""
           }
         ]
       },
@@ -200,9 +215,24 @@ Creates, updates, deletes or gets a <code>model_quality_job_definition</code> re
             "description": "Whether the Pipe or File is used as the input mode for transfering data for the monitoring job. Pipe mode is recommended for large datasets. File mode is useful for small files that fit in memory. Defaults to File."
           },
           {
-            "name": "exclude_features_attribute",
+            "name": "start_time_offset",
             "type": "string",
-            "description": "Indexes or names of the features to be excluded from analysis"
+            "description": "Monitoring start time offset, e.g. -PT1H"
+          },
+          {
+            "name": "inference_attribute",
+            "type": "string",
+            "description": "Index or JSONpath to locate predicted label(s)"
+          },
+          {
+            "name": "probability_attribute",
+            "type": "string",
+            "description": "Index or JSONpath to locate probabilities"
+          },
+          {
+            "name": "probability_threshold_attribute",
+            "type": "number",
+            "description": ""
           }
         ]
       },
@@ -238,22 +268,22 @@ Creates, updates, deletes or gets a <code>model_quality_job_definition</code> re
           {
             "name": "s3_output",
             "type": "object",
-            "description": "Configuration for uploading output data to Amazon S3 from the processing container.",
+            "description": "Information about where and how to store the results of a monitoring job.",
             "children": [
               {
                 "name": "local_path",
                 "type": "string",
-                "description": "The local path of a directory where you want Amazon SageMaker to upload its contents to Amazon S3. LocalPath is an absolute path to a directory containing output files. This directory will be created by the platform and exist when your container's entrypoint is invoked."
+                "description": "The local path to the Amazon S3 storage location where Amazon SageMaker saves the results of a monitoring job. LocalPath is an absolute path for the output data."
               },
               {
                 "name": "s3_upload_mode",
                 "type": "string",
-                "description": "Whether to upload the results of the processing job continuously or after the job completes."
+                "description": "Whether to upload the results of the monitoring job continuously or after the job completes."
               },
               {
                 "name": "s3_uri",
                 "type": "string",
-                "description": "A URI that identifies the Amazon S3 bucket where you want Amazon SageMaker to save the results of a processing job."
+                "description": "A URI that identifies the Amazon S3 storage location where Amazon SageMaker saves the results of a monitoring job."
               }
             ]
           }
@@ -269,27 +299,27 @@ Creates, updates, deletes or gets a <code>model_quality_job_definition</code> re
       {
         "name": "cluster_config",
         "type": "object",
-        "description": "Configuration for the cluster used to run a processing job.",
+        "description": "Configuration for the cluster used to run model monitoring jobs.",
         "children": [
           {
             "name": "instance_count",
             "type": "integer",
-            "description": "The number of ML compute instances to use in the processing job. For distributed processing jobs, specify a value greater than 1. The default value is 1."
+            "description": "The number of ML compute instances to use in the model monitoring job. For distributed processing jobs, specify a value greater than 1. The default value is 1."
           },
           {
             "name": "instance_type",
             "type": "string",
             "description": "The ML compute instance type for the processing job."
           },
-          {
-            "name": "volume_size_in_gb",
-            "type": "integer",
-            "description": "The size of the ML storage volume in gigabytes that you want to provision. You must specify sufficient ML storage for your scenario."
-          },
           {
             "name": "volume_kms_key_id",
             "type": "string",
-            "description": "The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt data on the storage volume attached to the ML compute instance(s) that run the processing job."
+            "description": "The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt data on the storage volume attached to the ML compute instance(s) that run the model monitoring job."
+          },
+          {
+            "name": "volume_size_in_gb",
+            "type": "integer",
+            "description": "The size of the ML storage volume, in gigabytes, that you want to provision. You must specify sufficient ML storage for your scenario."
           }
         ]
       }
@@ -313,17 +343,17 @@ Creates, updates, deletes or gets a <code>model_quality_job_definition</code> re
       {
         "name": "vpc_config",
         "type": "object",
-        "description": "Specifies an Amazon Virtual Private Cloud (VPC) that your SageMaker jobs, hosted models, and compute resources have access to. You can control access to and from your resources by configuring a VPC. For more information, see https://docs.aws.amazon.com/sagemaker/latest/dg/infrastructure-give-access.html",
+        "description": "Specifies a VPC that your training jobs and hosted models have access to. Control access to and from your training and model containers by configuring the VPC.",
         "children": [
           {
             "name": "security_group_ids",
             "type": "array",
-            "description": "The VPC security group IDs, in the form 'sg-xxxxxxxx'. Specify the security groups for the VPC that is specified in the 'Subnets' field."
+            "description": "The VPC security group IDs, in the form sg-xxxxxxxx. Specify the security groups for the VPC that is specified in the Subnets field."
           },
           {
             "name": "subnets",
             "type": "array",
-            "description": "The ID of the subnets in the VPC to which you want to connect your training job or model. For information about the availability of specific instance types, see https://docs.aws.amazon.com/sagemaker/latest/dg/regions-quotas.html"
+            "description": "The ID of the subnets in the VPC to which you want to connect to your monitoring jobs."
           }
         ]
       }
@@ -342,12 +372,12 @@ Creates, updates, deletes or gets a <code>model_quality_job_definition</code> re
   {
     "name": "stopping_condition",
     "type": "object",
-    "description": "Configures conditions under which the processing job should be stopped, such as how long the processing job has been running. After the condition is met, the processing job is stopped.",
+    "description": "Specifies a time limit for how long the monitoring job is allowed to run.",
     "children": [
       {
         "name": "max_runtime_in_seconds",
         "type": "integer",
-        "description": "Specifies the maximum runtime in seconds."
+        "description": "The maximum runtime allowed in seconds."
       }
     ]
   },
@@ -357,14 +387,14 @@ Creates, updates, deletes or gets a <code>model_quality_job_definition</code> re
     "description": "An array of key-value pairs to apply to this resource.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -612,7 +642,11 @@ resources:
             local_path: '{{ local_path }}'
             s3_data_distribution_type: '{{ s3_data_distribution_type }}'
             s3_input_mode: '{{ s3_input_mode }}'
-            exclude_features_attribute: '{{ exclude_features_attribute }}'
+            start_time_offset: '{{ start_time_offset }}'
+            end_time_offset: null
+            inference_attribute: '{{ inference_attribute }}'
+            probability_attribute: '{{ probability_attribute }}'
+            probability_threshold_attribute: null
           batch_transform_input:
             data_captured_destination_s3_uri: '{{ data_captured_destination_s3_uri }}'
             dataset_format:
@@ -624,7 +658,11 @@ resources:
             local_path: '{{ local_path }}'
             s3_data_distribution_type: '{{ s3_data_distribution_type }}'
             s3_input_mode: '{{ s3_input_mode }}'
-            exclude_features_attribute: '{{ exclude_features_attribute }}'
+            start_time_offset: null
+            end_time_offset: null
+            inference_attribute: '{{ inference_attribute }}'
+            probability_attribute: '{{ probability_attribute }}'
+            probability_threshold_attribute: null
           ground_truth_s3_input:
             s3_uri: '{{ s3_uri }}'
       - name: model_quality_job_output_config
@@ -640,8 +678,8 @@ resources:
           cluster_config:
             instance_count: '{{ instance_count }}'
             instance_type: '{{ instance_type }}'
-            volume_size_in_gb: '{{ volume_size_in_gb }}'
             volume_kms_key_id: '{{ volume_kms_key_id }}'
+            volume_size_in_gb: '{{ volume_size_in_gb }}'
       - name: network_config
         value:
           enable_inter_container_traffic_encryption: '{{ enable_inter_container_traffic_encryption }}'
@@ -660,8 +698,8 @@ resources:
           max_runtime_in_seconds: '{{ max_runtime_in_seconds }}'
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'`}</CodeBlock>
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/sagemaker/monitoring_schedules/index.md b/website/docs/services/sagemaker/monitoring_schedules/index.md
index ef02d5f8d..fa71f773a 100644
--- a/website/docs/services/sagemaker/monitoring_schedules/index.md
+++ b/website/docs/services/sagemaker/monitoring_schedules/index.md
@@ -155,7 +155,7 @@ Creates, updates, deletes or gets a <code>monitoring_schedule</code> resource or
               {
                 "name": "cluster_config",
                 "type": "object",
-                "description": "Configuration for the cluster used to run a processing job."
+                "description": "Configuration for the cluster used to run model monitoring jobs."
               }
             ]
           },
@@ -177,7 +177,7 @@ Creates, updates, deletes or gets a <code>monitoring_schedule</code> resource or
               {
                 "name": "vpc_config",
                 "type": "object",
-                "description": "Specifies an Amazon Virtual Private Cloud (VPC) that your SageMaker jobs, hosted models, and compute resources have access to. You can control access to and from your resources by configuring a VPC. For more information, see https://docs.aws.amazon.com/sagemaker/latest/dg/infrastructure-give-access.html"
+                "description": "Specifies a VPC that your training jobs and hosted models have access to. Control access to and from your training and model containers by configuring the VPC."
               }
             ]
           },
@@ -189,12 +189,12 @@ Creates, updates, deletes or gets a <code>monitoring_schedule</code> resource or
           {
             "name": "stopping_condition",
             "type": "object",
-            "description": "Configures conditions under which the processing job should be stopped, such as how long the processing job has been running. After the condition is met, the processing job is stopped.",
+            "description": "Specifies a time limit for how long the monitoring job is allowed to run.",
             "children": [
               {
                 "name": "max_runtime_in_seconds",
                 "type": "integer",
-                "description": "Specifies the maximum runtime in seconds."
+                "description": "The maximum runtime allowed in seconds."
               }
             ]
           }
@@ -235,14 +235,14 @@ Creates, updates, deletes or gets a <code>monitoring_schedule</code> resource or
     "description": "An array of key-value pairs to apply to this resource.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -560,8 +560,8 @@ resources:
               cluster_config:
                 instance_count: '{{ instance_count }}'
                 instance_type: '{{ instance_type }}'
-                volume_size_in_gb: '{{ volume_size_in_gb }}'
                 volume_kms_key_id: '{{ volume_kms_key_id }}'
+                volume_size_in_gb: '{{ volume_size_in_gb }}'
             network_config:
               enable_inter_container_traffic_encryption: '{{ enable_inter_container_traffic_encryption }}'
               enable_network_isolation: '{{ enable_network_isolation }}'
@@ -581,8 +581,8 @@ resources:
             data_analysis_end_time: null
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'
+          - key: '{{ key }}'
+            value: '{{ value }}'
       - name: endpoint_name
         value: null
       - name: failure_reason
diff --git a/website/docs/services/sagemaker/processing_jobs/index.md b/website/docs/services/sagemaker/processing_jobs/index.md
index 2197c6615..d33ab7edf 100644
--- a/website/docs/services/sagemaker/processing_jobs/index.md
+++ b/website/docs/services/sagemaker/processing_jobs/index.md
@@ -434,12 +434,12 @@ Creates, updates, deletes or gets a <code>processing_job</code> resource or list
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The tag value."
       },
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The tag key. Tag keys must be unique per resource."
       }
     ]
   },
diff --git a/website/docs/services/sagemaker/projects/index.md b/website/docs/services/sagemaker/projects/index.md
index 50624ddc2..3e47cbce2 100644
--- a/website/docs/services/sagemaker/projects/index.md
+++ b/website/docs/services/sagemaker/projects/index.md
@@ -50,14 +50,14 @@ Creates, updates, deletes or gets a <code>project</code> resource or lists <code
     "description": "An array of key-value pairs to apply to this resource.",
     "children": [
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
@@ -394,8 +394,8 @@ resources:
     props:
       - name: tags
         value:
-          - value: '{{ value }}'
-            key: '{{ key }}'
+          - key: '{{ key }}'
+            value: '{{ value }}'
       - name: project_name
         value: '{{ project_name }}'
       - name: project_description
diff --git a/website/docs/services/securityhub/aggregator_v2s/index.md b/website/docs/services/securityhub/aggregator_v2s/index.md
index 5bfa0929a..db0132463 100644
--- a/website/docs/services/securityhub/aggregator_v2s/index.md
+++ b/website/docs/services/securityhub/aggregator_v2s/index.md
@@ -62,7 +62,7 @@ Creates, updates, deletes or gets an <code>aggregator_v2</code> resource or list
   {
     "name": "tags",
     "type": "object",
-    "description": "A key-value pair to associate with the Security Hub V2 resource. You can specify a key that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+    "description": "A key-value pair to associate with the Security Hub V2 resource."
   },
   {
     "name": "region",
diff --git a/website/docs/services/securityhub/automation_rule_v2s/index.md b/website/docs/services/securityhub/automation_rule_v2s/index.md
index 270d61e0c..66ad6790d 100644
--- a/website/docs/services/securityhub/automation_rule_v2s/index.md
+++ b/website/docs/services/securityhub/automation_rule_v2s/index.md
@@ -169,7 +169,7 @@ Creates, updates, deletes or gets an <code>automation_rule_v2</code> resource or
   {
     "name": "tags",
     "type": "object",
-    "description": "A key-value pair to associate with the Security Hub V2 resource. You can specify a key that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+    "description": "A key-value pair to associate with a resource."
   },
   {
     "name": "rule_arn",
@@ -184,7 +184,7 @@ Creates, updates, deletes or gets an <code>automation_rule_v2</code> resource or
   {
     "name": "created_at",
     "type": "string",
-    "description": "The date and time, in UTC and ISO 8601 format."
+    "description": "The timestamp formatted in ISO8601"
   },
   {
     "name": "region",
@@ -411,8 +411,8 @@ resources:
               - string_filters:
                   - field_name: '{{ field_name }}'
                     filter:
-                      comparison: '{{ comparison }}'
                       value: '{{ value }}'
+                      comparison: '{{ comparison }}'
                 date_filters:
                   - field_name: '{{ field_name }}'
                     filter:
@@ -435,8 +435,8 @@ resources:
                   - field_name: '{{ field_name }}'
                     filter:
                       comparison: '{{ comparison }}'
-                      key: null
-                      value: null
+                      key: '{{ key }}'
+                      value: '{{ value }}'
                 operator: '{{ operator }}'
             composite_operator: null
       - name: actions
diff --git a/website/docs/services/securityhub/automation_rules/index.md b/website/docs/services/securityhub/automation_rules/index.md
index f1f809d72..9bee0c23d 100644
--- a/website/docs/services/securityhub/automation_rules/index.md
+++ b/website/docs/services/securityhub/automation_rules/index.md
@@ -204,12 +204,12 @@ Creates, updates, deletes or gets an <code>automation_rule</code> resource or li
           {
             "name": "comparison",
             "type": "string",
-            "description": "The condition to apply to a string value when filtering Security Hub findings."
+            "description": "<details><summary>The condition to apply to a string value when filtering Security Hub findings.</summary>To search for values that have the filter value, use one of the following comparison operators:<br />+  To search for values that include the filter value, use <code>CONTAINS</code>. For example, the filter <code>Title CONTAINS CloudFront</code> matches findings that have a <code>Title</code> that includes the string CloudFront.<br />+  To search for values that exactly match the filter value, use <code>EQUALS</code>. For example, the filter <code>AwsAccountId EQUALS 123456789012</code> only matches findings that have an account ID of <code>123456789012</code>.<br />+  To search for values that start with the filter value, use <code>PREFIX</code>. For example, the filter <code>ResourceRegion PREFIX us</code> matches findings that have a <code>ResourceRegion</code> that starts with <code>us</code>. A <code>ResourceRegion</code> that starts with a different value, such as <code>af</code>, <code>ap</code>, or <code>ca</code>, doesn't match.<br /><code>CONTAINS</code>, <code>EQUALS</code>, and <code>PREFIX</code> filters on the same field are joined by <code>OR</code>. A finding matches if it matches any one of those filters. For example, the filters <code>Title CONTAINS CloudFront OR Title CONTAINS CloudWatch</code> match a finding that includes either <code>CloudFront</code>, <code>CloudWatch</code>, or both strings in the title.<br />To search for values that don’t have the filter value, use one of the following comparison operators:<br />+  To search for values that exclude the filter value, use <code>NOT_CONTAINS</code>. For example, the filter <code>Title NOT_CONTAINS CloudFront</code> matches findings that have a <code>Title</code> that excludes the string CloudFront.<br />+  To search for values other than the filter value, use <code>NOT_EQUALS</code>. For example, the filter <code>AwsAccountId NOT_EQUALS 123456789012</code> only matches findings that have an account ID other than <code>123456789012</code>.<br />+  To search for values that don't start with the filter value, use <code>PREFIX_NOT_EQUALS</code>. For example, the filter <code>ResourceRegion PREFIX_NOT_EQUALS us</code> matches findings with a <code>ResourceRegion</code> that starts with a value other than <code>us</code>.<br /><code>NOT_CONTAINS</code>, <code>NOT_EQUALS</code>, and <code>PREFIX_NOT_EQUALS</code> filters on the same field are joined by <code>AND</code>. A finding matches only if it matches all of those filters. For example, the filters <code>Title NOT_CONTAINS CloudFront AND Title NOT_CONTAINS CloudWatch</code> match a finding that excludes both <code>CloudFront</code> and <code>CloudWatch</code> in the title.<br />You can’t have both a <code>CONTAINS</code> filter and a <code>NOT_CONTAINS</code> filter on the same field. Similarly, you can't provide both an <code>EQUALS</code> filter and a <code>NOT_EQUALS</code> or <code>PREFIX_NOT_EQUALS</code> filter on the same field. Combining filters in this way returns an error. <code>CONTAINS</code> filters can only be used with other <code>CONTAINS</code> filters. <code>NOT_CONTAINS</code> filters can only be used with other <code>NOT_CONTAINS</code> filters.<br />You can combine <code>PREFIX</code> filters with <code>NOT_EQUALS</code> or <code>PREFIX_NOT_EQUALS</code> filters for the same field. Security Hub first processes the <code>PREFIX</code> filters, and then the <code>NOT_EQUALS</code> or <code>PREFIX_NOT_EQUALS</code> filters.<br />For example, for the following filters, Security Hub first identifies findings that have resource types that start with either <code>AwsIam</code> or <code>AwsEc2</code>. It then excludes findings that have a resource type of <code>AwsIamPolicy</code> and findings that have a resource type of <code>AwsEc2NetworkInterface</code>.<br />+   <code>ResourceType PREFIX AwsIam</code><br />+   <code>ResourceType PREFIX AwsEc2</code><br />+   <code>ResourceType NOT_EQUALS AwsIamPolicy</code><br />+   <code>ResourceType NOT_EQUALS AwsEc2NetworkInterface</code><br /><code>CONTAINS</code> and <code>NOT_CONTAINS</code> operators can be used only with automation rules V1. <code>CONTAINS_WORD</code> operator is only supported in <code>GetFindingsV2</code>, <code>GetFindingStatisticsV2</code>, <code>GetResourcesV2</code>, and <code>GetResourceStatisticsV2</code> APIs. For more information, see <a href=\"https://docs.aws.amazon.com/securityhub/latest/userguide/automation-rules.html\">Automation rules</a> in the <i>User Guide</i>.</details>"
           },
           {
             "name": "value",
             "type": "string",
-            "description": ""
+            "description": "The string filter value. Filter values are case sensitive. For example, the product name for control-based findings is <code>Security Hub</code>. If you provide <code>security hub</code> as the filter value, there's no match."
           }
         ]
       },
@@ -357,12 +357,17 @@ Creates, updates, deletes or gets an <code>automation_rule</code> resource or li
           {
             "name": "comparison",
             "type": "string",
-            "description": "The condition to apply to the key value when filtering Security Hub findings with a map filter."
+            "description": "<details><summary>The condition to apply to the key value when filtering Security Hub findings with a map filter.</summary>To search for values that have the filter value, use one of the following comparison operators:<br />+  To search for values that include the filter value, use <code>CONTAINS</code>. For example, for the <code>ResourceTags</code> field, the filter <code>Department CONTAINS Security</code> matches findings that include the value <code>Security</code> for the <code>Department</code> tag. In the same example, a finding with a value of <code>Security team</code> for the <code>Department</code> tag is a match.<br />+  To search for values that exactly match the filter value, use <code>EQUALS</code>. For example, for the <code>ResourceTags</code> field, the filter <code>Department EQUALS Security</code> matches findings that have the value <code>Security</code> for the <code>Department</code> tag.<br /><code>CONTAINS</code> and <code>EQUALS</code> filters on the same field are joined by <code>OR</code>. A finding matches if it matches any one of those filters. For example, the filters <code>Department CONTAINS Security OR Department CONTAINS Finance</code> match a finding that includes either <code>Security</code>, <code>Finance</code>, or both values.<br />To search for values that don't have the filter value, use one of the following comparison operators:<br />+  To search for values that exclude the filter value, use <code>NOT_CONTAINS</code>. For example, for the <code>ResourceTags</code> field, the filter <code>Department NOT_CONTAINS Finance</code> matches findings that exclude the value <code>Finance</code> for the <code>Department</code> tag.<br />+  To search for values other than the filter value, use <code>NOT_EQUALS</code>. For example, for the <code>ResourceTags</code> field, the filter <code>Department NOT_EQUALS Finance</code> matches findings that don’t have the value <code>Finance</code> for the <code>Department</code> tag.<br /><code>NOT_CONTAINS</code> and <code>NOT_EQUALS</code> filters on the same field are joined by <code>AND</code>. A finding matches only if it matches all of those filters. For example, the filters <code>Department NOT_CONTAINS Security AND Department NOT_CONTAINS Finance</code> match a finding that excludes both the <code>Security</code> and <code>Finance</code> values.<br /><code>CONTAINS</code> filters can only be used with other <code>CONTAINS</code> filters. <code>NOT_CONTAINS</code> filters can only be used with other <code>NOT_CONTAINS</code> filters.<br />You can’t have both a <code>CONTAINS</code> filter and a <code>NOT_CONTAINS</code> filter on the same field. Similarly, you can’t have both an <code>EQUALS</code> filter and a <code>NOT_EQUALS</code> filter on the same field. Combining filters in this way returns an error.<br /><code>CONTAINS</code> and <code>NOT_CONTAINS</code> operators can be used only with automation rules. For more information, see <a href=\"https://docs.aws.amazon.com/securityhub/latest/userguide/automation-rules.html\">Automation rules</a> in the <i>User Guide</i>.</details>"
           },
           {
             "name": "key",
             "type": "string",
-            "description": ""
+            "description": "The key of the map filter. For example, for <code>ResourceTags</code>, <code>Key</code> identifies the name of the tag. For <code>UserDefinedFields</code>, <code>Key</code> is the name of the field."
+          },
+          {
+            "name": "value",
+            "type": "string",
+            "description": "The value for the key in the map filter. Filter values are case sensitive. For example, one of the values for a tag called <code>Department</code> might be <code>Security</code>. If you provide <code>security</code> as the filter value, then there's no match."
           }
         ]
       },
@@ -736,8 +741,8 @@ resources:
             - null
           resource_tags:
             - comparison: '{{ comparison }}'
-              key: null
-              value: null
+              key: '{{ key }}'
+              value: '{{ value }}'
           resource_details_other:
             - null
           compliance_status:
diff --git a/website/docs/services/securityhub/configuration_policies/index.md b/website/docs/services/securityhub/configuration_policies/index.md
index fcd7fc221..abef32a28 100644
--- a/website/docs/services/securityhub/configuration_policies/index.md
+++ b/website/docs/services/securityhub/configuration_policies/index.md
@@ -128,7 +128,7 @@ Creates, updates, deletes or gets a <code>configuration_policy</code> resource o
   {
     "name": "tags",
     "type": "object",
-    "description": "A key-value pair to associate with the Security Hub V2 resource. You can specify a key that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+    "description": "A key-value pair to associate with a resource."
   },
   {
     "name": "region",
diff --git a/website/docs/services/securityhub/hub_v2s/index.md b/website/docs/services/securityhub/hub_v2s/index.md
index a1699bc77..a7b5bb4dc 100644
--- a/website/docs/services/securityhub/hub_v2s/index.md
+++ b/website/docs/services/securityhub/hub_v2s/index.md
@@ -52,7 +52,7 @@ Creates, updates, deletes or gets a <code>hub_v2</code> resource or lists <code>
   {
     "name": "subscribed_at",
     "type": "string",
-    "description": "The date and time, in UTC and ISO 8601 format."
+    "description": ""
   },
   {
     "name": "tags",
diff --git a/website/docs/services/securityhub/hubs/index.md b/website/docs/services/securityhub/hubs/index.md
index 7a9ac058b..30ea71a4d 100644
--- a/website/docs/services/securityhub/hubs/index.md
+++ b/website/docs/services/securityhub/hubs/index.md
@@ -67,7 +67,7 @@ Creates, updates, deletes or gets a <code>hub</code> resource or lists <code>hub
   {
     "name": "tags",
     "type": "object",
-    "description": "A key-value pair to associate with the Security Hub V2 resource. You can specify a key that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
+    "description": "A key-value pair to associate with a resource."
   },
   {
     "name": "subscribed_at",
diff --git a/website/docs/services/securityhub/insights/index.md b/website/docs/services/securityhub/insights/index.md
index c7475c60d..f572558a7 100644
--- a/website/docs/services/securityhub/insights/index.md
+++ b/website/docs/services/securityhub/insights/index.md
@@ -72,7 +72,7 @@ Creates, updates, deletes or gets an <code>insight</code> resource or lists <cod
           {
             "name": "value",
             "type": "string",
-            "description": ""
+            "description": "Non-empty string definition."
           }
         ]
       },
@@ -215,7 +215,7 @@ Creates, updates, deletes or gets an <code>insight</code> resource or lists <cod
           {
             "name": "key",
             "type": "string",
-            "description": ""
+            "description": "Non-empty string definition."
           }
         ]
       },
diff --git a/website/docs/services/securitylake/aws_log_sources/index.md b/website/docs/services/securitylake/aws_log_sources/index.md
new file mode 100644
index 000000000..6e39e1a8d
--- /dev/null
+++ b/website/docs/services/securitylake/aws_log_sources/index.md
@@ -0,0 +1,407 @@
+---
+title: aws_log_sources
+hide_title: false
+hide_table_of_contents: false
+keywords:
+  - aws_log_sources
+  - securitylake
+  - aws
+  - stackql
+  - infrastructure-as-code
+  - configuration-as-data
+  - cloud inventory
+description: Query, deploy and manage AWS resources using SQL
+custom_edit_url: null
+image: /img/stackql-aws-provider-featured-image.png
+---
+
+import CodeBlock from '@theme/CodeBlock';
+import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
+
+Creates, updates, deletes or gets an <code>aws_log_source</code> resource or lists <code>aws_log_sources</code> in a region
+
+## Overview
+<table>
+<tbody>
+<tr><td><b>Name</b></td><td><code>aws_log_sources</code></td></tr>
+<tr><td><b>Type</b></td><td>Resource</td></tr>
+<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SecurityLake::AwsLogSource</td></tr>
+<tr><td><b>Id</b></td><td><CopyableCode code="awscc.securitylake.aws_log_sources" /></td></tr>
+</tbody>
+</table>
+
+## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "accounts",
+    "type": "array",
+    "description": "AWS account where you want to collect logs from."
+  },
+  {
+    "name": "data_lake_arn",
+    "type": "string",
+    "description": "The ARN for the data lake."
+  },
+  {
+    "name": "source_name",
+    "type": "string",
+    "description": "The name for a AWS source. This must be a Regionally unique value."
+  },
+  {
+    "name": "source_version",
+    "type": "string",
+    "description": "The version for a AWS source. This must be a Regionally unique value."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "source_name",
+    "type": "string",
+    "description": "The name for a AWS source. This must be a Regionally unique value."
+  },
+  {
+    "name": "source_version",
+    "type": "string",
+    "description": "The version for a AWS source. This must be a Regionally unique value."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
+
+For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securitylake-awslogsource.html"><code>AWS::SecurityLake::AwsLogSource</code></a>.
+
+## Methods
+
+<table>
+<tbody>
+  <tr>
+    <th>Name</th>
+    <th>Resource</th>
+    <th>Accessible by</th>
+    <th>Required Params</th>
+  </tr>
+  <tr>
+    <td><CopyableCode code="create_resource" /></td>
+    <td><code>aws_log_sources</code></td>
+    <td><code>INSERT</code></td>
+    <td><CopyableCode code="DataLakeArn, SourceVersion, SourceName, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="delete_resource" /></td>
+    <td><code>aws_log_sources</code></td>
+    <td><code>DELETE</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="update_resource" /></td>
+    <td><code>aws_log_sources</code></td>
+    <td><code>UPDATE</code></td>
+    <td><CopyableCode code="Identifier, PatchDocument, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="list_resources" /></td>
+    <td><code>aws_log_sources_list_only</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="get_resource" /></td>
+    <td><code>aws_log_sources</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+</tbody>
+</table>
+
+## `SELECT` examples
+
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+Gets all properties from an individual <code>aws_log_source</code>.
+```sql
+SELECT
+  region,
+  accounts,
+  data_lake_arn,
+  source_name,
+  source_version
+FROM awscc.securitylake.aws_log_sources
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ source_name }}|{{ source_version }}';
+```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>aws_log_sources</code> in a region.
+```sql
+SELECT
+  region,
+  source_name,
+  source_version
+FROM awscc.securitylake.aws_log_sources_list_only
+WHERE
+  region = '{{ region }}';
+```
+</TabItem>
+</Tabs>
+
+## `INSERT` example
+
+Use the following StackQL query and manifest file to create a new <code>aws_log_source</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+<Tabs
+    defaultValue="required"
+    values={[
+      { label: 'Required Properties', value: 'required', },
+      { label: 'All Properties', value: 'all', },
+      { label: 'Manifest', value: 'manifest', },
+    ]
+}>
+<TabItem value="required">
+
+```sql
+/*+ create */
+INSERT INTO awscc.securitylake.aws_log_sources (
+  DataLakeArn,
+  SourceName,
+  SourceVersion,
+  region
+)
+SELECT
+  '{{ data_lake_arn }}',
+  '{{ source_name }}',
+  '{{ source_version }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="all">
+
+```sql
+/*+ create */
+INSERT INTO awscc.securitylake.aws_log_sources (
+  Accounts,
+  DataLakeArn,
+  SourceName,
+  SourceVersion,
+  region
+)
+SELECT
+  '{{ accounts }}',
+  '{{ data_lake_arn }}',
+  '{{ source_name }}',
+  '{{ source_version }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="manifest">
+
+<CodeBlock language="yaml">{`version: 1
+name: stack name
+description: stack description
+providers:
+  - aws
+globals:
+  - name: region
+    value: '{{ vars.AWS_REGION }}'
+resources:
+  - name: aws_log_source
+    props:
+      - name: accounts
+        value:
+          - '{{ accounts[0] }}'
+      - name: data_lake_arn
+        value: '{{ data_lake_arn }}'
+      - name: source_name
+        value: '{{ source_name }}'
+      - name: source_version
+        value: '{{ source_version }}'`}</CodeBlock>
+
+</TabItem>
+</Tabs>
+
+## `UPDATE` example
+
+Use the following StackQL query and manifest file to update a <code>aws_log_source</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+```sql
+/*+ update */
+UPDATE awscc.securitylake.aws_log_sources
+SET PatchDocument = string('{{ {
+    "Accounts": accounts
+} | generate_patch_document }}')
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ source_name }}|{{ source_version }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## `DELETE` example
+
+```sql
+/*+ delete */
+DELETE FROM awscc.securitylake.aws_log_sources
+WHERE
+  Identifier = '{{ source_name }}|{{ source_version }}' AND
+  region = '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## Additional Parameters
+
+Mutable resources in the Cloud Control provider support additional optional parameters which can be supplied with `INSERT`, `UPDATE`, or `DELETE` operations. These include:
+
+| Parameter | Description |
+|-----------|-------------|
+| <CopyableCode code="ClientToken" /> | <details><summary>A unique identifier to ensure the idempotency of the resource request.</summary>This allows the provider to accurately distinguish between retries and new requests.<br />A client token is valid for 36 hours once used.<br />After that, a resource request with the same client token is treated as a new request.<br />If you do not specify a client token, one is generated for inclusion in the request.</details> |
+| <CopyableCode code="RoleArn" /> | <details><summary>The ARN of the IAM role used to perform this resource operation.</summary>The role specified must have the permissions required for this operation.<br />If you do not specify a role, a temporary session is created using your AWS user credentials.</details> |
+| <CopyableCode code="TypeVersionId" /> | <details><summary>For private resource types, the type version to use in this resource operation.</summary>If you do not specify a resource version, the default version is used.</details> |
+
+## Permissions
+
+To operate on the <code>aws_log_sources</code> resource, the following permissions are required:
+
+<Tabs
+    defaultValue="create"
+    values={[
+      { label: 'Create', value: 'create', },
+      { label: 'Read', value: 'read', },
+      { label: 'List', value: 'list', },
+      { label: 'Delete', value: 'delete', },
+      { label: 'Update', value: 'update', },
+    ]
+}>
+<TabItem value="create">
+
+```json
+glue:CreateDatabase,
+glue:CreateTable,
+glue:GetDatabase,
+glue:GetTable,
+iam:CreateServiceLinkedRole,
+kms:CreateGrant,
+kms:DescribeKey,
+securitylake:CreateDataLake,
+securitylake:CreateAwsLogSource,
+securitylake:ListLogSources
+```
+
+</TabItem>
+<TabItem value="read">
+
+```json
+securitylake:ListLogSources
+```
+
+</TabItem>
+<TabItem value="list">
+
+```json
+securitylake:ListLogSources
+```
+
+</TabItem>
+<TabItem value="delete">
+
+```json
+securitylake:DeleteAwsLogSource,
+securitylake:ListLogSources
+```
+
+</TabItem>
+<TabItem value="update">
+
+```json
+securitylake:CreateAwsLogSource,
+securitylake:DeleteAwsLogSource,
+glue:CreateDatabase,
+glue:CreateTable,
+glue:GetDatabase,
+glue:GetTable,
+iam:CreateServiceLinkedRole,
+kms:CreateGrant,
+kms:DescribeKey
+```
+
+</TabItem>
+</Tabs>
\ No newline at end of file
diff --git a/website/docs/services/securitylake/data_lakes/index.md b/website/docs/services/securitylake/data_lakes/index.md
index e7a872310..4889de01b 100644
--- a/website/docs/services/securitylake/data_lakes/index.md
+++ b/website/docs/services/securitylake/data_lakes/index.md
@@ -122,12 +122,12 @@ Creates, updates, deletes or gets a <code>data_lake</code> resource or lists <co
       {
         "name": "key",
         "type": "string",
-        "description": "The name of the tag. This is a general label that acts as a category for a more specific tag value (value)."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, <code>_</code>, <code>.</code>, <code>/</code>, <code>=</code>, <code>+</code>, and <code>-</code>."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value that is associated with the specified tag key (key). This value acts as a descriptor for the tag key. A tag value cannot be null, but it can be an empty string."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 characters in length."
       }
     ]
   },
diff --git a/website/docs/services/securitylake/index.md b/website/docs/services/securitylake/index.md
index 6c9143b06..f5c78fd7d 100644
--- a/website/docs/services/securitylake/index.md
+++ b/website/docs/services/securitylake/index.md
@@ -20,7 +20,7 @@ The securitylake service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>3</b></span><br />
+<span>total resources:&nbsp;<b>4</b></span><br />
 </div>
 </div>
 
@@ -29,10 +29,11 @@ The securitylake service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
-<a href="/services/securitylake/data_lakes/">data_lakes</a><br />
-<a href="/services/securitylake/subscriber_notifications/">subscriber_notifications</a>
+<a href="/services/securitylake/aws_log_sources/">aws_log_sources</a><br />
+<a href="/services/securitylake/data_lakes/">data_lakes</a>
 </div>
 <div class="providerDocColumn">
+<a href="/services/securitylake/subscriber_notifications/">subscriber_notifications</a><br />
 <a href="/services/securitylake/subscribers/">subscribers</a>
 </div>
 </div>
\ No newline at end of file
diff --git a/website/docs/services/ses/templates/index.md b/website/docs/services/ses/templates/index.md
index 707df6dc4..9be964248 100644
--- a/website/docs/services/ses/templates/index.md
+++ b/website/docs/services/ses/templates/index.md
@@ -52,12 +52,27 @@ Creates, updates, deletes or gets a <code>template</code> resource or lists <cod
   {
     "name": "template",
     "type": "object",
-    "description": "Resource Type definition for AWS::SES::Template",
+    "description": "The content of the email, composed of a subject line, an HTML part, and a text-only part",
     "children": [
       {
-        "name": "id",
+        "name": "template_name",
         "type": "string",
-        "description": ""
+        "description": "The name of the template."
+      },
+      {
+        "name": "subject_part",
+        "type": "string",
+        "description": "The subject line of the email."
+      },
+      {
+        "name": "text_part",
+        "type": "string",
+        "description": "The email body that is visible to recipients whose email clients do not display HTML content."
+      },
+      {
+        "name": "html_part",
+        "type": "string",
+        "description": "The HTML body of the email."
       }
     ]
   },
@@ -244,7 +259,10 @@ resources:
     props:
       - name: template
         value:
-          template: null`}</CodeBlock>
+          template_name: '{{ template_name }}'
+          subject_part: '{{ subject_part }}'
+          text_part: '{{ text_part }}'
+          html_part: '{{ html_part }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docs/services/sns/index.md b/website/docs/services/sns/index.md
index 9a768666d..2861c1e8f 100644
--- a/website/docs/services/sns/index.md
+++ b/website/docs/services/sns/index.md
@@ -20,7 +20,7 @@ The sns service documentation.
 
 <div class="row">
 <div class="providerDocColumn">
-<span>total resources:&nbsp;<b>2</b></span><br />
+<span>total resources:&nbsp;<b>3</b></span><br />
 </div>
 </div>
 
@@ -29,6 +29,7 @@ The sns service documentation.
 ## Resources
 <div class="row">
 <div class="providerDocColumn">
+<a href="/services/sns/subscriptions/">subscriptions</a><br />
 <a href="/services/sns/topic_inline_policies/">topic_inline_policies</a>
 </div>
 <div class="providerDocColumn">
diff --git a/website/docs/services/sns/subscriptions/index.md b/website/docs/services/sns/subscriptions/index.md
new file mode 100644
index 000000000..7d89ef0ac
--- /dev/null
+++ b/website/docs/services/sns/subscriptions/index.md
@@ -0,0 +1,473 @@
+---
+title: subscriptions
+hide_title: false
+hide_table_of_contents: false
+keywords:
+  - subscriptions
+  - sns
+  - aws
+  - stackql
+  - infrastructure-as-code
+  - configuration-as-data
+  - cloud inventory
+description: Query, deploy and manage AWS resources using SQL
+custom_edit_url: null
+image: /img/stackql-aws-provider-featured-image.png
+---
+
+import CodeBlock from '@theme/CodeBlock';
+import CopyableCode from '@site/src/components/CopyableCode/CopyableCode';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+import SchemaTable from '@site/src/components/SchemaTable/SchemaTable';
+
+Creates, updates, deletes or gets a <code>subscription</code> resource or lists <code>subscriptions</code> in a region
+
+## Overview
+<table>
+<tbody>
+<tr><td><b>Name</b></td><td><code>subscriptions</code></td></tr>
+<tr><td><b>Type</b></td><td>Resource</td></tr>
+<tr><td><b>Description</b></td><td>Resource Type definition for AWS::SNS::Subscription</td></tr>
+<tr><td><b>Id</b></td><td><CopyableCode code="awscc.sns.subscriptions" /></td></tr>
+</tbody>
+</table>
+
+## Fields
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Arn of the subscription"
+  },
+  {
+    "name": "replay_policy",
+    "type": "object",
+    "description": "Specifies whether Amazon SNS resends the notification to the subscription when a message's attribute changes."
+  },
+  {
+    "name": "raw_message_delivery",
+    "type": "boolean",
+    "description": "When set to true, enables raw message delivery. Raw messages don't contain any JSON formatting and can be sent to Amazon SQS and HTTP/S endpoints."
+  },
+  {
+    "name": "endpoint",
+    "type": "string",
+    "description": "The subscription's endpoint. The endpoint value depends on the protocol that you specify."
+  },
+  {
+    "name": "filter_policy",
+    "type": "object",
+    "description": "The filter policy JSON assigned to the subscription. Enables the subscriber to filter out unwanted messages."
+  },
+  {
+    "name": "topic_arn",
+    "type": "string",
+    "description": "The ARN of the topic to subscribe to."
+  },
+  {
+    "name": "redrive_policy",
+    "type": "object",
+    "description": "When specified, sends undeliverable messages to the specified Amazon SQS dead-letter queue. Messages that can't be delivered due to client errors are held in the dead-letter queue for further analysis or reprocessing."
+  },
+  {
+    "name": "delivery_policy",
+    "type": "object",
+    "description": "The delivery policy JSON assigned to the subscription. Enables the subscriber to define the message delivery retry strategy in the case of an HTTP/S endpoint subscribed to the topic."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "For cross-region subscriptions, the region in which the topic resides.If no region is specified, AWS CloudFormation uses the region of the caller as the default."
+  },
+  {
+    "name": "subscription_role_arn",
+    "type": "string",
+    "description": "This property applies only to Amazon Data Firehose delivery stream subscriptions."
+  },
+  {
+    "name": "filter_policy_scope",
+    "type": "string",
+    "description": "This attribute lets you choose the filtering scope by using one of the following string value types: MessageAttributes (default) and MessageBody."
+  },
+  {
+    "name": "protocol",
+    "type": "string",
+    "description": "The subscription's protocol."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+<TabItem value="list">
+
+<SchemaTable fields={[
+  {
+    "name": "arn",
+    "type": "string",
+    "description": "Arn of the subscription"
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "For cross-region subscriptions, the region in which the topic resides.If no region is specified, AWS CloudFormation uses the region of the caller as the default."
+  },
+  {
+    "name": "region",
+    "type": "string",
+    "description": "AWS region."
+  }
+]} />
+</TabItem>
+</Tabs>
+
+For more information, see <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html"><code>AWS::SNS::Subscription</code></a>.
+
+## Methods
+
+<table>
+<tbody>
+  <tr>
+    <th>Name</th>
+    <th>Resource</th>
+    <th>Accessible by</th>
+    <th>Required Params</th>
+  </tr>
+  <tr>
+    <td><CopyableCode code="create_resource" /></td>
+    <td><code>subscriptions</code></td>
+    <td><code>INSERT</code></td>
+    <td><CopyableCode code="TopicArn, Protocol, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="delete_resource" /></td>
+    <td><code>subscriptions</code></td>
+    <td><code>DELETE</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="update_resource" /></td>
+    <td><code>subscriptions</code></td>
+    <td><code>UPDATE</code></td>
+    <td><CopyableCode code="Identifier, PatchDocument, region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="list_resources" /></td>
+    <td><code>subscriptions_list_only</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="region" /></td>
+  </tr>
+  <tr>
+    <td><CopyableCode code="get_resource" /></td>
+    <td><code>subscriptions</code></td>
+    <td><code>SELECT</code></td>
+    <td><CopyableCode code="Identifier, region" /></td>
+  </tr>
+</tbody>
+</table>
+
+## `SELECT` examples
+
+<Tabs
+    defaultValue="get"
+    values={[
+        { label: 'get (all properties)', value: 'get' },
+        { label: 'list (identifiers only)', value: 'list' }
+    ]}
+>
+<TabItem value="get">
+
+Gets all properties from an individual <code>subscription</code>.
+```sql
+SELECT
+  region,
+  arn,
+  replay_policy,
+  raw_message_delivery,
+  endpoint,
+  filter_policy,
+  topic_arn,
+  redrive_policy,
+  delivery_policy,
+  region,
+  subscription_role_arn,
+  filter_policy_scope,
+  protocol
+FROM awscc.sns.subscriptions
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ arn }}';
+```
+</TabItem>
+<TabItem value="list">
+
+Lists all <code>subscriptions</code> in a region.
+```sql
+SELECT
+  region,
+  arn
+FROM awscc.sns.subscriptions_list_only
+WHERE
+  region = '{{ region }}';
+```
+</TabItem>
+</Tabs>
+
+## `INSERT` example
+
+Use the following StackQL query and manifest file to create a new <code>subscription</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+<Tabs
+    defaultValue="required"
+    values={[
+      { label: 'Required Properties', value: 'required', },
+      { label: 'All Properties', value: 'all', },
+      { label: 'Manifest', value: 'manifest', },
+    ]
+}>
+<TabItem value="required">
+
+```sql
+/*+ create */
+INSERT INTO awscc.sns.subscriptions (
+  TopicArn,
+  Protocol,
+  region
+)
+SELECT
+  '{{ topic_arn }}',
+  '{{ protocol }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="all">
+
+```sql
+/*+ create */
+INSERT INTO awscc.sns.subscriptions (
+  ReplayPolicy,
+  RawMessageDelivery,
+  Endpoint,
+  FilterPolicy,
+  TopicArn,
+  RedrivePolicy,
+  DeliveryPolicy,
+  Region,
+  SubscriptionRoleArn,
+  FilterPolicyScope,
+  Protocol,
+  region
+)
+SELECT
+  '{{ replay_policy }}',
+  '{{ raw_message_delivery }}',
+  '{{ endpoint }}',
+  '{{ filter_policy }}',
+  '{{ topic_arn }}',
+  '{{ redrive_policy }}',
+  '{{ delivery_policy }}',
+  '{{ region }}',
+  '{{ subscription_role_arn }}',
+  '{{ filter_policy_scope }}',
+  '{{ protocol }}',
+  '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+</TabItem>
+<TabItem value="manifest">
+
+<CodeBlock language="yaml">{`version: 1
+name: stack name
+description: stack description
+providers:
+  - aws
+globals:
+  - name: region
+    value: '{{ vars.AWS_REGION }}'
+resources:
+  - name: subscription
+    props:
+      - name: replay_policy
+        value: {}
+      - name: raw_message_delivery
+        value: '{{ raw_message_delivery }}'
+      - name: endpoint
+        value: '{{ endpoint }}'
+      - name: filter_policy
+        value: {}
+      - name: topic_arn
+        value: '{{ topic_arn }}'
+      - name: redrive_policy
+        value: {}
+      - name: delivery_policy
+        value: {}
+      - name: region
+        value: '{{ region }}'
+      - name: subscription_role_arn
+        value: '{{ subscription_role_arn }}'
+      - name: filter_policy_scope
+        value: '{{ filter_policy_scope }}'
+      - name: protocol
+        value: '{{ protocol }}'`}</CodeBlock>
+
+</TabItem>
+</Tabs>
+
+## `UPDATE` example
+
+Use the following StackQL query and manifest file to update a <code>subscription</code> resource, using [__`stack-deploy`__](https://pypi.org/project/stack-deploy/).
+
+```sql
+/*+ update */
+UPDATE awscc.sns.subscriptions
+SET PatchDocument = string('{{ {
+    "ReplayPolicy": replay_policy,
+    "RawMessageDelivery": raw_message_delivery,
+    "FilterPolicy": filter_policy,
+    "RedrivePolicy": redrive_policy,
+    "DeliveryPolicy": delivery_policy,
+    "Region": region,
+    "SubscriptionRoleArn": subscription_role_arn,
+    "FilterPolicyScope": filter_policy_scope
+} | generate_patch_document }}')
+WHERE
+  region = '{{ region }}' AND
+  Identifier = '{{ arn }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## `DELETE` example
+
+```sql
+/*+ delete */
+DELETE FROM awscc.sns.subscriptions
+WHERE
+  Identifier = '{{ arn }}' AND
+  region = '{{ region }}'
+RETURNING
+  ErrorCode,
+  EventTime,
+  Identifier,
+  Operation,
+  OperationStatus,
+  RequestToken,
+  ResourceModel,
+  RetryAfter,
+  StatusMessage,
+  TypeName
+;
+```
+
+
+## Additional Parameters
+
+Mutable resources in the Cloud Control provider support additional optional parameters which can be supplied with `INSERT`, `UPDATE`, or `DELETE` operations. These include:
+
+| Parameter | Description |
+|-----------|-------------|
+| <CopyableCode code="ClientToken" /> | <details><summary>A unique identifier to ensure the idempotency of the resource request.</summary>This allows the provider to accurately distinguish between retries and new requests.<br />A client token is valid for 36 hours once used.<br />After that, a resource request with the same client token is treated as a new request.<br />If you do not specify a client token, one is generated for inclusion in the request.</details> |
+| <CopyableCode code="RoleArn" /> | <details><summary>The ARN of the IAM role used to perform this resource operation.</summary>The role specified must have the permissions required for this operation.<br />If you do not specify a role, a temporary session is created using your AWS user credentials.</details> |
+| <CopyableCode code="TypeVersionId" /> | <details><summary>For private resource types, the type version to use in this resource operation.</summary>If you do not specify a resource version, the default version is used.</details> |
+
+## Permissions
+
+To operate on the <code>subscriptions</code> resource, the following permissions are required:
+
+<Tabs
+    defaultValue="create"
+    values={[
+      { label: 'Create', value: 'create', },
+      { label: 'Read', value: 'read', },
+      { label: 'Update', value: 'update', },
+      { label: 'Delete', value: 'delete', },
+      { label: 'List', value: 'list', },
+    ]
+}>
+<TabItem value="create">
+
+```json
+iam:GetRole,
+iam:PassRole,
+sns:Subscribe
+```
+
+</TabItem>
+<TabItem value="read">
+
+```json
+sns:GetSubscriptionAttributes
+```
+
+</TabItem>
+<TabItem value="update">
+
+```json
+iam:GetRole,
+iam:PassRole,
+sns:SetSubscriptionAttributes
+```
+
+</TabItem>
+<TabItem value="delete">
+
+```json
+sns:Unsubscribe,
+sns:GetSubscriptionAttributes
+```
+
+</TabItem>
+<TabItem value="list">
+
+```json
+sns:ListSubscriptions
+```
+
+</TabItem>
+</Tabs>
\ No newline at end of file
diff --git a/website/docs/services/ssm/documents/index.md b/website/docs/services/ssm/documents/index.md
index 3c3b8a5f9..588ec2e79 100644
--- a/website/docs/services/ssm/documents/index.md
+++ b/website/docs/services/ssm/documents/index.md
@@ -104,12 +104,12 @@ Creates, updates, deletes or gets a <code>document</code> resource or lists <cod
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The name of the tag."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value of the tag."
       }
     ]
   },
diff --git a/website/docs/services/ssmcontacts/contacts/index.md b/website/docs/services/ssmcontacts/contacts/index.md
index 4a90c8f5b..31f8eda98 100644
--- a/website/docs/services/ssmcontacts/contacts/index.md
+++ b/website/docs/services/ssmcontacts/contacts/index.md
@@ -109,6 +109,11 @@ Creates, updates, deletes or gets a <code>contact</code> resource or lists <code
             ]
           }
         ]
+      },
+      {
+        "name": "rotation_ids",
+        "type": "array",
+        "description": "List of Rotation Ids to associate with Contact"
       }
     ]
   },
@@ -347,6 +352,8 @@ resources:
                 channel_target_info:
                   channel_id: '{{ channel_id }}'
                   retry_interval_in_minutes: '{{ retry_interval_in_minutes }}'
+            rotation_ids:
+              - '{{ rotation_ids[0] }}'
       - name: tags
         value:
           - key: '{{ key }}'
diff --git a/website/docs/services/timestream/influxdb_instances/index.md b/website/docs/services/timestream/influxdb_instances/index.md
index 47b2073d4..86fc9a3fe 100644
--- a/website/docs/services/timestream/influxdb_instances/index.md
+++ b/website/docs/services/timestream/influxdb_instances/index.md
@@ -186,12 +186,12 @@ Creates, updates, deletes or gets an <code>influxdb_instance</code> resource or
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/timestream/scheduled_queries/index.md b/website/docs/services/timestream/scheduled_queries/index.md
index ebf6e87fa..85c2a79fa 100644
--- a/website/docs/services/timestream/scheduled_queries/index.md
+++ b/website/docs/services/timestream/scheduled_queries/index.md
@@ -282,12 +282,12 @@ Creates, updates, deletes or gets a <code>scheduled_query</code> resource or lis
       {
         "name": "key",
         "type": "string",
-        "description": ""
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": ""
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/transfer/certificates/index.md b/website/docs/services/transfer/certificates/index.md
index 728a3c39c..94416307d 100644
--- a/website/docs/services/transfer/certificates/index.md
+++ b/website/docs/services/transfer/certificates/index.md
@@ -87,12 +87,12 @@ Creates, updates, deletes or gets a <code>certificate</code> resource or lists <
       {
         "name": "key",
         "type": "string",
-        "description": "The name assigned to the tag that you create."
+        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       },
       {
         "name": "value",
         "type": "string",
-        "description": "Contains one or more values that you assigned to the key name you create."
+        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -."
       }
     ]
   },
diff --git a/website/docs/services/transfer/servers/index.md b/website/docs/services/transfer/servers/index.md
index 51af7f6ae..ab274a43b 100644
--- a/website/docs/services/transfer/servers/index.md
+++ b/website/docs/services/transfer/servers/index.md
@@ -104,22 +104,32 @@ Creates, updates, deletes or gets a <code>server</code> resource or lists <code>
   {
     "name": "identity_provider_details",
     "type": "object",
-    "description": "You can provide a structure that contains the details for the identity provider to use with your web app.",
+    "description": "",
     "children": [
       {
-        "name": "application_arn",
+        "name": "url",
         "type": "string",
         "description": ""
       },
       {
-        "name": "instance_arn",
+        "name": "invocation_role",
         "type": "string",
-        "description": "The Amazon Resource Name (ARN) for the IAM Identity Center used for the web app."
+        "description": ""
       },
       {
-        "name": "role",
+        "name": "directory_id",
         "type": "string",
-        "description": "The IAM role in IAM Identity Center used for the web app."
+        "description": ""
+      },
+      {
+        "name": "function",
+        "type": "string",
+        "description": ""
+      },
+      {
+        "name": "sftp_authentication_methods",
+        "type": "string",
+        "description": ""
       }
     ]
   },
@@ -220,12 +230,12 @@ Creates, updates, deletes or gets a <code>server</code> resource or lists <code>
       {
         "name": "key",
         "type": "string",
-        "description": "The name assigned to the tag that you create."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "Contains one or more values that you assigned to the key name you create."
+        "description": ""
       }
     ]
   },
@@ -540,9 +550,11 @@ resources:
         value: '{{ endpoint_type }}'
       - name: identity_provider_details
         value:
-          application_arn: '{{ application_arn }}'
-          instance_arn: '{{ instance_arn }}'
-          role: '{{ role }}'
+          url: '{{ url }}'
+          invocation_role: '{{ invocation_role }}'
+          directory_id: '{{ directory_id }}'
+          function: '{{ function }}'
+          sftp_authentication_methods: '{{ sftp_authentication_methods }}'
       - name: identity_provider_type
         value: '{{ identity_provider_type }}'
       - name: ip_address_type
diff --git a/website/docs/services/transfer/users/index.md b/website/docs/services/transfer/users/index.md
index 670b54ad3..a00f7305e 100644
--- a/website/docs/services/transfer/users/index.md
+++ b/website/docs/services/transfer/users/index.md
@@ -131,12 +131,12 @@ Creates, updates, deletes or gets a <code>user</code> resource or lists <code>us
       {
         "name": "key",
         "type": "string",
-        "description": "The name assigned to the tag that you create."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "Contains one or more values that you assigned to the key name you create."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/transfer/web_apps/index.md b/website/docs/services/transfer/web_apps/index.md
index 6653a638c..19f040b3c 100644
--- a/website/docs/services/transfer/web_apps/index.md
+++ b/website/docs/services/transfer/web_apps/index.md
@@ -121,12 +121,12 @@ Creates, updates, deletes or gets a <code>web_app</code> resource or lists <code
       {
         "name": "key",
         "type": "string",
-        "description": "The name assigned to the tag that you create."
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "Contains one or more values that you assigned to the key name you create."
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/vpclattice/resource_configurations/index.md b/website/docs/services/vpclattice/resource_configurations/index.md
index 250d481dc..8e7662b06 100644
--- a/website/docs/services/vpclattice/resource_configurations/index.md
+++ b/website/docs/services/vpclattice/resource_configurations/index.md
@@ -95,12 +95,12 @@ Creates, updates, deletes or gets a <code>resource_configuration</code> resource
     "description": "",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
         "description": ""
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
         "description": ""
       }
@@ -341,8 +341,8 @@ resources:
         value: '{{ resource_configuration_group_id }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'
+          - value: '{{ value }}'
+            key: '{{ key }}'
       - name: name
         value: '{{ name }}'`}</CodeBlock>
 
diff --git a/website/docs/services/vpclattice/resource_gateways/index.md b/website/docs/services/vpclattice/resource_gateways/index.md
index bfe053fdf..b038edac6 100644
--- a/website/docs/services/vpclattice/resource_gateways/index.md
+++ b/website/docs/services/vpclattice/resource_gateways/index.md
@@ -85,12 +85,12 @@ Creates, updates, deletes or gets a <code>resource_gateway</code> resource or li
     "description": "",
     "children": [
       {
-        "name": "key",
+        "name": "value",
         "type": "string",
         "description": ""
       },
       {
-        "name": "value",
+        "name": "key",
         "type": "string",
         "description": ""
       }
@@ -319,8 +319,8 @@ resources:
           - '{{ security_group_ids[0] }}'
       - name: tags
         value:
-          - key: '{{ key }}'
-            value: '{{ value }}'
+          - value: '{{ value }}'
+            key: '{{ key }}'
       - name: name
         value: '{{ name }}'`}</CodeBlock>
 
diff --git a/website/docs/services/wafv2/ip_sets/index.md b/website/docs/services/wafv2/ip_sets/index.md
index b120484d1..6cf4288ee 100644
--- a/website/docs/services/wafv2/ip_sets/index.md
+++ b/website/docs/services/wafv2/ip_sets/index.md
@@ -47,7 +47,7 @@ Creates, updates, deletes or gets an <code>ip_set</code> resource or lists <code
   {
     "name": "arn",
     "type": "string",
-    "description": ""
+    "description": "ARN of the WAF entity."
   },
   {
     "name": "description",
@@ -57,17 +57,17 @@ Creates, updates, deletes or gets an <code>ip_set</code> resource or lists <code
   {
     "name": "name",
     "type": "string",
-    "description": "Name of the WebACL."
+    "description": "Name of the IPSet."
   },
   {
     "name": "id",
     "type": "string",
-    "description": "Id of the WebACL"
+    "description": "Id of the IPSet"
   },
   {
     "name": "scope",
     "type": "string",
-    "description": "Use CLOUDFRONT for CloudFront WebACL, use REGIONAL for Application Load Balancer and API Gateway."
+    "description": "Use CLOUDFRONT for CloudFront IPSet, use REGIONAL for Application Load Balancer and API Gateway."
   },
   {
     "name": "ip_address_version",
@@ -109,17 +109,17 @@ Creates, updates, deletes or gets an <code>ip_set</code> resource or lists <code
   {
     "name": "name",
     "type": "string",
-    "description": "Name of the WebACL."
+    "description": "Name of the IPSet."
   },
   {
     "name": "id",
     "type": "string",
-    "description": "Id of the WebACL"
+    "description": "Id of the IPSet"
   },
   {
     "name": "scope",
     "type": "string",
-    "description": "Use CLOUDFRONT for CloudFront WebACL, use REGIONAL for Application Load Balancer and API Gateway."
+    "description": "Use CLOUDFRONT for CloudFront IPSet, use REGIONAL for Application Load Balancer and API Gateway."
   },
   {
     "name": "region",
diff --git a/website/docs/services/wafv2/logging_configurations/index.md b/website/docs/services/wafv2/logging_configurations/index.md
index 741a7b206..a13eb0664 100644
--- a/website/docs/services/wafv2/logging_configurations/index.md
+++ b/website/docs/services/wafv2/logging_configurations/index.md
@@ -59,214 +59,32 @@ Creates, updates, deletes or gets a <code>logging_configuration</code> resource
     "type": "array",
     "description": "The parts of the request that you want to keep out of the logs. For example, if you redact the HEADER field, the HEADER field in the firehose will be xxx.",
     "children": [
-      {
-        "name": "single_header",
-        "type": "object",
-        "description": "",
-        "children": [
-          {
-            "name": "name",
-            "type": "string",
-            "description": ""
-          }
-        ]
-      },
-      {
-        "name": "single_query_argument",
-        "type": "object",
-        "description": "One query argument in a web request, identified by name, for example UserName or SalesRegion. The name can be up to 30 characters long and isn't case sensitive.",
-        "children": [
-          {
-            "name": "name",
-            "type": "string",
-            "description": ""
-          }
-        ]
-      },
-      {
-        "name": "all_query_arguments",
-        "type": "object",
-        "description": "All query arguments of a web request."
-      },
-      {
-        "name": "uri_path",
-        "type": "object",
-        "description": "The path component of the URI of a web request. This is the part of a web request that identifies a resource, for example, /images/daily-ad.jpg."
-      },
-      {
-        "name": "query_string",
-        "type": "object",
-        "description": "The query string of a web request. This is the part of a URL that appears after a ? character, if any."
-      },
-      {
-        "name": "body",
-        "type": "object",
-        "description": "The body of a web request. This immediately follows the request headers.",
-        "children": [
-          {
-            "name": "oversize_handling",
-            "type": "string",
-            "description": "Handling of requests containing oversize fields"
-          }
-        ]
-      },
       {
         "name": "method",
         "type": "object",
-        "description": "The HTTP method of a web request. The method indicates the type of operation that the request is asking the origin to perform."
-      },
-      {
-        "name": "json_body",
-        "type": "object",
-        "description": "Inspect the request body as JSON. The request body immediately follows the request headers.",
-        "children": [
-          {
-            "name": "match_pattern",
-            "type": "object",
-            "description": "The pattern to look for in the JSON body.",
-            "children": [
-              {
-                "name": "all",
-                "type": "object",
-                "description": "Inspect all parts of the web request's JSON body."
-              },
-              {
-                "name": "included_paths",
-                "type": "array",
-                "description": ""
-              }
-            ]
-          },
-          {
-            "name": "match_scope",
-            "type": "string",
-            "description": "The parts of the JSON to match against using the MatchPattern."
-          },
-          {
-            "name": "invalid_fallback_behavior",
-            "type": "string",
-            "description": "The inspection behavior to fall back to if the JSON in the request body is invalid."
-          },
-          {
-            "name": "oversize_handling",
-            "type": "string",
-            "description": "Handling of requests containing oversize fields"
-          }
-        ]
-      },
-      {
-        "name": "headers",
-        "type": "object",
-        "description": "Includes headers of a web request.",
-        "children": [
-          {
-            "name": "match_pattern",
-            "type": "object",
-            "description": "The pattern to look for in the request headers.",
-            "children": [
-              {
-                "name": "all",
-                "type": "object",
-                "description": "Inspect all parts of the web request headers."
-              },
-              {
-                "name": "included_headers",
-                "type": "array",
-                "description": ""
-              },
-              {
-                "name": "excluded_headers",
-                "type": "array",
-                "description": ""
-              }
-            ]
-          },
-          {
-            "name": "match_scope",
-            "type": "string",
-            "description": "The parts of the request to match against using the MatchPattern."
-          },
-          {
-            "name": "oversize_handling",
-            "type": "string",
-            "description": "Handling of requests containing oversize fields"
-          }
-        ]
+        "description": "Inspect the HTTP method. The method indicates the type of operation that the request is asking the origin to perform."
       },
       {
-        "name": "cookies",
-        "type": "object",
-        "description": "Includes cookies of a web request.",
-        "children": [
-          {
-            "name": "match_pattern",
-            "type": "object",
-            "description": "The pattern to look for in the request cookies.",
-            "children": [
-              {
-                "name": "all",
-                "type": "object",
-                "description": "Inspect all parts of the web request cookies."
-              },
-              {
-                "name": "included_cookies",
-                "type": "array",
-                "description": ""
-              },
-              {
-                "name": "excluded_cookies",
-                "type": "array",
-                "description": ""
-              }
-            ]
-          },
-          {
-            "name": "match_scope",
-            "type": "string",
-            "description": "The parts of the request to match against using the MatchPattern."
-          },
-          {
-            "name": "oversize_handling",
-            "type": "string",
-            "description": "Handling of requests containing oversize fields"
-          }
-        ]
-      },
-      {
-        "name": "j_a3_fingerprint",
+        "name": "query_string",
         "type": "object",
-        "description": "Includes the JA3 fingerprint of a web request.",
-        "children": [
-          {
-            "name": "fallback_behavior",
-            "type": "string",
-            "description": ""
-          }
-        ]
+        "description": "Inspect the query string. This is the part of a URL that appears after a ? character, if any."
       },
       {
-        "name": "j_a4_fingerprint",
+        "name": "single_header",
         "type": "object",
-        "description": "Includes the JA4 fingerprint of a web request.",
+        "description": "Inspect a single header. Provide the name of the header to inspect, for example, User-Agent or Referer. This setting isn't case sensitive.",
         "children": [
           {
-            "name": "fallback_behavior",
+            "name": "name",
             "type": "string",
-            "description": ""
+            "description": "The name of the query header to inspect."
           }
         ]
       },
       {
-        "name": "uri_fragment",
+        "name": "uri_path",
         "type": "object",
-        "description": "The path component of the URI Fragment. This is the part of a web request that identifies a fragment uri, for example, /abcd#introduction",
-        "children": [
-          {
-            "name": "fallback_behavior",
-            "type": "string",
-            "description": ""
-          }
-        ]
+        "description": "Inspect the request URI path. This is the part of a web request that identifies a resource, for example, /images/daily-ad.jpg."
       }
     ]
   },
@@ -520,48 +338,11 @@ resources:
           - '{{ log_destination_configs[0] }}'
       - name: redacted_fields
         value:
-          - single_header:
-              name: '{{ name }}'
-            single_query_argument:
+          - method: {}
+            query_string: {}
+            single_header:
               name: '{{ name }}'
-            all_query_arguments: {}
             uri_path: {}
-            query_string: {}
-            body:
-              oversize_handling: '{{ oversize_handling }}'
-            method: {}
-            json_body:
-              match_pattern:
-                all: {}
-                included_paths:
-                  - '{{ included_paths[0] }}'
-              match_scope: '{{ match_scope }}'
-              invalid_fallback_behavior: '{{ invalid_fallback_behavior }}'
-              oversize_handling: null
-            headers:
-              match_pattern:
-                all: {}
-                included_headers:
-                  - '{{ included_headers[0] }}'
-                excluded_headers:
-                  - '{{ excluded_headers[0] }}'
-              match_scope: '{{ match_scope }}'
-              oversize_handling: null
-            cookies:
-              match_pattern:
-                all: {}
-                included_cookies:
-                  - '{{ included_cookies[0] }}'
-                excluded_cookies:
-                  - '{{ excluded_cookies[0] }}'
-              match_scope: null
-              oversize_handling: null
-            j_a3_fingerprint:
-              fallback_behavior: '{{ fallback_behavior }}'
-            j_a4_fingerprint:
-              fallback_behavior: '{{ fallback_behavior }}'
-            uri_fragment:
-              fallback_behavior: '{{ fallback_behavior }}'
       - name: logging_filter
         value:
           default_behavior: '{{ default_behavior }}'
diff --git a/website/docs/services/wafv2/rule_groups/index.md b/website/docs/services/wafv2/rule_groups/index.md
index 72a5ade66..b881093c7 100644
--- a/website/docs/services/wafv2/rule_groups/index.md
+++ b/website/docs/services/wafv2/rule_groups/index.md
@@ -47,7 +47,7 @@ Creates, updates, deletes or gets a <code>rule_group</code> resource or lists <c
   {
     "name": "arn",
     "type": "string",
-    "description": ""
+    "description": "ARN of the WAF entity."
   },
   {
     "name": "capacity",
@@ -62,17 +62,17 @@ Creates, updates, deletes or gets a <code>rule_group</code> resource or lists <c
   {
     "name": "name",
     "type": "string",
-    "description": "Name of the WebACL."
+    "description": "Name of the RuleGroup."
   },
   {
     "name": "id",
     "type": "string",
-    "description": "Id of the WebACL"
+    "description": "Id of the RuleGroup"
   },
   {
     "name": "scope",
     "type": "string",
-    "description": "Use CLOUDFRONT for CloudFront WebACL, use REGIONAL for Application Load Balancer and API Gateway."
+    "description": "Use CLOUDFRONT for CloudFront RuleGroup, use REGIONAL for Application Load Balancer and API Gateway."
   },
   {
     "name": "rules",
@@ -204,23 +204,6 @@ Creates, updates, deletes or gets a <code>rule_group</code> resource or lists <c
               }
             ]
           },
-          {
-            "name": "rule_group_reference_statement",
-            "type": "object",
-            "description": "",
-            "children": [
-              {
-                "name": "excluded_rules",
-                "type": "array",
-                "description": ""
-              },
-              {
-                "name": "rule_action_overrides",
-                "type": "array",
-                "description": "Action overrides for rules in the rule group."
-              }
-            ]
-          },
           {
             "name": "ip_set_reference_statement",
             "type": "object",
@@ -250,38 +233,6 @@ Creates, updates, deletes or gets a <code>rule_group</code> resource or lists <c
               }
             ]
           },
-          {
-            "name": "managed_rule_group_statement",
-            "type": "object",
-            "description": "",
-            "children": [
-              {
-                "name": "vendor_name",
-                "type": "string",
-                "description": ""
-              },
-              {
-                "name": "version",
-                "type": "string",
-                "description": ""
-              },
-              {
-                "name": "excluded_rules",
-                "type": "array",
-                "description": ""
-              },
-              {
-                "name": "managed_rule_group_configs",
-                "type": "array",
-                "description": "Collection of ManagedRuleGroupConfig."
-              },
-              {
-                "name": "rule_action_overrides",
-                "type": "array",
-                "description": "Action overrides for rules in the rule group."
-              }
-            ]
-          },
           {
             "name": "rate_based_statement",
             "type": "object",
@@ -433,7 +384,7 @@ Creates, updates, deletes or gets a <code>rule_group</code> resource or lists <c
           {
             "name": "count",
             "type": "object",
-            "description": "Allow traffic towards application.",
+            "description": "Count traffic towards application.",
             "children": [
               {
                 "name": "custom_request_handling",
@@ -468,23 +419,6 @@ Creates, updates, deletes or gets a <code>rule_group</code> resource or lists <c
           }
         ]
       },
-      {
-        "name": "override_action",
-        "type": "object",
-        "description": "Override a RuleGroup or ManagedRuleGroup behavior. This can only be applied to Rule that has RuleGroupReferenceStatement or ManagedRuleGroupReferenceStatement.",
-        "children": [
-          {
-            "name": "count",
-            "type": "object",
-            "description": "Count traffic towards application."
-          },
-          {
-            "name": "none",
-            "type": "object",
-            "description": "Keep the RuleGroup or ManagedRuleGroup behavior as is."
-          }
-        ]
-      },
       {
         "name": "rule_labels",
         "type": "array",
@@ -500,7 +434,7 @@ Creates, updates, deletes or gets a <code>rule_group</code> resource or lists <c
       {
         "name": "visibility_config",
         "type": "object",
-        "description": "Visibility Metric of the WebACL.",
+        "description": "Visibility Metric of the RuleGroup.",
         "children": [
           {
             "name": "sampled_requests_enabled",
@@ -562,7 +496,7 @@ Creates, updates, deletes or gets a <code>rule_group</code> resource or lists <c
   {
     "name": "visibility_config",
     "type": "object",
-    "description": "Visibility Metric of the WebACL.",
+    "description": "Visibility Metric of the RuleGroup.",
     "children": [
       {
         "name": "sampled_requests_enabled",
@@ -631,17 +565,17 @@ Creates, updates, deletes or gets a <code>rule_group</code> resource or lists <c
   {
     "name": "name",
     "type": "string",
-    "description": "Name of the WebACL."
+    "description": "Name of the RuleGroup."
   },
   {
     "name": "id",
     "type": "string",
-    "description": "Id of the WebACL"
+    "description": "Id of the RuleGroup"
   },
   {
     "name": "scope",
     "type": "string",
-    "description": "Use CLOUDFRONT for CloudFront WebACL, use REGIONAL for Application Load Balancer and API Gateway."
+    "description": "Use CLOUDFRONT for CloudFront RuleGroup, use REGIONAL for Application Load Balancer and API Gateway."
   },
   {
     "name": "region",
@@ -928,32 +862,8 @@ resources:
                 forwarded_ip_config:
                   header_name: '{{ header_name }}'
                   fallback_behavior: '{{ fallback_behavior }}'
-              rule_group_reference_statement:
-                arn: '{{ arn }}'
-                excluded_rules:
-                  - name: null
-                rule_action_overrides:
-                  - name: null
-                    action_to_use:
-                      allow:
-                        custom_request_handling:
-                          insert_headers:
-                            - name: '{{ name }}'
-                              value: '{{ value }}'
-                      block:
-                        custom_response:
-                          response_code: '{{ response_code }}'
-                          custom_response_body_key: '{{ custom_response_body_key }}'
-                          response_headers:
-                            - null
-                      count:
-                        custom_request_handling: null
-                      captcha:
-                        custom_request_handling: null
-                      challenge:
-                        custom_request_handling: null
               ip_set_reference_statement:
-                arn: null
+                arn: '{{ arn }}'
                 ip_set_forwarded_ip_config:
                   header_name: '{{ header_name }}'
                   fallback_behavior: '{{ fallback_behavior }}'
@@ -963,76 +873,6 @@ resources:
                 field_to_match: null
                 text_transformations:
                   - null
-              managed_rule_group_statement:
-                name: null
-                vendor_name: '{{ vendor_name }}'
-                version: '{{ version }}'
-                excluded_rules:
-                  - null
-                scope_down_statement: null
-                managed_rule_group_configs:
-                  - login_path: '{{ login_path }}'
-                    payload_type: '{{ payload_type }}'
-                    username_field:
-                      identifier: '{{ identifier }}'
-                    password_field: null
-                    aws_managed_rules_bot_control_rule_set:
-                      inspection_level: '{{ inspection_level }}'
-                      enable_machine_learning: '{{ enable_machine_learning }}'
-                    aws_managed_rules_at_prule_set:
-                      login_path: '{{ login_path }}'
-                      enable_regex_in_path: '{{ enable_regex_in_path }}'
-                      request_inspection:
-                        payload_type: '{{ payload_type }}'
-                        username_field: null
-                        password_field: null
-                      response_inspection:
-                        status_code:
-                          success_codes:
-                            - '{{ success_codes[0] }}'
-                          failure_codes:
-                            - '{{ failure_codes[0] }}'
-                        header:
-                          name: '{{ name }}'
-                          success_values:
-                            - '{{ success_values[0] }}'
-                          failure_values:
-                            - '{{ failure_values[0] }}'
-                        body_contains:
-                          success_strings:
-                            - '{{ success_strings[0] }}'
-                          failure_strings:
-                            - '{{ failure_strings[0] }}'
-                        json:
-                          identifier: '{{ identifier }}'
-                          success_values:
-                            - '{{ success_values[0] }}'
-                          failure_values:
-                            - '{{ failure_values[0] }}'
-                    aws_managed_rules_ac_fp_rule_set:
-                      creation_path: '{{ creation_path }}'
-                      registration_page_path: '{{ registration_page_path }}'
-                      request_inspection:
-                        payload_type: '{{ payload_type }}'
-                        username_field: null
-                        password_field: null
-                        email_field: null
-                        phone_number_fields:
-                          - null
-                        address_fields:
-                          - null
-                      response_inspection: null
-                      enable_regex_in_path: '{{ enable_regex_in_path }}'
-                    aws_managed_rules_anti_ddo_srule_set:
-                      client_side_action_config:
-                        challenge:
-                          usage_of_action: '{{ usage_of_action }}'
-                          sensitivity: '{{ sensitivity }}'
-                          exempt_uri_regular_expressions:
-                            - regex_string: '{{ regex_string }}'
-                      sensitivity_to_block: null
-                rule_action_overrides:
-                  - null
               rate_based_statement:
                 limit: '{{ limit }}'
                 evaluation_window_sec: '{{ evaluation_window_sec }}'
@@ -1088,10 +928,24 @@ resources:
                 asn_list:
                   - '{{ asn_list[0] }}'
                 forwarded_ip_config: null
-            action: null
-            override_action:
-              count: {}
-              none: {}
+            action:
+              allow:
+                custom_request_handling:
+                  insert_headers:
+                    - name: '{{ name }}'
+                      value: '{{ value }}'
+              block:
+                custom_response:
+                  response_code: '{{ response_code }}'
+                  custom_response_body_key: '{{ custom_response_body_key }}'
+                  response_headers:
+                    - null
+              count:
+                custom_request_handling: null
+              captcha:
+                custom_request_handling: null
+              challenge:
+                custom_request_handling: null
             rule_labels:
               - name: '{{ name }}'
             visibility_config:
diff --git a/website/docs/services/wafv2/web_acls/index.md b/website/docs/services/wafv2/web_acls/index.md
index 1ac733c53..ac396d85a 100644
--- a/website/docs/services/wafv2/web_acls/index.md
+++ b/website/docs/services/wafv2/web_acls/index.md
@@ -47,7 +47,7 @@ Creates, updates, deletes or gets a <code>web_acl</code> resource or lists <code
   {
     "name": "arn",
     "type": "string",
-    "description": ""
+    "description": "ARN of the WAF entity."
   },
   {
     "name": "capacity",
diff --git a/website/docs/services/wisdom/assistant_associations/index.md b/website/docs/services/wisdom/assistant_associations/index.md
index 5973c2cb7..fefbfb143 100644
--- a/website/docs/services/wisdom/assistant_associations/index.md
+++ b/website/docs/services/wisdom/assistant_associations/index.md
@@ -89,12 +89,12 @@ Creates, updates, deletes or gets an <code>assistant_association</code> resource
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -"
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -"
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/wisdom/assistants/index.md b/website/docs/services/wisdom/assistants/index.md
index 82eb7c64d..a175ee262 100644
--- a/website/docs/services/wisdom/assistants/index.md
+++ b/website/docs/services/wisdom/assistants/index.md
@@ -84,12 +84,12 @@ Creates, updates, deletes or gets an <code>assistant</code> resource or lists <c
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -"
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -"
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/wisdom/knowledge_bases/index.md b/website/docs/services/wisdom/knowledge_bases/index.md
index b0ce4eef4..71c7c87ea 100644
--- a/website/docs/services/wisdom/knowledge_bases/index.md
+++ b/website/docs/services/wisdom/knowledge_bases/index.md
@@ -210,12 +210,12 @@ Creates, updates, deletes or gets a <code>knowledge_base</code> resource or list
       {
         "name": "key",
         "type": "string",
-        "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -"
+        "description": ""
       },
       {
         "name": "value",
         "type": "string",
-        "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -"
+        "description": ""
       }
     ]
   },
diff --git a/website/docs/services/wisdom/message_templates/index.md b/website/docs/services/wisdom/message_templates/index.md
index 8155be0cd..3dd77e37b 100644
--- a/website/docs/services/wisdom/message_templates/index.md
+++ b/website/docs/services/wisdom/message_templates/index.md
@@ -149,7 +149,7 @@ Creates, updates, deletes or gets a <code>message_template</code> resource or li
   {
     "name": "grouping_configuration",
     "type": "object",
-    "description": "The configuration information of the user groups that the quick response is accessible to.",
+    "description": "The configuration information of the user groups that the message template is accessible to.",
     "children": [
       {
         "name": "criteria",
diff --git a/website/docs/services/workspacesinstances/volumes/index.md b/website/docs/services/workspacesinstances/volumes/index.md
index fac62bebc..e186b69a7 100644
--- a/website/docs/services/workspacesinstances/volumes/index.md
+++ b/website/docs/services/workspacesinstances/volumes/index.md
@@ -102,17 +102,17 @@ Creates, updates, deletes or gets a <code>volume</code> resource or lists <code>
       {
         "name": "tags",
         "type": "array",
-        "description": "",
+        "description": "The tags to apply to the resource",
         "children": [
           {
             "name": "key",
             "type": "string",
-            "description": ""
+            "description": "The key name of the tag"
           },
           {
             "name": "value",
             "type": "string",
-            "description": ""
+            "description": "The value for the tag"
           }
         ]
       }
diff --git a/website/docs/services/xray/sampling_rules/index.md b/website/docs/services/xray/sampling_rules/index.md
index ae78eaf5e..2f4e6737f 100644
--- a/website/docs/services/xray/sampling_rules/index.md
+++ b/website/docs/services/xray/sampling_rules/index.md
@@ -47,91 +47,42 @@ Creates, updates, deletes or gets a <code>sampling_rule</code> resource or lists
   {
     "name": "sampling_rule",
     "type": "object",
-    "description": "This schema provides construct and validation rules for AWS-XRay SamplingRule resource parameters.",
+    "description": "",
     "children": [
       {
-        "name": "sampling_rule_record",
+        "name": "attributes",
         "type": "object",
-        "description": "",
-        "children": [
-          {
-            "name": "created_at",
-            "type": "string",
-            "description": "When the rule was created, in Unix time seconds."
-          },
-          {
-            "name": "modified_at",
-            "type": "string",
-            "description": "When the rule was modified, in Unix time seconds."
-          }
-        ]
+        "description": "Matches attributes derived from the request."
       },
       {
-        "name": "sampling_rule_update",
-        "type": "object",
-        "description": "",
-        "children": [
-          {
-            "name": "attributes",
-            "type": "object",
-            "description": "Matches attributes derived from the request."
-          },
-          {
-            "name": "fixed_rate",
-            "type": "number",
-            "description": "The percentage of matching requests to instrument, after the reservoir is exhausted."
-          },
-          {
-            "name": "host",
-            "type": "string",
-            "description": "Matches the hostname from a request URL."
-          },
-          {
-            "name": "h_tt_pmethod",
-            "type": "string",
-            "description": "Matches the HTTP method from a request URL."
-          },
-          {
-            "name": "priority",
-            "type": "integer",
-            "description": "The priority of the sampling rule."
-          },
-          {
-            "name": "reservoir_size",
-            "type": "integer",
-            "description": "A fixed number of matching requests to instrument per second, prior to applying the fixed rate. The reservoir is not used directly by services, but applies to all services using the rule collectively."
-          },
-          {
-            "name": "resource_arn",
-            "type": "string",
-            "description": "Matches the ARN of the AWS resource on which the service runs."
-          },
-          {
-            "name": "rule_arn",
-            "type": "string",
-            "description": "The ARN of the sampling rule. Specify a rule by either name or ARN, but not both."
-          },
-          {
-            "name": "rule_name",
-            "type": "string",
-            "description": "The ARN of the sampling rule. Specify a rule by either name or ARN, but not both."
-          },
-          {
-            "name": "service_name",
-            "type": "string",
-            "description": "Matches the name that the service uses to identify itself in segments."
-          },
-          {
-            "name": "service_type",
-            "type": "string",
-            "description": "Matches the origin that the service uses to identify its type in segments."
-          },
-          {
-            "name": "url_path",
-            "type": "string",
-            "description": "Matches the path from a request URL."
-          }
-        ]
+        "name": "fixed_rate",
+        "type": "number",
+        "description": "The percentage of matching requests to instrument, after the reservoir is exhausted."
+      },
+      {
+        "name": "host",
+        "type": "string",
+        "description": "Matches the hostname from a request URL."
+      },
+      {
+        "name": "h_tt_pmethod",
+        "type": "string",
+        "description": "Matches the HTTP method from a request URL."
+      },
+      {
+        "name": "priority",
+        "type": "integer",
+        "description": "The priority of the sampling rule."
+      },
+      {
+        "name": "reservoir_size",
+        "type": "integer",
+        "description": "A fixed number of matching requests to instrument per second, prior to applying the fixed rate. The reservoir is not used directly by services, but applies to all services using the rule collectively."
+      },
+      {
+        "name": "resource_arn",
+        "type": "string",
+        "description": "Matches the ARN of the AWS resource on which the service runs."
       },
       {
         "name": "rule_arn",
@@ -144,21 +95,24 @@ Creates, updates, deletes or gets a <code>sampling_rule</code> resource or lists
         "description": "The ARN of the sampling rule. Specify a rule by either name or ARN, but not both."
       },
       {
-        "name": "tags",
-        "type": "array",
-        "description": "An array of key-value pairs to apply to this resource.",
-        "children": [
-          {
-            "name": "key",
-            "type": "string",
-            "description": "The key name of the tag."
-          },
-          {
-            "name": "value",
-            "type": "string",
-            "description": "The value for the tag."
-          }
-        ]
+        "name": "service_name",
+        "type": "string",
+        "description": "Matches the name that the service uses to identify itself in segments."
+      },
+      {
+        "name": "service_type",
+        "type": "string",
+        "description": "Matches the origin that the service uses to identify its type in segments."
+      },
+      {
+        "name": "url_path",
+        "type": "string",
+        "description": "Matches the path from a request URL."
+      },
+      {
+        "name": "version",
+        "type": "integer",
+        "description": "The version of the sampling rule format (1)"
       }
     ]
   },
@@ -476,36 +430,44 @@ resources:
     props:
       - name: sampling_rule
         value:
-          sampling_rule: null
-          sampling_rule_record:
-            created_at: '{{ created_at }}'
-            modified_at: '{{ modified_at }}'
-            sampling_rule: null
-          sampling_rule_update:
-            attributes: {}
-            fixed_rate: null
-            host: '{{ host }}'
-            h_tt_pmethod: '{{ h_tt_pmethod }}'
-            priority: '{{ priority }}'
-            reservoir_size: '{{ reservoir_size }}'
-            resource_arn: '{{ resource_arn }}'
-            rule_arn: '{{ rule_arn }}'
-            rule_name: '{{ rule_name }}'
-            service_name: '{{ service_name }}'
-            service_type: '{{ service_type }}'
-            url_path: '{{ url_path }}'
-          rule_name: null
-          tags:
-            - key: '{{ key }}'
-              value: '{{ value }}'
+          attributes: {}
+          fixed_rate: null
+          host: '{{ host }}'
+          h_tt_pmethod: '{{ h_tt_pmethod }}'
+          priority: '{{ priority }}'
+          reservoir_size: '{{ reservoir_size }}'
+          resource_arn: '{{ resource_arn }}'
+          rule_arn: '{{ rule_arn }}'
+          rule_name: '{{ rule_name }}'
+          service_name: '{{ service_name }}'
+          service_type: '{{ service_type }}'
+          url_path: '{{ url_path }}'
+          version: '{{ version }}'
       - name: sampling_rule_record
-        value: null
+        value:
+          created_at: '{{ created_at }}'
+          modified_at: '{{ modified_at }}'
+          sampling_rule: null
       - name: sampling_rule_update
-        value: null
+        value:
+          attributes: {}
+          fixed_rate: null
+          host: '{{ host }}'
+          h_tt_pmethod: '{{ h_tt_pmethod }}'
+          priority: '{{ priority }}'
+          reservoir_size: '{{ reservoir_size }}'
+          resource_arn: '{{ resource_arn }}'
+          rule_arn: null
+          rule_name: null
+          service_name: '{{ service_name }}'
+          service_type: '{{ service_type }}'
+          url_path: '{{ url_path }}'
       - name: rule_name
         value: null
       - name: tags
-        value: null`}</CodeBlock>
+        value:
+          - key: '{{ key }}'
+            value: '{{ value }}'`}</CodeBlock>
 
 </TabItem>
 </Tabs>
diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 92e86d2ac..b200f504a 100644
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -112,7 +112,11 @@ const config = {
   projectName: `stackql-provider-${providerName}`, // Usually your repo name.
 
   onBrokenLinks: 'warn',
-  onBrokenMarkdownLinks: 'warn',
+  markdown: {
+    hooks: {
+      onBrokenMarkdownLinks: 'warn',
+    },
+  },
 
   // Even if you don't use internationalization, you can use this field to set
   // useful metadata like html lang. For example, if your site is Chinese, you
diff --git a/website/package.json b/website/package.json
index 8f57f6c2f..6b73865a4 100644
--- a/website/package.json
+++ b/website/package.json
@@ -14,8 +14,9 @@
     "write-heading-ids": "docusaurus write-heading-ids"
   },
   "dependencies": {
-    "@docusaurus/core": "3.8.1",
-    "@docusaurus/preset-classic": "3.8.1",
+    "@docusaurus/core": "^3.10.2",
+    "@docusaurus/faster": "^3.10.2",
+    "@docusaurus/preset-classic": "^3.10.2",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
     "@iconify/react": "^6.0.0",
@@ -29,8 +30,8 @@
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "3.8.1",
-    "@docusaurus/types": "3.8.1"
+    "@docusaurus/module-type-aliases": "^3.10.2",
+    "@docusaurus/types": "^3.10.2"
   },
   "browserslist": {
     "production": [
diff --git a/website/yarn.lock b/website/yarn.lock
index 00f19000a..45c495b6c 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -2,163 +2,186 @@
 # yarn lockfile v1
 
 
-"@algolia/abtesting@1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@algolia/abtesting/-/abtesting-1.3.0.tgz#3fade769bf5b03244baaee8034b83e2b49f8e86c"
-  integrity sha512-KqPVLdVNfoJzX5BKNGM9bsW8saHeyax8kmPFXul5gejrSPN3qss7PgsFH5mMem7oR8tvjvNkia97ljEYPYCN8Q==
-  dependencies:
-    "@algolia/client-common" "5.37.0"
-    "@algolia/requester-browser-xhr" "5.37.0"
-    "@algolia/requester-fetch" "5.37.0"
-    "@algolia/requester-node-http" "5.37.0"
-
-"@algolia/autocomplete-core@1.17.9":
-  version "1.17.9"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.17.9.tgz#83374c47dc72482aa45d6b953e89377047f0dcdc"
-  integrity sha512-O7BxrpLDPJWWHv/DLA9DRFWs+iY1uOJZkqUwjS5HSZAGcl0hIVCQ97LTLewiZmZ402JYUrun+8NqFP+hCknlbQ==
-  dependencies:
-    "@algolia/autocomplete-plugin-algolia-insights" "1.17.9"
-    "@algolia/autocomplete-shared" "1.17.9"
-
-"@algolia/autocomplete-plugin-algolia-insights@1.17.9":
-  version "1.17.9"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.17.9.tgz#74c86024d09d09e8bfa3dd90b844b77d9f9947b6"
-  integrity sha512-u1fEHkCbWF92DBeB/KHeMacsjsoI0wFhjZtlCq2ddZbAehshbZST6Hs0Avkc0s+4UyBGbMDnSuXHLuvRWK5iDQ==
-  dependencies:
-    "@algolia/autocomplete-shared" "1.17.9"
-
-"@algolia/autocomplete-preset-algolia@1.17.9":
-  version "1.17.9"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.17.9.tgz#911f3250544eb8ea4096fcfb268f156b085321b5"
-  integrity sha512-Na1OuceSJeg8j7ZWn5ssMu/Ax3amtOwk76u4h5J4eK2Nx2KB5qt0Z4cOapCsxot9VcEN11ADV5aUSlQF4RhGjQ==
-  dependencies:
-    "@algolia/autocomplete-shared" "1.17.9"
-
-"@algolia/autocomplete-shared@1.17.9":
-  version "1.17.9"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.17.9.tgz#5f38868f7cb1d54b014b17a10fc4f7e79d427fa8"
-  integrity sha512-iDf05JDQ7I0b7JEA/9IektxN/80a2MZ1ToohfmNS3rfeuQnIKI3IJlIafD0xu4StbtQTghx9T3Maa97ytkXenQ==
-
-"@algolia/client-abtesting@5.37.0":
-  version "5.37.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-abtesting/-/client-abtesting-5.37.0.tgz#37df3674ccc37dfb0aa4cbfea42002bb136fb909"
-  integrity sha512-Dp2Zq+x9qQFnuiQhVe91EeaaPxWBhzwQ6QnznZQnH9C1/ei3dvtmAFfFeaTxM6FzfJXDLvVnaQagTYFTQz3R5g==
-  dependencies:
-    "@algolia/client-common" "5.37.0"
-    "@algolia/requester-browser-xhr" "5.37.0"
-    "@algolia/requester-fetch" "5.37.0"
-    "@algolia/requester-node-http" "5.37.0"
-
-"@algolia/client-analytics@5.37.0":
-  version "5.37.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-5.37.0.tgz#6fb4d748e1af43d8bc9f955d73d98205ce1c1ee5"
-  integrity sha512-wyXODDOluKogTuZxRII6mtqhAq4+qUR3zIUJEKTiHLe8HMZFxfUEI4NO2qSu04noXZHbv/sRVdQQqzKh12SZuQ==
-  dependencies:
-    "@algolia/client-common" "5.37.0"
-    "@algolia/requester-browser-xhr" "5.37.0"
-    "@algolia/requester-fetch" "5.37.0"
-    "@algolia/requester-node-http" "5.37.0"
-
-"@algolia/client-common@5.37.0":
-  version "5.37.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-5.37.0.tgz#f7ca097c4bae44e4ea365ee8f420693d0005c98e"
-  integrity sha512-GylIFlPvLy9OMgFG8JkonIagv3zF+Dx3H401Uo2KpmfMVBBJiGfAb9oYfXtplpRMZnZPxF5FnkWaI/NpVJMC+g==
-
-"@algolia/client-insights@5.37.0":
-  version "5.37.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-insights/-/client-insights-5.37.0.tgz#f4f4011fc89bc0b2dfc384acc3c6fb38f633f4ec"
-  integrity sha512-T63afO2O69XHKw2+F7mfRoIbmXWGzgpZxgOFAdP3fR4laid7pWBt20P4eJ+Zn23wXS5kC9P2K7Bo3+rVjqnYiw==
-  dependencies:
-    "@algolia/client-common" "5.37.0"
-    "@algolia/requester-browser-xhr" "5.37.0"
-    "@algolia/requester-fetch" "5.37.0"
-    "@algolia/requester-node-http" "5.37.0"
-
-"@algolia/client-personalization@5.37.0":
-  version "5.37.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-5.37.0.tgz#c1688db681623b189f353599815a118033ceebb5"
-  integrity sha512-1zOIXM98O9zD8bYDCJiUJRC/qNUydGHK/zRK+WbLXrW1SqLFRXECsKZa5KoG166+o5q5upk96qguOtE8FTXDWQ==
-  dependencies:
-    "@algolia/client-common" "5.37.0"
-    "@algolia/requester-browser-xhr" "5.37.0"
-    "@algolia/requester-fetch" "5.37.0"
-    "@algolia/requester-node-http" "5.37.0"
-
-"@algolia/client-query-suggestions@5.37.0":
-  version "5.37.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-query-suggestions/-/client-query-suggestions-5.37.0.tgz#fa514df8d36fb548258c712f3ba6f97eb84ebb87"
-  integrity sha512-31Nr2xOLBCYVal+OMZn1rp1H4lPs1914Tfr3a34wU/nsWJ+TB3vWjfkUUuuYhWoWBEArwuRzt3YNLn0F/KRVkg==
-  dependencies:
-    "@algolia/client-common" "5.37.0"
-    "@algolia/requester-browser-xhr" "5.37.0"
-    "@algolia/requester-fetch" "5.37.0"
-    "@algolia/requester-node-http" "5.37.0"
-
-"@algolia/client-search@5.37.0":
-  version "5.37.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-5.37.0.tgz#38c7110d96fbbbda7b7fb0578a18b8cad3c25af2"
-  integrity sha512-DAFVUvEg+u7jUs6BZiVz9zdaUebYULPiQ4LM2R4n8Nujzyj7BZzGr2DCd85ip4p/cx7nAZWKM8pLcGtkTRTdsg==
-  dependencies:
-    "@algolia/client-common" "5.37.0"
-    "@algolia/requester-browser-xhr" "5.37.0"
-    "@algolia/requester-fetch" "5.37.0"
-    "@algolia/requester-node-http" "5.37.0"
+"@11ty/gray-matter@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@11ty/gray-matter/-/gray-matter-1.0.0.tgz#35ee04d76b870893c053f64f659c923a7a9db2d7"
+  integrity sha512-7mJJl+wf1AByoT0PknQiQfOPnVNT4fevGrUBVWO4HXsnYn1aQPyRyrELYrNUFleUBM++KzMKN6QaxHPk0t/6/g==
+  dependencies:
+    js-yaml "^4.1.0"
+    kind-of "^6.0.3"
+    section-matter "^1.0.0"
+    strip-bom-string "^1.0.0"
+
+"@algolia/abtesting@1.22.0":
+  version "1.22.0"
+  resolved "https://registry.yarnpkg.com/@algolia/abtesting/-/abtesting-1.22.0.tgz#7537637f52d2fe00b3714fe2d5ce8cb856be35ff"
+  integrity sha512-BFR6zNowNKcY7Ou7TaJc9QWexES4YKPbmf/OTFofpdsdhz4x6q0lbxp3duO0EHnyrN7rE4ba/TSXuY+BDGu4+g==
+  dependencies:
+    "@algolia/client-common" "5.56.0"
+    "@algolia/requester-browser-xhr" "5.56.0"
+    "@algolia/requester-fetch" "5.56.0"
+    "@algolia/requester-node-http" "5.56.0"
+
+"@algolia/autocomplete-core@1.19.2":
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.19.2.tgz#702df67a08cb3cfe8c33ee1111ef136ec1a9e232"
+  integrity sha512-mKv7RyuAzXvwmq+0XRK8HqZXt9iZ5Kkm2huLjgn5JoCPtDy+oh9yxUMfDDaVCw0oyzZ1isdJBc7l9nuCyyR7Nw==
+  dependencies:
+    "@algolia/autocomplete-plugin-algolia-insights" "1.19.2"
+    "@algolia/autocomplete-shared" "1.19.2"
+
+"@algolia/autocomplete-core@^1.19.2":
+  version "1.19.9"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.19.9.tgz#bbed371e56aeea4a31a3af239f16733e1b8aedca"
+  integrity sha512-4U2JKLMWlDu0CotYyUkWakDxr8AIav3QtIUXXRpfavYN29aVWfzlwJp9T0rPKEf/dO2QCPAUc0Kq1Tj1GJxo2A==
+  dependencies:
+    "@algolia/autocomplete-plugin-algolia-insights" "1.19.9"
+    "@algolia/autocomplete-shared" "1.19.9"
+
+"@algolia/autocomplete-plugin-algolia-insights@1.19.2":
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.19.2.tgz#3584b625b9317e333d1ae43664d02358e175c52d"
+  integrity sha512-TjxbcC/r4vwmnZaPwrHtkXNeqvlpdyR+oR9Wi2XyfORkiGkLTVhX2j+O9SaCCINbKoDfc+c2PB8NjfOnz7+oKg==
+  dependencies:
+    "@algolia/autocomplete-shared" "1.19.2"
+
+"@algolia/autocomplete-plugin-algolia-insights@1.19.9":
+  version "1.19.9"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.19.9.tgz#f799737d13bf0c4ec8421619c7107fa05c836535"
+  integrity sha512-6mExC6X7762s2SV3eJy3QOkB8bdMmnUhQ2agvGVDuzwoGyr3PquGSY/0vPQXCfiAiCaXUz1rXn+lwghgSi0l0w==
+  dependencies:
+    "@algolia/autocomplete-shared" "1.19.9"
+
+"@algolia/autocomplete-shared@1.19.2":
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.19.2.tgz#c0b7b8dc30a5c65b70501640e62b009535e4578f"
+  integrity sha512-jEazxZTVD2nLrC+wYlVHQgpBoBB5KPStrJxLzsIFl6Kqd1AlG9sIAGl39V5tECLpIQzB3Qa2T6ZPJ1ChkwMK/w==
+
+"@algolia/autocomplete-shared@1.19.9":
+  version "1.19.9"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.19.9.tgz#c5b05e23c71027e4e45a301f286593dffdcdfbdf"
+  integrity sha512-YosP9Uoek6y/Ur1r1qeogk4biMe/hzkyNcgMCciw0//3XpCM7VlYLSHnyt/vOnEOGhCCc0+3v+unEiH6zz+Z1A==
+
+"@algolia/client-abtesting@5.56.0":
+  version "5.56.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-abtesting/-/client-abtesting-5.56.0.tgz#25be0db6f97ae91dfdbaffbe9eae99e963310891"
+  integrity sha512-7r4Z3NC7yU1oAQVWJNA2HX7tX481F3pJvCGyLIXiTdBcthz4Q/o21jwcMYDFkuI92UWTNBQQmHYgwHo1zS5dzg==
+  dependencies:
+    "@algolia/client-common" "5.56.0"
+    "@algolia/requester-browser-xhr" "5.56.0"
+    "@algolia/requester-fetch" "5.56.0"
+    "@algolia/requester-node-http" "5.56.0"
+
+"@algolia/client-analytics@5.56.0":
+  version "5.56.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-5.56.0.tgz#bcace36358cda26ca285f3a100544db0ce29aabe"
+  integrity sha512-avmjXQSq+jadFO8Xl2em05/uQdQnEmHsJyOAdVbZkmVgpMfxL12aJwVVfGNwYr9nulcpuJN1X0lTaQ5wxuNGcA==
+  dependencies:
+    "@algolia/client-common" "5.56.0"
+    "@algolia/requester-browser-xhr" "5.56.0"
+    "@algolia/requester-fetch" "5.56.0"
+    "@algolia/requester-node-http" "5.56.0"
+
+"@algolia/client-common@5.56.0":
+  version "5.56.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-5.56.0.tgz#6190221a7091dfa1a0e0a3b5964e92b1b59968ba"
+  integrity sha512-v2TPStUhY//ripPjIVclZ8AWc7DEGooXULZGFlFu37zNatgHjw34oZZ+OSbbc/YHO+xZwPl62I1k8xH1m4S2eg==
+
+"@algolia/client-insights@5.56.0":
+  version "5.56.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-insights/-/client-insights-5.56.0.tgz#2ff179c8924ff188d4604e32aef645c709cc76be"
+  integrity sha512-P0ehROpM4Sem3Sqo5x2cKPgj67D3G3jy0rh1Amwkcvsfr6tkvIcdCmerieanqTF7NxUMPNFLkpIFeMO8Rpa50w==
+  dependencies:
+    "@algolia/client-common" "5.56.0"
+    "@algolia/requester-browser-xhr" "5.56.0"
+    "@algolia/requester-fetch" "5.56.0"
+    "@algolia/requester-node-http" "5.56.0"
+
+"@algolia/client-personalization@5.56.0":
+  version "5.56.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-5.56.0.tgz#64f8197c46c60306a115bc4024f6ebce2d8140d8"
+  integrity sha512-SXK3Vn3WVxyzbm31oePZBJkp1wpOyuWdd4B/Pv7n0aXDxmeSWhC1R1FC1517mMrFAIaPH4Rt0x6RUe7ZNjz8FA==
+  dependencies:
+    "@algolia/client-common" "5.56.0"
+    "@algolia/requester-browser-xhr" "5.56.0"
+    "@algolia/requester-fetch" "5.56.0"
+    "@algolia/requester-node-http" "5.56.0"
+
+"@algolia/client-query-suggestions@5.56.0":
+  version "5.56.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-query-suggestions/-/client-query-suggestions-5.56.0.tgz#e4a28bc249e9c69f0b5ef280b72a12e32e8c53c8"
+  integrity sha512-5+ZdX8garFnmycnZgKhtXHePEaLj5zqDxI/0lkhhluzCcvTn0/PvvTirTg8hHYetQHvn7GDyeAiqTAieMvMW4A==
+  dependencies:
+    "@algolia/client-common" "5.56.0"
+    "@algolia/requester-browser-xhr" "5.56.0"
+    "@algolia/requester-fetch" "5.56.0"
+    "@algolia/requester-node-http" "5.56.0"
+
+"@algolia/client-search@5.56.0":
+  version "5.56.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-5.56.0.tgz#66b19d5382bf47a16105817b78e372f5e9039508"
+  integrity sha512-+mKUdYvqOi0BcvpAEyCEw49vSBptufIcfibtHz2bdr1pI789M46Yt0uQEk/sxtK3teh71OQvVFHaTDzShUWewQ==
+  dependencies:
+    "@algolia/client-common" "5.56.0"
+    "@algolia/requester-browser-xhr" "5.56.0"
+    "@algolia/requester-fetch" "5.56.0"
+    "@algolia/requester-node-http" "5.56.0"
 
 "@algolia/events@^4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@algolia/events/-/events-4.0.1.tgz#fd39e7477e7bc703d7f893b556f676c032af3950"
   integrity sha512-FQzvOCgoFXAbf5Y6mYozw2aj5KCJoA3m4heImceldzPSMbdyS4atVjJzXKMsfX3wnZTFYwkkt8/z8UesLHlSBQ==
 
-"@algolia/ingestion@1.37.0":
-  version "1.37.0"
-  resolved "https://registry.yarnpkg.com/@algolia/ingestion/-/ingestion-1.37.0.tgz#bb6016e656c68014050814abf130e103f977794e"
-  integrity sha512-pkCepBRRdcdd7dTLbFddnu886NyyxmhgqiRcHHaDunvX03Ij4WzvouWrQq7B7iYBjkMQrLS8wQqSP0REfA4W8g==
+"@algolia/ingestion@1.56.0":
+  version "1.56.0"
+  resolved "https://registry.yarnpkg.com/@algolia/ingestion/-/ingestion-1.56.0.tgz#1b3c41b8f1c5a2d309610683e3d1b99f962d92df"
+  integrity sha512-9g/zj+AZx5moFcdFIrYQoVrueXivjUcc3MQHtCYT8WhIuk1lUh1AyEhvJCS0XBZld09cLvd1AZ3BvDBpVpX2UA==
   dependencies:
-    "@algolia/client-common" "5.37.0"
-    "@algolia/requester-browser-xhr" "5.37.0"
-    "@algolia/requester-fetch" "5.37.0"
-    "@algolia/requester-node-http" "5.37.0"
+    "@algolia/client-common" "5.56.0"
+    "@algolia/requester-browser-xhr" "5.56.0"
+    "@algolia/requester-fetch" "5.56.0"
+    "@algolia/requester-node-http" "5.56.0"
 
-"@algolia/monitoring@1.37.0":
-  version "1.37.0"
-  resolved "https://registry.yarnpkg.com/@algolia/monitoring/-/monitoring-1.37.0.tgz#6d20c220d648db8faea45679350f1516917cc13d"
-  integrity sha512-fNw7pVdyZAAQQCJf1cc/ih4fwrRdQSgKwgor4gchsI/Q/ss9inmC6bl/69jvoRSzgZS9BX4elwHKdo0EfTli3w==
+"@algolia/monitoring@1.56.0":
+  version "1.56.0"
+  resolved "https://registry.yarnpkg.com/@algolia/monitoring/-/monitoring-1.56.0.tgz#11cc9198e778466eafde5a12d02fd02cfcbd1710"
+  integrity sha512-Qf3Sr6f9A9uxCZUf3MXS0d2b877uYzEB5yxqpVGXAhcJnBCQjrRRon0KvefpGkxy+BshrIJs96OUoMtGqXTFDA==
   dependencies:
-    "@algolia/client-common" "5.37.0"
-    "@algolia/requester-browser-xhr" "5.37.0"
-    "@algolia/requester-fetch" "5.37.0"
-    "@algolia/requester-node-http" "5.37.0"
+    "@algolia/client-common" "5.56.0"
+    "@algolia/requester-browser-xhr" "5.56.0"
+    "@algolia/requester-fetch" "5.56.0"
+    "@algolia/requester-node-http" "5.56.0"
 
-"@algolia/recommend@5.37.0":
-  version "5.37.0"
-  resolved "https://registry.yarnpkg.com/@algolia/recommend/-/recommend-5.37.0.tgz#dd5e814f30bbb92395902e120fdb28a120b91341"
-  integrity sha512-U+FL5gzN2ldx3TYfQO5OAta2TBuIdabEdFwD5UVfWPsZE5nvOKkc/6BBqP54Z/adW/34c5ZrvvZhlhNTZujJXQ==
+"@algolia/recommend@5.56.0":
+  version "5.56.0"
+  resolved "https://registry.yarnpkg.com/@algolia/recommend/-/recommend-5.56.0.tgz#6c96193cb91cf5c9f3c884fdf064e15dfe6cb742"
+  integrity sha512-GXWG1rWc5wu8hY4N33Y3b6ernY6sAdAvmKWN/zHAiACOx40WnpG0TVX5YazCAr/9gOYGInSiM2A0y2jy2xbiDA==
   dependencies:
-    "@algolia/client-common" "5.37.0"
-    "@algolia/requester-browser-xhr" "5.37.0"
-    "@algolia/requester-fetch" "5.37.0"
-    "@algolia/requester-node-http" "5.37.0"
+    "@algolia/client-common" "5.56.0"
+    "@algolia/requester-browser-xhr" "5.56.0"
+    "@algolia/requester-fetch" "5.56.0"
+    "@algolia/requester-node-http" "5.56.0"
 
-"@algolia/requester-browser-xhr@5.37.0":
-  version "5.37.0"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-5.37.0.tgz#8851ab846d8005055c36a59422161ebe1594ae48"
-  integrity sha512-Ao8GZo8WgWFABrU7iq+JAftXV0t+UcOtCDL4mzHHZ+rQeTTf1TZssr4d0vIuoqkVNnKt9iyZ7T4lQff4ydcTrw==
+"@algolia/requester-browser-xhr@5.56.0":
+  version "5.56.0"
+  resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-5.56.0.tgz#b1f4705c53f1602ec14339999bfbf0e3e9a7bbc8"
+  integrity sha512-7t24cBxaInS3mZb7ddEaZT/tp6q+/aR4YttsQVyP1/i+LmwPR34atO35KjaLFCcRVrlP7sYOAqkCfg6lIRB+ew==
   dependencies:
-    "@algolia/client-common" "5.37.0"
+    "@algolia/client-common" "5.56.0"
 
-"@algolia/requester-fetch@5.37.0":
-  version "5.37.0"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-fetch/-/requester-fetch-5.37.0.tgz#93602fdc9a59b41ecd53768c53c11cddb0db846a"
-  integrity sha512-H7OJOXrFg5dLcGJ22uxx8eiFId0aB9b0UBhoOi4SMSuDBe6vjJJ/LeZyY25zPaSvkXNBN3vAM+ad6M0h6ha3AA==
+"@algolia/requester-fetch@5.56.0":
+  version "5.56.0"
+  resolved "https://registry.yarnpkg.com/@algolia/requester-fetch/-/requester-fetch-5.56.0.tgz#03f0aeea08efc991ab9f0663f1ea63df720fd9ba"
+  integrity sha512-R7ePHgVYmDFjZpvrsVAfbDz/d4RxKAYZ5/vgLfIsCVRZRryjWl/3INOxpOICzitehQ5FjNtNjcLQTrmHPTcHBQ==
   dependencies:
-    "@algolia/client-common" "5.37.0"
+    "@algolia/client-common" "5.56.0"
 
-"@algolia/requester-node-http@5.37.0":
-  version "5.37.0"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-5.37.0.tgz#83da1b52f3ee86f262a5d4b2a88a74db665211c2"
-  integrity sha512-npZ9aeag4SGTx677eqPL3rkSPlQrnzx/8wNrl1P7GpWq9w/eTmRbOq+wKrJ2r78idlY0MMgmY/mld2tq6dc44g==
+"@algolia/requester-node-http@5.56.0":
+  version "5.56.0"
+  resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-5.56.0.tgz#238bfa98ed145e261c1db7e133bee6390ba58c94"
+  integrity sha512-PIOUXlSnrqM0S+WOgDRb4RzotydJH7ZoT6tOyL7tAO7qJOfvX5wsEW8Pe+PMKMwvuI4/gIyK9cg2H7lJXqnc4Q==
   dependencies:
-    "@algolia/client-common" "5.37.0"
+    "@algolia/client-common" "5.56.0"
 
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.27.1":
   version "7.27.1"
@@ -1019,13 +1042,6 @@
     "@babel/plugin-transform-modules-commonjs" "^7.27.1"
     "@babel/plugin-transform-typescript" "^7.27.1"
 
-"@babel/runtime-corejs3@^7.25.9":
-  version "7.28.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.28.4.tgz#c25be39c7997ce2f130d70b9baecb8ed94df93fa"
-  integrity sha512-h7iEYiW4HebClDEhtvFObtPmIvrd1SSfpI9EhOeKk4CtIK/ngBWFpuhCzhdmRKtg71ylcue+9I6dv54XYO1epQ==
-  dependencies:
-    core-js-pure "^3.43.0"
-
 "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.25.9", "@babel/runtime@^7.28.3", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7":
   version "7.28.4"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.4.tgz#a70226016fabe25c5783b2f22d3e1c9bc5ca3326"
@@ -1426,25 +1442,29 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
-"@docsearch/css@3.9.0":
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-3.9.0.tgz#3bc29c96bf024350d73b0cfb7c2a7b71bf251cd5"
-  integrity sha512-cQbnVbq0rrBwNAKegIac/t6a8nWoUAn8frnkLFW6YARaRmAQr5/Eoe6Ln2fqkUCZ40KpdrKbpSAmgrkviOxuWA==
+"@docsearch/core@4.7.0":
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/@docsearch/core/-/core-4.7.0.tgz#914962191f2718b9caa48f4cbe46c0720fdc055d"
+  integrity sha512-p/9xVKmPDj3FPvMfPf5naVO3Ej8SCbcUugGvx1+8GgkuBNbqxqN2Irx3WLBv8VY0jH7XpRwKWdlmjXLZsmTLsg==
 
-"@docsearch/react@^3.9.0":
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-3.9.0.tgz#d0842b700c3ee26696786f3c8ae9f10c1a3f0db3"
-  integrity sha512-mb5FOZYZIkRQ6s/NWnM98k879vu5pscWqTLubLFBO87igYYT4VzVazh4h5o/zCvTIZgEt3PvsCOMOswOUo9yHQ==
+"@docsearch/css@4.7.0":
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-4.7.0.tgz#d6d93c6ddf5e813a3ea09da719e150c222693a5c"
+  integrity sha512-Sk5xkdRFeE7PeWjG9l4AfTwdvMfr9wHiwNNCpHXT4v4SNyNMKdHGvEILc31BgaVFGDDNbv5u/a73tofRiwbEZw==
+
+"@docsearch/react@^3.9.0 || ^4.3.2":
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-4.7.0.tgz#8e7d77c34d19755f98d225a3413eddf605658d70"
+  integrity sha512-x6oedjJ8O8/pIDBsMo5Orca3/6cQCz616/CwthVe68l43mqnj2lrJ9kFQITBqy8hMsS3nWeBWFoVO5dJ1DCFKA==
   dependencies:
-    "@algolia/autocomplete-core" "1.17.9"
-    "@algolia/autocomplete-preset-algolia" "1.17.9"
-    "@docsearch/css" "3.9.0"
-    algoliasearch "^5.14.2"
+    "@algolia/autocomplete-core" "1.19.2"
+    "@docsearch/core" "4.7.0"
+    "@docsearch/css" "4.7.0"
 
-"@docusaurus/babel@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/babel/-/babel-3.8.1.tgz#db329ac047184214e08e2dbc809832c696c18506"
-  integrity sha512-3brkJrml8vUbn9aeoZUlJfsI/GqyFcDgQJwQkmBtclJgWDEQBKKeagZfOgx0WfUQhagL1sQLNW0iBdxnI863Uw==
+"@docusaurus/babel@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/babel/-/babel-3.10.2.tgz#4d5f8ac4d16bfe26c06f256687831787edb46e8a"
+  integrity sha512-aJ1hpGyvfkte3dDAfNbWM4biW4yWZBVz7TIGLZP+v+tWOBgxX3e0N5ZIXHIvmfNNXTI77pcHUx3KmtOk05Ze3Q==
   dependencies:
     "@babel/core" "^7.25.9"
     "@babel/generator" "^7.25.9"
@@ -1454,25 +1474,24 @@
     "@babel/preset-react" "^7.25.9"
     "@babel/preset-typescript" "^7.25.9"
     "@babel/runtime" "^7.25.9"
-    "@babel/runtime-corejs3" "^7.25.9"
     "@babel/traverse" "^7.25.9"
-    "@docusaurus/logger" "3.8.1"
-    "@docusaurus/utils" "3.8.1"
+    "@docusaurus/logger" "3.10.2"
+    "@docusaurus/utils" "3.10.2"
     babel-plugin-dynamic-import-node "^2.3.3"
     fs-extra "^11.1.1"
     tslib "^2.6.0"
 
-"@docusaurus/bundler@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/bundler/-/bundler-3.8.1.tgz#e2b11d615f09a6e470774bb36441b8d06736b94c"
-  integrity sha512-/z4V0FRoQ0GuSLToNjOSGsk6m2lQUG4FRn8goOVoZSRsTrU8YR2aJacX5K3RG18EaX9b+52pN4m1sL3MQZVsQA==
+"@docusaurus/bundler@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/bundler/-/bundler-3.10.2.tgz#323492eb0550b6a7f6e5fa6b9877cdb2c53b1be3"
+  integrity sha512-i0ZNcy0f0WhaOlYVgzLsWhIoEXO9kS3HRoKPtgE6vQtZUq7arKZaYdNBudr3mqCmd+TyOkwtwfHgs1ENj07r5g==
   dependencies:
     "@babel/core" "^7.25.9"
-    "@docusaurus/babel" "3.8.1"
-    "@docusaurus/cssnano-preset" "3.8.1"
-    "@docusaurus/logger" "3.8.1"
-    "@docusaurus/types" "3.8.1"
-    "@docusaurus/utils" "3.8.1"
+    "@docusaurus/babel" "3.10.2"
+    "@docusaurus/cssnano-preset" "3.10.2"
+    "@docusaurus/logger" "3.10.2"
+    "@docusaurus/types" "3.10.2"
+    "@docusaurus/utils" "3.10.2"
     babel-loader "^9.2.1"
     clean-css "^5.3.3"
     copy-webpack-plugin "^11.0.0"
@@ -1490,20 +1509,20 @@
     tslib "^2.6.0"
     url-loader "^4.1.1"
     webpack "^5.95.0"
-    webpackbar "^6.0.1"
-
-"@docusaurus/core@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-3.8.1.tgz#c22e47c16a22cb7d245306c64bc54083838ff3db"
-  integrity sha512-ENB01IyQSqI2FLtOzqSI3qxG2B/jP4gQPahl2C3XReiLebcVh5B5cB9KYFvdoOqOWPyr5gXK4sjgTKv7peXCrA==
-  dependencies:
-    "@docusaurus/babel" "3.8.1"
-    "@docusaurus/bundler" "3.8.1"
-    "@docusaurus/logger" "3.8.1"
-    "@docusaurus/mdx-loader" "3.8.1"
-    "@docusaurus/utils" "3.8.1"
-    "@docusaurus/utils-common" "3.8.1"
-    "@docusaurus/utils-validation" "3.8.1"
+    webpackbar "^7.0.0"
+
+"@docusaurus/core@3.10.2", "@docusaurus/core@^3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-3.10.2.tgz#349cae728fc3769b3f8aef4cf538ccb79aace8d0"
+  integrity sha512-EYByj6nk+aD9KeVxV6Hmo2/nAAT79P21Y82ycTBOBtrmqilloIbIEhgL2/8Xpt2Jz/pgNqHAwyusOGwmbKeJmA==
+  dependencies:
+    "@docusaurus/babel" "3.10.2"
+    "@docusaurus/bundler" "3.10.2"
+    "@docusaurus/logger" "3.10.2"
+    "@docusaurus/mdx-loader" "3.10.2"
+    "@docusaurus/utils" "3.10.2"
+    "@docusaurus/utils-common" "3.10.2"
+    "@docusaurus/utils-validation" "3.10.2"
     boxen "^6.2.1"
     chalk "^4.1.2"
     chokidar "^3.5.3"
@@ -1511,11 +1530,11 @@
     combine-promises "^1.1.0"
     commander "^5.1.0"
     core-js "^3.31.1"
-    detect-port "^1.5.1"
+    detect-port "^2.1.0"
     escape-html "^1.0.3"
     eta "^2.2.0"
     eval "^0.1.8"
-    execa "5.1.1"
+    execa "^5.1.1"
     fs-extra "^11.1.1"
     html-tags "^3.3.1"
     html-webpack-plugin "^5.6.0"
@@ -1526,46 +1545,62 @@
     prompts "^2.4.2"
     react-helmet-async "npm:@slorber/react-helmet-async@1.3.0"
     react-loadable "npm:@docusaurus/react-loadable@6.0.0"
-    react-loadable-ssr-addon-v5-slorber "^1.0.1"
+    react-loadable-ssr-addon-v5-slorber "^1.0.3"
     react-router "^5.3.4"
     react-router-config "^5.1.1"
     react-router-dom "^5.3.4"
     semver "^7.5.4"
-    serve-handler "^6.1.6"
+    serve-handler "^6.1.7"
     tinypool "^1.0.2"
     tslib "^2.6.0"
     update-notifier "^6.0.2"
     webpack "^5.95.0"
     webpack-bundle-analyzer "^4.10.2"
-    webpack-dev-server "^4.15.2"
+    webpack-dev-server "^5.2.2"
     webpack-merge "^6.0.1"
 
-"@docusaurus/cssnano-preset@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-3.8.1.tgz#bd55026251a6ab8e2194839a2042458ef9880c44"
-  integrity sha512-G7WyR2N6SpyUotqhGznERBK+x84uyhfMQM2MmDLs88bw4Flom6TY46HzkRkSEzaP9j80MbTN8naiL1fR17WQug==
+"@docusaurus/cssnano-preset@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-3.10.2.tgz#e3ac7e85585f77e8fdef95176ab7c211d1296630"
+  integrity sha512-4gCnHRbJLTloiwfvFAa92tgb2gI4KYhvjfQVYnEaiMO/EgvWfCo1LwytHXen+1oZAN0VAlS0JAPxp3MsvKDa3A==
   dependencies:
     cssnano-preset-advanced "^6.1.2"
     postcss "^8.5.4"
     postcss-sort-media-queries "^5.2.0"
     tslib "^2.6.0"
 
-"@docusaurus/logger@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-3.8.1.tgz#45321b2e2e14695d0dbd8b4104ea7b0fbaa98700"
-  integrity sha512-2wjeGDhKcExEmjX8k1N/MRDiPKXGF2Pg+df/bDDPnnJWHXnVEZxXj80d6jcxp1Gpnksl0hF8t/ZQw9elqj2+ww==
+"@docusaurus/faster@^3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/faster/-/faster-3.10.2.tgz#6cacd14085445d5826990f7525c5df1cf371e04a"
+  integrity sha512-p/5E5/RyHv+QWusJMPN5i3OMJTqTgkhuwzVbB1AReDWTUHXQCmf5mlTFzGiDrWeQWIDOKsuOPn1jJh0s9LUOHA==
+  dependencies:
+    "@docusaurus/types" "3.10.2"
+    "@rspack/core" "^1.7.10"
+    "@swc/core" "^1.15.40"
+    "@swc/html" "^1.15.40"
+    browserslist "^4.24.2"
+    lightningcss "^1.27.0"
+    semver "^7.5.4"
+    swc-loader "^0.2.6"
+    tslib "^2.6.0"
+    webpack "^5.95.0"
+
+"@docusaurus/logger@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-3.10.2.tgz#280bed53d0eb9cdc56e896a155036207910e89c9"
+  integrity sha512-gSEwqtPfCAnC3ZSJY6xL7tcIfgg0vFD39jbv93eakuweyvO2864xR0K+kmKwBhkTCtWRNjuGGnb5rdmkD/ndqw==
   dependencies:
     chalk "^4.1.2"
     tslib "^2.6.0"
 
-"@docusaurus/mdx-loader@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-3.8.1.tgz#74309b3614bbcef1d55fb13e6cc339b7fb000b5f"
-  integrity sha512-DZRhagSFRcEq1cUtBMo4TKxSNo/W6/s44yhr8X+eoXqCLycFQUylebOMPseHi5tc4fkGJqwqpWJLz6JStU9L4w==
+"@docusaurus/mdx-loader@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-3.10.2.tgz#3b4e7ffacff4ed856db2ec4e94c13b0a652d62eb"
+  integrity sha512-9Fd4V/SFjfrVQ0JH5EN0+iPWyFunvTeQE3gfyFeetqPaXMP0OylIjOw16dCuXG4NZJrYdBqwzjh18/h3gRi47w==
   dependencies:
-    "@docusaurus/logger" "3.8.1"
-    "@docusaurus/utils" "3.8.1"
-    "@docusaurus/utils-validation" "3.8.1"
+    "@docusaurus/logger" "3.10.2"
+    "@docusaurus/utils" "3.10.2"
+    "@docusaurus/utils-validation" "3.10.2"
     "@mdx-js/mdx" "^3.0.0"
     "@slorber/remark-comment" "^1.0.0"
     escape-html "^1.0.3"
@@ -1588,12 +1623,12 @@
     vfile "^6.0.1"
     webpack "^5.88.1"
 
-"@docusaurus/module-type-aliases@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-3.8.1.tgz#454de577bd7f50b5eae16db0f76b49ca5e4e281a"
-  integrity sha512-6xhvAJiXzsaq3JdosS7wbRt/PwEPWHr9eM4YNYqVlbgG1hSK3uQDXTVvQktasp3VO6BmfYWPozueLWuj4gB+vg==
+"@docusaurus/module-type-aliases@3.10.2", "@docusaurus/module-type-aliases@^3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-3.10.2.tgz#7c3b940c77d72e71d33a1e76f0e003b418e6163a"
+  integrity sha512-h/I5e4jaAhDHW4vaLENi1i2hnOEnXY1t9R+nnRTbgUl7ymVRzN/HF7dDfj8rKYGj8gfIge+Ef+iYRAMtbGvsrQ==
   dependencies:
-    "@docusaurus/types" "3.8.1"
+    "@docusaurus/types" "3.10.2"
     "@types/history" "^4.7.11"
     "@types/react" "*"
     "@types/react-router-config" "*"
@@ -1601,20 +1636,21 @@
     react-helmet-async "npm:@slorber/react-helmet-async@1.3.0"
     react-loadable "npm:@docusaurus/react-loadable@6.0.0"
 
-"@docusaurus/plugin-content-blog@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-3.8.1.tgz#88d842b562b04cf59df900d9f6984b086f821525"
-  integrity sha512-vNTpMmlvNP9n3hGEcgPaXyvTljanAKIUkuG9URQ1DeuDup0OR7Ltvoc8yrmH+iMZJbcQGhUJF+WjHLwuk8HSdw==
-  dependencies:
-    "@docusaurus/core" "3.8.1"
-    "@docusaurus/logger" "3.8.1"
-    "@docusaurus/mdx-loader" "3.8.1"
-    "@docusaurus/theme-common" "3.8.1"
-    "@docusaurus/types" "3.8.1"
-    "@docusaurus/utils" "3.8.1"
-    "@docusaurus/utils-common" "3.8.1"
-    "@docusaurus/utils-validation" "3.8.1"
+"@docusaurus/plugin-content-blog@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-3.10.2.tgz#2374886ec3d76e8f014e85db8c3c010de6c419be"
+  integrity sha512-0cbEnNKf0InmLkhj/+nVRmqEnWEoOE8Mh+2x1qOXI0qYpCnphq4RXknVJ8BvybKRXqYVvbmdMfiJSup+k4tm5w==
+  dependencies:
+    "@docusaurus/core" "3.10.2"
+    "@docusaurus/logger" "3.10.2"
+    "@docusaurus/mdx-loader" "3.10.2"
+    "@docusaurus/theme-common" "3.10.2"
+    "@docusaurus/types" "3.10.2"
+    "@docusaurus/utils" "3.10.2"
+    "@docusaurus/utils-common" "3.10.2"
+    "@docusaurus/utils-validation" "3.10.2"
     cheerio "1.0.0-rc.12"
+    combine-promises "^1.1.0"
     feed "^4.2.2"
     fs-extra "^11.1.1"
     lodash "^4.17.21"
@@ -1625,20 +1661,20 @@
     utility-types "^3.10.0"
     webpack "^5.88.1"
 
-"@docusaurus/plugin-content-docs@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-3.8.1.tgz#40686a206abb6373bee5638de100a2c312f112a4"
-  integrity sha512-oByRkSZzeGNQByCMaX+kif5Nl2vmtj2IHQI2fWjCfCootsdKZDPFLonhIp5s3IGJO7PLUfe0POyw0Xh/RrGXJA==
-  dependencies:
-    "@docusaurus/core" "3.8.1"
-    "@docusaurus/logger" "3.8.1"
-    "@docusaurus/mdx-loader" "3.8.1"
-    "@docusaurus/module-type-aliases" "3.8.1"
-    "@docusaurus/theme-common" "3.8.1"
-    "@docusaurus/types" "3.8.1"
-    "@docusaurus/utils" "3.8.1"
-    "@docusaurus/utils-common" "3.8.1"
-    "@docusaurus/utils-validation" "3.8.1"
+"@docusaurus/plugin-content-docs@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-3.10.2.tgz#249bbc806437f227b06410ecc771eb67d8910a9a"
+  integrity sha512-Sqwl4FPoZBDrlY8I2VU2H8O0M91CHp9T8ToMSkTZmjvHCif+1laqfXi6sTk8IfyVS/trN5yNjcWd1bFsGB6W5Q==
+  dependencies:
+    "@docusaurus/core" "3.10.2"
+    "@docusaurus/logger" "3.10.2"
+    "@docusaurus/mdx-loader" "3.10.2"
+    "@docusaurus/module-type-aliases" "3.10.2"
+    "@docusaurus/theme-common" "3.10.2"
+    "@docusaurus/types" "3.10.2"
+    "@docusaurus/utils" "3.10.2"
+    "@docusaurus/utils-common" "3.10.2"
+    "@docusaurus/utils-validation" "3.10.2"
     "@types/react-router-config" "^5.0.7"
     combine-promises "^1.1.0"
     fs-extra "^11.1.1"
@@ -1649,142 +1685,141 @@
     utility-types "^3.10.0"
     webpack "^5.88.1"
 
-"@docusaurus/plugin-content-pages@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-3.8.1.tgz#41b684dbd15390b7bb6a627f78bf81b6324511ac"
-  integrity sha512-a+V6MS2cIu37E/m7nDJn3dcxpvXb6TvgdNI22vJX8iUTp8eoMoPa0VArEbWvCxMY/xdC26WzNv4wZ6y0iIni/w==
+"@docusaurus/plugin-content-pages@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-3.10.2.tgz#377c11b36a6a5e0c0c14dd9dea799f986d662ed7"
+  integrity sha512-h5R12sZ/vV9EPiVjvIl9YFCOwkpwXes7dQMYt3EvP6Pphu4amHxxTqWxf08Fl5DR8h+oZMbWpFTNw5vKEYfvzQ==
   dependencies:
-    "@docusaurus/core" "3.8.1"
-    "@docusaurus/mdx-loader" "3.8.1"
-    "@docusaurus/types" "3.8.1"
-    "@docusaurus/utils" "3.8.1"
-    "@docusaurus/utils-validation" "3.8.1"
+    "@docusaurus/core" "3.10.2"
+    "@docusaurus/mdx-loader" "3.10.2"
+    "@docusaurus/types" "3.10.2"
+    "@docusaurus/utils" "3.10.2"
+    "@docusaurus/utils-validation" "3.10.2"
     fs-extra "^11.1.1"
     tslib "^2.6.0"
     webpack "^5.88.1"
 
-"@docusaurus/plugin-css-cascade-layers@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-css-cascade-layers/-/plugin-css-cascade-layers-3.8.1.tgz#cb414b4a82aa60fc64ef2a435ad0105e142a6c71"
-  integrity sha512-VQ47xRxfNKjHS5ItzaVXpxeTm7/wJLFMOPo1BkmoMG4Cuz4nuI+Hs62+RMk1OqVog68Swz66xVPK8g9XTrBKRw==
+"@docusaurus/plugin-css-cascade-layers@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-css-cascade-layers/-/plugin-css-cascade-layers-3.10.2.tgz#54edc6450b0bb95be5990ea416b4c4dc5e6bdde0"
+  integrity sha512-UkdvQby5OQUKWrw3lLnSTJXQ6VETaUVTuPQX9AABtmFm5h+ifEBx1OQ+LN726Q4byuwBf2ElHkf4qU4hTxdvRg==
   dependencies:
-    "@docusaurus/core" "3.8.1"
-    "@docusaurus/types" "3.8.1"
-    "@docusaurus/utils" "3.8.1"
-    "@docusaurus/utils-validation" "3.8.1"
+    "@docusaurus/core" "3.10.2"
+    "@docusaurus/types" "3.10.2"
+    "@docusaurus/utils" "3.10.2"
+    "@docusaurus/utils-validation" "3.10.2"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-debug@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-3.8.1.tgz#45b107e46b627caaae66995f53197ace78af3491"
-  integrity sha512-nT3lN7TV5bi5hKMB7FK8gCffFTBSsBsAfV84/v293qAmnHOyg1nr9okEw8AiwcO3bl9vije5nsUvP0aRl2lpaw==
+"@docusaurus/plugin-debug@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-3.10.2.tgz#2452f258668bb2514085d2d5fff700457c531aad"
+  integrity sha512-8vbZNOSCpnsT57EY6CgN7sgRVmx3KTYwO8Uvo2pbxOyb8tbqAwtT9SslqaQ41HbA1v1hpn5RP7u5s2KvRwAFpQ==
   dependencies:
-    "@docusaurus/core" "3.8.1"
-    "@docusaurus/types" "3.8.1"
-    "@docusaurus/utils" "3.8.1"
+    "@docusaurus/core" "3.10.2"
+    "@docusaurus/types" "3.10.2"
+    "@docusaurus/utils" "3.10.2"
     fs-extra "^11.1.1"
     react-json-view-lite "^2.3.0"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-google-analytics@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-3.8.1.tgz#64a302e62fe5cb6e007367c964feeef7b056764a"
-  integrity sha512-Hrb/PurOJsmwHAsfMDH6oVpahkEGsx7F8CWMjyP/dw1qjqmdS9rcV1nYCGlM8nOtD3Wk/eaThzUB5TSZsGz+7Q==
+"@docusaurus/plugin-google-analytics@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-3.10.2.tgz#7a0375c5a238cd9220166d9be8afc00ba508c55d"
+  integrity sha512-kMHMBK9j4VAtgd5owwrRLRIi0EjkrpXlX7ePj1+y68XfVZV9I1T4S+koPDm+Hfw2TtnyHvh0uNrDvjz+DjQGVA==
   dependencies:
-    "@docusaurus/core" "3.8.1"
-    "@docusaurus/types" "3.8.1"
-    "@docusaurus/utils-validation" "3.8.1"
+    "@docusaurus/core" "3.10.2"
+    "@docusaurus/types" "3.10.2"
+    "@docusaurus/utils-validation" "3.10.2"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-google-gtag@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-3.8.1.tgz#8c76f8a1d96448f2f0f7b10e6bde451c40672b95"
-  integrity sha512-tKE8j1cEZCh8KZa4aa80zpSTxsC2/ZYqjx6AAfd8uA8VHZVw79+7OTEP2PoWi0uL5/1Is0LF5Vwxd+1fz5HlKg==
+"@docusaurus/plugin-google-gtag@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-3.10.2.tgz#65df25eb5fb3f2a3f2d0fba8ddd423060e09e1ca"
+  integrity sha512-Vt90nNFhtAChRe9+it1hcHFgFvETdSnOkL5Bma+p6E/yU2tAYrvvyk+gv+LJGM2ZUkyKuKXLRsZ2Lb0bO7+Vog==
   dependencies:
-    "@docusaurus/core" "3.8.1"
-    "@docusaurus/types" "3.8.1"
-    "@docusaurus/utils-validation" "3.8.1"
-    "@types/gtag.js" "^0.0.12"
+    "@docusaurus/core" "3.10.2"
+    "@docusaurus/types" "3.10.2"
+    "@docusaurus/utils-validation" "3.10.2"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-google-tag-manager@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-3.8.1.tgz#88241ffd06369f4a4d5fb982ff3ac2777561ae37"
-  integrity sha512-iqe3XKITBquZq+6UAXdb1vI0fPY5iIOitVjPQ581R1ZKpHr0qe+V6gVOrrcOHixPDD/BUKdYwkxFjpNiEN+vBw==
+"@docusaurus/plugin-google-tag-manager@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-3.10.2.tgz#882a24e51dc42487d2c1d4f2cde3f59c99a276cb"
+  integrity sha512-MLCffCldysi/R0nzJQP7ZWd0xAoGNnSTiVOo6TTR6mKVGFhE+/XArGe67ZcaZv1uytgQXoXs92VJrgVDrz80rQ==
   dependencies:
-    "@docusaurus/core" "3.8.1"
-    "@docusaurus/types" "3.8.1"
-    "@docusaurus/utils-validation" "3.8.1"
+    "@docusaurus/core" "3.10.2"
+    "@docusaurus/types" "3.10.2"
+    "@docusaurus/utils-validation" "3.10.2"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-sitemap@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-3.8.1.tgz#3aebd39186dc30e53023f1aab44625bc0bdac892"
-  integrity sha512-+9YV/7VLbGTq8qNkjiugIelmfUEVkTyLe6X8bWq7K5qPvGXAjno27QAfFq63mYfFFbJc7z+pudL63acprbqGzw==
-  dependencies:
-    "@docusaurus/core" "3.8.1"
-    "@docusaurus/logger" "3.8.1"
-    "@docusaurus/types" "3.8.1"
-    "@docusaurus/utils" "3.8.1"
-    "@docusaurus/utils-common" "3.8.1"
-    "@docusaurus/utils-validation" "3.8.1"
+"@docusaurus/plugin-sitemap@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-3.10.2.tgz#6c662c7df3bb7d36887f8b73f54d85dc4d36371d"
+  integrity sha512-PODkwg5XetLML3hU/3xpCKJUZ9cqExLaBnD/Fzzwj2VHogLeqnDisLIujae87zuze7T4mCm2A6KEqZkyiz07EQ==
+  dependencies:
+    "@docusaurus/core" "3.10.2"
+    "@docusaurus/logger" "3.10.2"
+    "@docusaurus/types" "3.10.2"
+    "@docusaurus/utils" "3.10.2"
+    "@docusaurus/utils-common" "3.10.2"
+    "@docusaurus/utils-validation" "3.10.2"
     fs-extra "^11.1.1"
     sitemap "^7.1.1"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-svgr@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-svgr/-/plugin-svgr-3.8.1.tgz#6f340be8eae418a2cce540d8ece096ffd9c9b6ab"
-  integrity sha512-rW0LWMDsdlsgowVwqiMb/7tANDodpy1wWPwCcamvhY7OECReN3feoFwLjd/U4tKjNY3encj0AJSTxJA+Fpe+Gw==
+"@docusaurus/plugin-svgr@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-svgr/-/plugin-svgr-3.10.2.tgz#916fd0a5d39bf73cb621de9789cce243a7ef1754"
+  integrity sha512-JgfT3jWM0TJ8Uw0cEcqxHpybngQY1vlBYpuuNO+gEh5iPh5Ar+vxq/u9CFrYsWeXy48BN7Db76Pzp2edNXUQ8A==
   dependencies:
-    "@docusaurus/core" "3.8.1"
-    "@docusaurus/types" "3.8.1"
-    "@docusaurus/utils" "3.8.1"
-    "@docusaurus/utils-validation" "3.8.1"
+    "@docusaurus/core" "3.10.2"
+    "@docusaurus/types" "3.10.2"
+    "@docusaurus/utils" "3.10.2"
+    "@docusaurus/utils-validation" "3.10.2"
     "@svgr/core" "8.1.0"
     "@svgr/webpack" "^8.1.0"
     tslib "^2.6.0"
     webpack "^5.88.1"
 
-"@docusaurus/preset-classic@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-3.8.1.tgz#bb79fd12f3211363720c569a526c7e24d3aa966b"
-  integrity sha512-yJSjYNHXD8POMGc2mKQuj3ApPrN+eG0rO1UPgSx7jySpYU+n4WjBikbrA2ue5ad9A7aouEtMWUoiSRXTH/g7KQ==
-  dependencies:
-    "@docusaurus/core" "3.8.1"
-    "@docusaurus/plugin-content-blog" "3.8.1"
-    "@docusaurus/plugin-content-docs" "3.8.1"
-    "@docusaurus/plugin-content-pages" "3.8.1"
-    "@docusaurus/plugin-css-cascade-layers" "3.8.1"
-    "@docusaurus/plugin-debug" "3.8.1"
-    "@docusaurus/plugin-google-analytics" "3.8.1"
-    "@docusaurus/plugin-google-gtag" "3.8.1"
-    "@docusaurus/plugin-google-tag-manager" "3.8.1"
-    "@docusaurus/plugin-sitemap" "3.8.1"
-    "@docusaurus/plugin-svgr" "3.8.1"
-    "@docusaurus/theme-classic" "3.8.1"
-    "@docusaurus/theme-common" "3.8.1"
-    "@docusaurus/theme-search-algolia" "3.8.1"
-    "@docusaurus/types" "3.8.1"
-
-"@docusaurus/theme-classic@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-3.8.1.tgz#1e45c66d89ded359225fcd29bf3258d9205765c1"
-  integrity sha512-bqDUCNqXeYypMCsE1VcTXSI1QuO4KXfx8Cvl6rYfY0bhhqN6d2WZlRkyLg/p6pm+DzvanqHOyYlqdPyP0iz+iw==
-  dependencies:
-    "@docusaurus/core" "3.8.1"
-    "@docusaurus/logger" "3.8.1"
-    "@docusaurus/mdx-loader" "3.8.1"
-    "@docusaurus/module-type-aliases" "3.8.1"
-    "@docusaurus/plugin-content-blog" "3.8.1"
-    "@docusaurus/plugin-content-docs" "3.8.1"
-    "@docusaurus/plugin-content-pages" "3.8.1"
-    "@docusaurus/theme-common" "3.8.1"
-    "@docusaurus/theme-translations" "3.8.1"
-    "@docusaurus/types" "3.8.1"
-    "@docusaurus/utils" "3.8.1"
-    "@docusaurus/utils-common" "3.8.1"
-    "@docusaurus/utils-validation" "3.8.1"
+"@docusaurus/preset-classic@^3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-3.10.2.tgz#e4419c811723ab913a946c63efcc15e7f5f60a0a"
+  integrity sha512-a4B3VczmDl99zK0EufDQYomdJ186WDingjmDXxhN2PNPS9Ty/Y2M5CLFX1KQMRKqRTLiRDKfutzG5IY1FC/ceg==
+  dependencies:
+    "@docusaurus/core" "3.10.2"
+    "@docusaurus/plugin-content-blog" "3.10.2"
+    "@docusaurus/plugin-content-docs" "3.10.2"
+    "@docusaurus/plugin-content-pages" "3.10.2"
+    "@docusaurus/plugin-css-cascade-layers" "3.10.2"
+    "@docusaurus/plugin-debug" "3.10.2"
+    "@docusaurus/plugin-google-analytics" "3.10.2"
+    "@docusaurus/plugin-google-gtag" "3.10.2"
+    "@docusaurus/plugin-google-tag-manager" "3.10.2"
+    "@docusaurus/plugin-sitemap" "3.10.2"
+    "@docusaurus/plugin-svgr" "3.10.2"
+    "@docusaurus/theme-classic" "3.10.2"
+    "@docusaurus/theme-common" "3.10.2"
+    "@docusaurus/theme-search-algolia" "3.10.2"
+    "@docusaurus/types" "3.10.2"
+
+"@docusaurus/theme-classic@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-3.10.2.tgz#a64bd600c789b33c67c30c256b07e2ca0f57e2ae"
+  integrity sha512-JqTSLQmqmA9uKWZsD5iwBGJ4JyKB4/yTw6PsSXVPRJG/6GAm/u+add9Iip+hvwP12/AnPNztrdxsI14NJW4KeA==
+  dependencies:
+    "@docusaurus/core" "3.10.2"
+    "@docusaurus/logger" "3.10.2"
+    "@docusaurus/mdx-loader" "3.10.2"
+    "@docusaurus/module-type-aliases" "3.10.2"
+    "@docusaurus/plugin-content-blog" "3.10.2"
+    "@docusaurus/plugin-content-docs" "3.10.2"
+    "@docusaurus/plugin-content-pages" "3.10.2"
+    "@docusaurus/theme-common" "3.10.2"
+    "@docusaurus/theme-translations" "3.10.2"
+    "@docusaurus/types" "3.10.2"
+    "@docusaurus/utils" "3.10.2"
+    "@docusaurus/utils-common" "3.10.2"
+    "@docusaurus/utils-validation" "3.10.2"
     "@mdx-js/react" "^3.0.0"
     clsx "^2.0.0"
     copy-text-to-clipboard "^3.2.0"
@@ -1799,15 +1834,15 @@
     tslib "^2.6.0"
     utility-types "^3.10.0"
 
-"@docusaurus/theme-common@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-3.8.1.tgz#17c23316fbe3ee3f7e707c7298cb59a0fff38b4b"
-  integrity sha512-UswMOyTnPEVRvN5Qzbo+l8k4xrd5fTFu2VPPfD6FcW/6qUtVLmJTQCktbAL3KJ0BVXGm5aJXz/ZrzqFuZERGPw==
+"@docusaurus/theme-common@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-3.10.2.tgz#5cf2a8b76554b8b38c6afe8448470c411f683e5b"
+  integrity sha512-R9b/vMpK1yye6hNZTA6x/ivRv+at6GhxnXcxkpzCGzO1R1RwiquqiFg2wMFh6aqlJTpWRFKpFD2TzCDQcyOU0A==
   dependencies:
-    "@docusaurus/mdx-loader" "3.8.1"
-    "@docusaurus/module-type-aliases" "3.8.1"
-    "@docusaurus/utils" "3.8.1"
-    "@docusaurus/utils-common" "3.8.1"
+    "@docusaurus/mdx-loader" "3.10.2"
+    "@docusaurus/module-type-aliases" "3.10.2"
+    "@docusaurus/utils" "3.10.2"
+    "@docusaurus/utils-common" "3.10.2"
     "@types/history" "^4.7.11"
     "@types/react" "*"
     "@types/react-router-config" "*"
@@ -1817,21 +1852,22 @@
     tslib "^2.6.0"
     utility-types "^3.10.0"
 
-"@docusaurus/theme-search-algolia@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-3.8.1.tgz#3aa3d99c35cc2d4b709fcddd4df875a9b536e29b"
-  integrity sha512-NBFH5rZVQRAQM087aYSRKQ9yGEK9eHd+xOxQjqNpxMiV85OhJDD4ZGz6YJIod26Fbooy54UWVdzNU0TFeUUUzQ==
-  dependencies:
-    "@docsearch/react" "^3.9.0"
-    "@docusaurus/core" "3.8.1"
-    "@docusaurus/logger" "3.8.1"
-    "@docusaurus/plugin-content-docs" "3.8.1"
-    "@docusaurus/theme-common" "3.8.1"
-    "@docusaurus/theme-translations" "3.8.1"
-    "@docusaurus/utils" "3.8.1"
-    "@docusaurus/utils-validation" "3.8.1"
-    algoliasearch "^5.17.1"
-    algoliasearch-helper "^3.22.6"
+"@docusaurus/theme-search-algolia@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-3.10.2.tgz#e7756d4088a7df4d11fd734bfe0e8fa28ceac1dd"
+  integrity sha512-1msxllyhi/5m77JukXtp5UFnUAriwZIC1oJ7MTnpQpCwLTbclJi5BK5n28CTZuSXpQN2ewbbnqRgAhMM6c6ihg==
+  dependencies:
+    "@algolia/autocomplete-core" "^1.19.2"
+    "@docsearch/react" "^3.9.0 || ^4.3.2"
+    "@docusaurus/core" "3.10.2"
+    "@docusaurus/logger" "3.10.2"
+    "@docusaurus/plugin-content-docs" "3.10.2"
+    "@docusaurus/theme-common" "3.10.2"
+    "@docusaurus/theme-translations" "3.10.2"
+    "@docusaurus/utils" "3.10.2"
+    "@docusaurus/utils-validation" "3.10.2"
+    algoliasearch "^5.37.0"
+    algoliasearch-helper "^3.26.0"
     clsx "^2.0.0"
     eta "^2.2.0"
     fs-extra "^11.1.1"
@@ -1839,21 +1875,22 @@
     tslib "^2.6.0"
     utility-types "^3.10.0"
 
-"@docusaurus/theme-translations@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-3.8.1.tgz#4b1d76973eb53861e167c7723485e059ba4ffd0a"
-  integrity sha512-OTp6eebuMcf2rJt4bqnvuwmm3NVXfzfYejL+u/Y1qwKhZPrjPoKWfk1CbOP5xH5ZOPkiAsx4dHdQBRJszK3z2g==
+"@docusaurus/theme-translations@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-3.10.2.tgz#cd649083babd12df324e7129008aaccacd4cfb13"
+  integrity sha512-iv20wrxnyXkY89LM3TzRlzGlt5fIGO5UnaR6UL1ZVfB9RRFjxQFQ6awDrwAc6Km8Y5gD8pInuwYPF+6/TiCxXA==
   dependencies:
     fs-extra "^11.1.1"
     tslib "^2.6.0"
 
-"@docusaurus/types@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/types/-/types-3.8.1.tgz#83ab66c345464e003b576a49f78897482061fc26"
-  integrity sha512-ZPdW5AB+pBjiVrcLuw3dOS6BFlrG0XkS2lDGsj8TizcnREQg3J8cjsgfDviszOk4CweNfwo1AEELJkYaMUuOPg==
+"@docusaurus/types@3.10.2", "@docusaurus/types@^3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/types/-/types-3.10.2.tgz#9ffe35adfb4587e49158ee9e10d94b86419a5932"
+  integrity sha512-B6rvfwIFSapUqUJjMriZswX13K8l5Z7AcmVE6uTEJpYddQieSTR12DsGaFtcZAIDsQd4p+0WTl0Vc6jmZK0Trw==
   dependencies:
     "@mdx-js/mdx" "^3.0.0"
     "@types/history" "^4.7.11"
+    "@types/mdast" "^4.0.2"
     "@types/react" "*"
     commander "^5.1.0"
     joi "^17.9.2"
@@ -1862,43 +1899,43 @@
     webpack "^5.95.0"
     webpack-merge "^5.9.0"
 
-"@docusaurus/utils-common@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-3.8.1.tgz#c369b8c3041afb7dcd595d4172beb1cc1015c85f"
-  integrity sha512-zTZiDlvpvoJIrQEEd71c154DkcriBecm4z94OzEE9kz7ikS3J+iSlABhFXM45mZ0eN5pVqqr7cs60+ZlYLewtg==
+"@docusaurus/utils-common@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-3.10.2.tgz#a65fcfffafa4e15a59fe61d7ba315ee5d4c49269"
+  integrity sha512-x3Dz6jv6iQKBNjBmVTu8p57abMp/VNTUgKBMgRVXJc5444orBTsArv0+cdfrXTiz/VMmHfDRVkPbL7GH2B7T7w==
   dependencies:
-    "@docusaurus/types" "3.8.1"
+    "@docusaurus/types" "3.10.2"
     tslib "^2.6.0"
 
-"@docusaurus/utils-validation@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-3.8.1.tgz#0499c0d151a4098a0963237057993282cfbd538e"
-  integrity sha512-gs5bXIccxzEbyVecvxg6upTwaUbfa0KMmTj7HhHzc016AGyxH2o73k1/aOD0IFrdCsfJNt37MqNI47s2MgRZMA==
+"@docusaurus/utils-validation@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-3.10.2.tgz#2624b0ca6675675da2f063828115b43c9a22de47"
+  integrity sha512-sn8unbDfUL585NtR3cwHefPicOyaHvPaX7VD0aOg/siIxUBoKyKKaGEqzJZDS64mM43TnxurkYDtmB1wsJlZsw==
   dependencies:
-    "@docusaurus/logger" "3.8.1"
-    "@docusaurus/utils" "3.8.1"
-    "@docusaurus/utils-common" "3.8.1"
+    "@docusaurus/logger" "3.10.2"
+    "@docusaurus/utils" "3.10.2"
+    "@docusaurus/utils-common" "3.10.2"
     fs-extra "^11.2.0"
     joi "^17.9.2"
     js-yaml "^4.1.0"
     lodash "^4.17.21"
     tslib "^2.6.0"
 
-"@docusaurus/utils@3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-3.8.1.tgz#2ac1e734106e2f73dbd0f6a8824d525f9064e9f0"
-  integrity sha512-P1ml0nvOmEFdmu0smSXOqTS1sxU5tqvnc0dA4MTKV39kye+bhQnjkIKEE18fNOvxjyB86k8esoCIFM3x4RykOQ==
+"@docusaurus/utils@3.10.2":
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-3.10.2.tgz#d99c1ffc5c7961e912344269a8728ce2aad8b3dc"
+  integrity sha512-xx0W3eav2uW1NRIpuHJWNwLTC15xPNjU4Uxi9NSnd3swYC96BE3vFiT93SD8s24kmAAWNwgZwfZ2fghGZ01Lcw==
   dependencies:
-    "@docusaurus/logger" "3.8.1"
-    "@docusaurus/types" "3.8.1"
-    "@docusaurus/utils-common" "3.8.1"
+    "@11ty/gray-matter" "^1.0.0"
+    "@docusaurus/logger" "3.10.2"
+    "@docusaurus/types" "3.10.2"
+    "@docusaurus/utils-common" "3.10.2"
     escape-string-regexp "^4.0.0"
-    execa "5.1.1"
+    execa "^5.1.1"
     file-loader "^6.2.0"
     fs-extra "^11.1.1"
     github-slugger "^1.5.0"
     globby "^11.1.0"
-    gray-matter "^4.0.3"
     jiti "^1.20.0"
     js-yaml "^4.1.0"
     lodash "^4.17.21"
@@ -1911,6 +1948,28 @@
     utility-types "^3.10.0"
     webpack "^5.88.1"
 
+"@emnapi/core@^1.5.0":
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.11.3.tgz#5e95348a42cd1e06f0b9aa380cd74091daa4d520"
+  integrity sha512-zLpS5asjEb7lq8jYLq37N6XKaE41DIexlY1rF/z4/tIl3wo13Sqm28fRyfIsKZD+NZ8mM5RoKkpW/rBcuoSZSg==
+  dependencies:
+    "@emnapi/wasi-threads" "1.2.3"
+    tslib "^2.4.0"
+
+"@emnapi/runtime@^1.5.0":
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.11.3.tgz#84257ae3b0531eb2aec1ffa23d70700da007ba95"
+  integrity sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==
+  dependencies:
+    tslib "^2.4.0"
+
+"@emnapi/wasi-threads@1.2.3":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.2.3.tgz#c9bf72fd4be5b928aee894820e8d814ed73916e9"
+  integrity sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g==
+  dependencies:
+    tslib "^2.4.0"
+
 "@emotion/babel-plugin@^11.13.5":
   version "11.13.5"
   resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz#eab8d65dbded74e0ecfd28dc218e75607c4e7bc0"
@@ -2103,6 +2162,167 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
+"@jsonjoy.com/base64@17.67.0":
+  version "17.67.0"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/base64/-/base64-17.67.0.tgz#7eeda3cb41138d77a90408fd2e42b2aba10576d7"
+  integrity sha512-5SEsJGsm15aP8TQGkDfJvz9axgPwAEm98S5DxOuYe8e1EbfajcDmgeXXzccEjh+mLnjqEKrkBdjHWS5vFNwDdw==
+
+"@jsonjoy.com/base64@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/base64/-/base64-1.1.2.tgz#cf8ea9dcb849b81c95f14fc0aaa151c6b54d2578"
+  integrity sha512-q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA==
+
+"@jsonjoy.com/buffers@17.67.0", "@jsonjoy.com/buffers@^17.65.0":
+  version "17.67.0"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/buffers/-/buffers-17.67.0.tgz#5c58dbcdeea8824ce296bd1cfce006c2eb167b3d"
+  integrity sha512-tfExRpYxBvi32vPs9ZHaTjSP4fHAfzSmcahOfNxtvGHcyJel+aibkPlGeBB+7AoC6hL7lXIE++8okecBxx7lcw==
+
+"@jsonjoy.com/buffers@^1.0.0", "@jsonjoy.com/buffers@^1.2.0":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/buffers/-/buffers-1.2.1.tgz#8d99c7f67eaf724d3428dfd9826c6455266a5c83"
+  integrity sha512-12cdlDwX4RUM3QxmUbVJWqZ/mrK6dFQH4Zxq6+r1YXKXYBNgZXndx2qbCJwh3+WWkCSn67IjnlG3XYTvmvYtgA==
+
+"@jsonjoy.com/codegen@17.67.0":
+  version "17.67.0"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/codegen/-/codegen-17.67.0.tgz#3635fd8769d77e19b75dc5574bc9756019b2e591"
+  integrity sha512-idnkUplROpdBOV0HMcwhsCUS5TRUi9poagdGs70A6S4ux9+/aPuKbh8+UYRTLYQHtXvAdNfQWXDqZEx5k4Dj2Q==
+
+"@jsonjoy.com/codegen@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/codegen/-/codegen-1.0.0.tgz#5c23f796c47675f166d23b948cdb889184b93207"
+  integrity sha512-E8Oy+08cmCf0EK/NMxpaJZmOxPqM+6iSe2S4nlSBrPZOORoDJILxtbSUEDKQyTamm/BVAhIGllOBNU79/dwf0g==
+
+"@jsonjoy.com/fs-core@4.64.0":
+  version "4.64.0"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/fs-core/-/fs-core-4.64.0.tgz#82378ecedc5cbd8558fcc0a8e3c6b254db070fc8"
+  integrity sha512-zs2TAq7Six5jgMuoMNjpspAvOP3mhtgq/k1UyQodEzCtQi/N83y2/y+zcvnZSGp/Rxq96DBN+bValOBQAyn/ew==
+  dependencies:
+    "@jsonjoy.com/fs-node-builtins" "4.64.0"
+    "@jsonjoy.com/fs-node-utils" "4.64.0"
+    thingies "^2.5.0"
+
+"@jsonjoy.com/fs-fsa@4.64.0":
+  version "4.64.0"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/fs-fsa/-/fs-fsa-4.64.0.tgz#3cb0af64a33f075300ef63be97af89bb7849e6bd"
+  integrity sha512-nMWOVbkLFyEgmXZih3wyvxA9XpgyyqyfrINMHvEFqhi7uqfRl7c9ERJt6yX7vgMPrB9Uo+OJO+Spa0cFzPD01w==
+  dependencies:
+    "@jsonjoy.com/fs-core" "4.64.0"
+    "@jsonjoy.com/fs-node-builtins" "4.64.0"
+    "@jsonjoy.com/fs-node-utils" "4.64.0"
+    thingies "^2.5.0"
+
+"@jsonjoy.com/fs-node-builtins@4.64.0":
+  version "4.64.0"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/fs-node-builtins/-/fs-node-builtins-4.64.0.tgz#84371474b2a06d209ae9f0b2b06fc570b00fb612"
+  integrity sha512-/o7WRFhUWaM/fOrslwLZGnzn4RmRILykn+lAL+mNObqqRNw+CQSiij6hpCeZ+C7buhdoVo7go/OYqzaSUfDYmA==
+
+"@jsonjoy.com/fs-node-to-fsa@4.64.0":
+  version "4.64.0"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/fs-node-to-fsa/-/fs-node-to-fsa-4.64.0.tgz#fbb3026befa07d690f1523c0c166f0d447fa555e"
+  integrity sha512-WDD9WVs0hb7UAEKTgZW2f66WDrbj7gIIWwpP3spbLyXa0rghtUaFTB8L4gdR3ZCWwiKIsj38/CNijpVmpnuPUw==
+  dependencies:
+    "@jsonjoy.com/fs-fsa" "4.64.0"
+    "@jsonjoy.com/fs-node-builtins" "4.64.0"
+    "@jsonjoy.com/fs-node-utils" "4.64.0"
+
+"@jsonjoy.com/fs-node-utils@4.64.0":
+  version "4.64.0"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/fs-node-utils/-/fs-node-utils-4.64.0.tgz#5803eee4abd6871644a35ea35ad63a6b7f159892"
+  integrity sha512-k5Indsx9hWW9xSF7Y6oSKKwtCUNhzZxadub3owhIlitc+iMRVlPPdX2duTKQWBL3qNWpXya8jykgaaWpheeS4w==
+  dependencies:
+    "@jsonjoy.com/fs-node-builtins" "4.64.0"
+    glob-to-regex.js "^1.0.1"
+
+"@jsonjoy.com/fs-node@4.64.0":
+  version "4.64.0"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/fs-node/-/fs-node-4.64.0.tgz#e8c9c4346b38cc116ca0e9fb34b10419bcfc1916"
+  integrity sha512-dO+NNkODbUli4uV42bcNrrLvq5rE7SNpdZ5TNd0dtbLsAaNK3MDiIC9lUi+brboGoIjW6vd2fB1qao60nrk5xA==
+  dependencies:
+    "@jsonjoy.com/fs-core" "4.64.0"
+    "@jsonjoy.com/fs-node-builtins" "4.64.0"
+    "@jsonjoy.com/fs-node-utils" "4.64.0"
+    "@jsonjoy.com/fs-print" "4.64.0"
+    "@jsonjoy.com/fs-snapshot" "4.64.0"
+    glob-to-regex.js "^1.0.0"
+    thingies "^2.5.0"
+
+"@jsonjoy.com/fs-print@4.64.0":
+  version "4.64.0"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/fs-print/-/fs-print-4.64.0.tgz#375085d90b50c85754667671f58d13a63da4330d"
+  integrity sha512-PHZFccchvkhWrwPWHjmVAhbC3vSHCtyZvlZfJJ3ho2bnzl450hXri6/8e6pbkWdH+SkmLXNml0sV8e5HDAfxKw==
+  dependencies:
+    "@jsonjoy.com/fs-node-utils" "4.64.0"
+    tree-dump "^1.1.0"
+
+"@jsonjoy.com/fs-snapshot@4.64.0":
+  version "4.64.0"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/fs-snapshot/-/fs-snapshot-4.64.0.tgz#99a76af8664595875def5b20ed1cf159adc5f098"
+  integrity sha512-oM7UDeL83q6NBzzsfKAsYKXKVXlykKFqqOLh4xZZKAzzROTlInkPbc6LTDGThEOnPiFiUzA7tYziHG9xavd76Q==
+  dependencies:
+    "@jsonjoy.com/buffers" "^17.65.0"
+    "@jsonjoy.com/fs-node-utils" "4.64.0"
+    "@jsonjoy.com/json-pack" "^17.65.0"
+    "@jsonjoy.com/util" "^17.65.0"
+
+"@jsonjoy.com/json-pack@^1.11.0":
+  version "1.21.0"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/json-pack/-/json-pack-1.21.0.tgz#93f8dd57fe3a3a92132b33d1eb182dcd9e7629fa"
+  integrity sha512-+AKG+R2cfZMShzrF2uQw34v3zbeDYUqnQ+jg7ORic3BGtfw9p/+N6RJbq/kkV8JmYZaINknaEQ2m0/f693ZPpg==
+  dependencies:
+    "@jsonjoy.com/base64" "^1.1.2"
+    "@jsonjoy.com/buffers" "^1.2.0"
+    "@jsonjoy.com/codegen" "^1.0.0"
+    "@jsonjoy.com/json-pointer" "^1.0.2"
+    "@jsonjoy.com/util" "^1.9.0"
+    hyperdyperid "^1.2.0"
+    thingies "^2.5.0"
+    tree-dump "^1.1.0"
+
+"@jsonjoy.com/json-pack@^17.65.0":
+  version "17.67.0"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/json-pack/-/json-pack-17.67.0.tgz#8dd8ff65dd999c5d4d26df46c63915c7bdec093a"
+  integrity sha512-t0ejURcGaZsn1ClbJ/3kFqSOjlryd92eQY465IYrezsXmPcfHPE/av4twRSxf6WE+TkZgLY+71vCZbiIiFKA/w==
+  dependencies:
+    "@jsonjoy.com/base64" "17.67.0"
+    "@jsonjoy.com/buffers" "17.67.0"
+    "@jsonjoy.com/codegen" "17.67.0"
+    "@jsonjoy.com/json-pointer" "17.67.0"
+    "@jsonjoy.com/util" "17.67.0"
+    hyperdyperid "^1.2.0"
+    thingies "^2.5.0"
+    tree-dump "^1.1.0"
+
+"@jsonjoy.com/json-pointer@17.67.0":
+  version "17.67.0"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/json-pointer/-/json-pointer-17.67.0.tgz#74439573dc046e0c9a3a552fb94b391bc75313b8"
+  integrity sha512-+iqOFInH+QZGmSuaybBUNdh7yvNrXvqR+h3wjXm0N/3JK1EyyFAeGJvqnmQL61d1ARLlk/wJdFKSL+LHJ1eaUA==
+  dependencies:
+    "@jsonjoy.com/util" "17.67.0"
+
+"@jsonjoy.com/json-pointer@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/json-pointer/-/json-pointer-1.0.2.tgz#049cb530ac24e84cba08590c5e36b431c4843408"
+  integrity sha512-Fsn6wM2zlDzY1U+v4Nc8bo3bVqgfNTGcn6dMgs6FjrEnt4ZCe60o6ByKRjOGlI2gow0aE/Q41QOigdTqkyK5fg==
+  dependencies:
+    "@jsonjoy.com/codegen" "^1.0.0"
+    "@jsonjoy.com/util" "^1.9.0"
+
+"@jsonjoy.com/util@17.67.0", "@jsonjoy.com/util@^17.65.0":
+  version "17.67.0"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/util/-/util-17.67.0.tgz#7c4288fc3808233e55c7610101e7bb4590cddd3f"
+  integrity sha512-6+8xBaz1rLSohlGh68D1pdw3AwDi9xydm8QNlAFkvnavCJYSze+pxoW2VKP8p308jtlMRLs5NTHfPlZLd4w7ew==
+  dependencies:
+    "@jsonjoy.com/buffers" "17.67.0"
+    "@jsonjoy.com/codegen" "17.67.0"
+
+"@jsonjoy.com/util@^1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/util/-/util-1.9.0.tgz#7ee95586aed0a766b746cd8d8363e336c3c47c46"
+  integrity sha512-pLuQo+VPRnN8hfPqUTLTHk126wuYdXVxE6aDmjSeV4NCAgyxWbiOIeNJVtID3h1Vzpoi9m4jXezf73I6LgabgQ==
+  dependencies:
+    "@jsonjoy.com/buffers" "^1.0.0"
+    "@jsonjoy.com/codegen" "^1.0.0"
+
 "@leichtgewicht/ip-codec@^2.0.1":
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz#4fc56c15c580b9adb7dc3c333a134e540b44bfb1"
@@ -2146,6 +2366,49 @@
   dependencies:
     "@types/mdx" "^2.0.0"
 
+"@module-federation/error-codes@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@module-federation/error-codes/-/error-codes-0.22.0.tgz#31ccc990dc240d73912ba7bd001f7e35ac751992"
+  integrity sha512-xF9SjnEy7vTdx+xekjPCV5cIHOGCkdn3pIxo9vU7gEZMIw0SvAEdsy6Uh17xaCpm8V0FWvR0SZoK9Ik6jGOaug==
+
+"@module-federation/runtime-core@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@module-federation/runtime-core/-/runtime-core-0.22.0.tgz#7321ec792bb7d1d22bee6162ec43564b769d2a3c"
+  integrity sha512-GR1TcD6/s7zqItfhC87zAp30PqzvceoeDGYTgF3Vx2TXvsfDrhP6Qw9T4vudDQL3uJRne6t7CzdT29YyVxlgIA==
+  dependencies:
+    "@module-federation/error-codes" "0.22.0"
+    "@module-federation/sdk" "0.22.0"
+
+"@module-federation/runtime-tools@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@module-federation/runtime-tools/-/runtime-tools-0.22.0.tgz#36f2a7cb267af208a9d1a237fe9a71b4bf31431e"
+  integrity sha512-4ScUJ/aUfEernb+4PbLdhM/c60VHl698Gn1gY21m9vyC1Ucn69fPCA1y2EwcCB7IItseRMoNhdcWQnzt/OPCNA==
+  dependencies:
+    "@module-federation/runtime" "0.22.0"
+    "@module-federation/webpack-bundler-runtime" "0.22.0"
+
+"@module-federation/runtime@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@module-federation/runtime/-/runtime-0.22.0.tgz#f789c9ef40d846d110711c8221ecc0ad938d43d8"
+  integrity sha512-38g5iPju2tPC3KHMPxRKmy4k4onNp6ypFPS1eKGsNLUkXgHsPMBFqAjDw96iEcjri91BrahG4XcdyKi97xZzlA==
+  dependencies:
+    "@module-federation/error-codes" "0.22.0"
+    "@module-federation/runtime-core" "0.22.0"
+    "@module-federation/sdk" "0.22.0"
+
+"@module-federation/sdk@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@module-federation/sdk/-/sdk-0.22.0.tgz#6ad4c1de85a900c3c80ff26cb87cce253e3a2770"
+  integrity sha512-x4aFNBKn2KVQRuNVC5A7SnrSCSqyfIWmm1DvubjbO9iKFe7ith5niw8dqSFBekYBg2Fwy+eMg4sEFNVvCAdo6g==
+
+"@module-federation/webpack-bundler-runtime@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@module-federation/webpack-bundler-runtime/-/webpack-bundler-runtime-0.22.0.tgz#dcbe8f972d722fe278e6a7c21988d4bee53d401d"
+  integrity sha512-aM8gCqXu+/4wBmJtVeMeeMN5guw3chf+2i6HajKtQv7SJfxV/f4IyNQJUeUQu9HfiAZHjqtMV5Lvq/Lvh8LdyA==
+  dependencies:
+    "@module-federation/runtime" "0.22.0"
+    "@module-federation/sdk" "0.22.0"
+
 "@mui/core-downloads-tracker@^7.3.2":
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-7.3.2.tgz#896a7890864d619093dc79541ec1ecfa3b507ad2"
@@ -2230,6 +2493,20 @@
     prop-types "^15.8.1"
     react-is "^19.1.1"
 
+"@napi-rs/wasm-runtime@1.0.7":
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-1.0.7.tgz#dcfea99a75f06209a235f3d941e3460a51e9b14c"
+  integrity sha512-SeDnOO0Tk7Okiq6DbXmmBODgOAb9dp9gjlphokTUxmt8U3liIP1ZsozBahH69j/RJv+Rfs6IwUKHTgQYJ/HBAw==
+  dependencies:
+    "@emnapi/core" "^1.5.0"
+    "@emnapi/runtime" "^1.5.0"
+    "@tybys/wasm-util" "^0.10.1"
+
+"@noble/hashes@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.4.0.tgz#45814aa329f30e4fe0ba49426f49dfccdd066426"
+  integrity sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -2251,6 +2528,136 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@peculiar/asn1-cms@^2.6.0", "@peculiar/asn1-cms@^2.8.0":
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-cms/-/asn1-cms-2.8.0.tgz#b48a8389319228f929e9acd8cee8da6c858738de"
+  integrity sha512-NgekZOrSJFSBFLFoLfwePguAWAx7z1+f2TEsWFUMyiqqfntZ4+S/S5hzqME3q4pCA0iOsFKdwiQ35dwY24eVqA==
+  dependencies:
+    "@peculiar/asn1-schema" "^2.8.0"
+    "@peculiar/asn1-x509" "^2.8.0"
+    "@peculiar/asn1-x509-attr" "^2.8.0"
+    asn1js "^3.0.10"
+    tslib "^2.8.1"
+
+"@peculiar/asn1-csr@^2.6.0":
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-csr/-/asn1-csr-2.8.0.tgz#c9bb5dec2eaff824a705e82a4a58d45e6d2c35d0"
+  integrity sha512-akbF8+uvleHs8sejNPQxwmVFuInAg6FMNHOwMILXfP518YfFJwdR3jr6oNUPOaEJfuEhn/vkNOCIT6ASUd4mbg==
+  dependencies:
+    "@peculiar/asn1-schema" "^2.8.0"
+    "@peculiar/asn1-x509" "^2.8.0"
+    asn1js "^3.0.10"
+    tslib "^2.8.1"
+
+"@peculiar/asn1-ecc@^2.6.0":
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-ecc/-/asn1-ecc-2.8.0.tgz#d51ab2b07eca98e0cf492d051e98bbd0a071305a"
+  integrity sha512-ohwlk+u9Rv2NOAY1c6MfHj45ATVF8R1DUN/WCgABiRtLi2ZftlZWZX7KvpAbU8v9xPcmoILfELeEABj/rn18AQ==
+  dependencies:
+    "@peculiar/asn1-schema" "^2.8.0"
+    "@peculiar/asn1-x509" "^2.8.0"
+    asn1js "^3.0.10"
+    tslib "^2.8.1"
+
+"@peculiar/asn1-pfx@^2.8.0":
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-pfx/-/asn1-pfx-2.8.0.tgz#8e189b6455e2bf9e5f921bb150ea86d7e7d1875d"
+  integrity sha512-5yof1ytoB++RQtaFbqSUJ8pxDJtZT6vbVqZ8XoJ61ph7UjNVvfFwAilnCodqkNsAodpy13gDhoxZXw00pghnyg==
+  dependencies:
+    "@peculiar/asn1-cms" "^2.8.0"
+    "@peculiar/asn1-pkcs8" "^2.8.0"
+    "@peculiar/asn1-rsa" "^2.8.0"
+    "@peculiar/asn1-schema" "^2.8.0"
+    asn1js "^3.0.10"
+    tslib "^2.8.1"
+
+"@peculiar/asn1-pkcs8@^2.8.0":
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-pkcs8/-/asn1-pkcs8-2.8.0.tgz#a46cf8857b9b063896afa41d2b8b2aa6a07a70a2"
+  integrity sha512-qAKXtLpBEw9LqhKpjw3ajZSXlBur+ipW+y2ivVBQAG6F6qRx94yO+1ZR4mvw+YaCfKSaOzLeYEzsPaBp4SJELA==
+  dependencies:
+    "@peculiar/asn1-schema" "^2.8.0"
+    "@peculiar/asn1-x509" "^2.8.0"
+    asn1js "^3.0.10"
+    tslib "^2.8.1"
+
+"@peculiar/asn1-pkcs9@^2.6.0":
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-pkcs9/-/asn1-pkcs9-2.8.0.tgz#6d62697af0bbd4f30fdf0d23b4018f3f09620de3"
+  integrity sha512-b5nDWCnkV60+cQ141D6sVVwK9nz64R5n3zSVnklGd+ECdkW2Ol3U1a6yYFlalpSOaD557yuJB64A+q42jG7lUQ==
+  dependencies:
+    "@peculiar/asn1-cms" "^2.8.0"
+    "@peculiar/asn1-pfx" "^2.8.0"
+    "@peculiar/asn1-pkcs8" "^2.8.0"
+    "@peculiar/asn1-schema" "^2.8.0"
+    "@peculiar/asn1-x509" "^2.8.0"
+    "@peculiar/asn1-x509-attr" "^2.8.0"
+    asn1js "^3.0.10"
+    tslib "^2.8.1"
+
+"@peculiar/asn1-rsa@^2.6.0", "@peculiar/asn1-rsa@^2.8.0":
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-rsa/-/asn1-rsa-2.8.0.tgz#9d98d0fc42fec50119d2881b8a9925d36daaea73"
+  integrity sha512-zHEUlCqB2mk7x2lxDwHHJy7hWZOPdGHVlsmITWKB5/PbQo61atbu9PJ/0r9dQNMwFzbKPXZ8uK8/91eUhRznSg==
+  dependencies:
+    "@peculiar/asn1-schema" "^2.8.0"
+    "@peculiar/asn1-x509" "^2.8.0"
+    asn1js "^3.0.10"
+    tslib "^2.8.1"
+
+"@peculiar/asn1-schema@^2.6.0", "@peculiar/asn1-schema@^2.8.0":
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.8.0.tgz#69699f84259b2161607cabfc34e512a4023dbef9"
+  integrity sha512-7YT0U/ze0tF2QOBbE15gKZwy5tvgGyLRiRHLzhlbOpf7BT032oBSd0haZqXn5W6l26WLlu3dyxzjM+2638/z2Q==
+  dependencies:
+    "@peculiar/utils" "^2.0.2"
+    asn1js "^3.0.10"
+    tslib "^2.8.1"
+
+"@peculiar/asn1-x509-attr@^2.8.0":
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-x509-attr/-/asn1-x509-attr-2.8.0.tgz#bd168e3f5e8bc23e56b1a97891f9f2fb7f730204"
+  integrity sha512-tHjkfS/qhMnmrlB2J9NhflQlQ7In3khO3CfmVrriOlpTeErY9ZIKOso1hQ5JQiyrJ7ShvqVPk7E5fQmbclkSKA==
+  dependencies:
+    "@peculiar/asn1-schema" "^2.8.0"
+    "@peculiar/asn1-x509" "^2.8.0"
+    asn1js "^3.0.10"
+    tslib "^2.8.1"
+
+"@peculiar/asn1-x509@^2.6.0", "@peculiar/asn1-x509@^2.8.0":
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-x509/-/asn1-x509-2.8.0.tgz#9958a9ef35dec8426aabad78ffe8798e318b06e2"
+  integrity sha512-N0CMuhWUzsWEVq6F1q9X6+VKUnWzSW+cSVg+aPaGGwDdbFoFWTYgin5MHwXgpWd6y9COMBxnfy/Qc+Xc7F0Zwg==
+  dependencies:
+    "@peculiar/asn1-schema" "^2.8.0"
+    "@peculiar/utils" "^2.0.2"
+    asn1js "^3.0.10"
+    tslib "^2.8.1"
+
+"@peculiar/utils@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@peculiar/utils/-/utils-2.0.3.tgz#a27ca4c4b73652e110f19a7d16d664f458a5528e"
+  integrity sha512-+oL3HPFRIZ1St2K50lWCXiioIgSoxzz7R1J3uF6neO2yl1sgmpgY6XXJH4BdpoDkMWznQTeYF6oWNDZLCdQ4eQ==
+  dependencies:
+    tslib "^2.8.1"
+
+"@peculiar/x509@^1.14.2":
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/@peculiar/x509/-/x509-1.14.3.tgz#2c44c2b89474346afec38a0c2803ec4fb8ce959e"
+  integrity sha512-C2Xj8FZ0uHWeCXXqX5B4/gVFQmtSkiuOolzAgutjTfseNOHT3pUjljDZsTSxXFGgio54bCzVFqmEOUrIVk8RDA==
+  dependencies:
+    "@peculiar/asn1-cms" "^2.6.0"
+    "@peculiar/asn1-csr" "^2.6.0"
+    "@peculiar/asn1-ecc" "^2.6.0"
+    "@peculiar/asn1-pkcs9" "^2.6.0"
+    "@peculiar/asn1-rsa" "^2.6.0"
+    "@peculiar/asn1-schema" "^2.6.0"
+    "@peculiar/asn1-x509" "^2.6.0"
+    pvtsutils "^1.3.6"
+    reflect-metadata "^0.2.2"
+    tslib "^2.8.1"
+    tsyringe "^4.10.0"
+
 "@pnpm/config.env-replace@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz#ab29da53df41e8948a00f2433f085f54de8b3a4c"
@@ -2282,6 +2689,88 @@
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
   integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
 
+"@rspack/binding-darwin-arm64@1.7.12":
+  version "1.7.12"
+  resolved "https://registry.yarnpkg.com/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-1.7.12.tgz#e6e10e7ff15c2254d6cbe9125a747ada880a34f3"
+  integrity sha512-rbFprJaJiqrmfy8SHth8EsoRS0wg4bXcucwj9NiMzpGFq14Opw8c04iQ6H9BECYzgmN0PKZ9rh41LdVvhdZe4A==
+
+"@rspack/binding-darwin-x64@1.7.12":
+  version "1.7.12"
+  resolved "https://registry.yarnpkg.com/@rspack/binding-darwin-x64/-/binding-darwin-x64-1.7.12.tgz#fe90b64228eb49612e4932049325f52a4ddcfd28"
+  integrity sha512-jnOp+/UXOJa9xqUb8KXH03sysoO2e4Ij6tw6MqDdmdj8n/A8PQENRPUbW9AwXpPtVDJPus9r4fi7b3+6e4B8Hg==
+
+"@rspack/binding-linux-arm64-gnu@1.7.12":
+  version "1.7.12"
+  resolved "https://registry.yarnpkg.com/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.7.12.tgz#61d63a0fcb9b4eb25b9d68e1f897c8e2619a8a5a"
+  integrity sha512-C8owWG+yvo7X0oVLIXetkoJhIFBP1LYNcAQqtgLmJnQLQDklGuP83dKC+zISGQWpjawHfZ1ER96vLgoTrxKZdw==
+
+"@rspack/binding-linux-arm64-musl@1.7.12":
+  version "1.7.12"
+  resolved "https://registry.yarnpkg.com/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.7.12.tgz#fd5157890b1250937bb98332dcbb35ff2d7aafd3"
+  integrity sha512-i51WWI64aRpsfSki6rN0aepPqXkVfS+vZM7+4bWDcmnhUmdMvhIPcYg0QRk3DtyJnu33jqNLM0WHY78k00NyfA==
+
+"@rspack/binding-linux-x64-gnu@1.7.12":
+  version "1.7.12"
+  resolved "https://registry.yarnpkg.com/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.7.12.tgz#a8c963c47a043069b154c704d87bf6a658772ac7"
+  integrity sha512-MSos0FuPEefqo9V92ULd5hggKG29EkSNg1zDcypy0OkpsKh5pfjVxTLYFXgTcVyFoUQQbdG8zFBzYbwmJ8V4ew==
+
+"@rspack/binding-linux-x64-musl@1.7.12":
+  version "1.7.12"
+  resolved "https://registry.yarnpkg.com/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-1.7.12.tgz#1e95af2b152a0833272c26c3473cfa60832ef8b0"
+  integrity sha512-JcAMVKXOnjfpC3coWjCFPWD3Yl8RBw6a+IXQQ8mfRlHaHMIiOv8IfZqx15XRxMUn49CtP7Z0Na8iiAg2aKrcfw==
+
+"@rspack/binding-wasm32-wasi@1.7.12":
+  version "1.7.12"
+  resolved "https://registry.yarnpkg.com/@rspack/binding-wasm32-wasi/-/binding-wasm32-wasi-1.7.12.tgz#37a10f322e82cbd51114e8a3182f46c6af101a20"
+  integrity sha512-n+ZqP6ZMc0nhOgvadg5VhEs9ojtbES80AcWeFnmGkbzIszvGSO63GKNiRkXtjJ9KFuRzytbbmsCqkUVH+Tywxg==
+  dependencies:
+    "@napi-rs/wasm-runtime" "1.0.7"
+
+"@rspack/binding-win32-arm64-msvc@1.7.12":
+  version "1.7.12"
+  resolved "https://registry.yarnpkg.com/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.7.12.tgz#77f648ee1cb717c50fdd02126a528b4960654116"
+  integrity sha512-8+h5fYDXYdmugbdfZ+D1y8IQ3rv2EhSfyGP7vBe+bjNyaMa4jWrpucmZbtxojUL1AzaeuHbvMdj9UO/gelk/+g==
+
+"@rspack/binding-win32-ia32-msvc@1.7.12":
+  version "1.7.12"
+  resolved "https://registry.yarnpkg.com/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-1.7.12.tgz#9f7cbb26a9c8d9a1cc15d2059de21172b1623c41"
+  integrity sha512-cDMGwTRSa2p9fNBVe1wTRkF2AEXZ9ARWW36QeC5CkLaI0Ezz8lvhF2+CSOPnhaQ1O1qtn0L0SF+lFnrY+I7xGQ==
+
+"@rspack/binding-win32-x64-msvc@1.7.12":
+  version "1.7.12"
+  resolved "https://registry.yarnpkg.com/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.7.12.tgz#b4c6dceaa63def4aa205d25246c1a5b05d7f36b0"
+  integrity sha512-wIqFvlgFqrgUyj/6S/FJcvShnkZOmIeXTfqvheLY67MGq8qd8jb1YimQVKAIrmWB3yuJKUFACI3Ag1UBtEedEA==
+
+"@rspack/binding@1.7.12":
+  version "1.7.12"
+  resolved "https://registry.yarnpkg.com/@rspack/binding/-/binding-1.7.12.tgz#8c0b19795f980b0e513855245e689719352c08a4"
+  integrity sha512-f4HHuLbvuld8Ba4iB/4ibse5XrKxFrgmM3S4P2AOKnPlekAFlBjmltCuaTL/W2ggYvILaVY+YcFXrEH1rrKeQA==
+  optionalDependencies:
+    "@rspack/binding-darwin-arm64" "1.7.12"
+    "@rspack/binding-darwin-x64" "1.7.12"
+    "@rspack/binding-linux-arm64-gnu" "1.7.12"
+    "@rspack/binding-linux-arm64-musl" "1.7.12"
+    "@rspack/binding-linux-x64-gnu" "1.7.12"
+    "@rspack/binding-linux-x64-musl" "1.7.12"
+    "@rspack/binding-wasm32-wasi" "1.7.12"
+    "@rspack/binding-win32-arm64-msvc" "1.7.12"
+    "@rspack/binding-win32-ia32-msvc" "1.7.12"
+    "@rspack/binding-win32-x64-msvc" "1.7.12"
+
+"@rspack/core@^1.7.10":
+  version "1.7.12"
+  resolved "https://registry.yarnpkg.com/@rspack/core/-/core-1.7.12.tgz#e2a36bd16a10e10aee5905827064ac4b8a63b321"
+  integrity sha512-6CwFIHlhRmXfZoMj3v9MZ1SMTPBn+cHVXeMIeaGp5sufqinKsISbsqHu6ZMJu2wDSmZLdmQJX6zLxkhcAUlhkQ==
+  dependencies:
+    "@module-federation/runtime-tools" "0.22.0"
+    "@rspack/binding" "1.7.12"
+    "@rspack/lite-tapable" "1.1.0"
+
+"@rspack/lite-tapable@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@rspack/lite-tapable/-/lite-tapable-1.1.0.tgz#3cfdafeed01078e116bd4f191b684c8b484de425"
+  integrity sha512-E2B0JhYFmVAwdDiG14+DW0Di4Ze4Jg10Pc4/lILUrd5DRCaklduz2OvJ5HYQ6G+hd+WTzqQb3QnDNfK4yvAFYw==
+
 "@sideway/address@^4.1.5":
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.5.tgz#4bc149a0076623ced99ca8208ba780d65a99b9d5"
@@ -2429,6 +2918,179 @@
     "@svgr/plugin-jsx" "8.1.0"
     "@svgr/plugin-svgo" "8.1.0"
 
+"@swc/core-darwin-arm64@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.46.tgz#393903c7eda790dbd89abd8fa0afdd9041543e5f"
+  integrity sha512-IsISIT22EfktVJrlvIpnAxG2u/A9aob9l99HMlx80x72WlFmFPk1V3UhkEzx86eJP8hw049KTFv/RISho2cq2Q==
+
+"@swc/core-darwin-x64@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.15.46.tgz#ddf16787e320636621180df480a3490fd9a868ca"
+  integrity sha512-4Tj4ppVIPCmUMpmGFiGtyEriwLyJ+yi/US4WfBrP/ok8COGddDZXLEzQETnKyK46mjvr1v0jevrS23zjoff7vA==
+
+"@swc/core-linux-arm-gnueabihf@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.46.tgz#7bee01b7311c43b913771ef9c7012931871de73b"
+  integrity sha512-i8tUGnNjyOgMmfmgFSg4aeJLQoFyfpIHK5FjpQAwpRyQIqEUB2w1e8zIDQzY1WhOxx8NoS1S5iUL813Un4Sf5A==
+
+"@swc/core-linux-arm64-gnu@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.46.tgz#964596d757d18f04a02873d85a3660416c09c187"
+  integrity sha512-c0OnhqzdhfOvv6qhNCcByepB+sNYOGZyhtr2Qa6ZCHvAWTYhSRw4j/u92Stue9PbZ/6q74b9nHzi76+kVzqQHQ==
+
+"@swc/core-linux-arm64-musl@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.46.tgz#213d3ece772689a8166ed51064836346c6ce1c2a"
+  integrity sha512-imyRpNEcUzFQFV2LE4jL68ErvmKEuZCbvZru77iQREunJ+bR4i658cupTgtG1mLYM3F1Tzy3Sb9xYb02KghWTg==
+
+"@swc/core-linux-ppc64-gnu@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-ppc64-gnu/-/core-linux-ppc64-gnu-1.15.46.tgz#4d2ec554103c6bef60cc1e294f374ea5a5edaf78"
+  integrity sha512-ctEfcl/HcUeomK33cbySiHZm98GEDIxTm1EkpBsYCiHxElYBzvTXVeuQT2YwbUXn9XCrjiw4ipyUNk33k26qRg==
+
+"@swc/core-linux-s390x-gnu@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-s390x-gnu/-/core-linux-s390x-gnu-1.15.46.tgz#097a19792ec22e2f51f6bfac02da1e0b3f5e5bb1"
+  integrity sha512-DxlMdnt84TtRVTv7WL/thWyz9+QU8QZNNoAP9rrk0P68LziuhfePp8MjQ44zIprpTHTsEwyziIuGUUN5iSC1bQ==
+
+"@swc/core-linux-x64-gnu@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.46.tgz#39c1ca215f9ca643a4aa3ca6250cc38ba5f5c673"
+  integrity sha512-SKxI7J6t90XPl8hRUqtJi9NfGdunN/E/vZMc7Bc0figeRdOPDBT+Tm8g7cx9xM0T0mewh2l+8dewa3Am27/P+A==
+
+"@swc/core-linux-x64-musl@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.46.tgz#323a720bc965fffeedacdc3167b46a291553b5e0"
+  integrity sha512-qj9T6B7bosI0VEsrWOVXZN1OXxS8Tp63ywyrLxNdOycnUtLdkgYcoBsN5y8ImnDDsnwrEWZOy1e+J4xSe7mA3Q==
+
+"@swc/core-win32-arm64-msvc@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.46.tgz#9c2cfd2a59be74671a018097b8914f8cfbcc698d"
+  integrity sha512-8p7l4c3LU+eA5g9Et1JPhNeMC1oQwXTGU+uah8DPIBX7YXzqswvaBtyKVmXefVGi/DJU1x3YJsc3mbAp9aWzSQ==
+
+"@swc/core-win32-ia32-msvc@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.46.tgz#bd7bd009a47b0f9826212e7ed36385d32fe193d8"
+  integrity sha512-tUEnfr3Bn9u6FOjUb3PN9p+09qZC2j+wNDLKHzXXZn22rqGcUqR/ohCRSS+nG9B9+X+U+3FewNEHJkTmdIvMjQ==
+
+"@swc/core-win32-x64-msvc@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.46.tgz#8371845a5bdb330cf05b009f602bb8c4636c6beb"
+  integrity sha512-Vux7UDzBJYQggSuPfcl2w9iu+IJpgpRCxHzgCaVkELnAXAE4XZMOTX9HNcaNiwfeIDqdu2rkr69RuDm6wY8neA==
+
+"@swc/core@^1.15.40":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.15.46.tgz#8acc0f68ee55010fdc876adf2a8faf0b097c681b"
+  integrity sha512-Ri3em2mBpq3h2zSPliCYl63otDGqek8PPEfv2nWgRQEbZ/VBCNyypVTVQ6cEbTCXBhy+WE2T3fQb08moIyuYaw==
+  dependencies:
+    "@swc/counter" "^0.1.3"
+    "@swc/types" "^0.1.27"
+  optionalDependencies:
+    "@swc/core-darwin-arm64" "1.15.46"
+    "@swc/core-darwin-x64" "1.15.46"
+    "@swc/core-linux-arm-gnueabihf" "1.15.46"
+    "@swc/core-linux-arm64-gnu" "1.15.46"
+    "@swc/core-linux-arm64-musl" "1.15.46"
+    "@swc/core-linux-ppc64-gnu" "1.15.46"
+    "@swc/core-linux-s390x-gnu" "1.15.46"
+    "@swc/core-linux-x64-gnu" "1.15.46"
+    "@swc/core-linux-x64-musl" "1.15.46"
+    "@swc/core-win32-arm64-msvc" "1.15.46"
+    "@swc/core-win32-ia32-msvc" "1.15.46"
+    "@swc/core-win32-x64-msvc" "1.15.46"
+
+"@swc/counter@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.3.tgz#cc7463bd02949611c6329596fccd2b0ec782b0e9"
+  integrity sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==
+
+"@swc/html-darwin-arm64@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/html-darwin-arm64/-/html-darwin-arm64-1.15.46.tgz#a870c0a32983e67be72a6ee0accb85ed011cf7d4"
+  integrity sha512-ZsC+iFnLOHPt7DF0tBxGoctF4/L0cUcuGonDavnwHhISHJiDQuT8TuRD9dB2jS7Du12ZY2Vu3jTugSnOfaDWxg==
+
+"@swc/html-darwin-x64@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/html-darwin-x64/-/html-darwin-x64-1.15.46.tgz#ec7ad3089e87a997b8c60ac216c54cac0681593b"
+  integrity sha512-XBg/CK0sA+Fa0KUzShhnAM14MwhWoeMANY8NAAuSlDpJnv5A+ek4wd7eNvriTHwaS10hNzQeSFgVkkeS3I4x6A==
+
+"@swc/html-linux-arm-gnueabihf@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/html-linux-arm-gnueabihf/-/html-linux-arm-gnueabihf-1.15.46.tgz#7950f6f5c59211b4ed7528535e7c4b3928e78374"
+  integrity sha512-lIXI6nTEf8yaaCTN4mT7geL1L+CnoSSUCj9rds0B5W8Y/Jc3GHmAwErlFn2Eyt8hLjqvd7vZJw1oqAbmVwDesw==
+
+"@swc/html-linux-arm64-gnu@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/html-linux-arm64-gnu/-/html-linux-arm64-gnu-1.15.46.tgz#219aa80c6569619bf46a656ce040d9ffae1d2e4c"
+  integrity sha512-pBXrXBb3X5820lQQ+poQ/HcQxrtVfo+YJqHXLCFyAtkBxGG/c2XYFcMu4eBig1M5fvpquwtbb/qw6m67reM+kQ==
+
+"@swc/html-linux-arm64-musl@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/html-linux-arm64-musl/-/html-linux-arm64-musl-1.15.46.tgz#030f32828e2d0195c149bb50200ba21aac5e22c6"
+  integrity sha512-vbbCIsKhZMooIZVG+v0NDVVmSKo22CyTVc6Qy/bijukj2/LDglxDjgMq68p0mnwhYyE4Y6URFtniMkIgY8CQuw==
+
+"@swc/html-linux-ppc64-gnu@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/html-linux-ppc64-gnu/-/html-linux-ppc64-gnu-1.15.46.tgz#f84d1d251d711ab319f9780b3063ffc3b558944d"
+  integrity sha512-6bUllvm6IwF8vxhmD6gl2OFiHiCVMmnGqDywhmRSCB2mzSN6HAmNzNJk3wuRDHUILQa7R2bvA5Vpt00hLO71ww==
+
+"@swc/html-linux-s390x-gnu@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/html-linux-s390x-gnu/-/html-linux-s390x-gnu-1.15.46.tgz#a0f6c2bced4b7f0cfa6decf9b2f6dda83ad482af"
+  integrity sha512-3kbCA/8Ij8xDbzgrTVyQ0OshcR2PvYiVOugIATQBV2qZ+RAyeozHPcodO+Fi+7X07p+D8hNfDfFik2rq4Vc45Q==
+
+"@swc/html-linux-x64-gnu@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/html-linux-x64-gnu/-/html-linux-x64-gnu-1.15.46.tgz#230aed71a07817f5a7dd9c00b53d10b16e4bcb73"
+  integrity sha512-n5L9LVBW0aE1tfMGk4b6koOzHog51G25wXgWbRmUDG2iqUO1Ss75DFurGEnjM7KoiKw6iqTJU0sXl/S92SAQ7w==
+
+"@swc/html-linux-x64-musl@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/html-linux-x64-musl/-/html-linux-x64-musl-1.15.46.tgz#89eb91e560051ba4aa56cce411f5ae65f555be00"
+  integrity sha512-NHjUyt+SrjSZGqoltQcNztZn6SmM7XkCgcrJoMTlAbrcC4XY+xvVi0QTp31roNnmX4GtqsZAGdgHGY5r0Who/w==
+
+"@swc/html-win32-arm64-msvc@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/html-win32-arm64-msvc/-/html-win32-arm64-msvc-1.15.46.tgz#f4dd663a38f37a5190dc4497317e85621c3fea72"
+  integrity sha512-x0/muLfBFN9O8omLqxm3GaJe8GZrYR4LTyWMw+o4Pjx3sxX6+MuLne5ebhT2jBVADkucCURGnDHCBm53WHz7EA==
+
+"@swc/html-win32-ia32-msvc@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/html-win32-ia32-msvc/-/html-win32-ia32-msvc-1.15.46.tgz#b53bf69eaafdfd4c3c0863b118bcff52e2e75c4c"
+  integrity sha512-vebE5ouxwl4saFYmtjUuSqP83fj3eMJQgyrXwEFky08J5aAqt07y1d2jmetGA2guFoSYwAMKJWTU8287Mpzf4g==
+
+"@swc/html-win32-x64-msvc@1.15.46":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/html-win32-x64-msvc/-/html-win32-x64-msvc-1.15.46.tgz#4d59abce9e02b69c9ff4a2bd350469b45bbf2e58"
+  integrity sha512-WBYYs0O/LUNZrO5eA7Zlkokbqg5Np3gQ2lQtkHeFCSFEJDYk8XWaHIU/3Kg89dduVUPer3h4TR/tqCWdBAKMzw==
+
+"@swc/html@^1.15.40":
+  version "1.15.46"
+  resolved "https://registry.yarnpkg.com/@swc/html/-/html-1.15.46.tgz#5f3d2c21a446410eaf785d736cb4c17049ba140b"
+  integrity sha512-U5eaur7Hsickt5Tko7VHMNER/zLNNUAg9r+LCUBoevzP/0SeEU/ZqOxorKZ1eLFhm/rDT1Mv3KEP9W5vmeSsUw==
+  dependencies:
+    "@swc/counter" "^0.1.3"
+  optionalDependencies:
+    "@swc/html-darwin-arm64" "1.15.46"
+    "@swc/html-darwin-x64" "1.15.46"
+    "@swc/html-linux-arm-gnueabihf" "1.15.46"
+    "@swc/html-linux-arm64-gnu" "1.15.46"
+    "@swc/html-linux-arm64-musl" "1.15.46"
+    "@swc/html-linux-ppc64-gnu" "1.15.46"
+    "@swc/html-linux-s390x-gnu" "1.15.46"
+    "@swc/html-linux-x64-gnu" "1.15.46"
+    "@swc/html-linux-x64-musl" "1.15.46"
+    "@swc/html-win32-arm64-msvc" "1.15.46"
+    "@swc/html-win32-ia32-msvc" "1.15.46"
+    "@swc/html-win32-x64-msvc" "1.15.46"
+
+"@swc/types@^0.1.27":
+  version "0.1.27"
+  resolved "https://registry.yarnpkg.com/@swc/types/-/types-0.1.27.tgz#12080b0c426dea450634f202d9a3c82ac396e793"
+  integrity sha512-K6h3iUlqeM946U4sXFYeahefR1YBbXJvko+hv8WS8/0BNJ4OHiHRywMnQUJCqkR7Y9+hqQ1TvEpiKqUhz7NEFg==
+  dependencies:
+    "@swc/counter" "^0.1.3"
+
 "@szmarczak/http-timer@^5.0.1":
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-5.0.1.tgz#c7c1bf1141cdd4751b0399c8fc7b8b664cd5be3a"
@@ -2441,6 +3103,13 @@
   resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
   integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
 
+"@tybys/wasm-util@^0.10.1":
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.10.3.tgz#015cba9e9dd47ce14d03d2a8c5d547bfb169665d"
+  integrity sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==
+  dependencies:
+    tslib "^2.4.0"
+
 "@types/body-parser@*":
   version "1.19.6"
   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.6.tgz#1859bebb8fd7dac9918a45d54c1971ab8b5af474"
@@ -2449,14 +3118,14 @@
     "@types/connect" "*"
     "@types/node" "*"
 
-"@types/bonjour@^3.5.9":
+"@types/bonjour@^3.5.13":
   version "3.5.13"
   resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.13.tgz#adf90ce1a105e81dd1f9c61fdc5afda1bfb92956"
   integrity sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==
   dependencies:
     "@types/node" "*"
 
-"@types/connect-history-api-fallback@^1.3.5":
+"@types/connect-history-api-fallback@^1.5.4":
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz#7de71645a103056b48ac3ce07b3520b819c1d5b3"
   integrity sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==
@@ -2516,6 +3185,16 @@
     "@types/range-parser" "*"
     "@types/send" "*"
 
+"@types/express-serve-static-core@^4.17.21":
+  version "4.19.9"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.9.tgz#b746a8bb6c389af7a31141397bb539f775b0ae84"
+  integrity sha512-QP2ESEe/ImWY0HDwNAnK9PvEffUyhLTnWkk7KXzHfyeWAnlrDe1fN77bXl6ia8KT3wPlmA7t9/VPRpnf4Ex9sg==
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+    "@types/send" "*"
+
 "@types/express-serve-static-core@^4.17.33":
   version "4.19.6"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz#e01324c2a024ff367d92c66f48553ced0ab50267"
@@ -2535,20 +3214,15 @@
     "@types/express-serve-static-core" "^5.0.0"
     "@types/serve-static" "*"
 
-"@types/express@^4.17.13":
-  version "4.17.23"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.23.tgz#35af3193c640bfd4d7fe77191cd0ed411a433bef"
-  integrity sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==
+"@types/express@^4.17.25":
+  version "4.17.25"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.25.tgz#070c8c73a6fee6936d65c195dbbfb7da5026649b"
+  integrity sha512-dVd04UKsfpINUnK0yBoYHDF3xu7xVH4BuDotC/xGuycx4CgbP48X/KF/586bcObxT0HENHXEU8Nqtu6NR+eKhw==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^4.17.33"
     "@types/qs" "*"
-    "@types/serve-static" "*"
-
-"@types/gtag.js@^0.0.12":
-  version "0.0.12"
-  resolved "https://registry.yarnpkg.com/@types/gtag.js/-/gtag.js-0.0.12.tgz#095122edca896689bdfcdd73b057e23064d23572"
-  integrity sha512-YQV9bUsemkzG81Ea295/nF/5GijnD2Af7QhEofh7xu+kvCN6RdodgNwwGWXB5GMI3NoyvQo0odNctoH/qLMIpg==
+    "@types/serve-static" "^1"
 
 "@types/hast@^3.0.0":
   version "3.0.4"
@@ -2630,13 +3304,6 @@
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-2.1.0.tgz#052aa67a48eccc4309d7f0191b7e41434b90bb78"
   integrity sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==
 
-"@types/node-forge@^1.3.0":
-  version "1.3.14"
-  resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-1.3.14.tgz#006c2616ccd65550560c2757d8472eb6d3ecea0b"
-  integrity sha512-mhVF2BnD4BO+jtOp7z1CdzaK4mbuK0LLQYAvdOLqHTavxFNq4zA1EmYkpnFjP8HOUzedfQkRnp0E2ulSAYSzAw==
-  dependencies:
-    "@types/node" "*"
-
 "@types/node@*":
   version "24.5.2"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-24.5.2.tgz#52ceb83f50fe0fcfdfbd2a9fab6db2e9e7ef6446"
@@ -2712,10 +3379,10 @@
   dependencies:
     csstype "^3.0.2"
 
-"@types/retry@0.12.0":
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
-  integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
+"@types/retry@0.12.2":
+  version "0.12.2"
+  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.2.tgz#ed279a64fa438bb69f2480eda44937912bb7480a"
+  integrity sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==
 
 "@types/sax@^1.2.1":
   version "1.2.7"
@@ -2732,14 +3399,22 @@
     "@types/mime" "^1"
     "@types/node" "*"
 
-"@types/serve-index@^1.9.1":
+"@types/send@<1":
+  version "0.17.6"
+  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.6.tgz#aeb5385be62ff58a52cd5459daa509ae91651d25"
+  integrity sha512-Uqt8rPBE8SY0RK8JB1EzVOIZ32uqy8HwdxCnoCOsYrvnswqmFZ/k+9Ikidlk/ImhsdvBsloHbAlewb2IEBV/Og==
+  dependencies:
+    "@types/mime" "^1"
+    "@types/node" "*"
+
+"@types/serve-index@^1.9.4":
   version "1.9.4"
   resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.4.tgz#e6ae13d5053cb06ed36392110b4f9a49ac4ec898"
   integrity sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==
   dependencies:
     "@types/express" "*"
 
-"@types/serve-static@*", "@types/serve-static@^1.13.10":
+"@types/serve-static@*":
   version "1.15.8"
   resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.8.tgz#8180c3fbe4a70e8f00b9f70b9ba7f08f35987877"
   integrity sha512-roei0UY3LhpOJvjbIP6ZZFngyLKl5dskOtDhxY5THRSpO+ZI+nzJ+m5yUMzGrp89YRa7lvknKkMYjqQFGwA7Sg==
@@ -2748,7 +3423,16 @@
     "@types/node" "*"
     "@types/send" "*"
 
-"@types/sockjs@^0.3.33":
+"@types/serve-static@^1", "@types/serve-static@^1.15.5":
+  version "1.15.10"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.10.tgz#768169145a778f8f5dfcb6360aead414a3994fee"
+  integrity sha512-tRs1dB+g8Itk72rlSI2ZrW6vZg0YrLI81iQSTkMmOqnqCaNr/8Ek4VwWcN5vZgCYWbg/JJSGBlUaYGAOP73qBw==
+  dependencies:
+    "@types/http-errors" "*"
+    "@types/node" "*"
+    "@types/send" "<1"
+
+"@types/sockjs@^0.3.36":
   version "0.3.36"
   resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.36.tgz#ce322cf07bcc119d4cbf7f88954f3a3bd0f67535"
   integrity sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==
@@ -2765,7 +3449,7 @@
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.11.tgz#11af57b127e32487774841f7a4e54eab166d03c4"
   integrity sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==
 
-"@types/ws@^8.5.5":
+"@types/ws@^8.5.10":
   version "8.18.1"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.18.1.tgz#48464e4bf2ddfd17db13d845467f6070ffea4aa9"
   integrity sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==
@@ -2950,10 +3634,10 @@ acorn@^8.0.0, acorn@^8.0.4, acorn@^8.11.0, acorn@^8.15.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816"
   integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==
 
-address@^1.0.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/address/-/address-1.2.2.tgz#2b5248dac5485a6390532c6a517fda2e3faac89e"
-  integrity sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==
+address@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/address/-/address-2.0.3.tgz#e910900615db3d8a20c040d4c710631062fc4ba8"
+  integrity sha512-XNAb/a6TCqou+TufU8/u11HCu9x1gYvOoxLwtlXgIqmkrYQADVv6ljyW2zwiPhHz9R1gItAWpuDrdJMmrOBFEA==
 
 aggregate-error@^3.0.0:
   version "3.1.0"
@@ -3002,32 +3686,32 @@ ajv@^8.0.0, ajv@^8.9.0:
     json-schema-traverse "^1.0.0"
     require-from-string "^2.0.2"
 
-algoliasearch-helper@^3.22.6:
-  version "3.26.0"
-  resolved "https://registry.yarnpkg.com/algoliasearch-helper/-/algoliasearch-helper-3.26.0.tgz#d6e283396a9fc5bf944f365dc3b712570314363f"
-  integrity sha512-Rv2x3GXleQ3ygwhkhJubhhYGsICmShLAiqtUuJTUkr9uOCOXyF2E71LVT4XDnVffbknv8XgScP4U0Oxtgm+hIw==
+algoliasearch-helper@^3.26.0:
+  version "3.29.2"
+  resolved "https://registry.yarnpkg.com/algoliasearch-helper/-/algoliasearch-helper-3.29.2.tgz#ceb699ae6ec9bb088f8a2b781b66868222e9c23a"
+  integrity sha512-SaV+rZM3drExb0punEYYjT+sNcH74YFwN8ocjya7IDOyQvKWeQpEaSMVG3+IGTVos+feuatj7ljQ4BXlXdUp3w==
   dependencies:
     "@algolia/events" "^4.0.1"
 
-algoliasearch@^5.14.2, algoliasearch@^5.17.1:
-  version "5.37.0"
-  resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-5.37.0.tgz#73dc4a09654e6e02b529300018d639706b95b47b"
-  integrity sha512-y7gau/ZOQDqoInTQp0IwTOjkrHc4Aq4R8JgpmCleFwiLl+PbN2DMWoDUWZnrK8AhNJwT++dn28Bt4NZYNLAmuA==
-  dependencies:
-    "@algolia/abtesting" "1.3.0"
-    "@algolia/client-abtesting" "5.37.0"
-    "@algolia/client-analytics" "5.37.0"
-    "@algolia/client-common" "5.37.0"
-    "@algolia/client-insights" "5.37.0"
-    "@algolia/client-personalization" "5.37.0"
-    "@algolia/client-query-suggestions" "5.37.0"
-    "@algolia/client-search" "5.37.0"
-    "@algolia/ingestion" "1.37.0"
-    "@algolia/monitoring" "1.37.0"
-    "@algolia/recommend" "5.37.0"
-    "@algolia/requester-browser-xhr" "5.37.0"
-    "@algolia/requester-fetch" "5.37.0"
-    "@algolia/requester-node-http" "5.37.0"
+algoliasearch@^5.37.0:
+  version "5.56.0"
+  resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-5.56.0.tgz#042f1a39dfa951356206f43dece1c8d1ea1721bd"
+  integrity sha512-PrqppUmhT4ENdas2pH9caE7efUcxy6EcSFhWzosiVuQBzu2tQ5yLTI6jwomT/1cuBnivzGfxiJCqDNN9FRRh+Q==
+  dependencies:
+    "@algolia/abtesting" "1.22.0"
+    "@algolia/client-abtesting" "5.56.0"
+    "@algolia/client-analytics" "5.56.0"
+    "@algolia/client-common" "5.56.0"
+    "@algolia/client-insights" "5.56.0"
+    "@algolia/client-personalization" "5.56.0"
+    "@algolia/client-query-suggestions" "5.56.0"
+    "@algolia/client-search" "5.56.0"
+    "@algolia/ingestion" "1.56.0"
+    "@algolia/monitoring" "1.56.0"
+    "@algolia/recommend" "5.56.0"
+    "@algolia/requester-browser-xhr" "5.56.0"
+    "@algolia/requester-fetch" "5.56.0"
+    "@algolia/requester-node-http" "5.56.0"
 
 ansi-align@^3.0.1:
   version "3.0.1"
@@ -3036,13 +3720,6 @@ ansi-align@^3.0.1:
   dependencies:
     string-width "^4.1.0"
 
-ansi-escapes@^4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
-  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
-  dependencies:
-    type-fest "^0.21.3"
-
 ansi-html-community@^0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
@@ -3058,7 +3735,7 @@ ansi-regex@^6.0.1:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.2.tgz#60216eea464d864597ce2832000738a0589650c1"
   integrity sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==
 
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
@@ -3070,6 +3747,11 @@ ansi-styles@^6.1.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.3.tgz#c044d5dcc521a076413472597a1acb1f103c4041"
   integrity sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==
 
+ansis@^3.2.0:
+  version "3.17.0"
+  resolved "https://registry.yarnpkg.com/ansis/-/ansis-3.17.0.tgz#fa8d9c2a93fe7d1177e0c17f9eeb562a58a832d7"
+  integrity sha512-0qWUglt9JEqLFr3w1I1pbrChn1grhaiAR2ocX1PP/flRmxgtwTzPFFFnfIlD6aMOLQZgSuCRlidD70lvx8yhzg==
+
 anymatch@~3.1.2:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
@@ -3083,13 +3765,6 @@ arg@^5.0.0:
   resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
   integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==
 
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -3105,6 +3780,15 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
+asn1js@^3.0.10, asn1js@^3.0.6:
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-3.0.10.tgz#df26c874c8a8b41ca605efea47b2ad07551013dd"
+  integrity sha512-S2s3aOytiKdFRdulw2qPE51MzjzVOisppcVv7jVFR+Kw0kxwvFrDcYA0h7Ndqbmj0HkMIXYWaoj7fli8kgx1eg==
+  dependencies:
+    pvtsutils "^1.3.6"
+    pvutils "^1.1.5"
+    tslib "^2.8.1"
+
 astring@^1.8.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/astring/-/astring-1.9.0.tgz#cc73e6062a7eb03e7d19c22d8b0b3451fd9bfeef"
@@ -3180,6 +3864,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+baseline-browser-mapping@^2.10.44:
+  version "2.11.5"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.11.5.tgz#eca24c8ff0c24fcedef86260e2aae8c76b8dbce8"
+  integrity sha512-xJo6a6YZnwZfnyGmQKWMbVOcii7XRibjOskRh+WJ9UHQoX16xrQrcIgAMQOzfvs8XiLMx6ih/fsLPF73iY2D1A==
+
 baseline-browser-mapping@^2.8.3:
   version "2.8.5"
   resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.8.5.tgz#3147fe6b01a0c49ce1952daebcfc2057fc43fedb"
@@ -3200,28 +3889,28 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
   integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
 
-body-parser@1.20.3:
-  version "1.20.3"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6"
-  integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==
+body-parser@~1.20.5:
+  version "1.20.6"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.6.tgz#60c789c78e0992d906da0a29d71ae01d15c1ed76"
+  integrity sha512-p5tAzS57i5MV9fZFDj9LeIiTZEufbSe2eDozP+ElheSUq1m74CRq1jI4mYNDdVs9vQztXFLuk/Gd6BWTdwRJ5g==
   dependencies:
-    bytes "3.1.2"
+    bytes "~3.1.2"
     content-type "~1.0.5"
     debug "2.6.9"
     depd "2.0.0"
-    destroy "1.2.0"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    on-finished "2.4.1"
-    qs "6.13.0"
-    raw-body "2.5.2"
+    destroy "~1.2.0"
+    http-errors "~2.0.1"
+    iconv-lite "~0.4.24"
+    on-finished "~2.4.1"
+    qs "~6.15.1"
+    raw-body "~2.5.3"
     type-is "~1.6.18"
-    unpipe "1.0.0"
+    unpipe "~1.0.0"
 
-bonjour-service@^1.0.11:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.3.0.tgz#80d867430b5a0da64e82a8047fc1e355bdb71722"
-  integrity sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==
+bonjour-service@^1.2.1:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.4.3.tgz#5854e34a33ab5252a66cc31ffb46687e30c3a5f6"
+  integrity sha512-2Kd5UYlFUVgAKMTyuBLl6w49wqfOnbxHqmuH0oCl/n7TfAikR0zoowNOP5BU4dfXmm+Vr9JyEN370auSMx+CNg==
   dependencies:
     fast-deep-equal "^3.1.3"
     multicast-dns "^7.2.5"
@@ -3285,21 +3974,44 @@ browserslist@^4.0.0, browserslist@^4.23.0, browserslist@^4.24.0, browserslist@^4
     node-releases "^2.0.21"
     update-browserslist-db "^1.1.3"
 
+browserslist@^4.24.2:
+  version "4.28.7"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.28.7.tgz#409046517fccd2e51cdc20f077454b7141184028"
+  integrity sha512-JxV13hNrFxqjOc8alRbq9dK1MM79NEXYpma2B2J4wAtpWS5zIEIKqWPGCl7N4o7Uc7B7itylh7SuDujATRyyTw==
+  dependencies:
+    baseline-browser-mapping "^2.10.44"
+    caniuse-lite "^1.0.30001806"
+    electron-to-chromium "^1.5.393"
+    node-releases "^2.0.51"
+    update-browserslist-db "^1.2.3"
+
 buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
+bundle-name@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-4.1.0.tgz#f3b96b34160d6431a19d7688135af7cfb8797889"
+  integrity sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==
+  dependencies:
+    run-applescript "^7.0.0"
+
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
   integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==
 
-bytes@3.1.2:
+bytes@3.1.2, bytes@~3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
+bytestreamjs@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/bytestreamjs/-/bytestreamjs-2.0.1.tgz#a32947c7ce389a6fa11a09a9a563d0a45889535e"
+  integrity sha512-U1Z/ob71V/bXfVABvNr/Kumf5VyeQRBEm6Txb0PQ6S7V5GpBM3w4Cbqz/xPDicR5tN0uvDifng8C+5qECeGwyQ==
+
 cacheable-lookup@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz#3476a8215d046e5a3202a9209dd13fec1f933a27"
@@ -3382,6 +4094,11 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001702, caniuse-lite@^1.0.30001741:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001743.tgz#50ff91a991220a1ee2df5af00650dd5c308ea7cd"
   integrity sha512-e6Ojr7RV14Un7dz6ASD0aZDmQPT/A+eZU+nuTNfjqmRrmkmQlnTNWH0SKmqagx9PeW87UVqapSurtAXifmtdmw==
 
+caniuse-lite@^1.0.30001806:
+  version "1.0.30001806"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001806.tgz#1bc8e502b723fa393455dfbedd5ccec0c29bb74e"
+  integrity sha512-72Cuvd95zbSYPKq6Fhg8eDJRlzgWDf7/mtoZv6Qe/DYNCEBdNxoA3+rZAU2ZhGCpZlns3EssFavaZomckT5Uuw==
+
 ccount@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/ccount/-/ccount-2.0.1.tgz#17a3bf82302e0870d6da43a01311a8bc02a3ecf5"
@@ -3450,7 +4167,7 @@ cheerio@1.0.0-rc.12:
     parse5 "^7.0.0"
     parse5-htmlparser2-tree-adapter "^7.0.0"
 
-chokidar@^3.5.3:
+chokidar@^3.5.3, chokidar@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
   integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
@@ -3598,7 +4315,7 @@ compressible@~2.0.18:
   dependencies:
     mime-db ">= 1.43.0 < 2"
 
-compression@^1.7.4:
+compression@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/compression/-/compression-1.8.1.tgz#4a45d909ac16509195a9a28bd91094889c180d79"
   integrity sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==
@@ -3650,7 +4367,7 @@ content-disposition@0.5.2:
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
   integrity sha512-kRGRZw3bLlFISDBgwTSA1TMBFN6J6GWDeubmDE3AF+3+yXL8hTWv8r5rkLbqYXY4RjPk/EzHnClI3zQf1cFmHA==
 
-content-disposition@0.5.4:
+content-disposition@~0.5.4:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
   integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
@@ -3672,15 +4389,15 @@ convert-source-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-cookie-signature@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
+cookie-signature@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.7.tgz#ab5dd7ab757c54e60f37ef6550f481c426d10454"
+  integrity sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==
 
-cookie@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.1.tgz#2f73c42142d5d5cf71310a74fc4ae61670e5dbc9"
-  integrity sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==
+cookie@~0.7.1:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.2.tgz#556369c472a2ba910f2979891b526b3436237ed7"
+  integrity sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==
 
 copy-text-to-clipboard@^3.2.0:
   version "3.2.1"
@@ -3706,11 +4423,6 @@ core-js-compat@^3.43.0:
   dependencies:
     browserslist "^4.25.3"
 
-core-js-pure@^3.43.0:
-  version "3.45.1"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.45.1.tgz#b129d86a5f7f8380378577c7eaee83608570a05a"
-  integrity sha512-OHnWFKgTUshEU8MK+lOs1H8kC8GkTi9Z1tvNkxrCcw9wl3MJIO7q2ld77wjWn4/xuGrVu2X+nME1iIIPBSdyEQ==
-
 core-js@^3.31.1:
   version "3.45.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.45.1.tgz#5810e04a1b4e9bc5ddaa4dd12e702ff67300634d"
@@ -3949,7 +4661,7 @@ debug@2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.3.1, debug@^4.4.1:
+debug@^4.0.0, debug@^4.1.0, debug@^4.3.1, debug@^4.4.1:
   version "4.4.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
   integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
@@ -3980,12 +4692,18 @@ deepmerge@^4.3.1:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
   integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
 
-default-gateway@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"
-  integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==
+default-browser-id@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-5.0.1.tgz#f7a7ccb8f5104bf8e0f71ba3b1ccfa5eafdb21e8"
+  integrity sha512-x1VCxdX4t+8wVfd1so/9w+vQ4vx7lKd2Qp5tDRutErwmR85OgmfX7RlLRMWafRMY7hbEiXIbudNrjOAPa/hL8Q==
+
+default-browser@^5.2.1:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-5.5.0.tgz#2792e886f2422894545947cc80e1a444496c5976"
+  integrity sha512-H9LMLr5zwIbSxrmvikGuI/5KGhZ8E2zH3stkMgM5LpOWDutGM2JZaj460Udnf1a+946zc7YBgrqEWwbk7zHvGw==
   dependencies:
-    execa "^5.0.0"
+    bundle-name "^4.1.0"
+    default-browser-id "^5.0.0"
 
 defer-to-connect@^2.0.1:
   version "2.0.1"
@@ -4006,6 +4724,11 @@ define-lazy-prop@^2.0.0:
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
   integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
 
+define-lazy-prop@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f"
+  integrity sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==
+
 define-properties@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
@@ -4020,7 +4743,7 @@ delegate@^3.1.2:
   resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
   integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==
 
-depd@2.0.0:
+depd@2.0.0, depd@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
@@ -4035,23 +4758,27 @@ dequal@^2.0.0:
   resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
   integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
 
-destroy@1.2.0:
+destroy@1.2.0, destroy@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
+detect-libc@^2.0.3:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.2.tgz#689c5dcdc1900ef5583a4cb9f6d7b473742074ad"
+  integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==
+
 detect-node@^2.0.4:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
-detect-port@^1.5.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/detect-port/-/detect-port-1.6.1.tgz#45e4073997c5f292b957cb678fb0bb8ed4250a67"
-  integrity sha512-CmnVc+Hek2egPx1PeTFVta2W78xy2K/9Rkf6cC4T59S50tVnzKj+tnx5mmx5lwvCkujZ4uRrpRSuV+IVs3f90Q==
+detect-port@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/detect-port/-/detect-port-2.1.0.tgz#03d72644891fa451ca5609b83107a8a0ebd03f91"
+  integrity sha512-epZuWb/6Q62L+nDHJc/hQAqf8pylsqgk3BpZXVBx1CDnr3nkrVNn73Uu1rXcFzkNcc+hkP3whuOg7JZYaQB65Q==
   dependencies:
-    address "^1.0.1"
-    debug "4"
+    address "^2.0.1"
 
 devlop@^1.0.0, devlop@^1.1.0:
   version "1.1.0"
@@ -4188,6 +4915,11 @@ electron-to-chromium@^1.5.218:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.221.tgz#bd98014b2a247701c4ebd713080448d539545d79"
   integrity sha512-/1hFJ39wkW01ogqSyYoA4goOXOtMRy6B+yvA1u42nnsEGtHzIzmk93aPISumVQeblj47JUHLC9coCjUxb1EvtQ==
 
+electron-to-chromium@^1.5.393:
+  version "1.5.397"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.397.tgz#b376f17aefc1a6dd3b9898775a4257bd53906c2a"
+  integrity sha512-khGTy9U9x02KEtsKM8vx5A62BsRmcOsIgDpWr1ImE32Ax8GxHGPHZf+Eu9H8zOOyHJnB0jTbseyTHbq2XCT8yw==
+
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -4213,11 +4945,6 @@ emoticon@^4.0.1:
   resolved "https://registry.yarnpkg.com/emoticon/-/emoticon-4.1.0.tgz#d5a156868ee173095627a33de3f1e914c3dde79e"
   integrity sha512-VWZfnxqwNcc51hIy/sbOdEem6D+cVtpPzEEtVAFdaas30+1dgkyaOQ4sQ6Bp0tOMqWO1v+HQfYaoodOkdhK6SQ==
 
-encodeurl@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
-
 encodeurl@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58"
@@ -4310,11 +5037,6 @@ escape-html@^1.0.3, escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
-escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
-
 escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
@@ -4333,11 +5055,6 @@ eslint-scope@5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
 esrecurse@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
@@ -4449,7 +5166,7 @@ events@^3.2.0:
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-execa@5.1.1, execa@^5.0.0:
+execa@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
   integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
@@ -4464,39 +5181,39 @@ execa@5.1.1, execa@^5.0.0:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
-express@^4.17.3:
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.21.2.tgz#cf250e48362174ead6cea4a566abef0162c1ec32"
-  integrity sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==
+express@^4.22.1:
+  version "4.22.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.22.2.tgz#c17ae0981e5efc24b22272f0e041c4662503b700"
+  integrity sha512-IuL+Elrou2ZvCFHs18/CIzy2Nzvo25nZ1/D2eIZlz7c+QUayAcYoiM2BthCjs+EBHVpjYjcuLDAiCWgeIX3X1Q==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.20.3"
-    content-disposition "0.5.4"
+    body-parser "~1.20.5"
+    content-disposition "~0.5.4"
     content-type "~1.0.4"
-    cookie "0.7.1"
-    cookie-signature "1.0.6"
+    cookie "~0.7.1"
+    cookie-signature "~1.0.6"
     debug "2.6.9"
     depd "2.0.0"
     encodeurl "~2.0.0"
     escape-html "~1.0.3"
     etag "~1.8.1"
-    finalhandler "1.3.1"
-    fresh "0.5.2"
-    http-errors "2.0.0"
+    finalhandler "~1.3.1"
+    fresh "~0.5.2"
+    http-errors "~2.0.0"
     merge-descriptors "1.0.3"
     methods "~1.1.2"
-    on-finished "2.4.1"
+    on-finished "~2.4.1"
     parseurl "~1.3.3"
-    path-to-regexp "0.1.12"
+    path-to-regexp "~0.1.12"
     proxy-addr "~2.0.7"
-    qs "6.13.0"
+    qs "~6.15.1"
     range-parser "~1.2.1"
     safe-buffer "5.2.1"
-    send "0.19.0"
-    serve-static "1.16.2"
+    send "~0.19.0"
+    serve-static "~1.16.2"
     setprototypeof "1.2.0"
-    statuses "2.0.1"
+    statuses "~2.0.1"
     type-is "~1.6.18"
     utils-merge "1.0.1"
     vary "~1.1.2"
@@ -4567,13 +5284,6 @@ feed@^4.2.2:
   dependencies:
     xml-js "^1.6.11"
 
-figures@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
-  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
 file-loader@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
@@ -4589,17 +5299,17 @@ fill-range@^7.1.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-finalhandler@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019"
-  integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==
+finalhandler@~1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.2.tgz#1ebc2228fc7673aac4a472c310cc05b77d852b88"
+  integrity sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==
   dependencies:
     debug "2.6.9"
     encodeurl "~2.0.0"
     escape-html "~1.0.3"
-    on-finished "2.4.1"
+    on-finished "~2.4.1"
     parseurl "~1.3.3"
-    statuses "2.0.1"
+    statuses "~2.0.2"
     unpipe "~1.0.0"
 
 find-cache-dir@^4.0.0:
@@ -4653,7 +5363,7 @@ fraction.js@^4.3.7:
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
   integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
 
-fresh@0.5.2:
+fresh@~0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
@@ -4667,16 +5377,6 @@ fs-extra@^11.1.1, fs-extra@^11.2.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-monkey@^1.0.4:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.1.0.tgz#632aa15a20e71828ed56b24303363fb1414e5997"
-  integrity sha512-QMUezzXWII9EV5aTFXW1UBVUO77wYPpjqIF8/AviUCThNeSYZykpoTixUeaNNBwmCev0AMDWMAni+f8Hxb1IFw==
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
-
 fsevents@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
@@ -4745,23 +5445,16 @@ glob-parent@^6.0.1:
   dependencies:
     is-glob "^4.0.3"
 
+glob-to-regex.js@^1.0.0, glob-to-regex.js@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/glob-to-regex.js/-/glob-to-regex.js-1.2.0.tgz#2b323728271d133830850e32311f40766c5f6413"
+  integrity sha512-QMwlOQKU/IzqMUOAZWubUOT8Qft+Y0KQWnX9nK3ch0CJg0tTp4TvGZsTfudYKv2NzoQSyPcnA6TYeIQ3jGichQ==
+
 glob-to-regexp@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^7.1.3:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 global-dirs@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.1.tgz#0c488971f066baceda21447aecb1a8b911d22485"
@@ -4831,16 +5524,6 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11,
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
-gray-matter@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/gray-matter/-/gray-matter-4.0.3.tgz#e893c064825de73ea1f5f7d88c7a9f7274288798"
-  integrity sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==
-  dependencies:
-    js-yaml "^3.13.1"
-    kind-of "^6.0.2"
-    section-matter "^1.0.0"
-    strip-bom-string "^1.0.0"
-
 gzip-size@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
@@ -5030,11 +5713,6 @@ hpack.js@^2.1.6:
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
-html-entities@^2.3.2:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.6.0.tgz#7c64f1ea3b36818ccae3d3fb48b6974208e984f8"
-  integrity sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==
-
 html-escaper@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
@@ -5117,17 +5795,6 @@ http-deceiver@^1.2.7:
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
   integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==
 
-http-errors@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
-  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
-  dependencies:
-    depd "2.0.0"
-    inherits "2.0.4"
-    setprototypeof "1.2.0"
-    statuses "2.0.1"
-    toidentifier "1.0.1"
-
 http-errors@~1.6.2:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
@@ -5138,15 +5805,26 @@ http-errors@~1.6.2:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
+http-errors@~2.0.0, http-errors@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.1.tgz#36d2f65bc909c8790018dd36fb4d93da6caae06b"
+  integrity sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==
+  dependencies:
+    depd "~2.0.0"
+    inherits "~2.0.4"
+    setprototypeof "~1.2.0"
+    statuses "~2.0.2"
+    toidentifier "~1.0.1"
+
 http-parser-js@>=0.5.1:
   version "0.5.10"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.10.tgz#b3277bd6d7ed5588e20ea73bf724fcbe44609075"
   integrity sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA==
 
-http-proxy-middleware@^2.0.3:
-  version "2.0.9"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz#e9e63d68afaa4eee3d147f39149ab84c0c2815ef"
-  integrity sha512-c1IyJYLYppU574+YI7R4QyX2ystMtVXZwIdzazUIPIJsHuWNd+mho2j+bKoHftndicGj9yh+xjd+l0yj7VeT1Q==
+http-proxy-middleware@^2.0.9:
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.10.tgz#b2df7b705203d7a8c269ac8450cf96b00c532f94"
+  integrity sha512-RKzRWNPxUZqbuk3BC5mGVJbBnWgr+diEnjJexIOytFbBzDy88Fbh/YvBr3DsNrl1jYAfjWfpATEv0NO35FDuPQ==
   dependencies:
     "@types/http-proxy" "^1.17.8"
     http-proxy "^1.18.1"
@@ -5176,7 +5854,12 @@ human-signals@^2.1.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
-iconv-lite@0.4.24:
+hyperdyperid@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/hyperdyperid/-/hyperdyperid-1.2.0.tgz#59668d323ada92228d2a869d3e474d5a33b69e6b"
+  integrity sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==
+
+iconv-lite@~0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -5226,24 +5909,16 @@ infima@0.2.0-alpha.45:
   resolved "https://registry.yarnpkg.com/infima/-/infima-0.2.0-alpha.45.tgz#542aab5a249274d81679631b492973dd2c1e7466"
   integrity sha512-uyH0zfr1erU1OohLk0fT4Rrb94AOhguWNOcD9uGrSpRvNB+6gZXUoJX5J0NtvzBO10YZ9PgvA4NFgt+fYg8ojw==
 
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
 inherits@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
+inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3, inherits@~2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
 ini@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
@@ -5271,10 +5946,10 @@ ipaddr.js@1.9.1:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
-ipaddr.js@^2.0.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.2.0.tgz#d33fa7bac284f4de7af949638c9d68157c6b92e8"
-  integrity sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==
+ipaddr.js@^2.1.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.4.0.tgz#038e9ceaf8219efc5bb76347b7eb787875d5095b"
+  integrity sha512-9VGk3HGanVE6JoZXHiCpnGy5X0jYDnN4EA4lntFPj+1vIWlFhIylq2CrrCOJH9EAhc5CYhq18F2Av2tgoAPsYQ==
 
 is-alphabetical@^2.0.0:
   version "2.0.1"
@@ -5325,6 +6000,11 @@ is-docker@^2.0.0, is-docker@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
   integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
+is-docker@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200"
+  integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==
+
 is-extendable@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -5352,6 +6032,13 @@ is-hexadecimal@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-2.0.1.tgz#86b5bf668fca307498d319dfc03289d781a90027"
   integrity sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==
 
+is-inside-container@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4"
+  integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==
+  dependencies:
+    is-docker "^3.0.0"
+
 is-installed-globally@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"
@@ -5360,6 +6047,11 @@ is-installed-globally@^0.4.0:
     global-dirs "^3.0.0"
     is-path-inside "^3.0.2"
 
+is-network-error@^1.0.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/is-network-error/-/is-network-error-1.3.2.tgz#9460bc30f8419a4bca77114f4de88a3ee5e0c519"
+  integrity sha512-PhBY86zaxNZUuWP6h13Vu5oFe0XY6/UlKzQnYFELzGVHygP3MxmvTfYSG7GN3aIab/iWudSMgjSnG9Dq+nHrgA==
+
 is-npm@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-6.1.0.tgz#f70e0b6c132dfc817ac97d3badc0134945b098d3"
@@ -5424,6 +6116,13 @@ is-wsl@^2.2.0:
   dependencies:
     is-docker "^2.0.0"
 
+is-wsl@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-3.1.1.tgz#327897b26832a3eb117da6c27492d04ca132594f"
+  integrity sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw==
+  dependencies:
+    is-inside-container "^1.0.0"
+
 is-yarn-global@^0.4.0:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.4.1.tgz#b312d902b313f81e4eaf98b6361ba2b45cd694bb"
@@ -5501,14 +6200,6 @@ joi@^17.9.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 js-yaml@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
@@ -5567,7 +6258,7 @@ keyv@^4.5.3:
   dependencies:
     json-buffer "3.0.1"
 
-kind-of@^6.0.0, kind-of@^6.0.2:
+kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
@@ -5584,19 +6275,93 @@ latest-version@^7.0.0:
   dependencies:
     package-json "^8.1.0"
 
-launch-editor@^2.6.0:
-  version "2.11.1"
-  resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.11.1.tgz#61a0b7314a42fd84a6cbb564573d9e9ffcf3d72b"
-  integrity sha512-SEET7oNfgSaB6Ym0jufAdCeo3meJVeCaaDyzRygy0xsp2BFKCprcfHljTq4QkzTLUxEKkFK6OK4811YM2oSrRg==
+launch-editor@^2.14.1:
+  version "2.14.1"
+  resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.14.1.tgz#f7e0da3f58aaea03fea01074d840b5f739ed7ddc"
+  integrity sha512-QWBrQsMpH7gPr965dsKD/3cKWiNoTjpATQf++Xq63N6sKRGMwlVXz41O1IZTMfZQgBctD/K5Zt06+/I6pP6+HA==
   dependencies:
     picocolors "^1.1.1"
-    shell-quote "^1.8.3"
+    shell-quote "^1.8.4"
 
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
+lightningcss-android-arm64@1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-android-arm64/-/lightningcss-android-arm64-1.33.0.tgz#9a6841f88ae50fc83502903892b41af41bc2b907"
+  integrity sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==
+
+lightningcss-darwin-arm64@1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.33.0.tgz#c0f2c31c0bfd19fa4dd3f18e957a1f1a152097d6"
+  integrity sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg==
+
+lightningcss-darwin-x64@1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.33.0.tgz#cb0705965acb538c6683949ce6925fb3cdf7c361"
+  integrity sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ==
+
+lightningcss-freebsd-x64@1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.33.0.tgz#763538828b26bab2680dadafcc84ee78b0eb502b"
+  integrity sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg==
+
+lightningcss-linux-arm-gnueabihf@1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.33.0.tgz#6862e3176a331aedbdec1ed352b4d7d0dd0784de"
+  integrity sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ==
+
+lightningcss-linux-arm64-gnu@1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.33.0.tgz#c6a3a2ed15141daf6bdc2628930f8e39bdf473aa"
+  integrity sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg==
+
+lightningcss-linux-arm64-musl@1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.33.0.tgz#7fa1334971fc82845f9827df6ef8a0b20914bac6"
+  integrity sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==
+
+lightningcss-linux-x64-gnu@1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.33.0.tgz#8b927862ea8c2bbc6831a46509244b50d9936e55"
+  integrity sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==
+
+lightningcss-linux-x64-musl@1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.33.0.tgz#0c525bb077dfd94404c059cfe42dad797e96aeaf"
+  integrity sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==
+
+lightningcss-win32-arm64-msvc@1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.33.0.tgz#850ee1103dac989cfab50e3ac22d1a69e394e63d"
+  integrity sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==
+
+lightningcss-win32-x64-msvc@1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.33.0.tgz#e343ae152eed3609dc6e11949d1a3bf39a1c946f"
+  integrity sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==
+
+lightningcss@^1.27.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/lightningcss/-/lightningcss-1.33.0.tgz#c08867d71a79385c6e190214fd72fef3e5f95f0b"
+  integrity sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==
+  dependencies:
+    detect-libc "^2.0.3"
+  optionalDependencies:
+    lightningcss-android-arm64 "1.33.0"
+    lightningcss-darwin-arm64 "1.33.0"
+    lightningcss-darwin-x64 "1.33.0"
+    lightningcss-freebsd-x64 "1.33.0"
+    lightningcss-linux-arm-gnueabihf "1.33.0"
+    lightningcss-linux-arm64-gnu "1.33.0"
+    lightningcss-linux-arm64-musl "1.33.0"
+    lightningcss-linux-x64-gnu "1.33.0"
+    lightningcss-linux-x64-musl "1.33.0"
+    lightningcss-win32-arm64-msvc "1.33.0"
+    lightningcss-win32-x64-msvc "1.33.0"
+
 lilconfig@^3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.3.tgz#a1bcfd6257f9585bf5ae14ceeebb7b559025e4c4"
@@ -5684,13 +6449,6 @@ markdown-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/markdown-extensions/-/markdown-extensions-2.0.0.tgz#34bebc83e9938cae16e0e017e4a9814a8330d3c4"
   integrity sha512-o5vL7aDWatOTX8LzaS1WMoaoxIiLRQJuIKKe2wAw6IeULDHaqbiqiggmx+pKvZDb1Sj+pE46Sn1T7lCqfFtg1Q==
 
-markdown-table@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-2.0.0.tgz#194a90ced26d31fe753d8b9434430214c011865b"
-  integrity sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==
-  dependencies:
-    repeat-string "^1.0.0"
-
 markdown-table@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-3.0.4.tgz#fe44d6d410ff9d6f2ea1797a3f60aa4d2b631c2a"
@@ -5934,12 +6692,25 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
-memfs@^3.4.3:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6"
-  integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ==
-  dependencies:
-    fs-monkey "^1.0.4"
+memfs@^4.43.1:
+  version "4.64.0"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-4.64.0.tgz#88bb85610804c154a8121424d2aeba7c5bdf4e38"
+  integrity sha512-Kw72fgY7Wn+sD8KmtNWSafl1dz0UvAsE/PHs3YVfLiaZuA3HxNm9sRLqAu0ATiBGJvME1PxZXbBZPv5GycDeAw==
+  dependencies:
+    "@jsonjoy.com/fs-core" "4.64.0"
+    "@jsonjoy.com/fs-fsa" "4.64.0"
+    "@jsonjoy.com/fs-node" "4.64.0"
+    "@jsonjoy.com/fs-node-builtins" "4.64.0"
+    "@jsonjoy.com/fs-node-to-fsa" "4.64.0"
+    "@jsonjoy.com/fs-node-utils" "4.64.0"
+    "@jsonjoy.com/fs-print" "4.64.0"
+    "@jsonjoy.com/fs-snapshot" "4.64.0"
+    "@jsonjoy.com/json-pack" "^1.11.0"
+    "@jsonjoy.com/util" "^1.9.0"
+    glob-to-regex.js "^1.0.1"
+    thingies "^2.5.0"
+    tree-dump "^1.0.3"
+    tslib "^2.0.0"
 
 merge-descriptors@1.0.3:
   version "1.0.3"
@@ -6390,7 +7161,7 @@ mime-db@1.52.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-"mime-db@>= 1.43.0 < 2":
+"mime-db@>= 1.43.0 < 2", mime-db@^1.54.0:
   version "1.54.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.54.0.tgz#cddb3ee4f9c64530dff640236661d42cb6a314f5"
   integrity sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==
@@ -6407,13 +7178,20 @@ mime-types@2.1.18:
   dependencies:
     mime-db "~1.33.0"
 
-mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
+mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
     mime-db "1.52.0"
 
+mime-types@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-3.0.2.tgz#39002d4182575d5af036ffa118100f2524b2e2ab"
+  integrity sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==
+  dependencies:
+    mime-db "^1.54.0"
+
 mime@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
@@ -6447,10 +7225,10 @@ minimalistic-assert@^1.0.0:
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimatch@3.1.2, minimatch@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+minimatch@3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.5.tgz#580c88f8d5445f2bd6aa8f3cadefa0de79fbd69e"
+  integrity sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==
   dependencies:
     brace-expansion "^1.1.7"
 
@@ -6520,16 +7298,16 @@ node-emoji@^2.1.0:
     emojilib "^2.4.0"
     skin-tone "^2.0.0"
 
-node-forge@^1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
-  integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
-
 node-releases@^2.0.21:
   version "2.0.21"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.21.tgz#f59b018bc0048044be2d4c4c04e4c8b18160894c"
   integrity sha512-5b0pgg78U3hwXkCM8Z9b2FJdPZlr9Psr9V2gQPESdGHqbntyFJKFW4r5TeWGFzafGY3hzs1JC62VEQMbl1JFkw==
 
+node-releases@^2.0.51:
+  version "2.0.51"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.51.tgz#cdc08433577f5b32ad01694481726e22eeb54aef"
+  integrity sha512-wRNIrw4DmVLKQlbgOMdkMx27Wrpzes2hh5Jtbi2bjPd+4wJstWIqP5A+lscnqbm0xxmT5Bpg8Lec5ItEBwx6BQ==
+
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
@@ -6577,7 +7355,7 @@ object-assign@^4.1.1:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
-object-inspect@^1.13.3:
+object-inspect@^1.13.3, object-inspect@^1.13.4:
   version "1.13.4"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
   integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
@@ -6604,7 +7382,7 @@ obuf@^1.0.0, obuf@^1.1.2:
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
   integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
-on-finished@2.4.1:
+on-finished@^2.4.1, on-finished@~2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
   integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
@@ -6616,13 +7394,6 @@ on-headers@~1.1.0:
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.1.0.tgz#59da4f91c45f5f989c6e4bcedc5a3b0aed70ff65"
   integrity sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==
 
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
-  dependencies:
-    wrappy "1"
-
 onetime@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
@@ -6630,7 +7401,17 @@ onetime@^5.1.2:
   dependencies:
     mimic-fn "^2.1.0"
 
-open@^8.0.9, open@^8.4.0:
+open@^10.0.3:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-10.2.0.tgz#b9d855be007620e80b6fb05fac98141fe62db73c"
+  integrity sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA==
+  dependencies:
+    default-browser "^5.2.1"
+    define-lazy-prop "^3.0.0"
+    is-inside-container "^1.0.0"
+    wsl-utils "^0.1.0"
+
+open@^8.4.0:
   version "8.4.2"
   resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
   integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
@@ -6683,12 +7464,13 @@ p-queue@^6.6.2:
     eventemitter3 "^4.0.4"
     p-timeout "^3.2.0"
 
-p-retry@^4.5.0:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16"
-  integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==
+p-retry@^6.2.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-6.2.1.tgz#81828f8dc61c6ef5a800585491572cc9892703af"
+  integrity sha512-hEt02O4hUct5wtwg4H4KcWgDdm+l1bOaEy/hWzd8xtXB9BqxTWBBhb+2ImAtH4Cv4rPjV76xN3Zumqk3k3AhhQ==
   dependencies:
-    "@types/retry" "0.12.0"
+    "@types/retry" "0.12.2"
+    is-network-error "^1.0.0"
     retry "^0.13.1"
 
 p-timeout@^3.2.0:
@@ -6784,11 +7566,6 @@ path-exists@^5.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7"
   integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==
 
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
 path-is-inside@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
@@ -6804,11 +7581,6 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-path-to-regexp@0.1.12:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7"
-  integrity sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==
-
 path-to-regexp@3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-3.3.0.tgz#f7f31d32e8518c2660862b644414b6d5c63a611b"
@@ -6821,6 +7593,11 @@ path-to-regexp@^1.7.0:
   dependencies:
     isarray "0.0.1"
 
+path-to-regexp@~0.1.12:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.13.tgz#9b22ec16bc3ab88d05a0c7e369869421401ab17d"
+  integrity sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==
+
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -6843,6 +7620,18 @@ pkg-dir@^7.0.0:
   dependencies:
     find-up "^6.3.0"
 
+pkijs@^3.3.3:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/pkijs/-/pkijs-3.4.0.tgz#d9164def30ff6d97be2d88966d5e36192499ca9c"
+  integrity sha512-emEcLuomt2j03vxD54giVB4SxTjnsqkU692xZOZXHDVoYyypEm+b3jpiTcc+Cf+myooc+/Ly0z01jqeNHVgJGw==
+  dependencies:
+    "@noble/hashes" "1.4.0"
+    asn1js "^3.0.6"
+    bytestreamjs "^2.0.1"
+    pvtsutils "^1.3.6"
+    pvutils "^1.1.3"
+    tslib "^2.8.1"
+
 postcss-attribute-case-insensitive@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-7.0.1.tgz#0c4500e3bcb2141848e89382c05b5a31c23033a3"
@@ -7485,12 +8274,25 @@ pupa@^3.1.0:
   dependencies:
     escape-goat "^4.0.0"
 
-qs@6.13.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"
-  integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==
+pvtsutils@^1.3.6:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.3.6.tgz#ec46e34db7422b9e4fdc5490578c1883657d6001"
+  integrity sha512-PLgQXQ6H2FWCaeRak8vvk1GW462lMxB5s3Jm673N82zI4vqtVUPuZdffdZbPDFRoU8kAhItWFtPCWiPpp4/EDg==
   dependencies:
-    side-channel "^1.0.6"
+    tslib "^2.8.1"
+
+pvutils@^1.1.3, pvutils@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.1.5.tgz#84b0dea4a5d670249aa9800511804ee0b7c2809c"
+  integrity sha512-KTqnxsgGiQ6ZAzZCVlJH5eOjSnvlyEgx1m8bkRJfOhmGRqfo5KLvmAlACQkrjEtOQ4B7wF9TdSLIs9O90MX9xA==
+
+qs@~6.15.1:
+  version "6.15.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.15.3.tgz#76852132a58ed5c7c0ef67e4441b9bb5d6061b3b"
+  integrity sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==
+  dependencies:
+    es-define-property "^1.0.1"
+    side-channel "^1.1.1"
 
 queue-microtask@^1.2.2:
   version "1.2.3"
@@ -7519,15 +8321,15 @@ range-parser@^1.2.1, range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.5.2:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
-  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
+raw-body@~2.5.3:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.3.tgz#11c6650ee770a7de1b494f197927de0c923822e2"
+  integrity sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==
   dependencies:
-    bytes "3.1.2"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
+    bytes "~3.1.2"
+    http-errors "~2.0.1"
+    iconv-lite "~0.4.24"
+    unpipe "~1.0.0"
 
 rc@1.2.8:
   version "1.2.8"
@@ -7577,10 +8379,10 @@ react-json-view-lite@^2.3.0:
   resolved "https://registry.yarnpkg.com/react-json-view-lite/-/react-json-view-lite-2.5.0.tgz#c7ff011c7cc80e9900abc7aa4916c6a5c6d6c1c6"
   integrity sha512-tk7o7QG9oYyELWHL8xiMQ8x4WzjCzbWNyig3uexmkLb54r8jO0yH3WCWx8UZS0c49eSA4QUmG5caiRJ8fAn58g==
 
-react-loadable-ssr-addon-v5-slorber@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/react-loadable-ssr-addon-v5-slorber/-/react-loadable-ssr-addon-v5-slorber-1.0.1.tgz#2cdc91e8a744ffdf9e3556caabeb6e4278689883"
-  integrity sha512-lq3Lyw1lGku8zUEJPDxsNm1AfYHBrO9Y1+olAYwpUJ2IGFBskM0DMKok97A6LWUpHm+o7IvQBOWu9MLenp9Z+A==
+react-loadable-ssr-addon-v5-slorber@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/react-loadable-ssr-addon-v5-slorber/-/react-loadable-ssr-addon-v5-slorber-1.0.3.tgz#bb3791bf481222c63a5bc6b96ee23f68cb5614b9"
+  integrity sha512-GXfh9VLwB5ERaCsU6RULh7tkemeX15aNh6wuMEBtfdyMa7fFG8TXrhXlx1SoEK2Ty/l6XIkzzYIQmyaWW3JgdQ==
   dependencies:
     "@babel/runtime" "^7.10.3"
 
@@ -7710,6 +8512,11 @@ recma-stringify@^1.0.0:
     unified "^11.0.0"
     vfile "^6.0.0"
 
+reflect-metadata@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.2.2.tgz#400c845b6cba87a21f2c65c4aeb158f4fa4d9c5b"
+  integrity sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==
+
 regenerate-unicode-properties@^10.2.2:
   version "10.2.2"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.2.tgz#aa113812ba899b630658c7623466be71e1f86f66"
@@ -7875,11 +8682,6 @@ renderkid@^3.0.0:
     lodash "^4.17.21"
     strip-ansi "^6.0.1"
 
-repeat-string@^1.0.0:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
-
 require-from-string@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
@@ -7936,13 +8738,6 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.1.0.tgz#0fe13b9522e1473f51b558ee796e08f11f9b489f"
   integrity sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==
 
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
 rtlcss@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/rtlcss/-/rtlcss-4.3.0.tgz#f8efd4d5b64f640ec4af8fa25b65bacd9e07cc97"
@@ -7953,6 +8748,11 @@ rtlcss@^4.1.0:
     postcss "^8.4.21"
     strip-json-comments "^3.1.1"
 
+run-applescript@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-7.1.0.tgz#2e9e54c4664ec3106c5b5630e249d3d6595c4911"
+  integrity sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q==
+
 run-parallel@^1.1.9:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
@@ -8009,6 +8809,16 @@ schema-utils@^4.0.0, schema-utils@^4.0.1, schema-utils@^4.3.0, schema-utils@^4.3
     ajv-formats "^2.1.1"
     ajv-keywords "^5.1.0"
 
+schema-utils@^4.2.0:
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.3.3.tgz#5b1850912fa31df90716963d45d9121fdfc09f46"
+  integrity sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    ajv "^8.9.0"
+    ajv-formats "^2.1.1"
+    ajv-keywords "^5.1.0"
+
 section-matter@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167"
@@ -8027,13 +8837,13 @@ select@^1.1.2:
   resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
   integrity sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==
 
-selfsigned@^2.1.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.4.1.tgz#560d90565442a3ed35b674034cec4e95dceb4ae0"
-  integrity sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==
+selfsigned@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-5.5.0.tgz#4c9ab7c7c9f35f18fb6a9882c253eb0e6bd6557b"
+  integrity sha512-ftnu3TW4+3eBfLRFnDEkzGxSF/10BJBkaLJuBHZX0kiPS7bRdlpZGu6YGt4KngMkdTwJE6MbjavFpqHvqVt+Ew==
   dependencies:
-    "@types/node-forge" "^1.3.0"
-    node-forge "^1"
+    "@peculiar/x509" "^1.14.2"
+    pkijs "^3.3.3"
 
 semver-diff@^4.0.0:
   version "4.0.0"
@@ -8052,24 +8862,24 @@ semver@^7.3.5, semver@^7.3.7, semver@^7.5.4:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
   integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
 
-send@0.19.0:
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
-  integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==
+send@~0.19.0, send@~0.19.1:
+  version "0.19.2"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.19.2.tgz#59bc0da1b4ea7ad42736fd642b1c4294e114ff29"
+  integrity sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==
   dependencies:
     debug "2.6.9"
     depd "2.0.0"
     destroy "1.2.0"
-    encodeurl "~1.0.2"
+    encodeurl "~2.0.0"
     escape-html "~1.0.3"
     etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "2.0.0"
+    fresh "~0.5.2"
+    http-errors "~2.0.1"
     mime "1.6.0"
     ms "2.1.3"
-    on-finished "2.4.1"
+    on-finished "~2.4.1"
     range-parser "~1.2.1"
-    statuses "2.0.1"
+    statuses "~2.0.2"
 
 serialize-javascript@^6.0.0, serialize-javascript@^6.0.1, serialize-javascript@^6.0.2:
   version "6.0.2"
@@ -8078,15 +8888,15 @@ serialize-javascript@^6.0.0, serialize-javascript@^6.0.1, serialize-javascript@^
   dependencies:
     randombytes "^2.1.0"
 
-serve-handler@^6.1.6:
-  version "6.1.6"
-  resolved "https://registry.yarnpkg.com/serve-handler/-/serve-handler-6.1.6.tgz#50803c1d3e947cd4a341d617f8209b22bd76cfa1"
-  integrity sha512-x5RL9Y2p5+Sh3D38Fh9i/iQ5ZK+e4xuXRd/pGbM4D13tgo/MGwbttUk8emytcr1YYzBYs+apnUngBDFYfpjPuQ==
+serve-handler@^6.1.7:
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/serve-handler/-/serve-handler-6.1.7.tgz#e9bb864e87ee71e8dab874cde44d146b77e3fb78"
+  integrity sha512-CinAq1xWb0vR3twAv9evEU8cNWkXCb9kd5ePAHUKJBkOsUpR1wt/CvGdeca7vqumL1U5cSaeVQ6zZMxiJ3yWsg==
   dependencies:
     bytes "3.0.0"
     content-disposition "0.5.2"
     mime-types "2.1.18"
-    minimatch "3.1.2"
+    minimatch "3.1.5"
     path-is-inside "1.0.2"
     path-to-regexp "3.3.0"
     range-parser "1.2.0"
@@ -8104,15 +8914,15 @@ serve-index@^1.9.1:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.16.2:
-  version "1.16.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296"
-  integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==
+serve-static@~1.16.2:
+  version "1.16.3"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.3.tgz#a97b74d955778583f3862a4f0b841eb4d5d78cf9"
+  integrity sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==
   dependencies:
     encodeurl "~2.0.0"
     escape-html "~1.0.3"
     parseurl "~1.3.3"
-    send "0.19.0"
+    send "~0.19.1"
 
 set-function-length@^1.2.2:
   version "1.2.2"
@@ -8131,7 +8941,7 @@ setprototypeof@1.1.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
   integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
-setprototypeof@1.2.0:
+setprototypeof@1.2.0, setprototypeof@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
@@ -8160,18 +8970,18 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@^1.8.3:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.3.tgz#55e40ef33cf5c689902353a3d8cd1a6725f08b4b"
-  integrity sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==
+shell-quote@^1.8.4:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.10.0.tgz#482033e192e4f5c07151521ffa03400ec71b1b0f"
+  integrity sha512-w1aiOKwKuRgtwAReIIj89puqg+I7GvX4IbLrvmhXbzQsj1+Zwi4VO3+fa6ZF91TWSjIxoEkKnMeHcLEODK5ZXA==
 
-side-channel-list@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"
-  integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==
+side-channel-list@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.1.tgz#c2e0b5a14a540aebee3bbc6c3f8666cc9b509127"
+  integrity sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==
   dependencies:
     es-errors "^1.3.0"
-    object-inspect "^1.13.3"
+    object-inspect "^1.13.4"
 
 side-channel-map@^1.0.1:
   version "1.0.1"
@@ -8194,14 +9004,14 @@ side-channel-weakmap@^1.0.2:
     object-inspect "^1.13.3"
     side-channel-map "^1.0.1"
 
-side-channel@^1.0.6:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"
-  integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
+side-channel@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.1.tgz#ea02c62e05dc4bea67d4442f0fb71ee192f8e0ab"
+  integrity sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==
   dependencies:
     es-errors "^1.3.0"
-    object-inspect "^1.13.3"
-    side-channel-list "^1.0.0"
+    object-inspect "^1.13.4"
+    side-channel-list "^1.0.1"
     side-channel-map "^1.0.1"
     side-channel-weakmap "^1.0.2"
 
@@ -8329,26 +9139,21 @@ spdy@^4.0.2:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
-
 srcset@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/srcset/-/srcset-4.0.0.tgz#336816b665b14cd013ba545b6fe62357f86e65f4"
   integrity sha512-wvLeHgcVHKO8Sc/H/5lkGreJQVeYMm9rlmt8PuR1xE31rIuXhuzznUUqAt8MqLhB3MqJdFzlNAfpcWnxiFUcPw==
 
-statuses@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
-  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
-
 "statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
+statuses@~2.0.1, statuses@~2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.2.tgz#8f75eecef765b5e1cfcdc080da59409ed424e382"
+  integrity sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==
+
 std-env@^3.7.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.9.0.tgz#1a6f7243b339dca4c9fd55e1c7504c77ef23e8f1"
@@ -8403,7 +9208,7 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -8501,6 +9306,13 @@ svgo@^3.0.2, svgo@^3.2.0:
     csso "^5.0.5"
     picocolors "^1.0.0"
 
+swc-loader@^0.2.6:
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/swc-loader/-/swc-loader-0.2.7.tgz#2d1611ab314c5d8342d74aa5e5901b3fbf490de2"
+  integrity sha512-nwYWw3Fh9ame3Rtm7StS9SBLpHRRnYcK7bnpF3UKZmesAK0gw2/ADvlURFAINmPvKtDLzp+GBiP9yLoEjg6S9w==
+  dependencies:
+    "@swc/counter" "^0.1.3"
+
 tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.3.tgz#4b67b635b2d97578a06a2713d2f04800c237e99b"
@@ -8527,6 +9339,11 @@ terser@^5.10.0, terser@^5.15.1, terser@^5.31.1:
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
+thingies@^2.5.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/thingies/-/thingies-2.6.1.tgz#4eb28e2585a75288f1765a0b08f1dfa020357a6f"
+  integrity sha512-cV/CMGTK3M4MlnJ/0At6ismOw/A0EEniDNScajjz/Br3c1sqE72YD01rGpPTKwd27wAxI5Pr+6+0w8yofzFRYw==
+
 thunky@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
@@ -8559,7 +9376,7 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-toidentifier@1.0.1:
+toidentifier@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
@@ -8569,6 +9386,11 @@ totalist@^3.0.0:
   resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8"
   integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==
 
+tree-dump@^1.0.3, tree-dump@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/tree-dump/-/tree-dump-1.1.0.tgz#ab29129169dc46004414f5a9d4a3c6e89f13e8a4"
+  integrity sha512-rMuvhU4MCDbcbnleZTFezWsaZXRFemSqAM+7jPnzUl1fo9w3YEKOxAeui0fz3OI4EU4hf23iyA7uQRVko+UaBA==
+
 trim-lines@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-3.0.1.tgz#d802e332a07df861c48802c04321017b1bd87338"
@@ -8579,15 +9401,22 @@ trough@^2.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-2.2.0.tgz#94a60bd6bd375c152c1df911a4b11d5b0256f50f"
   integrity sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==
 
-tslib@^2.0.3, tslib@^2.6.0:
+tslib@^1.9.3:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
+tslib@^2.0.0, tslib@^2.0.3, tslib@^2.4.0, tslib@^2.6.0, tslib@^2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
 
-type-fest@^0.21.3:
-  version "0.21.3"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
-  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
+tsyringe@^4.10.0:
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/tsyringe/-/tsyringe-4.10.0.tgz#d0c95815d584464214060285eaaadd94aa03299c"
+  integrity sha512-axr3IdNuVIxnaK5XGEUFTu3YmAQ6lllgrvqfEoR16g/HGnYY/6We4oWENtAnzK6/LpJ2ur9PAb80RBt7/U4ugw==
+  dependencies:
+    tslib "^1.9.3"
 
 type-fest@^1.0.1:
   version "1.4.0"
@@ -8717,7 +9546,7 @@ universalify@^2.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
   integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
 
-unpipe@1.0.0, unpipe@~1.0.0:
+unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
@@ -8730,6 +9559,14 @@ update-browserslist-db@^1.1.3:
     escalade "^3.2.0"
     picocolors "^1.1.1"
 
+update-browserslist-db@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz#64d76db58713136acbeb4c49114366cc6cc2e80d"
+  integrity sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==
+  dependencies:
+    escalade "^3.2.0"
+    picocolors "^1.1.1"
+
 update-notifier@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-6.0.2.tgz#a6990253dfe6d5a02bd04fbb6a61543f55026b60"
@@ -8863,52 +9700,51 @@ webpack-bundle-analyzer@^4.10.2:
     sirv "^2.0.3"
     ws "^7.3.1"
 
-webpack-dev-middleware@^5.3.4:
-  version "5.3.4"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517"
-  integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==
+webpack-dev-middleware@^7.4.2:
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-7.4.5.tgz#d4e8720aa29cb03bc158084a94edb4594e3b7ac0"
+  integrity sha512-uxQ6YqGdE4hgDKNf7hUiPXOdtkXvBJXrfEGYSx7P7LC8hnUYGK70X6xQXUvXeNyBDDcsiQXpG2m3G9vxowaEuA==
   dependencies:
     colorette "^2.0.10"
-    memfs "^3.4.3"
-    mime-types "^2.1.31"
+    memfs "^4.43.1"
+    mime-types "^3.0.1"
+    on-finished "^2.4.1"
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-dev-server@^4.15.2:
-  version "4.15.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz#9e0c70a42a012560860adb186986da1248333173"
-  integrity sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==
-  dependencies:
-    "@types/bonjour" "^3.5.9"
-    "@types/connect-history-api-fallback" "^1.3.5"
-    "@types/express" "^4.17.13"
-    "@types/serve-index" "^1.9.1"
-    "@types/serve-static" "^1.13.10"
-    "@types/sockjs" "^0.3.33"
-    "@types/ws" "^8.5.5"
+webpack-dev-server@^5.2.2:
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-5.2.6.tgz#3a5d41233cbb7504f814d19e59a59173fb8ae23d"
+  integrity sha512-HNLRmamRvVavZQ+avceZifmv8hmdUjg43t6MI4SqJDwFdW7RPQwH5vzGhDRZSX59SgfbeHhLnq3g+uooWo7pVw==
+  dependencies:
+    "@types/bonjour" "^3.5.13"
+    "@types/connect-history-api-fallback" "^1.5.4"
+    "@types/express" "^4.17.25"
+    "@types/express-serve-static-core" "^4.17.21"
+    "@types/serve-index" "^1.9.4"
+    "@types/serve-static" "^1.15.5"
+    "@types/sockjs" "^0.3.36"
+    "@types/ws" "^8.5.10"
     ansi-html-community "^0.0.8"
-    bonjour-service "^1.0.11"
-    chokidar "^3.5.3"
+    bonjour-service "^1.2.1"
+    chokidar "^3.6.0"
     colorette "^2.0.10"
-    compression "^1.7.4"
+    compression "^1.8.1"
     connect-history-api-fallback "^2.0.0"
-    default-gateway "^6.0.3"
-    express "^4.17.3"
+    express "^4.22.1"
     graceful-fs "^4.2.6"
-    html-entities "^2.3.2"
-    http-proxy-middleware "^2.0.3"
-    ipaddr.js "^2.0.1"
-    launch-editor "^2.6.0"
-    open "^8.0.9"
-    p-retry "^4.5.0"
-    rimraf "^3.0.2"
-    schema-utils "^4.0.0"
-    selfsigned "^2.1.1"
+    http-proxy-middleware "^2.0.9"
+    ipaddr.js "^2.1.0"
+    launch-editor "^2.14.1"
+    open "^10.0.3"
+    p-retry "^6.2.0"
+    schema-utils "^4.2.0"
+    selfsigned "^5.5.0"
     serve-index "^1.9.1"
     sockjs "^0.3.24"
     spdy "^4.0.2"
-    webpack-dev-middleware "^5.3.4"
-    ws "^8.13.0"
+    webpack-dev-middleware "^7.4.2"
+    ws "^8.18.0"
 
 webpack-merge@^5.9.0:
   version "5.10.0"
@@ -8964,19 +9800,15 @@ webpack@^5.88.1, webpack@^5.95.0:
     watchpack "^2.4.1"
     webpack-sources "^3.3.3"
 
-webpackbar@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/webpackbar/-/webpackbar-6.0.1.tgz#5ef57d3bf7ced8b19025477bc7496ea9d502076b"
-  integrity sha512-TnErZpmuKdwWBdMoexjio3KKX6ZtoKHRVvLIU0A47R0VVBDtx3ZyOJDktgYixhoJokZTYTt1Z37OkO9pnGJa9Q==
+webpackbar@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/webpackbar/-/webpackbar-7.0.0.tgz#7228d32881af2392381b6514499ddea73cdf218a"
+  integrity sha512-aS9soqSO2iCHgqHoCrj4LbfGQUboDCYJPSFOAchEK+9psIjNrfSWW4Y0YEz67MKURNvMmfo0ycOg9d/+OOf9/Q==
   dependencies:
-    ansi-escapes "^4.3.2"
-    chalk "^4.1.2"
+    ansis "^3.2.0"
     consola "^3.2.3"
-    figures "^3.2.0"
-    markdown-table "^2.0.0"
     pretty-time "^1.1.0"
     std-env "^3.7.0"
-    wrap-ansi "^7.0.0"
 
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
   version "0.7.4"
@@ -9011,15 +9843,6 @@ wildcard@^2.0.0, wildcard@^2.0.1:
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
   integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
@@ -9029,11 +9852,6 @@ wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
     string-width "^5.0.1"
     strip-ansi "^7.0.1"
 
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
-
 write-file-atomic@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
@@ -9049,10 +9867,17 @@ ws@^7.3.1:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
   integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
-ws@^8.13.0:
-  version "8.18.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472"
-  integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==
+ws@^8.18.0:
+  version "8.21.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.21.1.tgz#045650cd4b1207809e7547146223c3814a9af586"
+  integrity sha512-+0NTnW77fFN/DjQi6k/Sq/Yvk4Sgajw7urW8V+asjXnRgDs9gyGkdb7EzgfhA4goXsRIZKE28fzIXBHEzhuiWw==
+
+wsl-utils@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/wsl-utils/-/wsl-utils-0.1.0.tgz#8783d4df671d4d50365be2ee4c71917a0557baab"
+  integrity sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw==
+  dependencies:
+    is-wsl "^3.1.0"
 
 xdg-basedir@^5.0.1, xdg-basedir@^5.1.0:
   version "5.1.0"