diff --git a/cloudformation/all.go b/cloudformation/all.go
index 0d358ee1cd..865610a3a3 100644
--- a/cloudformation/all.go
+++ b/cloudformation/all.go
@@ -937,6 +937,8 @@ func AllResources() map[string]Resource {
 		"AWS::KMS::Key":                                                    &kms.Key{},
 		"AWS::KMS::ReplicaKey":                                             &kms.ReplicaKey{},
 		"AWS::KafkaConnect::Connector":                                     &kafkaconnect.Connector{},
+		"AWS::KafkaConnect::CustomPlugin":                                  &kafkaconnect.CustomPlugin{},
+		"AWS::KafkaConnect::WorkerConfiguration":                           &kafkaconnect.WorkerConfiguration{},
 		"AWS::Kendra::DataSource":                                          &kendra.DataSource{},
 		"AWS::Kendra::Faq":                                                 &kendra.Faq{},
 		"AWS::Kendra::Index":                                               &kendra.Index{},
@@ -1342,10 +1344,7 @@ func AllResources() map[string]Resource {
 		"AWS::SecretsManager::Secret":                                      &secretsmanager.Secret{},
 		"AWS::SecretsManager::SecretTargetAttachment":                      &secretsmanager.SecretTargetAttachment{},
 		"AWS::SecurityHub::AutomationRule":                                 &securityhub.AutomationRule{},
-		"AWS::SecurityHub::DelegatedAdmin":                                 &securityhub.DelegatedAdmin{},
 		"AWS::SecurityHub::Hub":                                            &securityhub.Hub{},
-		"AWS::SecurityHub::Insight":                                        &securityhub.Insight{},
-		"AWS::SecurityHub::ProductSubscription":                            &securityhub.ProductSubscription{},
 		"AWS::SecurityHub::Standard":                                       &securityhub.Standard{},
 		"AWS::Serverless::Api":                                             &serverless.Api{},
 		"AWS::Serverless::Application":                                     &serverless.Application{},
@@ -18102,6 +18101,54 @@ func (t *Template) GetKafkaConnectConnectorWithName(name string) (*kafkaconnect.
 	return nil, fmt.Errorf("resource %q of type kafkaconnect.Connector not found", name)
 }
 
+// GetAllKafkaConnectCustomPluginResources retrieves all kafkaconnect.CustomPlugin items from an AWS CloudFormation template
+func (t *Template) GetAllKafkaConnectCustomPluginResources() map[string]*kafkaconnect.CustomPlugin {
+	results := map[string]*kafkaconnect.CustomPlugin{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *kafkaconnect.CustomPlugin:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetKafkaConnectCustomPluginWithName retrieves all kafkaconnect.CustomPlugin items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetKafkaConnectCustomPluginWithName(name string) (*kafkaconnect.CustomPlugin, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *kafkaconnect.CustomPlugin:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type kafkaconnect.CustomPlugin not found", name)
+}
+
+// GetAllKafkaConnectWorkerConfigurationResources retrieves all kafkaconnect.WorkerConfiguration items from an AWS CloudFormation template
+func (t *Template) GetAllKafkaConnectWorkerConfigurationResources() map[string]*kafkaconnect.WorkerConfiguration {
+	results := map[string]*kafkaconnect.WorkerConfiguration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *kafkaconnect.WorkerConfiguration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetKafkaConnectWorkerConfigurationWithName retrieves all kafkaconnect.WorkerConfiguration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetKafkaConnectWorkerConfigurationWithName(name string) (*kafkaconnect.WorkerConfiguration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *kafkaconnect.WorkerConfiguration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type kafkaconnect.WorkerConfiguration not found", name)
+}
+
 // GetAllKendraDataSourceResources retrieves all kendra.DataSource items from an AWS CloudFormation template
 func (t *Template) GetAllKendraDataSourceResources() map[string]*kendra.DataSource {
 	results := map[string]*kendra.DataSource{}
@@ -27822,30 +27869,6 @@ func (t *Template) GetSecurityHubAutomationRuleWithName(name string) (*securityh
 	return nil, fmt.Errorf("resource %q of type securityhub.AutomationRule not found", name)
 }
 
-// GetAllSecurityHubDelegatedAdminResources retrieves all securityhub.DelegatedAdmin items from an AWS CloudFormation template
-func (t *Template) GetAllSecurityHubDelegatedAdminResources() map[string]*securityhub.DelegatedAdmin {
-	results := map[string]*securityhub.DelegatedAdmin{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case *securityhub.DelegatedAdmin:
-			results[name] = resource
-		}
-	}
-	return results
-}
-
-// GetSecurityHubDelegatedAdminWithName retrieves all securityhub.DelegatedAdmin items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetSecurityHubDelegatedAdminWithName(name string) (*securityhub.DelegatedAdmin, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case *securityhub.DelegatedAdmin:
-			return resource, nil
-		}
-	}
-	return nil, fmt.Errorf("resource %q of type securityhub.DelegatedAdmin not found", name)
-}
-
 // GetAllSecurityHubHubResources retrieves all securityhub.Hub items from an AWS CloudFormation template
 func (t *Template) GetAllSecurityHubHubResources() map[string]*securityhub.Hub {
 	results := map[string]*securityhub.Hub{}
@@ -27870,54 +27893,6 @@ func (t *Template) GetSecurityHubHubWithName(name string) (*securityhub.Hub, err
 	return nil, fmt.Errorf("resource %q of type securityhub.Hub not found", name)
 }
 
-// GetAllSecurityHubInsightResources retrieves all securityhub.Insight items from an AWS CloudFormation template
-func (t *Template) GetAllSecurityHubInsightResources() map[string]*securityhub.Insight {
-	results := map[string]*securityhub.Insight{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case *securityhub.Insight:
-			results[name] = resource
-		}
-	}
-	return results
-}
-
-// GetSecurityHubInsightWithName retrieves all securityhub.Insight items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetSecurityHubInsightWithName(name string) (*securityhub.Insight, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case *securityhub.Insight:
-			return resource, nil
-		}
-	}
-	return nil, fmt.Errorf("resource %q of type securityhub.Insight not found", name)
-}
-
-// GetAllSecurityHubProductSubscriptionResources retrieves all securityhub.ProductSubscription items from an AWS CloudFormation template
-func (t *Template) GetAllSecurityHubProductSubscriptionResources() map[string]*securityhub.ProductSubscription {
-	results := map[string]*securityhub.ProductSubscription{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case *securityhub.ProductSubscription:
-			results[name] = resource
-		}
-	}
-	return results
-}
-
-// GetSecurityHubProductSubscriptionWithName retrieves all securityhub.ProductSubscription items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetSecurityHubProductSubscriptionWithName(name string) (*securityhub.ProductSubscription, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case *securityhub.ProductSubscription:
-			return resource, nil
-		}
-	}
-	return nil, fmt.Errorf("resource %q of type securityhub.ProductSubscription not found", name)
-}
-
 // GetAllSecurityHubStandardResources retrieves all securityhub.Standard items from an AWS CloudFormation template
 func (t *Template) GetAllSecurityHubStandardResources() map[string]*securityhub.Standard {
 	results := map[string]*securityhub.Standard{}
diff --git a/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_singlemetricanomalydetector.go b/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_singlemetricanomalydetector.go
index 41c58ce699..7d0751b62c 100644
--- a/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_singlemetricanomalydetector.go
+++ b/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_singlemetricanomalydetector.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-singlemetricanomalydetector.html
 type AnomalyDetector_SingleMetricAnomalyDetector struct {
 
+	// AccountId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-singlemetricanomalydetector.html#cfn-cloudwatch-anomalydetector-singlemetricanomalydetector-accountid
+	AccountId *string `json:"AccountId,omitempty"`
+
 	// Dimensions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-singlemetricanomalydetector.html#cfn-cloudwatch-anomalydetector-singlemetricanomalydetector-dimensions
diff --git a/cloudformation/kafkaconnect/aws-kafkaconnect-customplugin.go b/cloudformation/kafkaconnect/aws-kafkaconnect-customplugin.go
new file mode 100644
index 0000000000..17213be5c3
--- /dev/null
+++ b/cloudformation/kafkaconnect/aws-kafkaconnect-customplugin.go
@@ -0,0 +1,138 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package kafkaconnect
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// CustomPlugin AWS CloudFormation Resource (AWS::KafkaConnect::CustomPlugin)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kafkaconnect-customplugin.html
+type CustomPlugin struct {
+
+	// ContentType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kafkaconnect-customplugin.html#cfn-kafkaconnect-customplugin-contenttype
+	ContentType string `json:"ContentType"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kafkaconnect-customplugin.html#cfn-kafkaconnect-customplugin-description
+	Description *string `json:"Description,omitempty"`
+
+	// Location AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kafkaconnect-customplugin.html#cfn-kafkaconnect-customplugin-location
+	Location *CustomPlugin_CustomPluginLocation `json:"Location"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kafkaconnect-customplugin.html#cfn-kafkaconnect-customplugin-name
+	Name string `json:"Name"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kafkaconnect-customplugin.html#cfn-kafkaconnect-customplugin-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CustomPlugin) AWSCloudFormationType() string {
+	return "AWS::KafkaConnect::CustomPlugin"
+}
+
+// MarshalJSON is a custom JSON marshalling hook that embeds this object into
+// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
+func (r CustomPlugin) MarshalJSON() ([]byte, error) {
+	type Properties CustomPlugin
+	return json.Marshal(&struct {
+		Type                string
+		Properties          Properties
+		DependsOn           []string                     `json:"DependsOn,omitempty"`
+		Metadata            map[string]interface{}       `json:"Metadata,omitempty"`
+		DeletionPolicy      policies.DeletionPolicy      `json:"DeletionPolicy,omitempty"`
+		UpdateReplacePolicy policies.UpdateReplacePolicy `json:"UpdateReplacePolicy,omitempty"`
+		Condition           string                       `json:"Condition,omitempty"`
+	}{
+		Type:                r.AWSCloudFormationType(),
+		Properties:          (Properties)(r),
+		DependsOn:           r.AWSCloudFormationDependsOn,
+		Metadata:            r.AWSCloudFormationMetadata,
+		DeletionPolicy:      r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition:           r.AWSCloudFormationCondition,
+	})
+}
+
+// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
+// AWS CloudFormation resource object, and just keeps the 'Properties' field.
+func (r *CustomPlugin) UnmarshalJSON(b []byte) error {
+	type Properties CustomPlugin
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           interface{}
+		Metadata            map[string]interface{}
+		DeletionPolicy      string
+		UpdateReplacePolicy string
+		Condition           string
+	}{}
+
+	dec := json.NewDecoder(bytes.NewReader(b))
+	dec.DisallowUnknownFields() // Force error if unknown field is found
+
+	if err := dec.Decode(&res); err != nil {
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CustomPlugin(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		switch obj := res.DependsOn.(type) {
+		case string:
+			r.AWSCloudFormationDependsOn = []string{obj}
+		case []interface{}:
+			s := make([]string, 0, len(obj))
+			for _, v := range obj {
+				if value, ok := v.(string); ok {
+					s = append(s, value)
+				}
+			}
+			r.AWSCloudFormationDependsOn = s
+		}
+	}
+	if res.Metadata != nil {
+		r.AWSCloudFormationMetadata = res.Metadata
+	}
+	if res.DeletionPolicy != "" {
+		r.AWSCloudFormationDeletionPolicy = policies.DeletionPolicy(res.DeletionPolicy)
+	}
+	if res.UpdateReplacePolicy != "" {
+		r.AWSCloudFormationUpdateReplacePolicy = policies.UpdateReplacePolicy(res.UpdateReplacePolicy)
+	}
+	if res.Condition != "" {
+		r.AWSCloudFormationCondition = res.Condition
+	}
+	return nil
+}
diff --git a/cloudformation/kafkaconnect/aws-kafkaconnect-customplugin_custompluginfiledescription.go b/cloudformation/kafkaconnect/aws-kafkaconnect-customplugin_custompluginfiledescription.go
new file mode 100644
index 0000000000..0bcd03fb67
--- /dev/null
+++ b/cloudformation/kafkaconnect/aws-kafkaconnect-customplugin_custompluginfiledescription.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package kafkaconnect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// CustomPlugin_CustomPluginFileDescription AWS CloudFormation Resource (AWS::KafkaConnect::CustomPlugin.CustomPluginFileDescription)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kafkaconnect-customplugin-custompluginfiledescription.html
+type CustomPlugin_CustomPluginFileDescription struct {
+
+	// FileMd5 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kafkaconnect-customplugin-custompluginfiledescription.html#cfn-kafkaconnect-customplugin-custompluginfiledescription-filemd5
+	FileMd5 *string `json:"FileMd5,omitempty"`
+
+	// FileSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kafkaconnect-customplugin-custompluginfiledescription.html#cfn-kafkaconnect-customplugin-custompluginfiledescription-filesize
+	FileSize *int `json:"FileSize,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CustomPlugin_CustomPluginFileDescription) AWSCloudFormationType() string {
+	return "AWS::KafkaConnect::CustomPlugin.CustomPluginFileDescription"
+}
diff --git a/cloudformation/kafkaconnect/aws-kafkaconnect-customplugin_custompluginlocation.go b/cloudformation/kafkaconnect/aws-kafkaconnect-customplugin_custompluginlocation.go
new file mode 100644
index 0000000000..09b3d1711b
--- /dev/null
+++ b/cloudformation/kafkaconnect/aws-kafkaconnect-customplugin_custompluginlocation.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package kafkaconnect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// CustomPlugin_CustomPluginLocation AWS CloudFormation Resource (AWS::KafkaConnect::CustomPlugin.CustomPluginLocation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kafkaconnect-customplugin-custompluginlocation.html
+type CustomPlugin_CustomPluginLocation struct {
+
+	// S3Location AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kafkaconnect-customplugin-custompluginlocation.html#cfn-kafkaconnect-customplugin-custompluginlocation-s3location
+	S3Location *CustomPlugin_S3Location `json:"S3Location"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CustomPlugin_CustomPluginLocation) AWSCloudFormationType() string {
+	return "AWS::KafkaConnect::CustomPlugin.CustomPluginLocation"
+}
diff --git a/cloudformation/kafkaconnect/aws-kafkaconnect-customplugin_s3location.go b/cloudformation/kafkaconnect/aws-kafkaconnect-customplugin_s3location.go
new file mode 100644
index 0000000000..7d76027115
--- /dev/null
+++ b/cloudformation/kafkaconnect/aws-kafkaconnect-customplugin_s3location.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package kafkaconnect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// CustomPlugin_S3Location AWS CloudFormation Resource (AWS::KafkaConnect::CustomPlugin.S3Location)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kafkaconnect-customplugin-s3location.html
+type CustomPlugin_S3Location struct {
+
+	// BucketArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kafkaconnect-customplugin-s3location.html#cfn-kafkaconnect-customplugin-s3location-bucketarn
+	BucketArn string `json:"BucketArn"`
+
+	// FileKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kafkaconnect-customplugin-s3location.html#cfn-kafkaconnect-customplugin-s3location-filekey
+	FileKey string `json:"FileKey"`
+
+	// ObjectVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kafkaconnect-customplugin-s3location.html#cfn-kafkaconnect-customplugin-s3location-objectversion
+	ObjectVersion *string `json:"ObjectVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CustomPlugin_S3Location) AWSCloudFormationType() string {
+	return "AWS::KafkaConnect::CustomPlugin.S3Location"
+}
diff --git a/cloudformation/kafkaconnect/aws-kafkaconnect-workerconfiguration.go b/cloudformation/kafkaconnect/aws-kafkaconnect-workerconfiguration.go
new file mode 100644
index 0000000000..9b25be5136
--- /dev/null
+++ b/cloudformation/kafkaconnect/aws-kafkaconnect-workerconfiguration.go
@@ -0,0 +1,133 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package kafkaconnect
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// WorkerConfiguration AWS CloudFormation Resource (AWS::KafkaConnect::WorkerConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kafkaconnect-workerconfiguration.html
+type WorkerConfiguration struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kafkaconnect-workerconfiguration.html#cfn-kafkaconnect-workerconfiguration-description
+	Description *string `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kafkaconnect-workerconfiguration.html#cfn-kafkaconnect-workerconfiguration-name
+	Name string `json:"Name"`
+
+	// PropertiesFileContent AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kafkaconnect-workerconfiguration.html#cfn-kafkaconnect-workerconfiguration-propertiesfilecontent
+	PropertiesFileContent string `json:"PropertiesFileContent"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kafkaconnect-workerconfiguration.html#cfn-kafkaconnect-workerconfiguration-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WorkerConfiguration) AWSCloudFormationType() string {
+	return "AWS::KafkaConnect::WorkerConfiguration"
+}
+
+// MarshalJSON is a custom JSON marshalling hook that embeds this object into
+// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
+func (r WorkerConfiguration) MarshalJSON() ([]byte, error) {
+	type Properties WorkerConfiguration
+	return json.Marshal(&struct {
+		Type                string
+		Properties          Properties
+		DependsOn           []string                     `json:"DependsOn,omitempty"`
+		Metadata            map[string]interface{}       `json:"Metadata,omitempty"`
+		DeletionPolicy      policies.DeletionPolicy      `json:"DeletionPolicy,omitempty"`
+		UpdateReplacePolicy policies.UpdateReplacePolicy `json:"UpdateReplacePolicy,omitempty"`
+		Condition           string                       `json:"Condition,omitempty"`
+	}{
+		Type:                r.AWSCloudFormationType(),
+		Properties:          (Properties)(r),
+		DependsOn:           r.AWSCloudFormationDependsOn,
+		Metadata:            r.AWSCloudFormationMetadata,
+		DeletionPolicy:      r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition:           r.AWSCloudFormationCondition,
+	})
+}
+
+// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
+// AWS CloudFormation resource object, and just keeps the 'Properties' field.
+func (r *WorkerConfiguration) UnmarshalJSON(b []byte) error {
+	type Properties WorkerConfiguration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           interface{}
+		Metadata            map[string]interface{}
+		DeletionPolicy      string
+		UpdateReplacePolicy string
+		Condition           string
+	}{}
+
+	dec := json.NewDecoder(bytes.NewReader(b))
+	dec.DisallowUnknownFields() // Force error if unknown field is found
+
+	if err := dec.Decode(&res); err != nil {
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = WorkerConfiguration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		switch obj := res.DependsOn.(type) {
+		case string:
+			r.AWSCloudFormationDependsOn = []string{obj}
+		case []interface{}:
+			s := make([]string, 0, len(obj))
+			for _, v := range obj {
+				if value, ok := v.(string); ok {
+					s = append(s, value)
+				}
+			}
+			r.AWSCloudFormationDependsOn = s
+		}
+	}
+	if res.Metadata != nil {
+		r.AWSCloudFormationMetadata = res.Metadata
+	}
+	if res.DeletionPolicy != "" {
+		r.AWSCloudFormationDeletionPolicy = policies.DeletionPolicy(res.DeletionPolicy)
+	}
+	if res.UpdateReplacePolicy != "" {
+		r.AWSCloudFormationUpdateReplacePolicy = policies.UpdateReplacePolicy(res.UpdateReplacePolicy)
+	}
+	if res.Condition != "" {
+		r.AWSCloudFormationCondition = res.Condition
+	}
+	return nil
+}
diff --git a/schema/cdk.go b/schema/cdk.go
index 22520fc6eb..0695a322b2 100644
--- a/schema/cdk.go
+++ b/schema/cdk.go
@@ -30893,6 +30893,9 @@ var CdkSchema = `{
         "AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector": {
             "additionalProperties": false,
             "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
                 "Dimensions": {
                     "items": {
                         "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
@@ -105165,6 +105168,209 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::KafkaConnect::CustomPlugin": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContentType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Location": {
+                            "$ref": "#/definitions/AWS::KafkaConnect::CustomPlugin.CustomPluginLocation"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ContentType",
+                        "Location",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KafkaConnect::CustomPlugin"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KafkaConnect::CustomPlugin.CustomPluginFileDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "FileMd5": {
+                    "type": "string"
+                },
+                "FileSize": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KafkaConnect::CustomPlugin.CustomPluginLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Location": {
+                    "$ref": "#/definitions/AWS::KafkaConnect::CustomPlugin.S3Location"
+                }
+            },
+            "required": [
+                "S3Location"
+            ],
+            "type": "object"
+        },
+        "AWS::KafkaConnect::CustomPlugin.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
+                    "type": "string"
+                },
+                "FileKey": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketArn",
+                "FileKey"
+            ],
+            "type": "object"
+        },
+        "AWS::KafkaConnect::WorkerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PropertiesFileContent": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "PropertiesFileContent"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KafkaConnect::WorkerConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::Kendra::DataSource": {
             "additionalProperties": false,
             "properties": {
@@ -198957,7 +199163,7 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::SecurityHub::DelegatedAdmin": {
+        "AWS::SecurityHub::Hub": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -198992,18 +199198,30 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdminAccountId": {
+                        "AutoEnableControls": {
+                            "type": "boolean"
+                        },
+                        "ControlFindingGenerator": {
                             "type": "string"
+                        },
+                        "EnableDefaultStandards": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
-                    "required": [
-                        "AdminAccountId"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SecurityHub::DelegatedAdmin"
+                        "AWS::SecurityHub::Hub"
                     ],
                     "type": "string"
                 },
@@ -199017,12 +199235,11 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::SecurityHub::Hub": {
+        "AWS::SecurityHub::Standard": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -199057,30 +199274,24 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoEnableControls": {
-                            "type": "boolean"
+                        "DisabledStandardsControls": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SecurityHub::Standard.StandardsControl"
+                            },
+                            "type": "array"
                         },
-                        "ControlFindingGenerator": {
+                        "StandardsArn": {
                             "type": "string"
-                        },
-                        "EnableDefaultStandards": {
-                            "type": "boolean"
-                        },
-                        "Tags": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
                         }
                     },
+                    "required": [
+                        "StandardsArn"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SecurityHub::Hub"
+                        "AWS::SecurityHub::Standard"
                     ],
                     "type": "string"
                 },
@@ -199094,944 +199305,27 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::SecurityHub::Insight": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Filters": {
-                            "$ref": "#/definitions/AWS::SecurityHub::Insight.AwsSecurityFindingFilters"
-                        },
-                        "GroupByAttribute": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Filters",
-                        "GroupByAttribute",
-                        "Name"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::SecurityHub::Insight"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.AwsSecurityFindingFilters": {
-            "additionalProperties": false,
-            "properties": {
-                "AwsAccountId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "AwsAccountName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "CompanyName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceAssociatedStandardsId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceSecurityControlId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceSecurityControlParametersName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceSecurityControlParametersValue": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceStatus": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Confidence": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "CreatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "Criticality": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "Description": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsConfidence": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsCriticality": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsRelatedFindingsId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsRelatedFindingsProductArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsSeverityLabel": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsSeverityOriginal": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsTypes": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FirstObservedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "GeneratorId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Id": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "LastObservedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwareName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwarePath": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwareState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwareType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationDomain": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationIpV4": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationIpV6": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationPort": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDirection": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkProtocol": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceDomain": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceIpV4": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceIpV6": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceMac": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourcePort": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "NoteText": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NoteUpdatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "NoteUpdatedBy": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessLaunchedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessParentPid": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessPath": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessPid": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessTerminatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ProductArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProductFields": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "ProductName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RecommendationText": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RecordState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Region": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RelatedFindingsId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RelatedFindingsProductArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceApplicationArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceApplicationName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceIamInstanceProfileArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceImageId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceIpV4Addresses": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceIpV6Addresses": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceKeyName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceLaunchedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceSubnetId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceVpcId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamAccessKeyCreatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamAccessKeyPrincipalName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamAccessKeyStatus": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamUserUserName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsS3BucketOwnerId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsS3BucketOwnerName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerImageId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerImageName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerLaunchedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceDetailsOther": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourcePartition": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceRegion": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceTags": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Sample": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.BooleanFilter"
-                    },
-                    "type": "array"
-                },
-                "SeverityLabel": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "SourceUrl": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorCategory": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorLastObservedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorSource": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorSourceUrl": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorValue": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Title": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Type": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "UpdatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "UserDefinedFields": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "VerificationState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "VulnerabilitiesExploitAvailable": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "VulnerabilitiesFixAvailable": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "WorkflowState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "WorkflowStatus": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.BooleanFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Value": {
-                    "type": "boolean"
-                }
-            },
-            "required": [
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.DateFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "DateRange": {
-                    "$ref": "#/definitions/AWS::SecurityHub::Insight.DateRange"
-                },
-                "End": {
-                    "type": "string"
-                },
-                "Start": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.DateRange": {
-            "additionalProperties": false,
-            "properties": {
-                "Unit": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Unit",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.IpFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Cidr": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.MapFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Comparison": {
-                    "type": "string"
-                },
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Comparison",
-                "Key",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.NumberFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Eq": {
-                    "type": "number"
-                },
-                "Gte": {
-                    "type": "number"
-                },
-                "Lte": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.StringFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Comparison": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Comparison",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::ProductSubscription": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "ProductArn": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "ProductArn"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::SecurityHub::ProductSubscription"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Standard": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "DisabledStandardsControls": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::SecurityHub::Standard.StandardsControl"
-                            },
-                            "type": "array"
-                        },
-                        "StandardsArn": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "StandardsArn"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::SecurityHub::Standard"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Standard.StandardsControl": {
-            "additionalProperties": false,
-            "properties": {
-                "Reason": {
-                    "type": "string"
-                },
-                "StandardsControlArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "StandardsControlArn"
-            ],
-            "type": "object"
-        },
-        "AWS::ServiceCatalog::AcceptedPortfolioShare": {
+        "AWS::SecurityHub::Standard.StandardsControl": {
+            "additionalProperties": false,
+            "properties": {
+                "Reason": {
+                    "type": "string"
+                },
+                "StandardsControlArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StandardsControlArn"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::AcceptedPortfolioShare": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -215984,6 +215278,12 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::KafkaConnect::Connector"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::KafkaConnect::CustomPlugin"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KafkaConnect::WorkerConfiguration"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Kendra::DataSource"
                         },
@@ -217199,18 +216499,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::AutomationRule"
                         },
-                        {
-                            "$ref": "#/definitions/AWS::SecurityHub::DelegatedAdmin"
-                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Hub"
                         },
-                        {
-                            "$ref": "#/definitions/AWS::SecurityHub::Insight"
-                        },
-                        {
-                            "$ref": "#/definitions/AWS::SecurityHub::ProductSubscription"
-                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Standard"
                         },
diff --git a/schema/cdk.schema.json b/schema/cdk.schema.json
index 79f42ab581..05cd5c4671 100644
--- a/schema/cdk.schema.json
+++ b/schema/cdk.schema.json
@@ -30888,6 +30888,9 @@
         "AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector": {
             "additionalProperties": false,
             "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
                 "Dimensions": {
                     "items": {
                         "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
@@ -105160,6 +105163,209 @@
             },
             "type": "object"
         },
+        "AWS::KafkaConnect::CustomPlugin": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContentType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Location": {
+                            "$ref": "#/definitions/AWS::KafkaConnect::CustomPlugin.CustomPluginLocation"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ContentType",
+                        "Location",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KafkaConnect::CustomPlugin"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KafkaConnect::CustomPlugin.CustomPluginFileDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "FileMd5": {
+                    "type": "string"
+                },
+                "FileSize": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KafkaConnect::CustomPlugin.CustomPluginLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Location": {
+                    "$ref": "#/definitions/AWS::KafkaConnect::CustomPlugin.S3Location"
+                }
+            },
+            "required": [
+                "S3Location"
+            ],
+            "type": "object"
+        },
+        "AWS::KafkaConnect::CustomPlugin.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
+                    "type": "string"
+                },
+                "FileKey": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketArn",
+                "FileKey"
+            ],
+            "type": "object"
+        },
+        "AWS::KafkaConnect::WorkerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PropertiesFileContent": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "PropertiesFileContent"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KafkaConnect::WorkerConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::Kendra::DataSource": {
             "additionalProperties": false,
             "properties": {
@@ -198952,7 +199158,7 @@
             ],
             "type": "object"
         },
-        "AWS::SecurityHub::DelegatedAdmin": {
+        "AWS::SecurityHub::Hub": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -198987,18 +199193,30 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdminAccountId": {
+                        "AutoEnableControls": {
+                            "type": "boolean"
+                        },
+                        "ControlFindingGenerator": {
                             "type": "string"
+                        },
+                        "EnableDefaultStandards": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
-                    "required": [
-                        "AdminAccountId"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SecurityHub::DelegatedAdmin"
+                        "AWS::SecurityHub::Hub"
                     ],
                     "type": "string"
                 },
@@ -199012,12 +199230,11 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::SecurityHub::Hub": {
+        "AWS::SecurityHub::Standard": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -199052,30 +199269,24 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoEnableControls": {
-                            "type": "boolean"
+                        "DisabledStandardsControls": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SecurityHub::Standard.StandardsControl"
+                            },
+                            "type": "array"
                         },
-                        "ControlFindingGenerator": {
+                        "StandardsArn": {
                             "type": "string"
-                        },
-                        "EnableDefaultStandards": {
-                            "type": "boolean"
-                        },
-                        "Tags": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
                         }
                     },
+                    "required": [
+                        "StandardsArn"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SecurityHub::Hub"
+                        "AWS::SecurityHub::Standard"
                     ],
                     "type": "string"
                 },
@@ -199089,944 +199300,27 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::SecurityHub::Insight": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Filters": {
-                            "$ref": "#/definitions/AWS::SecurityHub::Insight.AwsSecurityFindingFilters"
-                        },
-                        "GroupByAttribute": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Filters",
-                        "GroupByAttribute",
-                        "Name"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::SecurityHub::Insight"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.AwsSecurityFindingFilters": {
-            "additionalProperties": false,
-            "properties": {
-                "AwsAccountId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "AwsAccountName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "CompanyName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceAssociatedStandardsId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceSecurityControlId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceSecurityControlParametersName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceSecurityControlParametersValue": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceStatus": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Confidence": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "CreatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "Criticality": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "Description": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsConfidence": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsCriticality": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsRelatedFindingsId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsRelatedFindingsProductArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsSeverityLabel": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsSeverityOriginal": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsTypes": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FirstObservedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "GeneratorId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Id": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "LastObservedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwareName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwarePath": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwareState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwareType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationDomain": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationIpV4": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationIpV6": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationPort": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDirection": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkProtocol": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceDomain": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceIpV4": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceIpV6": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceMac": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourcePort": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "NoteText": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NoteUpdatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "NoteUpdatedBy": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessLaunchedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessParentPid": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessPath": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessPid": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessTerminatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ProductArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProductFields": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "ProductName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RecommendationText": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RecordState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Region": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RelatedFindingsId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RelatedFindingsProductArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceApplicationArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceApplicationName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceIamInstanceProfileArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceImageId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceIpV4Addresses": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceIpV6Addresses": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceKeyName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceLaunchedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceSubnetId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceVpcId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamAccessKeyCreatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamAccessKeyPrincipalName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamAccessKeyStatus": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamUserUserName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsS3BucketOwnerId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsS3BucketOwnerName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerImageId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerImageName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerLaunchedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceDetailsOther": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourcePartition": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceRegion": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceTags": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Sample": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.BooleanFilter"
-                    },
-                    "type": "array"
-                },
-                "SeverityLabel": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "SourceUrl": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorCategory": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorLastObservedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorSource": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorSourceUrl": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorValue": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Title": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Type": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "UpdatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "UserDefinedFields": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "VerificationState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "VulnerabilitiesExploitAvailable": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "VulnerabilitiesFixAvailable": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "WorkflowState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "WorkflowStatus": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.BooleanFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Value": {
-                    "type": "boolean"
-                }
-            },
-            "required": [
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.DateFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "DateRange": {
-                    "$ref": "#/definitions/AWS::SecurityHub::Insight.DateRange"
-                },
-                "End": {
-                    "type": "string"
-                },
-                "Start": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.DateRange": {
-            "additionalProperties": false,
-            "properties": {
-                "Unit": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Unit",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.IpFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Cidr": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.MapFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Comparison": {
-                    "type": "string"
-                },
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Comparison",
-                "Key",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.NumberFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Eq": {
-                    "type": "number"
-                },
-                "Gte": {
-                    "type": "number"
-                },
-                "Lte": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.StringFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Comparison": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Comparison",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::ProductSubscription": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "ProductArn": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "ProductArn"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::SecurityHub::ProductSubscription"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Standard": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "DisabledStandardsControls": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::SecurityHub::Standard.StandardsControl"
-                            },
-                            "type": "array"
-                        },
-                        "StandardsArn": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "StandardsArn"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::SecurityHub::Standard"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Standard.StandardsControl": {
-            "additionalProperties": false,
-            "properties": {
-                "Reason": {
-                    "type": "string"
-                },
-                "StandardsControlArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "StandardsControlArn"
-            ],
-            "type": "object"
-        },
-        "AWS::ServiceCatalog::AcceptedPortfolioShare": {
+        "AWS::SecurityHub::Standard.StandardsControl": {
+            "additionalProperties": false,
+            "properties": {
+                "Reason": {
+                    "type": "string"
+                },
+                "StandardsControlArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StandardsControlArn"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::AcceptedPortfolioShare": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -215979,6 +215273,12 @@
                         {
                             "$ref": "#/definitions/AWS::KafkaConnect::Connector"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::KafkaConnect::CustomPlugin"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KafkaConnect::WorkerConfiguration"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Kendra::DataSource"
                         },
@@ -217194,18 +216494,9 @@
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::AutomationRule"
                         },
-                        {
-                            "$ref": "#/definitions/AWS::SecurityHub::DelegatedAdmin"
-                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Hub"
                         },
-                        {
-                            "$ref": "#/definitions/AWS::SecurityHub::Insight"
-                        },
-                        {
-                            "$ref": "#/definitions/AWS::SecurityHub::ProductSubscription"
-                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Standard"
                         },
diff --git a/schema/cloudformation.go b/schema/cloudformation.go
index 0f755f4040..af8682bc8f 100644
--- a/schema/cloudformation.go
+++ b/schema/cloudformation.go
@@ -30832,6 +30832,9 @@ var CloudformationSchema = `{
         "AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector": {
             "additionalProperties": false,
             "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
                 "Dimensions": {
                     "items": {
                         "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
@@ -105104,6 +105107,209 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::KafkaConnect::CustomPlugin": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContentType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Location": {
+                            "$ref": "#/definitions/AWS::KafkaConnect::CustomPlugin.CustomPluginLocation"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ContentType",
+                        "Location",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KafkaConnect::CustomPlugin"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KafkaConnect::CustomPlugin.CustomPluginFileDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "FileMd5": {
+                    "type": "string"
+                },
+                "FileSize": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KafkaConnect::CustomPlugin.CustomPluginLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Location": {
+                    "$ref": "#/definitions/AWS::KafkaConnect::CustomPlugin.S3Location"
+                }
+            },
+            "required": [
+                "S3Location"
+            ],
+            "type": "object"
+        },
+        "AWS::KafkaConnect::CustomPlugin.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
+                    "type": "string"
+                },
+                "FileKey": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketArn",
+                "FileKey"
+            ],
+            "type": "object"
+        },
+        "AWS::KafkaConnect::WorkerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PropertiesFileContent": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "PropertiesFileContent"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KafkaConnect::WorkerConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::Kendra::DataSource": {
             "additionalProperties": false,
             "properties": {
@@ -198896,7 +199102,7 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::SecurityHub::DelegatedAdmin": {
+        "AWS::SecurityHub::Hub": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -198931,18 +199137,30 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdminAccountId": {
+                        "AutoEnableControls": {
+                            "type": "boolean"
+                        },
+                        "ControlFindingGenerator": {
                             "type": "string"
+                        },
+                        "EnableDefaultStandards": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
-                    "required": [
-                        "AdminAccountId"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SecurityHub::DelegatedAdmin"
+                        "AWS::SecurityHub::Hub"
                     ],
                     "type": "string"
                 },
