diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.25.0
+
+* Update resource specification document to version 2.6.0
+
 ## 0.24.4
 
 * Update resource specification document to new unspecified version
diff --git a/library-gen/Stratosphere/ResourceProperties/AmazonMQBrokerLogList.hs b/library-gen/Stratosphere/ResourceProperties/AmazonMQBrokerLogList.hs
new file mode 100644
--- /dev/null
+++ b/library-gen/Stratosphere/ResourceProperties/AmazonMQBrokerLogList.hs
@@ -0,0 +1,51 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE TupleSections #-}
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-loglist.html
+
+module Stratosphere.ResourceProperties.AmazonMQBrokerLogList where
+
+import Stratosphere.ResourceImports
+
+
+-- | Full data type definition for AmazonMQBrokerLogList. See
+-- 'amazonMQBrokerLogList' for a more convenient constructor.
+data AmazonMQBrokerLogList =
+  AmazonMQBrokerLogList
+  { _amazonMQBrokerLogListAudit :: Maybe (Val Bool)
+  , _amazonMQBrokerLogListGeneral :: Maybe (Val Bool)
+  } deriving (Show, Eq)
+
+instance ToJSON AmazonMQBrokerLogList where
+  toJSON AmazonMQBrokerLogList{..} =
+    object $
+    catMaybes
+    [ fmap (("Audit",) . toJSON . fmap Bool') _amazonMQBrokerLogListAudit
+    , fmap (("General",) . toJSON . fmap Bool') _amazonMQBrokerLogListGeneral
+    ]
+
+instance FromJSON AmazonMQBrokerLogList where
+  parseJSON (Object obj) =
+    AmazonMQBrokerLogList <$>
+      fmap (fmap (fmap unBool')) (obj .:? "Audit") <*>
+      fmap (fmap (fmap unBool')) (obj .:? "General")
+  parseJSON _ = mempty
+
+-- | Constructor for 'AmazonMQBrokerLogList' containing required fields as
+-- arguments.
+amazonMQBrokerLogList
+  :: AmazonMQBrokerLogList
+amazonMQBrokerLogList  =
+  AmazonMQBrokerLogList
+  { _amazonMQBrokerLogListAudit = Nothing
+  , _amazonMQBrokerLogListGeneral = Nothing
+  }
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-loglist.html#cfn-amazonmq-broker-loglist-audit
+amqbllAudit :: Lens' AmazonMQBrokerLogList (Maybe (Val Bool))
+amqbllAudit = lens _amazonMQBrokerLogListAudit (\s a -> s { _amazonMQBrokerLogListAudit = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-loglist.html#cfn-amazonmq-broker-loglist-general
+amqbllGeneral :: Lens' AmazonMQBrokerLogList (Maybe (Val Bool))
+amqbllGeneral = lens _amazonMQBrokerLogListGeneral (\s a -> s { _amazonMQBrokerLogListGeneral = a })
diff --git a/library-gen/Stratosphere/ResourceProperties/DAXClusterSSESpecification.hs b/library-gen/Stratosphere/ResourceProperties/DAXClusterSSESpecification.hs
new file mode 100644
--- /dev/null
+++ b/library-gen/Stratosphere/ResourceProperties/DAXClusterSSESpecification.hs
@@ -0,0 +1,43 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE TupleSections #-}
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dax-cluster-ssespecification.html
+
+module Stratosphere.ResourceProperties.DAXClusterSSESpecification where
+
+import Stratosphere.ResourceImports
+
+
+-- | Full data type definition for DAXClusterSSESpecification. See
+-- 'daxClusterSSESpecification' for a more convenient constructor.
+data DAXClusterSSESpecification =
+  DAXClusterSSESpecification
+  { _dAXClusterSSESpecificationSSEEnabled :: Maybe (Val Bool)
+  } deriving (Show, Eq)
+
+instance ToJSON DAXClusterSSESpecification where
+  toJSON DAXClusterSSESpecification{..} =
+    object $
+    catMaybes
+    [ fmap (("SSEEnabled",) . toJSON . fmap Bool') _dAXClusterSSESpecificationSSEEnabled
+    ]
+
+instance FromJSON DAXClusterSSESpecification where
+  parseJSON (Object obj) =
+    DAXClusterSSESpecification <$>
+      fmap (fmap (fmap unBool')) (obj .:? "SSEEnabled")
+  parseJSON _ = mempty
+
+-- | Constructor for 'DAXClusterSSESpecification' containing required fields
+-- as arguments.
+daxClusterSSESpecification
+  :: DAXClusterSSESpecification
+daxClusterSSESpecification  =
+  DAXClusterSSESpecification
+  { _dAXClusterSSESpecificationSSEEnabled = Nothing
+  }
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dax-cluster-ssespecification.html#cfn-dax-cluster-ssespecification-sseenabled
+daxcssesSSEEnabled :: Lens' DAXClusterSSESpecification (Maybe (Val Bool))
+daxcssesSSEEnabled = lens _dAXClusterSSESpecificationSSEEnabled (\s a -> s { _dAXClusterSSESpecificationSSEEnabled = a })
diff --git a/library-gen/Stratosphere/ResourceProperties/EMRClusterKerberosAttributes.hs b/library-gen/Stratosphere/ResourceProperties/EMRClusterKerberosAttributes.hs
new file mode 100644
--- /dev/null
+++ b/library-gen/Stratosphere/ResourceProperties/EMRClusterKerberosAttributes.hs
@@ -0,0 +1,77 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE TupleSections #-}
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-kerberosattributes.html
+
+module Stratosphere.ResourceProperties.EMRClusterKerberosAttributes where
+
+import Stratosphere.ResourceImports
+
+
+-- | Full data type definition for EMRClusterKerberosAttributes. See
+-- 'emrClusterKerberosAttributes' for a more convenient constructor.
+data EMRClusterKerberosAttributes =
+  EMRClusterKerberosAttributes
+  { _eMRClusterKerberosAttributesADDomainJoinPassword :: Maybe (Val Text)
+  , _eMRClusterKerberosAttributesADDomainJoinUser :: Maybe (Val Text)
+  , _eMRClusterKerberosAttributesCrossRealmTrustPrincipalPassword :: Maybe (Val Text)
+  , _eMRClusterKerberosAttributesKdcAdminPassword :: Val Text
+  , _eMRClusterKerberosAttributesRealm :: Val Text
+  } deriving (Show, Eq)
+
+instance ToJSON EMRClusterKerberosAttributes where
+  toJSON EMRClusterKerberosAttributes{..} =
+    object $
+    catMaybes
+    [ fmap (("ADDomainJoinPassword",) . toJSON) _eMRClusterKerberosAttributesADDomainJoinPassword
+    , fmap (("ADDomainJoinUser",) . toJSON) _eMRClusterKerberosAttributesADDomainJoinUser
+    , fmap (("CrossRealmTrustPrincipalPassword",) . toJSON) _eMRClusterKerberosAttributesCrossRealmTrustPrincipalPassword
+    , (Just . ("KdcAdminPassword",) . toJSON) _eMRClusterKerberosAttributesKdcAdminPassword
+    , (Just . ("Realm",) . toJSON) _eMRClusterKerberosAttributesRealm
+    ]
+
+instance FromJSON EMRClusterKerberosAttributes where
+  parseJSON (Object obj) =
+    EMRClusterKerberosAttributes <$>
+      (obj .:? "ADDomainJoinPassword") <*>
+      (obj .:? "ADDomainJoinUser") <*>
+      (obj .:? "CrossRealmTrustPrincipalPassword") <*>
+      (obj .: "KdcAdminPassword") <*>
+      (obj .: "Realm")
+  parseJSON _ = mempty
+
+-- | Constructor for 'EMRClusterKerberosAttributes' containing required fields
+-- as arguments.
+emrClusterKerberosAttributes
+  :: Val Text -- ^ 'emrckaKdcAdminPassword'
+  -> Val Text -- ^ 'emrckaRealm'
+  -> EMRClusterKerberosAttributes
+emrClusterKerberosAttributes kdcAdminPasswordarg realmarg =
+  EMRClusterKerberosAttributes
+  { _eMRClusterKerberosAttributesADDomainJoinPassword = Nothing
+  , _eMRClusterKerberosAttributesADDomainJoinUser = Nothing
+  , _eMRClusterKerberosAttributesCrossRealmTrustPrincipalPassword = Nothing
+  , _eMRClusterKerberosAttributesKdcAdminPassword = kdcAdminPasswordarg
+  , _eMRClusterKerberosAttributesRealm = realmarg
+  }
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-kerberosattributes.html#cfn-elasticmapreduce-cluster-kerberosattributes-addomainjoinpassword
+emrckaADDomainJoinPassword :: Lens' EMRClusterKerberosAttributes (Maybe (Val Text))
+emrckaADDomainJoinPassword = lens _eMRClusterKerberosAttributesADDomainJoinPassword (\s a -> s { _eMRClusterKerberosAttributesADDomainJoinPassword = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-kerberosattributes.html#cfn-elasticmapreduce-cluster-kerberosattributes-addomainjoinuser
+emrckaADDomainJoinUser :: Lens' EMRClusterKerberosAttributes (Maybe (Val Text))
+emrckaADDomainJoinUser = lens _eMRClusterKerberosAttributesADDomainJoinUser (\s a -> s { _eMRClusterKerberosAttributesADDomainJoinUser = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-kerberosattributes.html#cfn-elasticmapreduce-cluster-kerberosattributes-crossrealmtrustprincipalpassword
+emrckaCrossRealmTrustPrincipalPassword :: Lens' EMRClusterKerberosAttributes (Maybe (Val Text))
+emrckaCrossRealmTrustPrincipalPassword = lens _eMRClusterKerberosAttributesCrossRealmTrustPrincipalPassword (\s a -> s { _eMRClusterKerberosAttributesCrossRealmTrustPrincipalPassword = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-kerberosattributes.html#cfn-elasticmapreduce-cluster-kerberosattributes-kdcadminpassword
+emrckaKdcAdminPassword :: Lens' EMRClusterKerberosAttributes (Val Text)
+emrckaKdcAdminPassword = lens _eMRClusterKerberosAttributesKdcAdminPassword (\s a -> s { _eMRClusterKerberosAttributesKdcAdminPassword = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-kerberosattributes.html#cfn-elasticmapreduce-cluster-kerberosattributes-realm
+emrckaRealm :: Lens' EMRClusterKerberosAttributes (Val Text)
+emrckaRealm = lens _eMRClusterKerberosAttributesRealm (\s a -> s { _eMRClusterKerberosAttributesRealm = a })
diff --git a/library-gen/Stratosphere/ResourceProperties/WAFWebACLActivatedRule.hs b/library-gen/Stratosphere/ResourceProperties/WAFWebACLActivatedRule.hs
--- a/library-gen/Stratosphere/ResourceProperties/WAFWebACLActivatedRule.hs
+++ b/library-gen/Stratosphere/ResourceProperties/WAFWebACLActivatedRule.hs
@@ -13,7 +13,7 @@
 -- 'wafWebACLActivatedRule' for a more convenient constructor.
 data WAFWebACLActivatedRule =
   WAFWebACLActivatedRule
-  { _wAFWebACLActivatedRuleAction :: WAFWebACLWafAction
+  { _wAFWebACLActivatedRuleAction :: Maybe WAFWebACLWafAction
   , _wAFWebACLActivatedRulePriority :: Val Integer
   , _wAFWebACLActivatedRuleRuleId :: Val Text
   } deriving (Show, Eq)
@@ -22,7 +22,7 @@
   toJSON WAFWebACLActivatedRule{..} =
     object $
     catMaybes
-    [ (Just . ("Action",) . toJSON) _wAFWebACLActivatedRuleAction
+    [ fmap (("Action",) . toJSON) _wAFWebACLActivatedRuleAction
     , (Just . ("Priority",) . toJSON . fmap Integer') _wAFWebACLActivatedRulePriority
     , (Just . ("RuleId",) . toJSON) _wAFWebACLActivatedRuleRuleId
     ]
@@ -30,7 +30,7 @@
 instance FromJSON WAFWebACLActivatedRule where
   parseJSON (Object obj) =
     WAFWebACLActivatedRule <$>
-      (obj .: "Action") <*>
+      (obj .:? "Action") <*>
       fmap (fmap unInteger') (obj .: "Priority") <*>
       (obj .: "RuleId")
   parseJSON _ = mempty
@@ -38,19 +38,18 @@
 -- | Constructor for 'WAFWebACLActivatedRule' containing required fields as
 -- arguments.
 wafWebACLActivatedRule
-  :: WAFWebACLWafAction -- ^ 'wafwaclarAction'
-  -> Val Integer -- ^ 'wafwaclarPriority'
+  :: Val Integer -- ^ 'wafwaclarPriority'
   -> Val Text -- ^ 'wafwaclarRuleId'
   -> WAFWebACLActivatedRule
-wafWebACLActivatedRule actionarg priorityarg ruleIdarg =
+wafWebACLActivatedRule priorityarg ruleIdarg =
   WAFWebACLActivatedRule
-  { _wAFWebACLActivatedRuleAction = actionarg
+  { _wAFWebACLActivatedRuleAction = Nothing
   , _wAFWebACLActivatedRulePriority = priorityarg
   , _wAFWebACLActivatedRuleRuleId = ruleIdarg
   }
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-webacl-rules.html#cfn-waf-webacl-rules-action
-wafwaclarAction :: Lens' WAFWebACLActivatedRule WAFWebACLWafAction
+wafwaclarAction :: Lens' WAFWebACLActivatedRule (Maybe WAFWebACLWafAction)
 wafwaclarAction = lens _wAFWebACLActivatedRuleAction (\s a -> s { _wAFWebACLActivatedRuleAction = a })
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-webacl-rules.html#cfn-waf-webacl-rules-priority
diff --git a/library-gen/Stratosphere/Resources.hs b/library-gen/Stratosphere/Resources.hs
--- a/library-gen/Stratosphere/Resources.hs
+++ b/library-gen/Stratosphere/Resources.hs
@@ -346,6 +346,7 @@
 import Stratosphere.Resources.WAFRegionalXssMatchSet as X
 import Stratosphere.Resources.WorkSpacesWorkspace as X
 import Stratosphere.ResourceProperties.AmazonMQBrokerConfigurationId as X
+import Stratosphere.ResourceProperties.AmazonMQBrokerLogList as X
 import Stratosphere.ResourceProperties.AmazonMQBrokerMaintenanceWindow as X
 import Stratosphere.ResourceProperties.AmazonMQBrokerUser as X
 import Stratosphere.ResourceProperties.ApiGatewayApiKeyStageKey as X
@@ -500,6 +501,7 @@
 import Stratosphere.ResourceProperties.ConfigConfigurationAggregatorOrganizationAggregationSource as X
 import Stratosphere.ResourceProperties.ConfigConfigurationRecorderRecordingGroup as X
 import Stratosphere.ResourceProperties.ConfigDeliveryChannelConfigSnapshotDeliveryProperties as X
+import Stratosphere.ResourceProperties.DAXClusterSSESpecification as X
 import Stratosphere.ResourceProperties.DMSEndpointDynamoDbSettings as X
 import Stratosphere.ResourceProperties.DMSEndpointMongoDbSettings as X
 import Stratosphere.ResourceProperties.DMSEndpointS3Settings as X
@@ -603,6 +605,7 @@
 import Stratosphere.ResourceProperties.EMRClusterInstanceGroupConfig as X
 import Stratosphere.ResourceProperties.EMRClusterInstanceTypeConfig as X
 import Stratosphere.ResourceProperties.EMRClusterJobFlowInstancesConfig as X
+import Stratosphere.ResourceProperties.EMRClusterKerberosAttributes as X
 import Stratosphere.ResourceProperties.EMRClusterMetricDimension as X
 import Stratosphere.ResourceProperties.EMRClusterPlacementType as X
 import Stratosphere.ResourceProperties.EMRClusterScalingAction as X
diff --git a/library-gen/Stratosphere/Resources/AmazonMQBroker.hs b/library-gen/Stratosphere/Resources/AmazonMQBroker.hs
--- a/library-gen/Stratosphere/Resources/AmazonMQBroker.hs
+++ b/library-gen/Stratosphere/Resources/AmazonMQBroker.hs
@@ -8,6 +8,7 @@
 
 import Stratosphere.ResourceImports
 import Stratosphere.ResourceProperties.AmazonMQBrokerConfigurationId
+import Stratosphere.ResourceProperties.AmazonMQBrokerLogList
 import Stratosphere.ResourceProperties.AmazonMQBrokerMaintenanceWindow
 import Stratosphere.ResourceProperties.AmazonMQBrokerUser
 
@@ -22,6 +23,7 @@
   , _amazonMQBrokerEngineType :: Val Text
   , _amazonMQBrokerEngineVersion :: Val Text
   , _amazonMQBrokerHostInstanceType :: Val Text
+  , _amazonMQBrokerLogs :: Maybe AmazonMQBrokerLogList
   , _amazonMQBrokerMaintenanceWindowStartTime :: Maybe AmazonMQBrokerMaintenanceWindow
   , _amazonMQBrokerPubliclyAccessible :: Val Bool
   , _amazonMQBrokerSecurityGroups :: Maybe (ValList Text)
@@ -40,6 +42,7 @@
     , (Just . ("EngineType",) . toJSON) _amazonMQBrokerEngineType
     , (Just . ("EngineVersion",) . toJSON) _amazonMQBrokerEngineVersion
     , (Just . ("HostInstanceType",) . toJSON) _amazonMQBrokerHostInstanceType
+    , fmap (("Logs",) . toJSON) _amazonMQBrokerLogs
     , fmap (("MaintenanceWindowStartTime",) . toJSON) _amazonMQBrokerMaintenanceWindowStartTime
     , (Just . ("PubliclyAccessible",) . toJSON . fmap Bool') _amazonMQBrokerPubliclyAccessible
     , fmap (("SecurityGroups",) . toJSON) _amazonMQBrokerSecurityGroups
@@ -57,6 +60,7 @@
       (obj .: "EngineType") <*>
       (obj .: "EngineVersion") <*>
       (obj .: "HostInstanceType") <*>
+      (obj .:? "Logs") <*>
       (obj .:? "MaintenanceWindowStartTime") <*>
       fmap (fmap unBool') (obj .: "PubliclyAccessible") <*>
       (obj .:? "SecurityGroups") <*>
@@ -84,6 +88,7 @@
   , _amazonMQBrokerEngineType = engineTypearg
   , _amazonMQBrokerEngineVersion = engineVersionarg
   , _amazonMQBrokerHostInstanceType = hostInstanceTypearg
+  , _amazonMQBrokerLogs = Nothing
   , _amazonMQBrokerMaintenanceWindowStartTime = Nothing
   , _amazonMQBrokerPubliclyAccessible = publiclyAccessiblearg
   , _amazonMQBrokerSecurityGroups = Nothing
@@ -118,6 +123,10 @@
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-hostinstancetype
 amqbHostInstanceType :: Lens' AmazonMQBroker (Val Text)
 amqbHostInstanceType = lens _amazonMQBrokerHostInstanceType (\s a -> s { _amazonMQBrokerHostInstanceType = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-logs
+amqbLogs :: Lens' AmazonMQBroker (Maybe AmazonMQBrokerLogList)
+amqbLogs = lens _amazonMQBrokerLogs (\s a -> s { _amazonMQBrokerLogs = a })
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-maintenancewindowstarttime
 amqbMaintenanceWindowStartTime :: Lens' AmazonMQBroker (Maybe AmazonMQBrokerMaintenanceWindow)
diff --git a/library-gen/Stratosphere/Resources/DAXCluster.hs b/library-gen/Stratosphere/Resources/DAXCluster.hs
--- a/library-gen/Stratosphere/Resources/DAXCluster.hs
+++ b/library-gen/Stratosphere/Resources/DAXCluster.hs
@@ -7,7 +7,7 @@
 module Stratosphere.Resources.DAXCluster where
 
 import Stratosphere.ResourceImports
-
+import Stratosphere.ResourceProperties.DAXClusterSSESpecification
 
 -- | Full data type definition for DAXCluster. See 'daxCluster' for a more
 -- convenient constructor.
@@ -22,6 +22,7 @@
   , _dAXClusterParameterGroupName :: Maybe (Val Text)
   , _dAXClusterPreferredMaintenanceWindow :: Maybe (Val Text)
   , _dAXClusterReplicationFactor :: Val Integer
+  , _dAXClusterSSESpecification :: Maybe DAXClusterSSESpecification
   , _dAXClusterSecurityGroupIds :: Maybe (ValList Text)
   , _dAXClusterSubnetGroupName :: Maybe (Val Text)
   , _dAXClusterTags :: Maybe Object
@@ -40,6 +41,7 @@
     , fmap (("ParameterGroupName",) . toJSON) _dAXClusterParameterGroupName
     , fmap (("PreferredMaintenanceWindow",) . toJSON) _dAXClusterPreferredMaintenanceWindow
     , (Just . ("ReplicationFactor",) . toJSON . fmap Integer') _dAXClusterReplicationFactor
+    , fmap (("SSESpecification",) . toJSON) _dAXClusterSSESpecification
     , fmap (("SecurityGroupIds",) . toJSON) _dAXClusterSecurityGroupIds
     , fmap (("SubnetGroupName",) . toJSON) _dAXClusterSubnetGroupName
     , fmap (("Tags",) . toJSON) _dAXClusterTags
@@ -57,6 +59,7 @@
       (obj .:? "ParameterGroupName") <*>
       (obj .:? "PreferredMaintenanceWindow") <*>
       fmap (fmap unInteger') (obj .: "ReplicationFactor") <*>
+      (obj .:? "SSESpecification") <*>
       (obj .:? "SecurityGroupIds") <*>
       (obj .:? "SubnetGroupName") <*>
       (obj .:? "Tags")
@@ -79,6 +82,7 @@
   , _dAXClusterParameterGroupName = Nothing
   , _dAXClusterPreferredMaintenanceWindow = Nothing
   , _dAXClusterReplicationFactor = replicationFactorarg
+  , _dAXClusterSSESpecification = Nothing
   , _dAXClusterSecurityGroupIds = Nothing
   , _dAXClusterSubnetGroupName = Nothing
   , _dAXClusterTags = Nothing
@@ -119,6 +123,10 @@
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-replicationfactor
 daxcReplicationFactor :: Lens' DAXCluster (Val Integer)
 daxcReplicationFactor = lens _dAXClusterReplicationFactor (\s a -> s { _dAXClusterReplicationFactor = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-ssespecification
+daxcSSESpecification :: Lens' DAXCluster (Maybe DAXClusterSSESpecification)
+daxcSSESpecification = lens _dAXClusterSSESpecification (\s a -> s { _dAXClusterSSESpecification = a })
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-securitygroupids
 daxcSecurityGroupIds :: Lens' DAXCluster (Maybe (ValList Text))
diff --git a/library-gen/Stratosphere/Resources/EC2VPCPeeringConnection.hs b/library-gen/Stratosphere/Resources/EC2VPCPeeringConnection.hs
--- a/library-gen/Stratosphere/Resources/EC2VPCPeeringConnection.hs
+++ b/library-gen/Stratosphere/Resources/EC2VPCPeeringConnection.hs
@@ -14,6 +14,7 @@
 data EC2VPCPeeringConnection =
   EC2VPCPeeringConnection
   { _eC2VPCPeeringConnectionPeerOwnerId :: Maybe (Val Text)
+  , _eC2VPCPeeringConnectionPeerRegion :: Maybe (Val Text)
   , _eC2VPCPeeringConnectionPeerRoleArn :: Maybe (Val Text)
   , _eC2VPCPeeringConnectionPeerVpcId :: Val Text
   , _eC2VPCPeeringConnectionTags :: Maybe [Tag]
@@ -25,6 +26,7 @@
     object $
     catMaybes
     [ fmap (("PeerOwnerId",) . toJSON) _eC2VPCPeeringConnectionPeerOwnerId
+    , fmap (("PeerRegion",) . toJSON) _eC2VPCPeeringConnectionPeerRegion
     , fmap (("PeerRoleArn",) . toJSON) _eC2VPCPeeringConnectionPeerRoleArn
     , (Just . ("PeerVpcId",) . toJSON) _eC2VPCPeeringConnectionPeerVpcId
     , fmap (("Tags",) . toJSON) _eC2VPCPeeringConnectionTags
@@ -35,6 +37,7 @@
   parseJSON (Object obj) =
     EC2VPCPeeringConnection <$>
       (obj .:? "PeerOwnerId") <*>
+      (obj .:? "PeerRegion") <*>
       (obj .:? "PeerRoleArn") <*>
       (obj .: "PeerVpcId") <*>
       (obj .:? "Tags") <*>
@@ -50,6 +53,7 @@
 ec2VPCPeeringConnection peerVpcIdarg vpcIdarg =
   EC2VPCPeeringConnection
   { _eC2VPCPeeringConnectionPeerOwnerId = Nothing
+  , _eC2VPCPeeringConnectionPeerRegion = Nothing
   , _eC2VPCPeeringConnectionPeerRoleArn = Nothing
   , _eC2VPCPeeringConnectionPeerVpcId = peerVpcIdarg
   , _eC2VPCPeeringConnectionTags = Nothing
@@ -59,6 +63,10 @@
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html#cfn-ec2-vpcpeeringconnection-peerownerid
 ecvpcpcPeerOwnerId :: Lens' EC2VPCPeeringConnection (Maybe (Val Text))
 ecvpcpcPeerOwnerId = lens _eC2VPCPeeringConnectionPeerOwnerId (\s a -> s { _eC2VPCPeeringConnectionPeerOwnerId = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html#cfn-ec2-vpcpeeringconnection-peerregion
+ecvpcpcPeerRegion :: Lens' EC2VPCPeeringConnection (Maybe (Val Text))
+ecvpcpcPeerRegion = lens _eC2VPCPeeringConnectionPeerRegion (\s a -> s { _eC2VPCPeeringConnectionPeerRegion = a })
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html#cfn-ec2-vpcpeeringconnection-peerrolearn
 ecvpcpcPeerRoleArn :: Lens' EC2VPCPeeringConnection (Maybe (Val Text))
diff --git a/library-gen/Stratosphere/Resources/EFSFileSystem.hs b/library-gen/Stratosphere/Resources/EFSFileSystem.hs
--- a/library-gen/Stratosphere/Resources/EFSFileSystem.hs
+++ b/library-gen/Stratosphere/Resources/EFSFileSystem.hs
@@ -17,6 +17,8 @@
   , _eFSFileSystemFileSystemTags :: Maybe [EFSFileSystemElasticFileSystemTag]
   , _eFSFileSystemKmsKeyId :: Maybe (Val Text)
   , _eFSFileSystemPerformanceMode :: Maybe (Val Text)
+  , _eFSFileSystemProvisionedThroughputInMibps :: Maybe (Val Double)
+  , _eFSFileSystemThroughputMode :: Maybe (Val Text)
   } deriving (Show, Eq)
 
 instance ToJSON EFSFileSystem where
@@ -27,6 +29,8 @@
     , fmap (("FileSystemTags",) . toJSON) _eFSFileSystemFileSystemTags
     , fmap (("KmsKeyId",) . toJSON) _eFSFileSystemKmsKeyId
     , fmap (("PerformanceMode",) . toJSON) _eFSFileSystemPerformanceMode
+    , fmap (("ProvisionedThroughputInMibps",) . toJSON . fmap Double') _eFSFileSystemProvisionedThroughputInMibps
+    , fmap (("ThroughputMode",) . toJSON) _eFSFileSystemThroughputMode
     ]
 
 instance FromJSON EFSFileSystem where
@@ -35,7 +39,9 @@
       fmap (fmap (fmap unBool')) (obj .:? "Encrypted") <*>
       (obj .:? "FileSystemTags") <*>
       (obj .:? "KmsKeyId") <*>
-      (obj .:? "PerformanceMode")
+      (obj .:? "PerformanceMode") <*>
+      fmap (fmap (fmap unDouble')) (obj .:? "ProvisionedThroughputInMibps") <*>
+      (obj .:? "ThroughputMode")
   parseJSON _ = mempty
 
 -- | Constructor for 'EFSFileSystem' containing required fields as arguments.
@@ -47,6 +53,8 @@
   , _eFSFileSystemFileSystemTags = Nothing
   , _eFSFileSystemKmsKeyId = Nothing
   , _eFSFileSystemPerformanceMode = Nothing
+  , _eFSFileSystemProvisionedThroughputInMibps = Nothing
+  , _eFSFileSystemThroughputMode = Nothing
   }
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-efs-filesystem-encrypted
@@ -64,3 +72,11 @@
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-efs-filesystem-performancemode
 efsfsPerformanceMode :: Lens' EFSFileSystem (Maybe (Val Text))
 efsfsPerformanceMode = lens _eFSFileSystemPerformanceMode (\s a -> s { _eFSFileSystemPerformanceMode = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-elasticfilesystem-filesystem-provisionedthroughputinmibps
+efsfsProvisionedThroughputInMibps :: Lens' EFSFileSystem (Maybe (Val Double))
+efsfsProvisionedThroughputInMibps = lens _eFSFileSystemProvisionedThroughputInMibps (\s a -> s { _eFSFileSystemProvisionedThroughputInMibps = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-elasticfilesystem-filesystem-throughputmode
+efsfsThroughputMode :: Lens' EFSFileSystem (Maybe (Val Text))
+efsfsThroughputMode = lens _eFSFileSystemThroughputMode (\s a -> s { _eFSFileSystemThroughputMode = a })
diff --git a/library-gen/Stratosphere/Resources/EMRCluster.hs b/library-gen/Stratosphere/Resources/EMRCluster.hs
--- a/library-gen/Stratosphere/Resources/EMRCluster.hs
+++ b/library-gen/Stratosphere/Resources/EMRCluster.hs
@@ -11,6 +11,7 @@
 import Stratosphere.ResourceProperties.EMRClusterBootstrapActionConfig
 import Stratosphere.ResourceProperties.EMRClusterConfiguration
 import Stratosphere.ResourceProperties.EMRClusterJobFlowInstancesConfig
+import Stratosphere.ResourceProperties.EMRClusterKerberosAttributes
 import Stratosphere.ResourceProperties.Tag
 
 -- | Full data type definition for EMRCluster. See 'emrCluster' for a more
@@ -26,6 +27,7 @@
   , _eMRClusterEbsRootVolumeSize :: Maybe (Val Integer)
   , _eMRClusterInstances :: EMRClusterJobFlowInstancesConfig
   , _eMRClusterJobFlowRole :: Val Text
+  , _eMRClusterKerberosAttributes :: Maybe EMRClusterKerberosAttributes
   , _eMRClusterLogUri :: Maybe (Val Text)
   , _eMRClusterName :: Val Text
   , _eMRClusterReleaseLabel :: Maybe (Val Text)
@@ -49,6 +51,7 @@
     , fmap (("EbsRootVolumeSize",) . toJSON . fmap Integer') _eMRClusterEbsRootVolumeSize
     , (Just . ("Instances",) . toJSON) _eMRClusterInstances
     , (Just . ("JobFlowRole",) . toJSON) _eMRClusterJobFlowRole
+    , fmap (("KerberosAttributes",) . toJSON) _eMRClusterKerberosAttributes
     , fmap (("LogUri",) . toJSON) _eMRClusterLogUri
     , (Just . ("Name",) . toJSON) _eMRClusterName
     , fmap (("ReleaseLabel",) . toJSON) _eMRClusterReleaseLabel
@@ -71,6 +74,7 @@
       fmap (fmap (fmap unInteger')) (obj .:? "EbsRootVolumeSize") <*>
       (obj .: "Instances") <*>
       (obj .: "JobFlowRole") <*>
+      (obj .:? "KerberosAttributes") <*>
       (obj .:? "LogUri") <*>
       (obj .: "Name") <*>
       (obj .:? "ReleaseLabel") <*>
@@ -99,6 +103,7 @@
   , _eMRClusterEbsRootVolumeSize = Nothing
   , _eMRClusterInstances = instancesarg
   , _eMRClusterJobFlowRole = jobFlowRolearg
+  , _eMRClusterKerberosAttributes = Nothing
   , _eMRClusterLogUri = Nothing
   , _eMRClusterName = namearg
   , _eMRClusterReleaseLabel = Nothing
@@ -144,6 +149,10 @@
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-jobflowrole
 emrcJobFlowRole :: Lens' EMRCluster (Val Text)
 emrcJobFlowRole = lens _eMRClusterJobFlowRole (\s a -> s { _eMRClusterJobFlowRole = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-kerberosattributes
+emrcKerberosAttributes :: Lens' EMRCluster (Maybe EMRClusterKerberosAttributes)
+emrcKerberosAttributes = lens _eMRClusterKerberosAttributes (\s a -> s { _eMRClusterKerberosAttributes = a })
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-loguri
 emrcLogUri :: Lens' EMRCluster (Maybe (Val Text))
diff --git a/library-gen/Stratosphere/Resources/SNSSubscription.hs b/library-gen/Stratosphere/Resources/SNSSubscription.hs
--- a/library-gen/Stratosphere/Resources/SNSSubscription.hs
+++ b/library-gen/Stratosphere/Resources/SNSSubscription.hs
@@ -13,8 +13,12 @@
 -- a more convenient constructor.
 data SNSSubscription =
   SNSSubscription
-  { _sNSSubscriptionEndpoint :: Maybe (Val Text)
+  { _sNSSubscriptionDeliveryPolicy :: Maybe Object
+  , _sNSSubscriptionEndpoint :: Maybe (Val Text)
+  , _sNSSubscriptionFilterPolicy :: Maybe Object
   , _sNSSubscriptionProtocol :: Maybe (Val SNSProtocol)
+  , _sNSSubscriptionRawMessageDelivery :: Maybe (Val Bool)
+  , _sNSSubscriptionRegion :: Maybe (Val Text)
   , _sNSSubscriptionTopicArn :: Maybe (Val Text)
   } deriving (Show, Eq)
 
@@ -22,16 +26,24 @@
   toJSON SNSSubscription{..} =
     object $
     catMaybes
-    [ fmap (("Endpoint",) . toJSON) _sNSSubscriptionEndpoint
+    [ fmap (("DeliveryPolicy",) . toJSON) _sNSSubscriptionDeliveryPolicy
+    , fmap (("Endpoint",) . toJSON) _sNSSubscriptionEndpoint
+    , fmap (("FilterPolicy",) . toJSON) _sNSSubscriptionFilterPolicy
     , fmap (("Protocol",) . toJSON) _sNSSubscriptionProtocol
+    , fmap (("RawMessageDelivery",) . toJSON . fmap Bool') _sNSSubscriptionRawMessageDelivery
+    , fmap (("Region",) . toJSON) _sNSSubscriptionRegion
     , fmap (("TopicArn",) . toJSON) _sNSSubscriptionTopicArn
     ]
 
 instance FromJSON SNSSubscription where
   parseJSON (Object obj) =
     SNSSubscription <$>
+      (obj .:? "DeliveryPolicy") <*>
       (obj .:? "Endpoint") <*>
+      (obj .:? "FilterPolicy") <*>
       (obj .:? "Protocol") <*>
+      fmap (fmap (fmap unBool')) (obj .:? "RawMessageDelivery") <*>
+      (obj .:? "Region") <*>
       (obj .:? "TopicArn")
   parseJSON _ = mempty
 
@@ -41,18 +53,38 @@
   :: SNSSubscription
 snsSubscription  =
   SNSSubscription
-  { _sNSSubscriptionEndpoint = Nothing
+  { _sNSSubscriptionDeliveryPolicy = Nothing
+  , _sNSSubscriptionEndpoint = Nothing
+  , _sNSSubscriptionFilterPolicy = Nothing
   , _sNSSubscriptionProtocol = Nothing
+  , _sNSSubscriptionRawMessageDelivery = Nothing
+  , _sNSSubscriptionRegion = Nothing
   , _sNSSubscriptionTopicArn = Nothing
   }
 
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-subscription-deliverypolicy
+snssDeliveryPolicy :: Lens' SNSSubscription (Maybe Object)
+snssDeliveryPolicy = lens _sNSSubscriptionDeliveryPolicy (\s a -> s { _sNSSubscriptionDeliveryPolicy = a })
+
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-endpoint
 snssEndpoint :: Lens' SNSSubscription (Maybe (Val Text))
 snssEndpoint = lens _sNSSubscriptionEndpoint (\s a -> s { _sNSSubscriptionEndpoint = a })
 
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-subscription-filterpolicy
+snssFilterPolicy :: Lens' SNSSubscription (Maybe Object)
+snssFilterPolicy = lens _sNSSubscriptionFilterPolicy (\s a -> s { _sNSSubscriptionFilterPolicy = a })
+
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-protocol
 snssProtocol :: Lens' SNSSubscription (Maybe (Val SNSProtocol))
 snssProtocol = lens _sNSSubscriptionProtocol (\s a -> s { _sNSSubscriptionProtocol = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-subscription-rawmessagedelivery
+snssRawMessageDelivery :: Lens' SNSSubscription (Maybe (Val Bool))
+snssRawMessageDelivery = lens _sNSSubscriptionRawMessageDelivery (\s a -> s { _sNSSubscriptionRawMessageDelivery = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-subscription-region
+snssRegion :: Lens' SNSSubscription (Maybe (Val Text))
+snssRegion = lens _sNSSubscriptionRegion (\s a -> s { _sNSSubscriptionRegion = a })
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#topicarn
 snssTopicArn :: Lens' SNSSubscription (Maybe (Val Text))
diff --git a/library-gen/Stratosphere/Resources/SQSQueue.hs b/library-gen/Stratosphere/Resources/SQSQueue.hs
--- a/library-gen/Stratosphere/Resources/SQSQueue.hs
+++ b/library-gen/Stratosphere/Resources/SQSQueue.hs
@@ -7,7 +7,7 @@
 module Stratosphere.Resources.SQSQueue where
 
 import Stratosphere.ResourceImports
-
+import Stratosphere.ResourceProperties.Tag
 
 -- | Full data type definition for SQSQueue. See 'sqsQueue' for a more
 -- convenient constructor.
@@ -23,6 +23,7 @@
   , _sQSQueueQueueName :: Maybe (Val Text)
   , _sQSQueueReceiveMessageWaitTimeSeconds :: Maybe (Val Integer)
   , _sQSQueueRedrivePolicy :: Maybe Object
+  , _sQSQueueTags :: Maybe [Tag]
   , _sQSQueueVisibilityTimeout :: Maybe (Val Integer)
   } deriving (Show, Eq)
 
@@ -40,6 +41,7 @@
     , fmap (("QueueName",) . toJSON) _sQSQueueQueueName
     , fmap (("ReceiveMessageWaitTimeSeconds",) . toJSON . fmap Integer') _sQSQueueReceiveMessageWaitTimeSeconds
     , fmap (("RedrivePolicy",) . toJSON) _sQSQueueRedrivePolicy
+    , fmap (("Tags",) . toJSON) _sQSQueueTags
     , fmap (("VisibilityTimeout",) . toJSON . fmap Integer') _sQSQueueVisibilityTimeout
     ]
 
@@ -56,6 +58,7 @@
       (obj .:? "QueueName") <*>
       fmap (fmap (fmap unInteger')) (obj .:? "ReceiveMessageWaitTimeSeconds") <*>
       (obj .:? "RedrivePolicy") <*>
+      (obj .:? "Tags") <*>
       fmap (fmap (fmap unInteger')) (obj .:? "VisibilityTimeout")
   parseJSON _ = mempty
 
@@ -74,6 +77,7 @@
   , _sQSQueueQueueName = Nothing
   , _sQSQueueReceiveMessageWaitTimeSeconds = Nothing
   , _sQSQueueRedrivePolicy = Nothing
+  , _sQSQueueTags = Nothing
   , _sQSQueueVisibilityTimeout = Nothing
   }
 
@@ -116,6 +120,10 @@
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-redrive
 sqsqRedrivePolicy :: Lens' SQSQueue (Maybe Object)
 sqsqRedrivePolicy = lens _sQSQueueRedrivePolicy (\s a -> s { _sQSQueueRedrivePolicy = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#cfn-sqs-queue-tags
+sqsqTags :: Lens' SQSQueue (Maybe [Tag])
+sqsqTags = lens _sQSQueueTags (\s a -> s { _sQSQueueTags = a })
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-visiblitytimeout
 sqsqVisibilityTimeout :: Lens' SQSQueue (Maybe (Val Integer))
diff --git a/stratosphere.cabal b/stratosphere.cabal
--- a/stratosphere.cabal
+++ b/stratosphere.cabal
@@ -2,10 +2,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 83bf792117e7f6a55911f942484536c93826f6cd02831415741fa235711b3273
+-- hash: 1240380557351af82d5b4cca1213969ef6ce1f9d22796c0163e2d1d25d77eb0f
 
 name:           stratosphere
-version:        0.24.4
+version:        0.25.0
 synopsis:       EDSL for AWS CloudFormation
 description:    EDSL for AWS CloudFormation
 category:       AWS, Cloud
@@ -48,6 +48,7 @@
       Stratosphere.Types
       Stratosphere.Values
       Stratosphere.ResourceProperties.AmazonMQBrokerConfigurationId
+      Stratosphere.ResourceProperties.AmazonMQBrokerLogList
       Stratosphere.ResourceProperties.AmazonMQBrokerMaintenanceWindow
       Stratosphere.ResourceProperties.AmazonMQBrokerUser
       Stratosphere.ResourceProperties.ApiGatewayApiKeyStageKey
@@ -208,6 +209,7 @@
       Stratosphere.ResourceProperties.DataPipelinePipelineParameterValue
       Stratosphere.ResourceProperties.DataPipelinePipelinePipelineObject
       Stratosphere.ResourceProperties.DataPipelinePipelinePipelineTag
+      Stratosphere.ResourceProperties.DAXClusterSSESpecification
       Stratosphere.ResourceProperties.DirectoryServiceMicrosoftADVpcSettings
       Stratosphere.ResourceProperties.DirectoryServiceSimpleADVpcSettings
       Stratosphere.ResourceProperties.DMSEndpointDynamoDbSettings
@@ -338,6 +340,7 @@
       Stratosphere.ResourceProperties.EMRClusterInstanceGroupConfig
       Stratosphere.ResourceProperties.EMRClusterInstanceTypeConfig
       Stratosphere.ResourceProperties.EMRClusterJobFlowInstancesConfig
+      Stratosphere.ResourceProperties.EMRClusterKerberosAttributes
       Stratosphere.ResourceProperties.EMRClusterMetricDimension
       Stratosphere.ResourceProperties.EMRClusterPlacementType
       Stratosphere.ResourceProperties.EMRClusterScalingAction