diff --git a/cloudformation/resources/aws-serverless-api.go b/cloudformation/resources/aws-serverless-api.go
index 9ac430adfb..fa2ea0285a 100644
--- a/cloudformation/resources/aws-serverless-api.go
+++ b/cloudformation/resources/aws-serverless-api.go
@@ -66,6 +66,11 @@ type AWSServerlessApi struct {
 	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
 	StageName string `json:"StageName,omitempty"`
 
+	// TracingEnabled AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
+	TracingEnabled bool `json:"TracingEnabled,omitempty"`
+
 	// Variables AWS CloudFormation Property
 	// Required: false
 	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
diff --git a/cloudformation/resources/aws-serverless-function.go b/cloudformation/resources/aws-serverless-function.go
index 5b8a442ac7..f6acecf676 100644
--- a/cloudformation/resources/aws-serverless-function.go
+++ b/cloudformation/resources/aws-serverless-function.go
@@ -71,6 +71,11 @@ type AWSServerlessFunction struct {
 	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
 	MemorySize int `json:"MemorySize,omitempty"`
 
+	// PermissionsBoundary AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	PermissionsBoundary string `json:"PermissionsBoundary,omitempty"`
+
 	// Policies AWS CloudFormation Property
 	// Required: false
 	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
diff --git a/cloudformation/resources/aws-serverless-function_dynamodbevent.go b/cloudformation/resources/aws-serverless-function_dynamodbevent.go
index ceb6bd5b88..da6225cb7a 100644
--- a/cloudformation/resources/aws-serverless-function_dynamodbevent.go
+++ b/cloudformation/resources/aws-serverless-function_dynamodbevent.go
@@ -11,6 +11,11 @@ type AWSServerlessFunction_DynamoDBEvent struct {
 	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb
 	BatchSize int `json:"BatchSize,omitempty"`
 
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb
+	Enabled bool `json:"Enabled,omitempty"`
+
 	// StartingPosition AWS CloudFormation Property
 	// Required: true
 	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb
diff --git a/cloudformation/resources/aws-serverless-function_kinesisevent.go b/cloudformation/resources/aws-serverless-function_kinesisevent.go
index 89c38c0ef8..db2e283a2b 100644
--- a/cloudformation/resources/aws-serverless-function_kinesisevent.go
+++ b/cloudformation/resources/aws-serverless-function_kinesisevent.go
@@ -11,6 +11,11 @@ type AWSServerlessFunction_KinesisEvent struct {
 	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#kinesis
 	BatchSize int `json:"BatchSize,omitempty"`
 
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#kinesis
+	Enabled bool `json:"Enabled,omitempty"`
+
 	// StartingPosition AWS CloudFormation Property
 	// Required: true
 	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#kinesis
diff --git a/cloudformation/resources/aws-serverless-function_sqsevent.go b/cloudformation/resources/aws-serverless-function_sqsevent.go
index 80bb954a61..7b7d9cd32a 100644
--- a/cloudformation/resources/aws-serverless-function_sqsevent.go
+++ b/cloudformation/resources/aws-serverless-function_sqsevent.go
@@ -11,6 +11,11 @@ type AWSServerlessFunction_SQSEvent struct {
 	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#sqs
 	BatchSize int `json:"BatchSize,omitempty"`
 
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#sqs
+	Enabled bool `json:"Enabled,omitempty"`
+
 	// Queue AWS CloudFormation Property
 	// Required: true
 	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#sqs
diff --git a/generate/sam-2016-10-31.json b/generate/sam-2016-10-31.json
index 5a02c999d1..48228687ee 100644
--- a/generate/sam-2016-10-31.json
+++ b/generate/sam-2016-10-31.json
@@ -75,6 +75,12 @@
                     ],
                     "UpdateType": "Immutable"
                 },
+                "PermissionsBoundary": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
                 "Environment": {
                     "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
                     "Required": false,
@@ -227,6 +233,12 @@
                     "Required": false,
                     "Type": "Auth",
                     "UpdateType": "Immutable"
+                },
+                "TracingEnabled": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi",
+                    "Required": false,
+                    "PrimitiveType": "Boolean",
+                    "UpdateType": "Immutable"
                 }
             }
         },