@@ -198956,12 +199174,11 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::SecurityHub::Hub": {
+        "AWS::SecurityHub::Standard": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -198996,30 +199213,24 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoEnableControls": {
-                            "type": "boolean"
+                        "DisabledStandardsControls": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SecurityHub::Standard.StandardsControl"
+                            },
+                            "type": "array"
                         },
-                        "ControlFindingGenerator": {
+                        "StandardsArn": {
                             "type": "string"
-                        },
-                        "EnableDefaultStandards": {
-                            "type": "boolean"
-                        },
-                        "Tags": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
                         }
                     },
+                    "required": [
+                        "StandardsArn"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SecurityHub::Hub"
+                        "AWS::SecurityHub::Standard"
                     ],
                     "type": "string"
                 },
@@ -199033,944 +199244,27 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::SecurityHub::Insight": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Filters": {
-                            "$ref": "#/definitions/AWS::SecurityHub::Insight.AwsSecurityFindingFilters"
-                        },
-                        "GroupByAttribute": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Filters",
-                        "GroupByAttribute",
-                        "Name"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::SecurityHub::Insight"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.AwsSecurityFindingFilters": {
-            "additionalProperties": false,
-            "properties": {
-                "AwsAccountId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "AwsAccountName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "CompanyName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceAssociatedStandardsId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceSecurityControlId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceSecurityControlParametersName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceSecurityControlParametersValue": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceStatus": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Confidence": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "CreatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "Criticality": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "Description": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsConfidence": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsCriticality": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsRelatedFindingsId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsRelatedFindingsProductArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsSeverityLabel": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsSeverityOriginal": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsTypes": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FirstObservedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "GeneratorId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Id": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "LastObservedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwareName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwarePath": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwareState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwareType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationDomain": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationIpV4": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationIpV6": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationPort": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDirection": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkProtocol": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceDomain": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceIpV4": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceIpV6": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceMac": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourcePort": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "NoteText": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NoteUpdatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "NoteUpdatedBy": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessLaunchedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessParentPid": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessPath": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessPid": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessTerminatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ProductArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProductFields": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "ProductName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RecommendationText": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RecordState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Region": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RelatedFindingsId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RelatedFindingsProductArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceApplicationArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceApplicationName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceIamInstanceProfileArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceImageId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceIpV4Addresses": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceIpV6Addresses": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceKeyName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceLaunchedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceSubnetId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceVpcId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamAccessKeyCreatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamAccessKeyPrincipalName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamAccessKeyStatus": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamUserUserName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsS3BucketOwnerId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsS3BucketOwnerName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerImageId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerImageName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerLaunchedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceDetailsOther": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourcePartition": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceRegion": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceTags": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Sample": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.BooleanFilter"
-                    },
-                    "type": "array"
-                },
-                "SeverityLabel": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "SourceUrl": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorCategory": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorLastObservedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorSource": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorSourceUrl": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorValue": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Title": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Type": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "UpdatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "UserDefinedFields": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "VerificationState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "VulnerabilitiesExploitAvailable": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "VulnerabilitiesFixAvailable": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "WorkflowState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "WorkflowStatus": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.BooleanFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Value": {
-                    "type": "boolean"
-                }
-            },
-            "required": [
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.DateFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "DateRange": {
-                    "$ref": "#/definitions/AWS::SecurityHub::Insight.DateRange"
-                },
-                "End": {
-                    "type": "string"
-                },
-                "Start": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.DateRange": {
-            "additionalProperties": false,
-            "properties": {
-                "Unit": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Unit",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.IpFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Cidr": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.MapFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Comparison": {
-                    "type": "string"
-                },
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Comparison",
-                "Key",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.NumberFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Eq": {
-                    "type": "number"
-                },
-                "Gte": {
-                    "type": "number"
-                },
-                "Lte": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.StringFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Comparison": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Comparison",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::ProductSubscription": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "ProductArn": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "ProductArn"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::SecurityHub::ProductSubscription"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Standard": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "DisabledStandardsControls": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::SecurityHub::Standard.StandardsControl"
-                            },
-                            "type": "array"
-                        },
-                        "StandardsArn": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "StandardsArn"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::SecurityHub::Standard"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Standard.StandardsControl": {
-            "additionalProperties": false,
-            "properties": {
-                "Reason": {
-                    "type": "string"
-                },
-                "StandardsControlArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "StandardsControlArn"
-            ],
-            "type": "object"
-        },
-        "AWS::ServiceCatalog::AcceptedPortfolioShare": {
+        "AWS::SecurityHub::Standard.StandardsControl": {
+            "additionalProperties": false,
+            "properties": {
+                "Reason": {
+                    "type": "string"
+                },
+                "StandardsControlArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StandardsControlArn"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::AcceptedPortfolioShare": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -215920,6 +215214,12 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::KafkaConnect::Connector"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::KafkaConnect::CustomPlugin"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KafkaConnect::WorkerConfiguration"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Kendra::DataSource"
                         },
@@ -217135,18 +216435,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::AutomationRule"
                         },
-                        {
-                            "$ref": "#/definitions/AWS::SecurityHub::DelegatedAdmin"
-                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Hub"
                         },
-                        {
-                            "$ref": "#/definitions/AWS::SecurityHub::Insight"
-                        },
-                        {
-                            "$ref": "#/definitions/AWS::SecurityHub::ProductSubscription"
-                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Standard"
                         },
diff --git a/schema/cloudformation.schema.json b/schema/cloudformation.schema.json
index acb7af3d87..54688edb08 100644
--- a/schema/cloudformation.schema.json
+++ b/schema/cloudformation.schema.json
@@ -30827,6 +30827,9 @@
         "AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector": {
             "additionalProperties": false,
             "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
                 "Dimensions": {
                     "items": {
                         "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
@@ -105099,6 +105102,209 @@
             },
             "type": "object"
         },
+        "AWS::KafkaConnect::CustomPlugin": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContentType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Location": {
+                            "$ref": "#/definitions/AWS::KafkaConnect::CustomPlugin.CustomPluginLocation"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ContentType",
+                        "Location",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KafkaConnect::CustomPlugin"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KafkaConnect::CustomPlugin.CustomPluginFileDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "FileMd5": {
+                    "type": "string"
+                },
+                "FileSize": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KafkaConnect::CustomPlugin.CustomPluginLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Location": {
+                    "$ref": "#/definitions/AWS::KafkaConnect::CustomPlugin.S3Location"
+                }
+            },
+            "required": [
+                "S3Location"
+            ],
+            "type": "object"
+        },
+        "AWS::KafkaConnect::CustomPlugin.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
+                    "type": "string"
+                },
+                "FileKey": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketArn",
+                "FileKey"
+            ],
+            "type": "object"
+        },
+        "AWS::KafkaConnect::WorkerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PropertiesFileContent": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "PropertiesFileContent"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KafkaConnect::WorkerConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::Kendra::DataSource": {
             "additionalProperties": false,
             "properties": {
@@ -198891,7 +199097,7 @@
             ],
             "type": "object"
         },
