diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcc7849..50050f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,12 @@ and this project adheres to [Semantic
 Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [1.9.4] - 2018-12-09
 ### Changed
 - Update CloudFormation specification (downloaded 07-Dec-2018) - version: 2.17.0
 - Manually edit specification to fix incorrect type setting on AWS::ServiceDiscovery::Instance.InstanceAttributes
+- Update SAM specification (downloaded 09-Dec-2018)
 
 ### Added
 - Merge PR #216, adding tests for SQS tags
@@ -202,7 +205,8 @@ Versioning](http://semver.org/spec/v2.0.0.html).
 ### Added
 - Add pseudo parameter support
 
-[Unreleased]: https://github.com/martysweet/cfn-lint/compare/v1.9.3...HEAD
+[Unreleased]: https://github.com/martysweet/cfn-lint/compare/v1.9.4...HEAD
+[1.9.4]: https://github.com/martysweet/cfn-lint/compare/v1.9.3...v1.9.4
 [1.9.3]: https://github.com/martysweet/cfn-lint/compare/v1.9.2...v1.9.3
 [1.9.2]: https://github.com/martysweet/cfn-lint/compare/v1.9.1...v1.9.2
 [1.9.1]: https://github.com/martysweet/cfn-lint/compare/v1.9.0...v1.9.1
diff --git a/data/sam_20161031_cfn.json b/data/sam_20161031_cfn.json
index 5be4fb1..3611748 100644
--- a/data/sam_20161031_cfn.json
+++ b/data/sam_20161031_cfn.json
@@ -1 +1 @@
-{"PropertyTypes":{"AWS::Serverless::Api.S3Location":{"Documentation":"","Properties":{"Bucket":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["S3Location#Bucket<String>","S3Location#Bucket<Timestamp>"]},"Key":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["S3Location#Key<String>","S3Location#Key<Timestamp>"]},"Version":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["S3Location#Version<Integer>","S3Location#Version<Long>","S3Location#Version<Double>"]}}},"AWS::Serverless::Function.AlexaSkillEvent":{"Documentation":"","Properties":{"Variables":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["AlexaSkillEvent#Variables<Map<String>>","AlexaSkillEvent#Variables<Map<Timestamp>>"]}}},"AWS::Serverless::Function.ApiEvent":{"Documentation":"","Properties":{"Method":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["ApiEvent#Method<String>","ApiEvent#Method<Timestamp>"]},"Path":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["ApiEvent#Path<String>","ApiEvent#Path<Timestamp>"]},"RestApiId":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["ApiEvent#RestApiId<String>","ApiEvent#RestApiId<Timestamp>","ApiEvent#RestApiId<Json>"]}}},"AWS::Serverless::Function.CloudWatchEventEvent":{"Documentation":"","Properties":{"Input":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["CloudWatchEventEvent#Input<String>","CloudWatchEventEvent#Input<Timestamp>"]},"InputPath":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["CloudWatchEventEvent#InputPath<String>","CloudWatchEventEvent#InputPath<Timestamp>"]},"Pattern":{"Documentation":"","Required":true,"UpdateType":"Mutable","PrimitiveType":"Json"}}},"AWS::Serverless::Function.LogEvent":{"Documentation":"","Properties":{"LogGroupName":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["LogEvent#LogGroupName<String>","LogEvent#LogGroupName<Timestamp>"]},"FilterPattern":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["LogEvent#FilterPattern<String>","LogEvent#FilterPattern<Timestamp>"]}}},"AWS::Serverless::Function.DeadLetterQueue":{"Documentation":"","Properties":{"TargetArn":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["DeadLetterQueue#TargetArn<String>","DeadLetterQueue#TargetArn<Timestamp>"]},"Type":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["DeadLetterQueue#Type<String>","DeadLetterQueue#Type<Timestamp>"]}}},"AWS::Serverless::Function.DynamoDBEvent":{"Documentation":"","Properties":{"BatchSize":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["DynamoDBEvent#BatchSize<Integer>","DynamoDBEvent#BatchSize<Long>","DynamoDBEvent#BatchSize<Double>"]},"StartingPosition":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["DynamoDBEvent#StartingPosition<String>","DynamoDBEvent#StartingPosition<Timestamp>"]},"Stream":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["DynamoDBEvent#Stream<String>","DynamoDBEvent#Stream<Timestamp>"]}}},"AWS::Serverless::Function.EventSource":{"Documentation":"","Properties":{"Properties":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["EventSource#Properties<S3Event>","EventSource#Properties<SNSEvent>","EventSource#Properties<KinesisEvent>","EventSource#Properties<SQSEvent>","EventSource#Properties<DynamoDBEvent>","EventSource#Properties<ApiEvent>","EventSource#Properties<ScheduleEvent>","EventSource#Properties<CloudWatchEventEvent>","EventSource#Properties<LogEvent>","EventSource#Properties<IoTRuleEvent>","EventSource#Properties<AlexaSkillEvent>"]},"Type":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["EventSource#Type<String>","EventSource#Type<Timestamp>"]}}},"AWS::Serverless::Function.FunctionEnvironment":{"Documentation":"","Properties":{"Variables":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["FunctionEnvironment#Variables<Map<String>>","FunctionEnvironment#Variables<Map<Timestamp>>"]}}},"AWS::Serverless::Function.IAMPolicyDocument":{"Documentation":"","Properties":{"Statement":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":"List","PrimitiveItemType":"Json"},"Version":{"Required":false,"PrimitiveType":"String","UpdateType":"Mutable"}}},"AWS::Serverless::Function.IoTRuleEvent":{"Documentation":"","Properties":{"AwsIotSqlVersion":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["IoTRuleEvent#AwsIotSqlVersion<String>","IoTRuleEvent#AwsIotSqlVersion<Timestamp>"]},"Sql":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["IoTRuleEvent#Sql<String>","IoTRuleEvent#Sql<Timestamp>"]}}},"AWS::Serverless::Function.KinesisEvent":{"Documentation":"","Properties":{"BatchSize":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["KinesisEvent#BatchSize<Integer>","KinesisEvent#BatchSize<Long>","KinesisEvent#BatchSize<Double>"]},"StartingPosition":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["KinesisEvent#StartingPosition<String>","KinesisEvent#StartingPosition<Timestamp>"]},"Stream":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["KinesisEvent#Stream<String>","KinesisEvent#Stream<Timestamp>"]}}},"AWS::Serverless::Function.SQSEvent":{"Documentation":"","Properties":{"BatchSize":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["SQSEvent#BatchSize<Integer>","SQSEvent#BatchSize<Long>","SQSEvent#BatchSize<Double>"]},"Queue":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["SQSEvent#Queue<String>","SQSEvent#Queue<Timestamp>","SQSEvent#Queue<Json>"]}}},"AWS::Serverless::Function.S3Event":{"Documentation":"","Properties":{"Bucket":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["S3Event#Bucket<String>","S3Event#Bucket<Timestamp>","S3Event#Bucket<Json>"]},"Events":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["S3Event#Events<String>","S3Event#Events<Timestamp>","S3Event#Events<List<String>>","S3Event#Events<List<Timestamp>>"]},"Filter":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":"S3NotificationFilter"}}},"AWS::Serverless::Function.S3Location":{"Documentation":"","Properties":{"Bucket":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["S3Location#Bucket<String>","S3Location#Bucket<Timestamp>"]},"Key":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["S3Location#Key<String>","S3Location#Key<Timestamp>"]},"Version":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["S3Location#Version<Integer>","S3Location#Version<Long>","S3Location#Version<Double>"]}}},"AWS::Serverless::Function.S3NotificationFilter":{"Documentation":"","Properties":{"S3Key":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["S3NotificationFilter#S3Key<String>","S3NotificationFilter#S3Key<Timestamp>","S3NotificationFilter#S3Key<Json>"]}}},"AWS::Serverless::Function.SNSEvent":{"Documentation":"","Properties":{"Topic":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["SNSEvent#Topic<String>","SNSEvent#Topic<Timestamp>"]},"FilterPolicy":{"Documentation":"","Required":false,"UpdateType":"Mutable","PrimitiveType":"Json"}}},"AWS::Serverless::Function.ScheduleEvent":{"Documentation":"","Properties":{"Input":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["ScheduleEvent#Input<String>","ScheduleEvent#Input<Timestamp>"]},"Schedule":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["ScheduleEvent#Schedule<String>","ScheduleEvent#Schedule<Timestamp>"]}}},"AWS::Serverless::Function.VpcConfig":{"Documentation":"","Properties":{"SecurityGroupIds":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["VpcConfig#SecurityGroupIds<List<String>>","VpcConfig#SecurityGroupIds<List<Timestamp>>"]},"SubnetIds":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["VpcConfig#SubnetIds<List<String>>","VpcConfig#SubnetIds<List<Timestamp>>"]},"SubnetIdsUsingRef":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":"List","PrimitiveItemType":"Json"}}},"AWS::Serverless::SimpleTable.PrimaryKey":{"Documentation":"","Properties":{"Name":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["PrimaryKey#Name<String>","PrimaryKey#Name<Timestamp>"]},"Type":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["PrimaryKey#Type<String>","PrimaryKey#Type<Timestamp>"]}}},"AWS::Serverless::SimpleTable.ProvisionedThroughput":{"Documentation":"","Properties":{"ReadCapacityUnits":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["ProvisionedThroughput#ReadCapacityUnits<Integer>","ProvisionedThroughput#ReadCapacityUnits<Long>","ProvisionedThroughput#ReadCapacityUnits<Double>"]},"WriteCapacityUnits":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["ProvisionedThroughput#WriteCapacityUnits<Integer>","ProvisionedThroughput#WriteCapacityUnits<Long>","ProvisionedThroughput#WriteCapacityUnits<Double>"]}}},"AWS::Serverless::SimpleTable.SSESpecification":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-ssespecification.html","Properties":{"SSEEnabled":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-ssespecification.html#cfn-dynamodb-table-ssespecification-sseenabled","Required":true,"UpdateType":"Mutable","PrimitiveType":"Boolean"}}},"AWS::Serverless::Function.Hooks":{"Documentation":"https://github.com/awslabs/serverless-application-model/blob/develop/docs/safe_lambda_deployments.rst#pretraffic--posttraffic-hooks","Properties":{"PreTraffic":{"Required":false,"PrimitiveType":"String","UpdateType":"Mutable"},"PostTraffic":{"Required":false,"PrimitiveType":"String","UpdateType":"Mutable"}}},"AWS::Serverless::Function.DeploymentPreference":{"Documentation":"https://github.com/awslabs/serverless-application-model/blob/develop/versions/2016-10-31.md#deploymentpreference-object","Properties":{"Enabled":{"Required":false,"PrimitiveType":"Boolean","UpdateType":"Mutable"},"Type":{"Required":false,"PrimitiveType":"String","UpdateType":"Mutable"},"Alarms":{"Required":false,"Type":"List","PrimitiveItemType":"String","UpdateType":"Mutable"},"Hooks":{"Required":false,"Type":"Hooks","UpdateType":"Mutable"}}},"AWS::Serverless::Api.CorsConfiguration":{"Documentation":"https://github.com/awslabs/serverless-application-model/blob/develop/versions/2016-10-31.md#cors-configuration","Properties":{"AllowedHeaders":{"Required":false,"PrimitiveType":"String","UpdateType":"Mutable"},"AllowedMethods":{"Required":false,"PrimitiveType":"String","UpdateType":"Mutable"},"AllowedOrigin":{"Required":false,"PrimitiveType":"String","UpdateType":"Mutable"},"MaxAge":{"PrimitiveType":"Integer","Required":false,"UpdateType":"Mutable"}}},"AWS::Serverless::Api.MethodSetting":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html","Properties":{"CacheDataEncrypted":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-cachedataencrypted","PrimitiveType":"Boolean","Required":false,"UpdateType":"Mutable"},"CacheTtlInSeconds":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-cachettlinseconds","PrimitiveType":"Integer","Required":false,"UpdateType":"Mutable"},"CachingEnabled":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-cachingenabled","PrimitiveType":"Boolean","Required":false,"UpdateType":"Mutable"},"DataTraceEnabled":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-datatraceenabled","PrimitiveType":"Boolean","Required":false,"UpdateType":"Mutable"},"HttpMethod":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-httpmethod","PrimitiveType":"String","Required":false,"UpdateType":"Mutable"},"LoggingLevel":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-logginglevel","PrimitiveType":"String","Required":false,"UpdateType":"Mutable"},"MetricsEnabled":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-metricsenabled","PrimitiveType":"Boolean","Required":false,"UpdateType":"Mutable"},"ResourcePath":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-resourcepath","PrimitiveType":"String","Required":false,"UpdateType":"Mutable"},"ThrottlingBurstLimit":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-throttlingburstlimit","PrimitiveType":"Integer","Required":false,"UpdateType":"Mutable"},"ThrottlingRateLimit":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-throttlingratelimit","PrimitiveType":"Double","Required":false,"UpdateType":"Mutable"}}}},"ResourceTypes":{"AWS::Serverless::Api":{"Documentation":"https://github.com/awslabs/serverless-application-model/blob/develop/versions/2016-10-31.md#awsserverlessapi","AdditionalProperties":false,"Properties":{"CacheClusterEnabled":{"Documentation":"","Required":false,"UpdateType":"Mutable","PrimitiveType":"Boolean"},"CacheClusterSize":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#CacheClusterSize<String>","#CacheClusterSize<Timestamp>"]},"DefinitionBody":{"Documentation":"","Required":false,"UpdateType":"Mutable","PrimitiveType":"Json"},"DefinitionUri":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#DefinitionUri<String>","#DefinitionUri<Timestamp>","#DefinitionUri<S3Location>"]},"Name":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#Name<String>","#Name<Timestamp>"]},"StageName":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["#StageName<String>","#StageName<Timestamp>","#StageName<Json>"]},"TracingEnabled":{"Documentation":"","Required":false,"UpdateType":"Mutable","PrimitiveType":"Boolean"},"Variables":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#Variables<Map<String>>","#Variables<Map<Timestamp>>","#Variables<Map<Json>>"]},"BinaryMediaTypes":{"Required":false,"Type":"List","PrimitiveItemType":"String","UpdateType":"Mutable"},"Cors":{"Required":false,"Type":["#Cors<String>","#Cors<CorsConfiguration>"],"UpdateType":"Mutable"},"EndpointConfiguration":{"Required":false,"PrimitiveType":"String","UpdateType":"Mutable"},"MethodSettings":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-methodsettings","DuplicatesAllowed":false,"Required":false,"Type":"MethodSetting","UpdateType":"Mutable"}}},"AWS::Serverless::Function":{"Documentation":"https://github.com/awslabs/serverless-application-model/blob/develop/versions/2016-10-31.md#awsserverlessfunction","AdditionalProperties":false,"Properties":{"InlineCode":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#InlineCode<String>","#InlineCode<Json>"]},"CodeUri":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#CodeUri<String>","#CodeUri<Timestamp>","#CodeUri<S3Location>"]},"DeadLetterQueue":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":"DeadLetterQueue"},"Description":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#Description<String>","#Description<Timestamp>"]},"Environment":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":"FunctionEnvironment"},"Events":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":"Map","ItemType":"EventSource"},"FunctionName":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#FunctionName<String>","#FunctionName<Timestamp>"]},"Handler":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#Handler<String>","#Handler<Timestamp>"]},"KmsKeyArn":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#KmsKeyArn<String>","#KmsKeyArn<Timestamp>"]},"MemorySize":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#MemorySize<Integer>","#MemorySize<Long>","#MemorySize<Double>"]},"Policies":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#Policies<String>","#Policies<Json>","#Policies<IAMPolicyDocument>","#Policies<List<IAMPolicyDocument>>"]},"Role":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#Role<String>","#Role<Timestamp>","#Role<Json>"]},"Runtime":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#Runtime<String>","#Runtime<Timestamp>"]},"Tags":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#Tags<Map<String>>","#Tags<Map<Timestamp>>"]},"Timeout":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#Timeout<Integer>","#Timeout<Long>","#Timeout<Double>"]},"Tracing":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#Tracing<String>","#Tracing<Timestamp>"]},"VpcConfig":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":"VpcConfig"},"AutoPublishAlias":{"Required":false,"PrimitiveType":"String","UpdateType":"Mutable"},"DeploymentPreference":{"Required":false,"Type":"DeploymentPreference","UpdateType":"Mutable"},"ReservedConcurrentExecutions":{"Required":false,"PrimitiveType":"Integer","UpdateType":"Mutable"}}},"AWS::Serverless::SimpleTable":{"Documentation":"https://github.com/awslabs/serverless-application-model/blob/develop/versions/2016-10-31.md#awsserverlesssimpletable","AdditionalProperties":false,"Properties":{"PrimaryKey":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":"PrimaryKey"},"ProvisionedThroughput":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":"ProvisionedThroughput"},"SSESpecification":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":"SSESpecification"},"Tags":{"DuplicatesAllowed":false,"Required":false,"Type":"Map","ItemType":"String","UpdateType":"Mutable"},"TableName":{"Required":false,"PrimitiveType":"String","UpdateType":"Mutable"}}}}}
\ No newline at end of file
+{"PropertyTypes":{"AWS::Serverless::Api.S3Location":{"Documentation":"","Properties":{"Bucket":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["S3Location#Bucket<String>","S3Location#Bucket<Timestamp>"]},"Key":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["S3Location#Key<String>","S3Location#Key<Timestamp>"]},"Version":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["S3Location#Version<Integer>","S3Location#Version<Long>","S3Location#Version<Double>"]}}},"AWS::Serverless::Function.AlexaSkillEvent":{"Documentation":"","Properties":{"Variables":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["AlexaSkillEvent#Variables<Map<String>>","AlexaSkillEvent#Variables<Map<Timestamp>>"]}}},"AWS::Serverless::Function.ApiEvent":{"Documentation":"","Properties":{"Method":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["ApiEvent#Method<String>","ApiEvent#Method<Timestamp>"]},"Path":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["ApiEvent#Path<String>","ApiEvent#Path<Timestamp>"]},"RestApiId":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["ApiEvent#RestApiId<String>","ApiEvent#RestApiId<Timestamp>","ApiEvent#RestApiId<Json>"]}}},"AWS::Serverless::Function.CloudWatchEventEvent":{"Documentation":"","Properties":{"Input":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["CloudWatchEventEvent#Input<String>","CloudWatchEventEvent#Input<Timestamp>"]},"InputPath":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["CloudWatchEventEvent#InputPath<String>","CloudWatchEventEvent#InputPath<Timestamp>"]},"Pattern":{"Documentation":"","Required":true,"UpdateType":"Mutable","PrimitiveType":"Json"}}},"AWS::Serverless::Function.LogEvent":{"Documentation":"","Properties":{"LogGroupName":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["LogEvent#LogGroupName<String>","LogEvent#LogGroupName<Timestamp>"]},"FilterPattern":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["LogEvent#FilterPattern<String>","LogEvent#FilterPattern<Timestamp>"]}}},"AWS::Serverless::Function.DeadLetterQueue":{"Documentation":"","Properties":{"TargetArn":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["DeadLetterQueue#TargetArn<String>","DeadLetterQueue#TargetArn<Timestamp>"]},"Type":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["DeadLetterQueue#Type<String>","DeadLetterQueue#Type<Timestamp>"]}}},"AWS::Serverless::Function.DynamoDBEvent":{"Documentation":"","Properties":{"BatchSize":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["DynamoDBEvent#BatchSize<Integer>","DynamoDBEvent#BatchSize<Long>","DynamoDBEvent#BatchSize<Double>"]},"StartingPosition":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["DynamoDBEvent#StartingPosition<String>","DynamoDBEvent#StartingPosition<Timestamp>"]},"Stream":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["DynamoDBEvent#Stream<String>","DynamoDBEvent#Stream<Timestamp>"]},"Enabled":{"Documentation":"","Required":false,"UpdateType":"Mutable","PrimitiveType":"Boolean"}}},"AWS::Serverless::Function.EventSource":{"Documentation":"","Properties":{"Properties":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["EventSource#Properties<S3Event>","EventSource#Properties<SNSEvent>","EventSource#Properties<KinesisEvent>","EventSource#Properties<SQSEvent>","EventSource#Properties<DynamoDBEvent>","EventSource#Properties<ApiEvent>","EventSource#Properties<ScheduleEvent>","EventSource#Properties<CloudWatchEventEvent>","EventSource#Properties<LogEvent>","EventSource#Properties<IoTRuleEvent>","EventSource#Properties<AlexaSkillEvent>"]},"Type":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["EventSource#Type<String>","EventSource#Type<Timestamp>"]}}},"AWS::Serverless::Function.FunctionEnvironment":{"Documentation":"","Properties":{"Variables":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["FunctionEnvironment#Variables<Map<String>>","FunctionEnvironment#Variables<Map<Timestamp>>"]}}},"AWS::Serverless::Function.IAMPolicyDocument":{"Documentation":"","Properties":{"Statement":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":"List","PrimitiveItemType":"Json"},"Version":{"Required":false,"PrimitiveType":"String","UpdateType":"Mutable"}}},"AWS::Serverless::Function.IoTRuleEvent":{"Documentation":"","Properties":{"AwsIotSqlVersion":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["IoTRuleEvent#AwsIotSqlVersion<String>","IoTRuleEvent#AwsIotSqlVersion<Timestamp>"]},"Sql":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["IoTRuleEvent#Sql<String>","IoTRuleEvent#Sql<Timestamp>"]}}},"AWS::Serverless::Function.KinesisEvent":{"Documentation":"","Properties":{"BatchSize":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["KinesisEvent#BatchSize<Integer>","KinesisEvent#BatchSize<Long>","KinesisEvent#BatchSize<Double>"]},"StartingPosition":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["KinesisEvent#StartingPosition<String>","KinesisEvent#StartingPosition<Timestamp>"]},"Stream":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["KinesisEvent#Stream<String>","KinesisEvent#Stream<Timestamp>"]},"Enabled":{"Documentation":"","Required":false,"UpdateType":"Mutable","PrimitiveType":"Boolean"}}},"AWS::Serverless::Function.SQSEvent":{"Documentation":"","Properties":{"BatchSize":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["SQSEvent#BatchSize<Integer>","SQSEvent#BatchSize<Long>","SQSEvent#BatchSize<Double>"]},"Queue":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["SQSEvent#Queue<String>","SQSEvent#Queue<Timestamp>","SQSEvent#Queue<Json>"]},"Enabled":{"Documentation":"","Required":false,"UpdateType":"Mutable","PrimitiveType":"Boolean"}}},"AWS::Serverless::Function.S3Event":{"Documentation":"","Properties":{"Bucket":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["S3Event#Bucket<String>","S3Event#Bucket<Timestamp>","S3Event#Bucket<Json>"]},"Events":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["S3Event#Events<String>","S3Event#Events<Timestamp>","S3Event#Events<List<String>>","S3Event#Events<List<Timestamp>>"]},"Filter":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":"S3NotificationFilter"}}},"AWS::Serverless::Function.S3Location":{"Documentation":"","Properties":{"Bucket":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["S3Location#Bucket<String>","S3Location#Bucket<Timestamp>"]},"Key":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["S3Location#Key<String>","S3Location#Key<Timestamp>"]},"Version":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["S3Location#Version<Integer>","S3Location#Version<Long>","S3Location#Version<Double>"]}}},"AWS::Serverless::Function.S3NotificationFilter":{"Documentation":"","Properties":{"S3Key":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["S3NotificationFilter#S3Key<String>","S3NotificationFilter#S3Key<Timestamp>","S3NotificationFilter#S3Key<Json>"]}}},"AWS::Serverless::Function.SNSEvent":{"Documentation":"","Properties":{"Topic":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["SNSEvent#Topic<String>","SNSEvent#Topic<Timestamp>"]},"FilterPolicy":{"Documentation":"","Required":false,"UpdateType":"Mutable","PrimitiveType":"Json"}}},"AWS::Serverless::Function.ScheduleEvent":{"Documentation":"","Properties":{"Input":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["ScheduleEvent#Input<String>","ScheduleEvent#Input<Timestamp>"]},"Schedule":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["ScheduleEvent#Schedule<String>","ScheduleEvent#Schedule<Timestamp>"]}}},"AWS::Serverless::Function.VpcConfig":{"Documentation":"","Properties":{"SecurityGroupIds":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["VpcConfig#SecurityGroupIds<List<String>>","VpcConfig#SecurityGroupIds<List<Timestamp>>"]},"SubnetIds":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["VpcConfig#SubnetIds<List<String>>","VpcConfig#SubnetIds<List<Timestamp>>"]},"SubnetIdsUsingRef":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":"List","PrimitiveItemType":"Json"}}},"AWS::Serverless::SimpleTable.PrimaryKey":{"Documentation":"","Properties":{"Name":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["PrimaryKey#Name<String>","PrimaryKey#Name<Timestamp>"]},"Type":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["PrimaryKey#Type<String>","PrimaryKey#Type<Timestamp>"]}}},"AWS::Serverless::SimpleTable.ProvisionedThroughput":{"Documentation":"","Properties":{"ReadCapacityUnits":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["ProvisionedThroughput#ReadCapacityUnits<Integer>","ProvisionedThroughput#ReadCapacityUnits<Long>","ProvisionedThroughput#ReadCapacityUnits<Double>"]},"WriteCapacityUnits":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["ProvisionedThroughput#WriteCapacityUnits<Integer>","ProvisionedThroughput#WriteCapacityUnits<Long>","ProvisionedThroughput#WriteCapacityUnits<Double>"]}}},"AWS::Serverless::SimpleTable.SSESpecification":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-ssespecification.html","Properties":{"SSEEnabled":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-ssespecification.html#cfn-dynamodb-table-ssespecification-sseenabled","Required":true,"UpdateType":"Mutable","PrimitiveType":"Boolean"}}},"AWS::Serverless::Function.Hooks":{"Documentation":"https://github.com/awslabs/serverless-application-model/blob/develop/docs/safe_lambda_deployments.rst#pretraffic--posttraffic-hooks","Properties":{"PreTraffic":{"Required":false,"PrimitiveType":"String","UpdateType":"Mutable"},"PostTraffic":{"Required":false,"PrimitiveType":"String","UpdateType":"Mutable"}}},"AWS::Serverless::Function.DeploymentPreference":{"Documentation":"https://github.com/awslabs/serverless-application-model/blob/develop/versions/2016-10-31.md#deploymentpreference-object","Properties":{"Enabled":{"Required":false,"PrimitiveType":"Boolean","UpdateType":"Mutable"},"Type":{"Required":false,"PrimitiveType":"String","UpdateType":"Mutable"},"Alarms":{"Required":false,"Type":"List","PrimitiveItemType":"String","UpdateType":"Mutable"},"Hooks":{"Required":false,"Type":"Hooks","UpdateType":"Mutable"}}},"AWS::Serverless::Api.CorsConfiguration":{"Documentation":"https://github.com/awslabs/serverless-application-model/blob/develop/versions/2016-10-31.md#cors-configuration","Properties":{"AllowedHeaders":{"Required":false,"PrimitiveType":"String","UpdateType":"Mutable"},"AllowedMethods":{"Required":false,"PrimitiveType":"String","UpdateType":"Mutable"},"AllowedOrigin":{"Required":false,"PrimitiveType":"String","UpdateType":"Mutable"},"MaxAge":{"PrimitiveType":"Integer","Required":false,"UpdateType":"Mutable"}}},"AWS::Serverless::Api.MethodSetting":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html","Properties":{"CacheDataEncrypted":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-cachedataencrypted","PrimitiveType":"Boolean","Required":false,"UpdateType":"Mutable"},"CacheTtlInSeconds":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-cachettlinseconds","PrimitiveType":"Integer","Required":false,"UpdateType":"Mutable"},"CachingEnabled":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-cachingenabled","PrimitiveType":"Boolean","Required":false,"UpdateType":"Mutable"},"DataTraceEnabled":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-datatraceenabled","PrimitiveType":"Boolean","Required":false,"UpdateType":"Mutable"},"HttpMethod":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-httpmethod","PrimitiveType":"String","Required":false,"UpdateType":"Mutable"},"LoggingLevel":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-logginglevel","PrimitiveType":"String","Required":false,"UpdateType":"Mutable"},"MetricsEnabled":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-metricsenabled","PrimitiveType":"Boolean","Required":false,"UpdateType":"Mutable"},"ResourcePath":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-resourcepath","PrimitiveType":"String","Required":false,"UpdateType":"Mutable"},"ThrottlingBurstLimit":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-throttlingburstlimit","PrimitiveType":"Integer","Required":false,"UpdateType":"Mutable"},"ThrottlingRateLimit":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-throttlingratelimit","PrimitiveType":"Double","Required":false,"UpdateType":"Mutable"}}}},"ResourceTypes":{"AWS::Serverless::Api":{"Documentation":"https://github.com/awslabs/serverless-application-model/blob/develop/versions/2016-10-31.md#awsserverlessapi","AdditionalProperties":false,"Properties":{"CacheClusterEnabled":{"Documentation":"","Required":false,"UpdateType":"Mutable","PrimitiveType":"Boolean"},"CacheClusterSize":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#CacheClusterSize<String>","#CacheClusterSize<Timestamp>"]},"DefinitionBody":{"Documentation":"","Required":false,"UpdateType":"Mutable","PrimitiveType":"Json"},"DefinitionUri":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#DefinitionUri<String>","#DefinitionUri<Timestamp>","#DefinitionUri<S3Location>"]},"Name":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#Name<String>","#Name<Timestamp>"]},"StageName":{"Documentation":"","Required":true,"UpdateType":"Mutable","Type":["#StageName<String>","#StageName<Timestamp>","#StageName<Json>"]},"TracingEnabled":{"Documentation":"","Required":false,"UpdateType":"Mutable","PrimitiveType":"Boolean"},"Variables":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#Variables<Map<String>>","#Variables<Map<Timestamp>>","#Variables<Map<Json>>"]},"BinaryMediaTypes":{"Required":false,"Type":"List","PrimitiveItemType":"String","UpdateType":"Mutable"},"Cors":{"Required":false,"Type":["#Cors<String>","#Cors<CorsConfiguration>"],"UpdateType":"Mutable"},"EndpointConfiguration":{"Required":false,"PrimitiveType":"String","UpdateType":"Mutable"},"MethodSettings":{"Documentation":"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-methodsettings","DuplicatesAllowed":false,"Required":false,"Type":"MethodSetting","UpdateType":"Mutable"}}},"AWS::Serverless::Function":{"Documentation":"https://github.com/awslabs/serverless-application-model/blob/develop/versions/2016-10-31.md#awsserverlessfunction","AdditionalProperties":false,"Properties":{"InlineCode":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#InlineCode<String>","#InlineCode<Json>"]},"CodeUri":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#CodeUri<String>","#CodeUri<Timestamp>","#CodeUri<S3Location>"]},"DeadLetterQueue":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":"DeadLetterQueue"},"Description":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#Description<String>","#Description<Timestamp>"]},"Environment":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":"FunctionEnvironment"},"Events":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":"Map","ItemType":"EventSource"},"FunctionName":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#FunctionName<String>","#FunctionName<Timestamp>"]},"Handler":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#Handler<String>","#Handler<Timestamp>"]},"KmsKeyArn":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#KmsKeyArn<String>","#KmsKeyArn<Timestamp>"]},"MemorySize":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#MemorySize<Integer>","#MemorySize<Long>","#MemorySize<Double>"]},"Policies":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#Policies<String>","#Policies<Json>","#Policies<IAMPolicyDocument>","#Policies<List<IAMPolicyDocument>>"]},"Role":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#Role<String>","#Role<Timestamp>","#Role<Json>"]},"Runtime":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#Runtime<String>","#Runtime<Timestamp>"]},"Tags":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#Tags<Map<String>>","#Tags<Map<Timestamp>>"]},"Timeout":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#Timeout<Integer>","#Timeout<Long>","#Timeout<Double>"]},"Tracing":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":["#Tracing<String>","#Tracing<Timestamp>"]},"VpcConfig":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":"VpcConfig"},"AutoPublishAlias":{"Required":false,"PrimitiveType":"String","UpdateType":"Mutable"},"DeploymentPreference":{"Required":false,"Type":"DeploymentPreference","UpdateType":"Mutable"},"ReservedConcurrentExecutions":{"Required":false,"PrimitiveType":"Integer","UpdateType":"Mutable"}}},"AWS::Serverless::SimpleTable":{"Documentation":"https://github.com/awslabs/serverless-application-model/blob/develop/versions/2016-10-31.md#awsserverlesssimpletable","AdditionalProperties":false,"Properties":{"PrimaryKey":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":"PrimaryKey"},"ProvisionedThroughput":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":"ProvisionedThroughput"},"SSESpecification":{"Documentation":"","Required":false,"UpdateType":"Mutable","Type":"SSESpecification"},"Tags":{"DuplicatesAllowed":false,"Required":false,"Type":"Map","ItemType":"String","UpdateType":"Mutable"},"TableName":{"Required":false,"PrimitiveType":"String","UpdateType":"Mutable"}}}}}
\ No newline at end of file
diff --git a/data/sam_20161031_schema.json b/data/sam_20161031_schema.json
index d89e1c0..28ffef3 100644
--- a/data/sam_20161031_schema.json
+++ b/data/sam_20161031_schema.json
@@ -394,6 +394,9 @@
         },
         "Stream": {
           "type": "string"
+        },
+        "Enabled": {
+          "type": "boolean"
         }
       },
       "required": [
@@ -512,6 +515,9 @@
         },
         "Stream": {
           "type": "string"
+        },
+        "Enabled": {
+          "type": "boolean"
         }
       },
       "required": [
@@ -534,6 +540,9 @@
               "type": "object"
             }
           ]
+        },
+        "Enabled": {
+          "type": "boolean"
         }
       },
       "required": [