@@ -486,6 +498,12 @@
                     "Required": false,
                     "PrimitiveType": "Integer",
                     "UpdateType": "Immutable"
+                },
+                "Enabled": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#kinesis",
+                    "Required": false,
+                    "PrimitiveType": "Boolean",
+                    "UpdateType": "Immutable"
                 }
             }
         },
@@ -509,6 +527,12 @@
                     "Required": false,
                     "PrimitiveType": "Integer",
                     "UpdateType": "Immutable"
+                },
+                "Enabled": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb",
+                    "Required": false,
+                    "PrimitiveType": "Boolean",
+                    "UpdateType": "Immutable"
                 }
             }
         },
@@ -526,6 +550,12 @@
                     "Required": false,
                     "PrimitiveType": "Integer",
                     "UpdateType": "Immutable"
+                },
+                "Enabled": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#sqs",
+                    "Required": false,
+                    "PrimitiveType": "Boolean",
+                    "UpdateType": "Immutable"
                 }
             }
         },
diff --git a/schema/sam.go b/schema/sam.go
index bdf7133502..89fd10526b 100644
--- a/schema/sam.go
+++ b/schema/sam.go
@@ -39838,6 +39838,9 @@ var SamSchema = `{
                         "StageName": {
                             "type": "string"
                         },
+                        "TracingEnabled": {
+                            "type": "boolean"
+                        },
                         "Variables": {
                             "additionalProperties": true,
                             "patternProperties": {
@@ -40090,6 +40093,9 @@ var SamSchema = `{
                         "MemorySize": {
                             "type": "number"
                         },
+                        "PermissionsBoundary": {
+                            "type": "string"
+                        },
                         "Policies": {
                             "anyOf": [
                                 {
@@ -40266,6 +40272,9 @@ var SamSchema = `{
                 "BatchSize": {
                     "type": "number"
                 },
+                "Enabled": {
+                    "type": "boolean"
+                },
                 "StartingPosition": {
                     "type": "string"
                 },
@@ -40377,6 +40386,9 @@ var SamSchema = `{
                 "BatchSize": {
                     "type": "number"
                 },
+                "Enabled": {
+                    "type": "boolean"
+                },
                 "StartingPosition": {
                     "type": "string"
                 },
@@ -40471,6 +40483,9 @@ var SamSchema = `{
                 "BatchSize": {
                     "type": "number"
                 },
+                "Enabled": {
+                    "type": "boolean"
+                },
                 "Queue": {
                     "type": "string"
                 }
diff --git a/schema/sam.schema.json b/schema/sam.schema.json
index 3289da2bf7..f20d205d13 100644
--- a/schema/sam.schema.json
+++ b/schema/sam.schema.json
@@ -39835,6 +39835,9 @@
                         "StageName": {
                             "type": "string"
                         },
+                        "TracingEnabled": {
+                            "type": "boolean"
+                        },
                         "Variables": {
                             "additionalProperties": true,
                             "patternProperties": {
@@ -40087,6 +40090,9 @@
                         "MemorySize": {
                             "type": "number"
                         },
+                        "PermissionsBoundary": {
+                            "type": "string"
+                        },
                         "Policies": {
                             "anyOf": [
                                 {
@@ -40263,6 +40269,9 @@
                 "BatchSize": {
                     "type": "number"
                 },
+                "Enabled": {
+                    "type": "boolean"
+                },
                 "StartingPosition": {
                     "type": "string"
                 },
@@ -40374,6 +40383,9 @@
                 "BatchSize": {
                     "type": "number"
                 },
+                "Enabled": {
+                    "type": "boolean"
+                },
                 "StartingPosition": {
                     "type": "string"
                 },
@@ -40468,6 +40480,9 @@
                 "BatchSize": {
                     "type": "number"
                 },
+                "Enabled": {
+                    "type": "boolean"
+                },
                 "Queue": {
                     "type": "string"
                 }