-        "AWS::SecurityHub::DelegatedAdmin": {
+        "AWS::SecurityHub::Hub": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -198926,18 +199132,30 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdminAccountId": {
+                        "AutoEnableControls": {
+                            "type": "boolean"
+                        },
+                        "ControlFindingGenerator": {
                             "type": "string"
+                        },
+                        "EnableDefaultStandards": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
-                    "required": [
-                        "AdminAccountId"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SecurityHub::DelegatedAdmin"
+                        "AWS::SecurityHub::Hub"
                     ],
                     "type": "string"
                 },
@@ -198951,12 +199169,11 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::SecurityHub::Hub": {
+        "AWS::SecurityHub::Standard": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -198991,30 +199208,24 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoEnableControls": {
-                            "type": "boolean"
+                        "DisabledStandardsControls": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SecurityHub::Standard.StandardsControl"
+                            },
+                            "type": "array"
                         },
-                        "ControlFindingGenerator": {
+                        "StandardsArn": {
                             "type": "string"
-                        },
-                        "EnableDefaultStandards": {
-                            "type": "boolean"
-                        },
-                        "Tags": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
                         }
                     },
+                    "required": [
+                        "StandardsArn"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SecurityHub::Hub"
+                        "AWS::SecurityHub::Standard"
                     ],
                     "type": "string"
                 },
@@ -199028,944 +199239,27 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::SecurityHub::Insight": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Filters": {
-                            "$ref": "#/definitions/AWS::SecurityHub::Insight.AwsSecurityFindingFilters"
-                        },
-                        "GroupByAttribute": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Filters",
-                        "GroupByAttribute",
-                        "Name"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::SecurityHub::Insight"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.AwsSecurityFindingFilters": {
-            "additionalProperties": false,
-            "properties": {
-                "AwsAccountId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "AwsAccountName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "CompanyName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceAssociatedStandardsId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceSecurityControlId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceSecurityControlParametersName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceSecurityControlParametersValue": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceStatus": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Confidence": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "CreatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "Criticality": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "Description": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsConfidence": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsCriticality": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsRelatedFindingsId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsRelatedFindingsProductArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsSeverityLabel": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsSeverityOriginal": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsTypes": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FirstObservedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "GeneratorId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Id": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "LastObservedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwareName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwarePath": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwareState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwareType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationDomain": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationIpV4": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationIpV6": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationPort": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDirection": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkProtocol": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceDomain": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceIpV4": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceIpV6": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceMac": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourcePort": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "NoteText": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NoteUpdatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "NoteUpdatedBy": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessLaunchedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessParentPid": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessPath": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessPid": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessTerminatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ProductArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProductFields": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "ProductName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RecommendationText": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RecordState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Region": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RelatedFindingsId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RelatedFindingsProductArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceApplicationArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceApplicationName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceIamInstanceProfileArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceImageId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceIpV4Addresses": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceIpV6Addresses": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceKeyName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceLaunchedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceSubnetId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceVpcId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamAccessKeyCreatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamAccessKeyPrincipalName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamAccessKeyStatus": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamUserUserName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsS3BucketOwnerId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsS3BucketOwnerName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerImageId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerImageName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerLaunchedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceDetailsOther": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourcePartition": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceRegion": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceTags": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Sample": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.BooleanFilter"
-                    },
-                    "type": "array"
-                },
-                "SeverityLabel": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "SourceUrl": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorCategory": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorLastObservedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorSource": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorSourceUrl": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorValue": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Title": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Type": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "UpdatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "UserDefinedFields": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "VerificationState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "VulnerabilitiesExploitAvailable": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "VulnerabilitiesFixAvailable": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "WorkflowState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "WorkflowStatus": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.BooleanFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Value": {
-                    "type": "boolean"
-                }
-            },
-            "required": [
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.DateFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "DateRange": {
-                    "$ref": "#/definitions/AWS::SecurityHub::Insight.DateRange"
-                },
-                "End": {
-                    "type": "string"
-                },
-                "Start": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.DateRange": {
-            "additionalProperties": false,
-            "properties": {
-                "Unit": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Unit",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.IpFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Cidr": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.MapFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Comparison": {
-                    "type": "string"
-                },
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Comparison",
-                "Key",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.NumberFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Eq": {
-                    "type": "number"
-                },
-                "Gte": {
-                    "type": "number"
-                },
-                "Lte": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.StringFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Comparison": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Comparison",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::ProductSubscription": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "ProductArn": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "ProductArn"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::SecurityHub::ProductSubscription"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Standard": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "DisabledStandardsControls": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::SecurityHub::Standard.StandardsControl"
-                            },
-                            "type": "array"
-                        },
-                        "StandardsArn": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "StandardsArn"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::SecurityHub::Standard"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Standard.StandardsControl": {
-            "additionalProperties": false,
-            "properties": {
-                "Reason": {
-                    "type": "string"
-                },
-                "StandardsControlArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "StandardsControlArn"
-            ],
-            "type": "object"
-        },
-        "AWS::ServiceCatalog::AcceptedPortfolioShare": {
+        "AWS::SecurityHub::Standard.StandardsControl": {
+            "additionalProperties": false,
+            "properties": {
+                "Reason": {
+                    "type": "string"
+                },
+                "StandardsControlArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StandardsControlArn"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::AcceptedPortfolioShare": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -215915,6 +215209,12 @@
                         {
                             "$ref": "#/definitions/AWS::KafkaConnect::Connector"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::KafkaConnect::CustomPlugin"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KafkaConnect::WorkerConfiguration"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Kendra::DataSource"
                         },
@@ -217130,18 +216430,9 @@
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::AutomationRule"
                         },
-                        {
-                            "$ref": "#/definitions/AWS::SecurityHub::DelegatedAdmin"
-                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Hub"
                         },
-                        {
-                            "$ref": "#/definitions/AWS::SecurityHub::Insight"
-                        },
-                        {
-                            "$ref": "#/definitions/AWS::SecurityHub::ProductSubscription"
-                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Standard"
                         },
diff --git a/schema/sam.go b/schema/sam.go
index 166e3e3ba4..0b5cd909b3 100644
--- a/schema/sam.go
+++ b/schema/sam.go
@@ -30832,6 +30832,9 @@ var SamSchema = `{
         "AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector": {
             "additionalProperties": false,
             "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
                 "Dimensions": {
                     "items": {
                         "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
@@ -105104,6 +105107,209 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::KafkaConnect::CustomPlugin": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContentType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Location": {
+                            "$ref": "#/definitions/AWS::KafkaConnect::CustomPlugin.CustomPluginLocation"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ContentType",
+                        "Location",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KafkaConnect::CustomPlugin"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KafkaConnect::CustomPlugin.CustomPluginFileDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "FileMd5": {
+                    "type": "string"
+                },
+                "FileSize": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KafkaConnect::CustomPlugin.CustomPluginLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Location": {
+                    "$ref": "#/definitions/AWS::KafkaConnect::CustomPlugin.S3Location"
+                }
+            },
+            "required": [
+                "S3Location"
+            ],
+            "type": "object"
+        },
+        "AWS::KafkaConnect::CustomPlugin.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
+                    "type": "string"
+                },
+                "FileKey": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketArn",
+                "FileKey"
+            ],
+            "type": "object"
+        },
+        "AWS::KafkaConnect::WorkerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PropertiesFileContent": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "PropertiesFileContent"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KafkaConnect::WorkerConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::Kendra::DataSource": {
             "additionalProperties": false,
             "properties": {
@@ -198896,7 +199102,7 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::SecurityHub::DelegatedAdmin": {
+        "AWS::SecurityHub::Hub": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -198931,18 +199137,30 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdminAccountId": {
+                        "AutoEnableControls": {
+                            "type": "boolean"
+                        },
+                        "ControlFindingGenerator": {
                             "type": "string"
+                        },
+                        "EnableDefaultStandards": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
-                    "required": [
-                        "AdminAccountId"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SecurityHub::DelegatedAdmin"
+                        "AWS::SecurityHub::Hub"
                     ],
                     "type": "string"
                 },
@@ -198956,12 +199174,11 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::SecurityHub::Hub": {
+        "AWS::SecurityHub::Standard": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -198996,30 +199213,24 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoEnableControls": {
-                            "type": "boolean"
+                        "DisabledStandardsControls": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SecurityHub::Standard.StandardsControl"
+                            },
+                            "type": "array"
                         },
-                        "ControlFindingGenerator": {
+                        "StandardsArn": {
                             "type": "string"
-                        },
-                        "EnableDefaultStandards": {
-                            "type": "boolean"
-                        },
-                        "Tags": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
                         }
                     },
+                    "required": [
+                        "StandardsArn"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SecurityHub::Hub"
+                        "AWS::SecurityHub::Standard"
                     ],
                     "type": "string"
                 },
@@ -199033,944 +199244,27 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::SecurityHub::Insight": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Filters": {
-                            "$ref": "#/definitions/AWS::SecurityHub::Insight.AwsSecurityFindingFilters"
-                        },
-                        "GroupByAttribute": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Filters",
-                        "GroupByAttribute",
-                        "Name"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::SecurityHub::Insight"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.AwsSecurityFindingFilters": {
-            "additionalProperties": false,
-            "properties": {
-                "AwsAccountId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "AwsAccountName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "CompanyName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceAssociatedStandardsId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceSecurityControlId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceSecurityControlParametersName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceSecurityControlParametersValue": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceStatus": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Confidence": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "CreatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "Criticality": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "Description": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsConfidence": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsCriticality": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsRelatedFindingsId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsRelatedFindingsProductArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsSeverityLabel": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsSeverityOriginal": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsTypes": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FirstObservedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "GeneratorId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Id": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "LastObservedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwareName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwarePath": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwareState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwareType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationDomain": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationIpV4": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationIpV6": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationPort": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDirection": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkProtocol": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceDomain": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceIpV4": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceIpV6": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceMac": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourcePort": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "NoteText": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NoteUpdatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "NoteUpdatedBy": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessLaunchedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessParentPid": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessPath": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessPid": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessTerminatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ProductArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProductFields": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "ProductName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RecommendationText": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RecordState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Region": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RelatedFindingsId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RelatedFindingsProductArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceApplicationArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceApplicationName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceIamInstanceProfileArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceImageId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceIpV4Addresses": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceIpV6Addresses": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceKeyName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceLaunchedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceSubnetId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceVpcId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamAccessKeyCreatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamAccessKeyPrincipalName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamAccessKeyStatus": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamUserUserName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsS3BucketOwnerId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsS3BucketOwnerName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerImageId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerImageName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerLaunchedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceDetailsOther": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourcePartition": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceRegion": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceTags": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Sample": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.BooleanFilter"
-                    },
-                    "type": "array"
-                },
-                "SeverityLabel": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "SourceUrl": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorCategory": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorLastObservedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorSource": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorSourceUrl": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorValue": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Title": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Type": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "UpdatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "UserDefinedFields": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "VerificationState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "VulnerabilitiesExploitAvailable": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "VulnerabilitiesFixAvailable": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "WorkflowState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "WorkflowStatus": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.BooleanFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Value": {
-                    "type": "boolean"
-                }
-            },
-            "required": [
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.DateFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "DateRange": {
-                    "$ref": "#/definitions/AWS::SecurityHub::Insight.DateRange"
-                },
-                "End": {
-                    "type": "string"
-                },
-                "Start": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.DateRange": {
-            "additionalProperties": false,
-            "properties": {
-                "Unit": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Unit",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.IpFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Cidr": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.MapFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Comparison": {
-                    "type": "string"
-                },
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Comparison",
-                "Key",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.NumberFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Eq": {
-                    "type": "number"
-                },
-                "Gte": {
-                    "type": "number"
-                },
-                "Lte": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.StringFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Comparison": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Comparison",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::ProductSubscription": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "ProductArn": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "ProductArn"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::SecurityHub::ProductSubscription"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Standard": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "DisabledStandardsControls": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::SecurityHub::Standard.StandardsControl"
-                            },
-                            "type": "array"
-                        },
-                        "StandardsArn": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "StandardsArn"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::SecurityHub::Standard"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Standard.StandardsControl": {
-            "additionalProperties": false,
-            "properties": {
-                "Reason": {
-                    "type": "string"
-                },
-                "StandardsControlArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "StandardsControlArn"
-            ],
-            "type": "object"
-        },
-        "AWS::Serverless::Api": {
+        "AWS::SecurityHub::Standard.StandardsControl": {
+            "additionalProperties": false,
+            "properties": {
+                "Reason": {
+                    "type": "string"
+                },
+                "StandardsControlArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StandardsControlArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Api": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -219002,6 +218296,12 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::KafkaConnect::Connector"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::KafkaConnect::CustomPlugin"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KafkaConnect::WorkerConfiguration"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Kendra::DataSource"
                         },
@@ -220217,18 +219517,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::AutomationRule"
                         },
-                        {
-                            "$ref": "#/definitions/AWS::SecurityHub::DelegatedAdmin"
-                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Hub"
                         },
-                        {
-                            "$ref": "#/definitions/AWS::SecurityHub::Insight"
-                        },
-                        {
-                            "$ref": "#/definitions/AWS::SecurityHub::ProductSubscription"
-                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Standard"
                         },
diff --git a/schema/sam.schema.json b/schema/sam.schema.json
index a92b78149d..821ce0f925 100644
--- a/schema/sam.schema.json
+++ b/schema/sam.schema.json
@@ -30827,6 +30827,9 @@
         "AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector": {
             "additionalProperties": false,
             "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
                 "Dimensions": {
                     "items": {
                         "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
@@ -105099,6 +105102,209 @@
             },
             "type": "object"
         },
+        "AWS::KafkaConnect::CustomPlugin": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContentType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Location": {
+                            "$ref": "#/definitions/AWS::KafkaConnect::CustomPlugin.CustomPluginLocation"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ContentType",
+                        "Location",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KafkaConnect::CustomPlugin"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KafkaConnect::CustomPlugin.CustomPluginFileDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "FileMd5": {
+                    "type": "string"
+                },
+                "FileSize": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KafkaConnect::CustomPlugin.CustomPluginLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Location": {
+                    "$ref": "#/definitions/AWS::KafkaConnect::CustomPlugin.S3Location"
+                }
+            },
+            "required": [
+                "S3Location"
+            ],
+            "type": "object"
+        },
+        "AWS::KafkaConnect::CustomPlugin.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
+                    "type": "string"
+                },
+                "FileKey": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketArn",
+                "FileKey"
+            ],
+            "type": "object"
+        },
+        "AWS::KafkaConnect::WorkerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PropertiesFileContent": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "PropertiesFileContent"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KafkaConnect::WorkerConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::Kendra::DataSource": {
             "additionalProperties": false,
             "properties": {
@@ -198891,7 +199097,7 @@
             ],
             "type": "object"
         },
-        "AWS::SecurityHub::DelegatedAdmin": {
+        "AWS::SecurityHub::Hub": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -198926,18 +199132,30 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdminAccountId": {
+                        "AutoEnableControls": {
+                            "type": "boolean"
+                        },
+                        "ControlFindingGenerator": {
                             "type": "string"
+                        },
+                        "EnableDefaultStandards": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
-                    "required": [
-                        "AdminAccountId"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SecurityHub::DelegatedAdmin"
+                        "AWS::SecurityHub::Hub"
                     ],
                     "type": "string"
                 },
@@ -198951,12 +199169,11 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::SecurityHub::Hub": {
+        "AWS::SecurityHub::Standard": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -198991,30 +199208,24 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoEnableControls": {
-                            "type": "boolean"
+                        "DisabledStandardsControls": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SecurityHub::Standard.StandardsControl"
+                            },
+                            "type": "array"
                         },
-                        "ControlFindingGenerator": {
+                        "StandardsArn": {
                             "type": "string"
-                        },
-                        "EnableDefaultStandards": {
-                            "type": "boolean"
-                        },
-                        "Tags": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
                         }
                     },
+                    "required": [
+                        "StandardsArn"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SecurityHub::Hub"
+                        "AWS::SecurityHub::Standard"
                     ],
                     "type": "string"
                 },
@@ -199028,944 +199239,27 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::SecurityHub::Insight": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Filters": {
-                            "$ref": "#/definitions/AWS::SecurityHub::Insight.AwsSecurityFindingFilters"
-                        },
-                        "GroupByAttribute": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Filters",
-                        "GroupByAttribute",
-                        "Name"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::SecurityHub::Insight"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.AwsSecurityFindingFilters": {
-            "additionalProperties": false,
-            "properties": {
-                "AwsAccountId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "AwsAccountName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "CompanyName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceAssociatedStandardsId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceSecurityControlId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceSecurityControlParametersName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceSecurityControlParametersValue": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ComplianceStatus": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Confidence": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "CreatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "Criticality": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "Description": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsConfidence": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsCriticality": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsRelatedFindingsId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsRelatedFindingsProductArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsSeverityLabel": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsSeverityOriginal": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FindingProviderFieldsTypes": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "FirstObservedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "GeneratorId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Id": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "LastObservedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwareName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwarePath": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwareState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "MalwareType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationDomain": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationIpV4": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationIpV6": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDestinationPort": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkDirection": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkProtocol": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceDomain": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceIpV4": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceIpV6": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourceMac": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NetworkSourcePort": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "NoteText": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "NoteUpdatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "NoteUpdatedBy": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessLaunchedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessParentPid": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessPath": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessPid": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.NumberFilter"
-                    },
-                    "type": "array"
-                },
-                "ProcessTerminatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ProductArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ProductFields": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "ProductName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RecommendationText": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RecordState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Region": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RelatedFindingsId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "RelatedFindingsProductArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceApplicationArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceApplicationName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceIamInstanceProfileArn": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceImageId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceIpV4Addresses": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceIpV6Addresses": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.IpFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceKeyName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceLaunchedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceSubnetId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsEc2InstanceVpcId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamAccessKeyCreatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamAccessKeyPrincipalName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamAccessKeyStatus": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsIamUserUserName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsS3BucketOwnerId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceAwsS3BucketOwnerName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerImageId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerImageName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerLaunchedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceContainerName": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceDetailsOther": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceId": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourcePartition": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceRegion": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceTags": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "ResourceType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Sample": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.BooleanFilter"
-                    },
-                    "type": "array"
-                },
-                "SeverityLabel": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "SourceUrl": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorCategory": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorLastObservedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorSource": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorSourceUrl": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorType": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "ThreatIntelIndicatorValue": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Title": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "Type": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "UpdatedAt": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.DateFilter"
-                    },
-                    "type": "array"
-                },
-                "UserDefinedFields": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.MapFilter"
-                    },
-                    "type": "array"
-                },
-                "VerificationState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "VulnerabilitiesExploitAvailable": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "VulnerabilitiesFixAvailable": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "WorkflowState": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                },
-                "WorkflowStatus": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SecurityHub::Insight.StringFilter"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.BooleanFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Value": {
-                    "type": "boolean"
-                }
-            },
-            "required": [
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.DateFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "DateRange": {
-                    "$ref": "#/definitions/AWS::SecurityHub::Insight.DateRange"
-                },
-                "End": {
-                    "type": "string"
-                },
-                "Start": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.DateRange": {
-            "additionalProperties": false,
-            "properties": {
-                "Unit": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Unit",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.IpFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Cidr": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.MapFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Comparison": {
-                    "type": "string"
-                },
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Comparison",
-                "Key",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.NumberFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Eq": {
-                    "type": "number"
-                },
-                "Gte": {
-                    "type": "number"
-                },
-                "Lte": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::SecurityHub::Insight.StringFilter": {
-            "additionalProperties": false,
-            "properties": {
-                "Comparison": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Comparison",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::ProductSubscription": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "ProductArn": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "ProductArn"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::SecurityHub::ProductSubscription"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Standard": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "DisabledStandardsControls": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::SecurityHub::Standard.StandardsControl"
-                            },
-                            "type": "array"
-                        },
-                        "StandardsArn": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "StandardsArn"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::SecurityHub::Standard"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::SecurityHub::Standard.StandardsControl": {
-            "additionalProperties": false,
-            "properties": {
-                "Reason": {
-                    "type": "string"
-                },
-                "StandardsControlArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "StandardsControlArn"
-            ],
-            "type": "object"
-        },
-        "AWS::Serverless::Api": {
+        "AWS::SecurityHub::Standard.StandardsControl": {
+            "additionalProperties": false,
+            "properties": {
+                "Reason": {
+                    "type": "string"
+                },
+                "StandardsControlArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StandardsControlArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Api": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -218997,6 +218291,12 @@
                         {
                             "$ref": "#/definitions/AWS::KafkaConnect::Connector"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::KafkaConnect::CustomPlugin"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KafkaConnect::WorkerConfiguration"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Kendra::DataSource"
                         },
@@ -220212,18 +219512,9 @@
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::AutomationRule"
                         },
-                        {
-                            "$ref": "#/definitions/AWS::SecurityHub::DelegatedAdmin"
-                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Hub"
                         },
-                        {
-                            "$ref": "#/definitions/AWS::SecurityHub::Insight"
-                        },
-                        {
-                            "$ref": "#/definitions/AWS::SecurityHub::ProductSubscription"
-                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Standard"
                         },