diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.13.0
+
+* Update resource specification document to version 1.11.0
+
 ## 0.12.0
 
 * Update resource specification document to version 1.10.0
diff --git a/library-gen/Stratosphere/ResourceProperties/ApiGatewayApiKeyStageKey.hs b/library-gen/Stratosphere/ResourceProperties/ApiGatewayApiKeyStageKey.hs
--- a/library-gen/Stratosphere/ResourceProperties/ApiGatewayApiKeyStageKey.hs
+++ b/library-gen/Stratosphere/ResourceProperties/ApiGatewayApiKeyStageKey.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE TupleSections #-}
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-apikey-stagekey.html
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-apikey-stagekey.html
 
 module Stratosphere.ResourceProperties.ApiGatewayApiKeyStageKey where
 
@@ -48,10 +48,10 @@
   , _apiGatewayApiKeyStageKeyStageName = Nothing
   }
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-apikey-stagekey.html#cfn-apigateway-apikey-stagekey-restapiid
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-apikey-stagekey.html#cfn-apigateway-apikey-stagekey-restapiid
 agakskRestApiId :: Lens' ApiGatewayApiKeyStageKey (Maybe (Val Text))
 agakskRestApiId = lens _apiGatewayApiKeyStageKeyRestApiId (\s a -> s { _apiGatewayApiKeyStageKeyRestApiId = a })
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-apikey-stagekey.html#cfn-apigateway-apikey-stagekey-stagename
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-apikey-stagekey.html#cfn-apigateway-apikey-stagekey-stagename
 agakskStageName :: Lens' ApiGatewayApiKeyStageKey (Maybe (Val Text))
 agakskStageName = lens _apiGatewayApiKeyStageKeyStageName (\s a -> s { _apiGatewayApiKeyStageKeyStageName = a })
diff --git a/library-gen/Stratosphere/ResourceProperties/ApiGatewayDomainNameEndpointConfiguration.hs b/library-gen/Stratosphere/ResourceProperties/ApiGatewayDomainNameEndpointConfiguration.hs
new file mode 100644
--- /dev/null
+++ b/library-gen/Stratosphere/ResourceProperties/ApiGatewayDomainNameEndpointConfiguration.hs
@@ -0,0 +1,50 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE TupleSections #-}
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-domainname-endpointconfiguration.html
+
+module Stratosphere.ResourceProperties.ApiGatewayDomainNameEndpointConfiguration where
+
+import Control.Lens hiding ((.=))
+import Data.Aeson
+import Data.Maybe (catMaybes)
+import Data.Monoid (mempty)
+import Data.Text
+
+import Stratosphere.Values
+
+
+-- | Full data type definition for ApiGatewayDomainNameEndpointConfiguration.
+-- See 'apiGatewayDomainNameEndpointConfiguration' for a more convenient
+-- constructor.
+data ApiGatewayDomainNameEndpointConfiguration =
+  ApiGatewayDomainNameEndpointConfiguration
+  { _apiGatewayDomainNameEndpointConfigurationTypes :: Maybe (ValList Text)
+  } deriving (Show, Eq)
+
+instance ToJSON ApiGatewayDomainNameEndpointConfiguration where
+  toJSON ApiGatewayDomainNameEndpointConfiguration{..} =
+    object $
+    catMaybes
+    [ fmap (("Types",) . toJSON) _apiGatewayDomainNameEndpointConfigurationTypes
+    ]
+
+instance FromJSON ApiGatewayDomainNameEndpointConfiguration where
+  parseJSON (Object obj) =
+    ApiGatewayDomainNameEndpointConfiguration <$>
+      (obj .:? "Types")
+  parseJSON _ = mempty
+
+-- | Constructor for 'ApiGatewayDomainNameEndpointConfiguration' containing
+-- required fields as arguments.
+apiGatewayDomainNameEndpointConfiguration
+  :: ApiGatewayDomainNameEndpointConfiguration
+apiGatewayDomainNameEndpointConfiguration  =
+  ApiGatewayDomainNameEndpointConfiguration
+  { _apiGatewayDomainNameEndpointConfigurationTypes = Nothing
+  }
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-domainname-endpointconfiguration.html#cfn-apigateway-domainname-endpointconfiguration-types
+agdnecTypes :: Lens' ApiGatewayDomainNameEndpointConfiguration (Maybe (ValList Text))
+agdnecTypes = lens _apiGatewayDomainNameEndpointConfigurationTypes (\s a -> s { _apiGatewayDomainNameEndpointConfigurationTypes = a })
diff --git a/library-gen/Stratosphere/ResourceProperties/ApiGatewayRestApiEndpointConfiguration.hs b/library-gen/Stratosphere/ResourceProperties/ApiGatewayRestApiEndpointConfiguration.hs
new file mode 100644
--- /dev/null
+++ b/library-gen/Stratosphere/ResourceProperties/ApiGatewayRestApiEndpointConfiguration.hs
@@ -0,0 +1,50 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE TupleSections #-}
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-restapi-endpointconfiguration.html
+
+module Stratosphere.ResourceProperties.ApiGatewayRestApiEndpointConfiguration where
+
+import Control.Lens hiding ((.=))
+import Data.Aeson
+import Data.Maybe (catMaybes)
+import Data.Monoid (mempty)
+import Data.Text
+
+import Stratosphere.Values
+
+
+-- | Full data type definition for ApiGatewayRestApiEndpointConfiguration. See
+-- 'apiGatewayRestApiEndpointConfiguration' for a more convenient
+-- constructor.
+data ApiGatewayRestApiEndpointConfiguration =
+  ApiGatewayRestApiEndpointConfiguration
+  { _apiGatewayRestApiEndpointConfigurationTypes :: Maybe (ValList Text)
+  } deriving (Show, Eq)
+
+instance ToJSON ApiGatewayRestApiEndpointConfiguration where
+  toJSON ApiGatewayRestApiEndpointConfiguration{..} =
+    object $
+    catMaybes
+    [ fmap (("Types",) . toJSON) _apiGatewayRestApiEndpointConfigurationTypes
+    ]
+
+instance FromJSON ApiGatewayRestApiEndpointConfiguration where
+  parseJSON (Object obj) =
+    ApiGatewayRestApiEndpointConfiguration <$>
+      (obj .:? "Types")
+  parseJSON _ = mempty
+
+-- | Constructor for 'ApiGatewayRestApiEndpointConfiguration' containing
+-- required fields as arguments.
+apiGatewayRestApiEndpointConfiguration
+  :: ApiGatewayRestApiEndpointConfiguration
+apiGatewayRestApiEndpointConfiguration  =
+  ApiGatewayRestApiEndpointConfiguration
+  { _apiGatewayRestApiEndpointConfigurationTypes = Nothing
+  }
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-restapi-endpointconfiguration.html#cfn-apigateway-restapi-endpointconfiguration-types
+agraecTypes :: Lens' ApiGatewayRestApiEndpointConfiguration (Maybe (ValList Text))
+agraecTypes = lens _apiGatewayRestApiEndpointConfigurationTypes (\s a -> s { _apiGatewayRestApiEndpointConfigurationTypes = a })
diff --git a/library-gen/Stratosphere/ResourceProperties/ApiGatewayRestApiS3Location.hs b/library-gen/Stratosphere/ResourceProperties/ApiGatewayRestApiS3Location.hs
--- a/library-gen/Stratosphere/ResourceProperties/ApiGatewayRestApiS3Location.hs
+++ b/library-gen/Stratosphere/ResourceProperties/ApiGatewayRestApiS3Location.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE TupleSections #-}
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-restapi-bodys3location.html
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-restapi-s3location.html
 
 module Stratosphere.ResourceProperties.ApiGatewayRestApiS3Location where
 
@@ -56,18 +56,18 @@
   , _apiGatewayRestApiS3LocationVersion = Nothing
   }
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-restapi-bodys3location.html#cfn-apigateway-restapi-s3location-bucket
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-restapi-s3location.html#cfn-apigateway-restapi-s3location-bucket
 agraslBucket :: Lens' ApiGatewayRestApiS3Location (Maybe (Val Text))
 agraslBucket = lens _apiGatewayRestApiS3LocationBucket (\s a -> s { _apiGatewayRestApiS3LocationBucket = a })
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-restapi-bodys3location.html#cfn-apigateway-restapi-s3location-etag
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-restapi-s3location.html#cfn-apigateway-restapi-s3location-etag
 agraslETag :: Lens' ApiGatewayRestApiS3Location (Maybe (Val Text))
 agraslETag = lens _apiGatewayRestApiS3LocationETag (\s a -> s { _apiGatewayRestApiS3LocationETag = a })
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-restapi-bodys3location.html#cfn-apigateway-restapi-s3location-key
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-restapi-s3location.html#cfn-apigateway-restapi-s3location-key
 agraslKey :: Lens' ApiGatewayRestApiS3Location (Maybe (Val Text))
 agraslKey = lens _apiGatewayRestApiS3LocationKey (\s a -> s { _apiGatewayRestApiS3LocationKey = a })
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-restapi-bodys3location.html#cfn-apigateway-restapi-s3location-version
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-restapi-s3location.html#cfn-apigateway-restapi-s3location-version
 agraslVersion :: Lens' ApiGatewayRestApiS3Location (Maybe (Val Text))
 agraslVersion = lens _apiGatewayRestApiS3LocationVersion (\s a -> s { _apiGatewayRestApiS3LocationVersion = a })
diff --git a/library-gen/Stratosphere/ResourceProperties/ApplicationAutoScalingScalableTargetScalableTargetAction.hs b/library-gen/Stratosphere/ResourceProperties/ApplicationAutoScalingScalableTargetScalableTargetAction.hs
new file mode 100644
--- /dev/null
+++ b/library-gen/Stratosphere/ResourceProperties/ApplicationAutoScalingScalableTargetScalableTargetAction.hs
@@ -0,0 +1,60 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE TupleSections #-}
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scalabletargetaction.html
+
+module Stratosphere.ResourceProperties.ApplicationAutoScalingScalableTargetScalableTargetAction where
+
+import Control.Lens hiding ((.=))
+import Data.Aeson
+import Data.Maybe (catMaybes)
+import Data.Monoid (mempty)
+import Data.Text
+
+import Stratosphere.Values
+
+
+-- | Full data type definition for
+-- ApplicationAutoScalingScalableTargetScalableTargetAction. See
+-- 'applicationAutoScalingScalableTargetScalableTargetAction' for a more
+-- convenient constructor.
+data ApplicationAutoScalingScalableTargetScalableTargetAction =
+  ApplicationAutoScalingScalableTargetScalableTargetAction
+  { _applicationAutoScalingScalableTargetScalableTargetActionMaxCapacity :: Maybe (Val Integer)
+  , _applicationAutoScalingScalableTargetScalableTargetActionMinCapacity :: Maybe (Val Integer)
+  } deriving (Show, Eq)
+
+instance ToJSON ApplicationAutoScalingScalableTargetScalableTargetAction where
+  toJSON ApplicationAutoScalingScalableTargetScalableTargetAction{..} =
+    object $
+    catMaybes
+    [ fmap (("MaxCapacity",) . toJSON . fmap Integer') _applicationAutoScalingScalableTargetScalableTargetActionMaxCapacity
+    , fmap (("MinCapacity",) . toJSON . fmap Integer') _applicationAutoScalingScalableTargetScalableTargetActionMinCapacity
+    ]
+
+instance FromJSON ApplicationAutoScalingScalableTargetScalableTargetAction where
+  parseJSON (Object obj) =
+    ApplicationAutoScalingScalableTargetScalableTargetAction <$>
+      fmap (fmap (fmap unInteger')) (obj .:? "MaxCapacity") <*>
+      fmap (fmap (fmap unInteger')) (obj .:? "MinCapacity")
+  parseJSON _ = mempty
+
+-- | Constructor for
+-- 'ApplicationAutoScalingScalableTargetScalableTargetAction' containing
+-- required fields as arguments.
+applicationAutoScalingScalableTargetScalableTargetAction
+  :: ApplicationAutoScalingScalableTargetScalableTargetAction
+applicationAutoScalingScalableTargetScalableTargetAction  =
+  ApplicationAutoScalingScalableTargetScalableTargetAction
+  { _applicationAutoScalingScalableTargetScalableTargetActionMaxCapacity = Nothing
+  , _applicationAutoScalingScalableTargetScalableTargetActionMinCapacity = Nothing
+  }
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scalabletargetaction.html#cfn-applicationautoscaling-scalabletarget-scalabletargetaction-maxcapacity
+aasststaMaxCapacity :: Lens' ApplicationAutoScalingScalableTargetScalableTargetAction (Maybe (Val Integer))
+aasststaMaxCapacity = lens _applicationAutoScalingScalableTargetScalableTargetActionMaxCapacity (\s a -> s { _applicationAutoScalingScalableTargetScalableTargetActionMaxCapacity = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scalabletargetaction.html#cfn-applicationautoscaling-scalabletarget-scalabletargetaction-mincapacity
+aasststaMinCapacity :: Lens' ApplicationAutoScalingScalableTargetScalableTargetAction (Maybe (Val Integer))
+aasststaMinCapacity = lens _applicationAutoScalingScalableTargetScalableTargetActionMinCapacity (\s a -> s { _applicationAutoScalingScalableTargetScalableTargetActionMinCapacity = a })
diff --git a/library-gen/Stratosphere/ResourceProperties/ApplicationAutoScalingScalableTargetScheduledAction.hs b/library-gen/Stratosphere/ResourceProperties/ApplicationAutoScalingScalableTargetScheduledAction.hs
new file mode 100644
--- /dev/null
+++ b/library-gen/Stratosphere/ResourceProperties/ApplicationAutoScalingScalableTargetScheduledAction.hs
@@ -0,0 +1,85 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE TupleSections #-}
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scheduledaction.html
+
+module Stratosphere.ResourceProperties.ApplicationAutoScalingScalableTargetScheduledAction where
+
+import Control.Lens hiding ((.=))
+import Data.Aeson
+import Data.Maybe (catMaybes)
+import Data.Monoid (mempty)
+import Data.Text
+
+import Stratosphere.Values
+import Stratosphere.ResourceProperties.ApplicationAutoScalingScalableTargetScalableTargetAction
+
+-- | Full data type definition for
+-- ApplicationAutoScalingScalableTargetScheduledAction. See
+-- 'applicationAutoScalingScalableTargetScheduledAction' for a more
+-- convenient constructor.
+data ApplicationAutoScalingScalableTargetScheduledAction =
+  ApplicationAutoScalingScalableTargetScheduledAction
+  { _applicationAutoScalingScalableTargetScheduledActionEndTime :: Maybe (Val Text)
+  , _applicationAutoScalingScalableTargetScheduledActionScalableTargetAction :: Maybe ApplicationAutoScalingScalableTargetScalableTargetAction
+  , _applicationAutoScalingScalableTargetScheduledActionSchedule :: Val Text
+  , _applicationAutoScalingScalableTargetScheduledActionScheduledActionName :: Val Text
+  , _applicationAutoScalingScalableTargetScheduledActionStartTime :: Maybe (Val Text)
+  } deriving (Show, Eq)
+
+instance ToJSON ApplicationAutoScalingScalableTargetScheduledAction where
+  toJSON ApplicationAutoScalingScalableTargetScheduledAction{..} =
+    object $
+    catMaybes
+    [ fmap (("EndTime",) . toJSON) _applicationAutoScalingScalableTargetScheduledActionEndTime
+    , fmap (("ScalableTargetAction",) . toJSON) _applicationAutoScalingScalableTargetScheduledActionScalableTargetAction
+    , (Just . ("Schedule",) . toJSON) _applicationAutoScalingScalableTargetScheduledActionSchedule
+    , (Just . ("ScheduledActionName",) . toJSON) _applicationAutoScalingScalableTargetScheduledActionScheduledActionName
+    , fmap (("StartTime",) . toJSON) _applicationAutoScalingScalableTargetScheduledActionStartTime
+    ]
+
+instance FromJSON ApplicationAutoScalingScalableTargetScheduledAction where
+  parseJSON (Object obj) =
+    ApplicationAutoScalingScalableTargetScheduledAction <$>
+      (obj .:? "EndTime") <*>
+      (obj .:? "ScalableTargetAction") <*>
+      (obj .: "Schedule") <*>
+      (obj .: "ScheduledActionName") <*>
+      (obj .:? "StartTime")
+  parseJSON _ = mempty
+
+-- | Constructor for 'ApplicationAutoScalingScalableTargetScheduledAction'
+-- containing required fields as arguments.
+applicationAutoScalingScalableTargetScheduledAction
+  :: Val Text -- ^ 'aasstsaSchedule'
+  -> Val Text -- ^ 'aasstsaScheduledActionName'
+  -> ApplicationAutoScalingScalableTargetScheduledAction
+applicationAutoScalingScalableTargetScheduledAction schedulearg scheduledActionNamearg =
+  ApplicationAutoScalingScalableTargetScheduledAction
+  { _applicationAutoScalingScalableTargetScheduledActionEndTime = Nothing
+  , _applicationAutoScalingScalableTargetScheduledActionScalableTargetAction = Nothing
+  , _applicationAutoScalingScalableTargetScheduledActionSchedule = schedulearg
+  , _applicationAutoScalingScalableTargetScheduledActionScheduledActionName = scheduledActionNamearg
+  , _applicationAutoScalingScalableTargetScheduledActionStartTime = Nothing
+  }
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scheduledaction.html#cfn-applicationautoscaling-scalabletarget-scheduledaction-endtime
+aasstsaEndTime :: Lens' ApplicationAutoScalingScalableTargetScheduledAction (Maybe (Val Text))
+aasstsaEndTime = lens _applicationAutoScalingScalableTargetScheduledActionEndTime (\s a -> s { _applicationAutoScalingScalableTargetScheduledActionEndTime = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scheduledaction.html#cfn-applicationautoscaling-scalabletarget-scheduledaction-scalabletargetaction
+aasstsaScalableTargetAction :: Lens' ApplicationAutoScalingScalableTargetScheduledAction (Maybe ApplicationAutoScalingScalableTargetScalableTargetAction)
+aasstsaScalableTargetAction = lens _applicationAutoScalingScalableTargetScheduledActionScalableTargetAction (\s a -> s { _applicationAutoScalingScalableTargetScheduledActionScalableTargetAction = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scheduledaction.html#cfn-applicationautoscaling-scalabletarget-scheduledaction-schedule
+aasstsaSchedule :: Lens' ApplicationAutoScalingScalableTargetScheduledAction (Val Text)
+aasstsaSchedule = lens _applicationAutoScalingScalableTargetScheduledActionSchedule (\s a -> s { _applicationAutoScalingScalableTargetScheduledActionSchedule = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scheduledaction.html#cfn-applicationautoscaling-scalabletarget-scheduledaction-scheduledactionname
+aasstsaScheduledActionName :: Lens' ApplicationAutoScalingScalableTargetScheduledAction (Val Text)
+aasstsaScheduledActionName = lens _applicationAutoScalingScalableTargetScheduledActionScheduledActionName (\s a -> s { _applicationAutoScalingScalableTargetScheduledActionScheduledActionName = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scheduledaction.html#cfn-applicationautoscaling-scalabletarget-scheduledaction-starttime
+aasstsaStartTime :: Lens' ApplicationAutoScalingScalableTargetScheduledAction (Maybe (Val Text))
+aasstsaStartTime = lens _applicationAutoScalingScalableTargetScheduledActionStartTime (\s a -> s { _applicationAutoScalingScalableTargetScheduledActionStartTime = a })
diff --git a/library-gen/Stratosphere/ResourceProperties/ECRRepositoryLifecyclePolicy.hs b/library-gen/Stratosphere/ResourceProperties/ECRRepositoryLifecyclePolicy.hs
new file mode 100644
--- /dev/null
+++ b/library-gen/Stratosphere/ResourceProperties/ECRRepositoryLifecyclePolicy.hs
@@ -0,0 +1,57 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE TupleSections #-}
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-repository-lifecyclepolicy.html
+
+module Stratosphere.ResourceProperties.ECRRepositoryLifecyclePolicy where
+
+import Control.Lens hiding ((.=))
+import Data.Aeson
+import Data.Maybe (catMaybes)
+import Data.Monoid (mempty)
+import Data.Text
+
+import Stratosphere.Values
+
+
+-- | Full data type definition for ECRRepositoryLifecyclePolicy. See
+-- 'ecrRepositoryLifecyclePolicy' for a more convenient constructor.
+data ECRRepositoryLifecyclePolicy =
+  ECRRepositoryLifecyclePolicy
+  { _eCRRepositoryLifecyclePolicyLifecyclePolicyText :: Maybe (Val Text)
+  , _eCRRepositoryLifecyclePolicyRegistryId :: Maybe (Val Text)
+  } deriving (Show, Eq)
+
+instance ToJSON ECRRepositoryLifecyclePolicy where
+  toJSON ECRRepositoryLifecyclePolicy{..} =
+    object $
+    catMaybes
+    [ fmap (("LifecyclePolicyText",) . toJSON) _eCRRepositoryLifecyclePolicyLifecyclePolicyText
+    , fmap (("RegistryId",) . toJSON) _eCRRepositoryLifecyclePolicyRegistryId
+    ]
+
+instance FromJSON ECRRepositoryLifecyclePolicy where
+  parseJSON (Object obj) =
+    ECRRepositoryLifecyclePolicy <$>
+      (obj .:? "LifecyclePolicyText") <*>
+      (obj .:? "RegistryId")
+  parseJSON _ = mempty
+
+-- | Constructor for 'ECRRepositoryLifecyclePolicy' containing required fields
+-- as arguments.
+ecrRepositoryLifecyclePolicy
+  :: ECRRepositoryLifecyclePolicy
+ecrRepositoryLifecyclePolicy  =
+  ECRRepositoryLifecyclePolicy
+  { _eCRRepositoryLifecyclePolicyLifecyclePolicyText = Nothing
+  , _eCRRepositoryLifecyclePolicyRegistryId = Nothing
+  }
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-repository-lifecyclepolicy.html#cfn-ecr-repository-lifecyclepolicy-lifecyclepolicytext
+ecrrlpLifecyclePolicyText :: Lens' ECRRepositoryLifecyclePolicy (Maybe (Val Text))
+ecrrlpLifecyclePolicyText = lens _eCRRepositoryLifecyclePolicyLifecyclePolicyText (\s a -> s { _eCRRepositoryLifecyclePolicyLifecyclePolicyText = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-repository-lifecyclepolicy.html#cfn-ecr-repository-lifecyclepolicy-registryid
+ecrrlpRegistryId :: Lens' ECRRepositoryLifecyclePolicy (Maybe (Val Text))
+ecrrlpRegistryId = lens _eCRRepositoryLifecyclePolicyRegistryId (\s a -> s { _eCRRepositoryLifecyclePolicyRegistryId = a })
diff --git a/library-gen/Stratosphere/ResourceProperties/ECSTaskDefinitionContainerDefinition.hs b/library-gen/Stratosphere/ResourceProperties/ECSTaskDefinitionContainerDefinition.hs
--- a/library-gen/Stratosphere/ResourceProperties/ECSTaskDefinitionContainerDefinition.hs
+++ b/library-gen/Stratosphere/ResourceProperties/ECSTaskDefinitionContainerDefinition.hs
@@ -15,6 +15,7 @@
 import Stratosphere.Values
 import Stratosphere.ResourceProperties.ECSTaskDefinitionKeyValuePair
 import Stratosphere.ResourceProperties.ECSTaskDefinitionHostEntry
+import Stratosphere.ResourceProperties.ECSTaskDefinitionLinuxParameters
 import Stratosphere.ResourceProperties.ECSTaskDefinitionLogConfiguration
 import Stratosphere.ResourceProperties.ECSTaskDefinitionMountPoint
 import Stratosphere.ResourceProperties.ECSTaskDefinitionPortMapping
@@ -39,6 +40,7 @@
   , _eCSTaskDefinitionContainerDefinitionHostname :: Maybe (Val Text)
   , _eCSTaskDefinitionContainerDefinitionImage :: Val Text
   , _eCSTaskDefinitionContainerDefinitionLinks :: Maybe (ValList Text)
+  , _eCSTaskDefinitionContainerDefinitionLinuxParameters :: Maybe ECSTaskDefinitionLinuxParameters
   , _eCSTaskDefinitionContainerDefinitionLogConfiguration :: Maybe ECSTaskDefinitionLogConfiguration
   , _eCSTaskDefinitionContainerDefinitionMemory :: Maybe (Val Integer)
   , _eCSTaskDefinitionContainerDefinitionMemoryReservation :: Maybe (Val Integer)
@@ -71,6 +73,7 @@
     , fmap (("Hostname",) . toJSON) _eCSTaskDefinitionContainerDefinitionHostname
     , (Just . ("Image",) . toJSON) _eCSTaskDefinitionContainerDefinitionImage
     , fmap (("Links",) . toJSON) _eCSTaskDefinitionContainerDefinitionLinks
+    , fmap (("LinuxParameters",) . toJSON) _eCSTaskDefinitionContainerDefinitionLinuxParameters
     , fmap (("LogConfiguration",) . toJSON) _eCSTaskDefinitionContainerDefinitionLogConfiguration
     , fmap (("Memory",) . toJSON . fmap Integer') _eCSTaskDefinitionContainerDefinitionMemory
     , fmap (("MemoryReservation",) . toJSON . fmap Integer') _eCSTaskDefinitionContainerDefinitionMemoryReservation
@@ -102,6 +105,7 @@
       (obj .:? "Hostname") <*>
       (obj .: "Image") <*>
       (obj .:? "Links") <*>
+      (obj .:? "LinuxParameters") <*>
       (obj .:? "LogConfiguration") <*>
       fmap (fmap (fmap unInteger')) (obj .:? "Memory") <*>
       fmap (fmap (fmap unInteger')) (obj .:? "MemoryReservation") <*>
@@ -138,6 +142,7 @@
   , _eCSTaskDefinitionContainerDefinitionHostname = Nothing
   , _eCSTaskDefinitionContainerDefinitionImage = imagearg
   , _eCSTaskDefinitionContainerDefinitionLinks = Nothing
+  , _eCSTaskDefinitionContainerDefinitionLinuxParameters = Nothing
   , _eCSTaskDefinitionContainerDefinitionLogConfiguration = Nothing
   , _eCSTaskDefinitionContainerDefinitionMemory = Nothing
   , _eCSTaskDefinitionContainerDefinitionMemoryReservation = Nothing
@@ -207,6 +212,10 @@
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-links
 ecstdcdLinks :: Lens' ECSTaskDefinitionContainerDefinition (Maybe (ValList Text))
 ecstdcdLinks = lens _eCSTaskDefinitionContainerDefinitionLinks (\s a -> s { _eCSTaskDefinitionContainerDefinitionLinks = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-linuxparameters
+ecstdcdLinuxParameters :: Lens' ECSTaskDefinitionContainerDefinition (Maybe ECSTaskDefinitionLinuxParameters)
+ecstdcdLinuxParameters = lens _eCSTaskDefinitionContainerDefinitionLinuxParameters (\s a -> s { _eCSTaskDefinitionContainerDefinitionLinuxParameters = a })
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-logconfiguration
 ecstdcdLogConfiguration :: Lens' ECSTaskDefinitionContainerDefinition (Maybe ECSTaskDefinitionLogConfiguration)
diff --git a/library-gen/Stratosphere/ResourceProperties/ECSTaskDefinitionDevice.hs b/library-gen/Stratosphere/ResourceProperties/ECSTaskDefinitionDevice.hs
new file mode 100644
--- /dev/null
+++ b/library-gen/Stratosphere/ResourceProperties/ECSTaskDefinitionDevice.hs
@@ -0,0 +1,66 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE TupleSections #-}
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-device.html
+
+module Stratosphere.ResourceProperties.ECSTaskDefinitionDevice where
+
+import Control.Lens hiding ((.=))
+import Data.Aeson
+import Data.Maybe (catMaybes)
+import Data.Monoid (mempty)
+import Data.Text
+
+import Stratosphere.Values
+
+
+-- | Full data type definition for ECSTaskDefinitionDevice. See
+-- 'ecsTaskDefinitionDevice' for a more convenient constructor.
+data ECSTaskDefinitionDevice =
+  ECSTaskDefinitionDevice
+  { _eCSTaskDefinitionDeviceContainerPath :: Maybe (Val Text)
+  , _eCSTaskDefinitionDeviceHostPath :: Val Text
+  , _eCSTaskDefinitionDevicePermissions :: Maybe (ValList Text)
+  } deriving (Show, Eq)
+
+instance ToJSON ECSTaskDefinitionDevice where
+  toJSON ECSTaskDefinitionDevice{..} =
+    object $
+    catMaybes
+    [ fmap (("ContainerPath",) . toJSON) _eCSTaskDefinitionDeviceContainerPath
+    , (Just . ("HostPath",) . toJSON) _eCSTaskDefinitionDeviceHostPath
+    , fmap (("Permissions",) . toJSON) _eCSTaskDefinitionDevicePermissions
+    ]
+
+instance FromJSON ECSTaskDefinitionDevice where
+  parseJSON (Object obj) =
+    ECSTaskDefinitionDevice <$>
+      (obj .:? "ContainerPath") <*>
+      (obj .: "HostPath") <*>
+      (obj .:? "Permissions")
+  parseJSON _ = mempty
+
+-- | Constructor for 'ECSTaskDefinitionDevice' containing required fields as
+-- arguments.
+ecsTaskDefinitionDevice
+  :: Val Text -- ^ 'ecstddHostPath'
+  -> ECSTaskDefinitionDevice
+ecsTaskDefinitionDevice hostPatharg =
+  ECSTaskDefinitionDevice
+  { _eCSTaskDefinitionDeviceContainerPath = Nothing
+  , _eCSTaskDefinitionDeviceHostPath = hostPatharg
+  , _eCSTaskDefinitionDevicePermissions = Nothing
+  }
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-device.html#cfn-ecs-taskdefinition-device-containerpath
+ecstddContainerPath :: Lens' ECSTaskDefinitionDevice (Maybe (Val Text))
+ecstddContainerPath = lens _eCSTaskDefinitionDeviceContainerPath (\s a -> s { _eCSTaskDefinitionDeviceContainerPath = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-device.html#cfn-ecs-taskdefinition-device-hostpath
+ecstddHostPath :: Lens' ECSTaskDefinitionDevice (Val Text)
+ecstddHostPath = lens _eCSTaskDefinitionDeviceHostPath (\s a -> s { _eCSTaskDefinitionDeviceHostPath = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-device.html#cfn-ecs-taskdefinition-device-permissions
+ecstddPermissions :: Lens' ECSTaskDefinitionDevice (Maybe (ValList Text))
+ecstddPermissions = lens _eCSTaskDefinitionDevicePermissions (\s a -> s { _eCSTaskDefinitionDevicePermissions = a })
diff --git a/library-gen/Stratosphere/ResourceProperties/ECSTaskDefinitionKernelCapabilities.hs b/library-gen/Stratosphere/ResourceProperties/ECSTaskDefinitionKernelCapabilities.hs
new file mode 100644
--- /dev/null
+++ b/library-gen/Stratosphere/ResourceProperties/ECSTaskDefinitionKernelCapabilities.hs
@@ -0,0 +1,57 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE TupleSections #-}
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-kernelcapabilities.html
+
+module Stratosphere.ResourceProperties.ECSTaskDefinitionKernelCapabilities where
+
+import Control.Lens hiding ((.=))
+import Data.Aeson
+import Data.Maybe (catMaybes)
+import Data.Monoid (mempty)
+import Data.Text
+
+import Stratosphere.Values
+
+
+-- | Full data type definition for ECSTaskDefinitionKernelCapabilities. See
+-- 'ecsTaskDefinitionKernelCapabilities' for a more convenient constructor.
+data ECSTaskDefinitionKernelCapabilities =
+  ECSTaskDefinitionKernelCapabilities
+  { _eCSTaskDefinitionKernelCapabilitiesAdd :: Maybe (ValList Text)
+  , _eCSTaskDefinitionKernelCapabilitiesDrop :: Maybe (ValList Text)
+  } deriving (Show, Eq)
+
+instance ToJSON ECSTaskDefinitionKernelCapabilities where
+  toJSON ECSTaskDefinitionKernelCapabilities{..} =
+    object $
+    catMaybes
+    [ fmap (("Add",) . toJSON) _eCSTaskDefinitionKernelCapabilitiesAdd
+    , fmap (("Drop",) . toJSON) _eCSTaskDefinitionKernelCapabilitiesDrop
+    ]
+
+instance FromJSON ECSTaskDefinitionKernelCapabilities where
+  parseJSON (Object obj) =
+    ECSTaskDefinitionKernelCapabilities <$>
+      (obj .:? "Add") <*>
+      (obj .:? "Drop")
+  parseJSON _ = mempty
+
+-- | Constructor for 'ECSTaskDefinitionKernelCapabilities' containing required
+-- fields as arguments.
+ecsTaskDefinitionKernelCapabilities
+  :: ECSTaskDefinitionKernelCapabilities
+ecsTaskDefinitionKernelCapabilities  =
+  ECSTaskDefinitionKernelCapabilities
+  { _eCSTaskDefinitionKernelCapabilitiesAdd = Nothing
+  , _eCSTaskDefinitionKernelCapabilitiesDrop = Nothing
+  }
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-kernelcapabilities.html#cfn-ecs-taskdefinition-kernelcapabilities-add
+ecstdkcAdd :: Lens' ECSTaskDefinitionKernelCapabilities (Maybe (ValList Text))
+ecstdkcAdd = lens _eCSTaskDefinitionKernelCapabilitiesAdd (\s a -> s { _eCSTaskDefinitionKernelCapabilitiesAdd = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-kernelcapabilities.html#cfn-ecs-taskdefinition-kernelcapabilities-drop
+ecstdkcDrop :: Lens' ECSTaskDefinitionKernelCapabilities (Maybe (ValList Text))
+ecstdkcDrop = lens _eCSTaskDefinitionKernelCapabilitiesDrop (\s a -> s { _eCSTaskDefinitionKernelCapabilitiesDrop = a })
diff --git a/library-gen/Stratosphere/ResourceProperties/ECSTaskDefinitionLinuxParameters.hs b/library-gen/Stratosphere/ResourceProperties/ECSTaskDefinitionLinuxParameters.hs
new file mode 100644
--- /dev/null
+++ b/library-gen/Stratosphere/ResourceProperties/ECSTaskDefinitionLinuxParameters.hs
@@ -0,0 +1,66 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE TupleSections #-}
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-linuxparameters.html
+
+module Stratosphere.ResourceProperties.ECSTaskDefinitionLinuxParameters where
+
+import Control.Lens hiding ((.=))
+import Data.Aeson
+import Data.Maybe (catMaybes)
+import Data.Monoid (mempty)
+import Data.Text
+
+import Stratosphere.Values
+import Stratosphere.ResourceProperties.ECSTaskDefinitionKernelCapabilities
+import Stratosphere.ResourceProperties.ECSTaskDefinitionDevice
+
+-- | Full data type definition for ECSTaskDefinitionLinuxParameters. See
+-- 'ecsTaskDefinitionLinuxParameters' for a more convenient constructor.
+data ECSTaskDefinitionLinuxParameters =
+  ECSTaskDefinitionLinuxParameters
+  { _eCSTaskDefinitionLinuxParametersCapabilities :: Maybe ECSTaskDefinitionKernelCapabilities
+  , _eCSTaskDefinitionLinuxParametersDevices :: Maybe [ECSTaskDefinitionDevice]
+  , _eCSTaskDefinitionLinuxParametersInitProcessEnabled :: Maybe (Val Bool)
+  } deriving (Show, Eq)
+
+instance ToJSON ECSTaskDefinitionLinuxParameters where
+  toJSON ECSTaskDefinitionLinuxParameters{..} =
+    object $
+    catMaybes
+    [ fmap (("Capabilities",) . toJSON) _eCSTaskDefinitionLinuxParametersCapabilities
+    , fmap (("Devices",) . toJSON) _eCSTaskDefinitionLinuxParametersDevices
+    , fmap (("InitProcessEnabled",) . toJSON . fmap Bool') _eCSTaskDefinitionLinuxParametersInitProcessEnabled
+    ]
+
+instance FromJSON ECSTaskDefinitionLinuxParameters where
+  parseJSON (Object obj) =
+    ECSTaskDefinitionLinuxParameters <$>
+      (obj .:? "Capabilities") <*>
+      (obj .:? "Devices") <*>
+      fmap (fmap (fmap unBool')) (obj .:? "InitProcessEnabled")
+  parseJSON _ = mempty
+
+-- | Constructor for 'ECSTaskDefinitionLinuxParameters' containing required
+-- fields as arguments.
+ecsTaskDefinitionLinuxParameters
+  :: ECSTaskDefinitionLinuxParameters
+ecsTaskDefinitionLinuxParameters  =
+  ECSTaskDefinitionLinuxParameters
+  { _eCSTaskDefinitionLinuxParametersCapabilities = Nothing
+  , _eCSTaskDefinitionLinuxParametersDevices = Nothing
+  , _eCSTaskDefinitionLinuxParametersInitProcessEnabled = Nothing
+  }
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-linuxparameters.html#cfn-ecs-taskdefinition-linuxparameters-capabilities
+ecstdlpCapabilities :: Lens' ECSTaskDefinitionLinuxParameters (Maybe ECSTaskDefinitionKernelCapabilities)
+ecstdlpCapabilities = lens _eCSTaskDefinitionLinuxParametersCapabilities (\s a -> s { _eCSTaskDefinitionLinuxParametersCapabilities = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-linuxparameters.html#cfn-ecs-taskdefinition-linuxparameters-devices
+ecstdlpDevices :: Lens' ECSTaskDefinitionLinuxParameters (Maybe [ECSTaskDefinitionDevice])
+ecstdlpDevices = lens _eCSTaskDefinitionLinuxParametersDevices (\s a -> s { _eCSTaskDefinitionLinuxParametersDevices = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-linuxparameters.html#cfn-ecs-taskdefinition-linuxparameters-initprocessenabled
+ecstdlpInitProcessEnabled :: Lens' ECSTaskDefinitionLinuxParameters (Maybe (Val Bool))
+ecstdlpInitProcessEnabled = lens _eCSTaskDefinitionLinuxParametersInitProcessEnabled (\s a -> s { _eCSTaskDefinitionLinuxParametersInitProcessEnabled = a })
diff --git a/library-gen/Stratosphere/ResourceProperties/ElasticBeanstalkConfigurationTemplateConfigurationOptionSetting.hs b/library-gen/Stratosphere/ResourceProperties/ElasticBeanstalkConfigurationTemplateConfigurationOptionSetting.hs
--- a/library-gen/Stratosphere/ResourceProperties/ElasticBeanstalkConfigurationTemplateConfigurationOptionSetting.hs
+++ b/library-gen/Stratosphere/ResourceProperties/ElasticBeanstalkConfigurationTemplateConfigurationOptionSetting.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE TupleSections #-}
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-option-settings.html
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-configurationtemplate-configurationoptionsetting.html
 
 module Stratosphere.ResourceProperties.ElasticBeanstalkConfigurationTemplateConfigurationOptionSetting where
 
@@ -61,18 +61,18 @@
   , _elasticBeanstalkConfigurationTemplateConfigurationOptionSettingValue = Nothing
   }
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-option-settings.html#cfn-beanstalk-optionsettings-namespace
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-configurationtemplate-configurationoptionsetting.html#cfn-elasticbeanstalk-configurationtemplate-configurationoptionsetting-namespace
 ebctcosNamespace :: Lens' ElasticBeanstalkConfigurationTemplateConfigurationOptionSetting (Val Text)
 ebctcosNamespace = lens _elasticBeanstalkConfigurationTemplateConfigurationOptionSettingNamespace (\s a -> s { _elasticBeanstalkConfigurationTemplateConfigurationOptionSettingNamespace = a })
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-option-settings.html#cfn-beanstalk-optionsettings-optionname
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-configurationtemplate-configurationoptionsetting.html#cfn-elasticbeanstalk-configurationtemplate-configurationoptionsetting-optionname
 ebctcosOptionName :: Lens' ElasticBeanstalkConfigurationTemplateConfigurationOptionSetting (Val Text)
 ebctcosOptionName = lens _elasticBeanstalkConfigurationTemplateConfigurationOptionSettingOptionName (\s a -> s { _elasticBeanstalkConfigurationTemplateConfigurationOptionSettingOptionName = a })
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-option-settings.html#cfn-elasticbeanstalk-configurationtemplate-configurationoptionsetting-resourcename
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-configurationtemplate-configurationoptionsetting.html#cfn-elasticbeanstalk-configurationtemplate-configurationoptionsetting-resourcename
 ebctcosResourceName :: Lens' ElasticBeanstalkConfigurationTemplateConfigurationOptionSetting (Maybe (Val Text))
 ebctcosResourceName = lens _elasticBeanstalkConfigurationTemplateConfigurationOptionSettingResourceName (\s a -> s { _elasticBeanstalkConfigurationTemplateConfigurationOptionSettingResourceName = a })
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-option-settings.html#cfn-beanstalk-optionsettings-value
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-configurationtemplate-configurationoptionsetting.html#cfn-elasticbeanstalk-configurationtemplate-configurationoptionsetting-value
 ebctcosValue :: Lens' ElasticBeanstalkConfigurationTemplateConfigurationOptionSetting (Maybe (Val Text))
 ebctcosValue = lens _elasticBeanstalkConfigurationTemplateConfigurationOptionSettingValue (\s a -> s { _elasticBeanstalkConfigurationTemplateConfigurationOptionSettingValue = a })
diff --git a/library-gen/Stratosphere/ResourceProperties/ElasticBeanstalkConfigurationTemplateSourceConfiguration.hs b/library-gen/Stratosphere/ResourceProperties/ElasticBeanstalkConfigurationTemplateSourceConfiguration.hs
--- a/library-gen/Stratosphere/ResourceProperties/ElasticBeanstalkConfigurationTemplateSourceConfiguration.hs
+++ b/library-gen/Stratosphere/ResourceProperties/ElasticBeanstalkConfigurationTemplateSourceConfiguration.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE TupleSections #-}
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-configurationtemplate-sourceconfiguration.html
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-configurationtemplate-sourceconfiguration.html
 
 module Stratosphere.ResourceProperties.ElasticBeanstalkConfigurationTemplateSourceConfiguration where
 
@@ -53,10 +53,10 @@
   , _elasticBeanstalkConfigurationTemplateSourceConfigurationTemplateName = templateNamearg
   }
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-configurationtemplate-sourceconfiguration.html#cfn-beanstalk-configurationtemplate-sourceconfiguration-applicationname
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-configurationtemplate-sourceconfiguration.html#cfn-elasticbeanstalk-configurationtemplate-sourceconfiguration-applicationname
 ebctscApplicationName :: Lens' ElasticBeanstalkConfigurationTemplateSourceConfiguration (Val Text)
 ebctscApplicationName = lens _elasticBeanstalkConfigurationTemplateSourceConfigurationApplicationName (\s a -> s { _elasticBeanstalkConfigurationTemplateSourceConfigurationApplicationName = a })
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-configurationtemplate-sourceconfiguration.html#cfn-beanstalk-configurationtemplate-sourceconfiguration-templatename
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-configurationtemplate-sourceconfiguration.html#cfn-elasticbeanstalk-configurationtemplate-sourceconfiguration-templatename
 ebctscTemplateName :: Lens' ElasticBeanstalkConfigurationTemplateSourceConfiguration (Val Text)
 ebctscTemplateName = lens _elasticBeanstalkConfigurationTemplateSourceConfigurationTemplateName (\s a -> s { _elasticBeanstalkConfigurationTemplateSourceConfigurationTemplateName = a })
diff --git a/library-gen/Stratosphere/ResourceProperties/ElasticsearchDomainVPCOptions.hs b/library-gen/Stratosphere/ResourceProperties/ElasticsearchDomainVPCOptions.hs
new file mode 100644
--- /dev/null
+++ b/library-gen/Stratosphere/ResourceProperties/ElasticsearchDomainVPCOptions.hs
@@ -0,0 +1,57 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE TupleSections #-}
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-vpcoptions.html
+
+module Stratosphere.ResourceProperties.ElasticsearchDomainVPCOptions where
+
+import Control.Lens hiding ((.=))
+import Data.Aeson
+import Data.Maybe (catMaybes)
+import Data.Monoid (mempty)
+import Data.Text
+
+import Stratosphere.Values
+
+
+-- | Full data type definition for ElasticsearchDomainVPCOptions. See
+-- 'elasticsearchDomainVPCOptions' for a more convenient constructor.
+data ElasticsearchDomainVPCOptions =
+  ElasticsearchDomainVPCOptions
+  { _elasticsearchDomainVPCOptionsSecurityGroupIds :: Maybe (ValList Text)
+  , _elasticsearchDomainVPCOptionsSubnetIds :: Maybe (ValList Text)
+  } deriving (Show, Eq)
+
+instance ToJSON ElasticsearchDomainVPCOptions where
+  toJSON ElasticsearchDomainVPCOptions{..} =
+    object $
+    catMaybes
+    [ fmap (("SecurityGroupIds",) . toJSON) _elasticsearchDomainVPCOptionsSecurityGroupIds
+    , fmap (("SubnetIds",) . toJSON) _elasticsearchDomainVPCOptionsSubnetIds
+    ]
+
+instance FromJSON ElasticsearchDomainVPCOptions where
+  parseJSON (Object obj) =
+    ElasticsearchDomainVPCOptions <$>
+      (obj .:? "SecurityGroupIds") <*>
+      (obj .:? "SubnetIds")
+  parseJSON _ = mempty
+
+-- | Constructor for 'ElasticsearchDomainVPCOptions' containing required
+-- fields as arguments.
+elasticsearchDomainVPCOptions
+  :: ElasticsearchDomainVPCOptions
+elasticsearchDomainVPCOptions  =
+  ElasticsearchDomainVPCOptions
+  { _elasticsearchDomainVPCOptionsSecurityGroupIds = Nothing
+  , _elasticsearchDomainVPCOptionsSubnetIds = Nothing
+  }
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-vpcoptions.html#cfn-elasticsearch-domain-vpcoptions-securitygroupids
+edvpcoSecurityGroupIds :: Lens' ElasticsearchDomainVPCOptions (Maybe (ValList Text))
+edvpcoSecurityGroupIds = lens _elasticsearchDomainVPCOptionsSecurityGroupIds (\s a -> s { _elasticsearchDomainVPCOptionsSecurityGroupIds = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-vpcoptions.html#cfn-elasticsearch-domain-vpcoptions-subnetids
+edvpcoSubnetIds :: Lens' ElasticsearchDomainVPCOptions (Maybe (ValList Text))
+edvpcoSubnetIds = lens _elasticsearchDomainVPCOptionsSubnetIds (\s a -> s { _elasticsearchDomainVPCOptionsSubnetIds = a })
diff --git a/library-gen/Stratosphere/ResourceProperties/LambdaAliasAliasRoutingConfiguration.hs b/library-gen/Stratosphere/ResourceProperties/LambdaAliasAliasRoutingConfiguration.hs
deleted file mode 100644
--- a/library-gen/Stratosphere/ResourceProperties/LambdaAliasAliasRoutingConfiguration.hs
+++ /dev/null
@@ -1,50 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE TupleSections #-}
-
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-alias-aliasroutingconfiguration.html
-
-module Stratosphere.ResourceProperties.LambdaAliasAliasRoutingConfiguration where
-
-import Control.Lens hiding ((.=))
-import Data.Aeson
-import Data.Maybe (catMaybes)
-import Data.Monoid (mempty)
-import Data.Text
-
-import Stratosphere.Values
-import Stratosphere.ResourceProperties.LambdaAliasVersionWeight
-
--- | Full data type definition for LambdaAliasAliasRoutingConfiguration. See
--- 'lambdaAliasAliasRoutingConfiguration' for a more convenient constructor.
-data LambdaAliasAliasRoutingConfiguration =
-  LambdaAliasAliasRoutingConfiguration
-  { _lambdaAliasAliasRoutingConfigurationAdditionalVersionWeights :: [LambdaAliasVersionWeight]
-  } deriving (Show, Eq)
-
-instance ToJSON LambdaAliasAliasRoutingConfiguration where
-  toJSON LambdaAliasAliasRoutingConfiguration{..} =
-    object $
-    catMaybes
-    [ (Just . ("AdditionalVersionWeights",) . toJSON) _lambdaAliasAliasRoutingConfigurationAdditionalVersionWeights
-    ]
-
-instance FromJSON LambdaAliasAliasRoutingConfiguration where
-  parseJSON (Object obj) =
-    LambdaAliasAliasRoutingConfiguration <$>
-      (obj .: "AdditionalVersionWeights")
-  parseJSON _ = mempty
-
--- | Constructor for 'LambdaAliasAliasRoutingConfiguration' containing
--- required fields as arguments.
-lambdaAliasAliasRoutingConfiguration
-  :: [LambdaAliasVersionWeight] -- ^ 'laarcAdditionalVersionWeights'
-  -> LambdaAliasAliasRoutingConfiguration
-lambdaAliasAliasRoutingConfiguration additionalVersionWeightsarg =
-  LambdaAliasAliasRoutingConfiguration
-  { _lambdaAliasAliasRoutingConfigurationAdditionalVersionWeights = additionalVersionWeightsarg
-  }
-
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-alias-aliasroutingconfiguration.html#cfn-lambda-alias-aliasroutingconfiguration-additionalversionweights
-laarcAdditionalVersionWeights :: Lens' LambdaAliasAliasRoutingConfiguration [LambdaAliasVersionWeight]
-laarcAdditionalVersionWeights = lens _lambdaAliasAliasRoutingConfigurationAdditionalVersionWeights (\s a -> s { _lambdaAliasAliasRoutingConfigurationAdditionalVersionWeights = a })
diff --git a/library-gen/Stratosphere/ResourceProperties/LambdaAliasVersionWeight.hs b/library-gen/Stratosphere/ResourceProperties/LambdaAliasVersionWeight.hs
deleted file mode 100644
--- a/library-gen/Stratosphere/ResourceProperties/LambdaAliasVersionWeight.hs
+++ /dev/null
@@ -1,59 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE TupleSections #-}
-
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-alias-versionweight.html
-
-module Stratosphere.ResourceProperties.LambdaAliasVersionWeight where
-
-import Control.Lens hiding ((.=))
-import Data.Aeson
-import Data.Maybe (catMaybes)
-import Data.Monoid (mempty)
-import Data.Text
-
-import Stratosphere.Values
-
-
--- | Full data type definition for LambdaAliasVersionWeight. See
--- 'lambdaAliasVersionWeight' for a more convenient constructor.
-data LambdaAliasVersionWeight =
-  LambdaAliasVersionWeight
-  { _lambdaAliasVersionWeightFunctionVersion :: Val Text
-  , _lambdaAliasVersionWeightFunctionWeight :: Val Double
-  } deriving (Show, Eq)
-
-instance ToJSON LambdaAliasVersionWeight where
-  toJSON LambdaAliasVersionWeight{..} =
-    object $
-    catMaybes
-    [ (Just . ("FunctionVersion",) . toJSON) _lambdaAliasVersionWeightFunctionVersion
-    , (Just . ("FunctionWeight",) . toJSON . fmap Double') _lambdaAliasVersionWeightFunctionWeight
-    ]
-
-instance FromJSON LambdaAliasVersionWeight where
-  parseJSON (Object obj) =
-    LambdaAliasVersionWeight <$>
-      (obj .: "FunctionVersion") <*>
-      fmap (fmap unDouble') (obj .: "FunctionWeight")
-  parseJSON _ = mempty
-
--- | Constructor for 'LambdaAliasVersionWeight' containing required fields as
--- arguments.
-lambdaAliasVersionWeight
-  :: Val Text -- ^ 'lavwFunctionVersion'
-  -> Val Double -- ^ 'lavwFunctionWeight'
-  -> LambdaAliasVersionWeight
-lambdaAliasVersionWeight functionVersionarg functionWeightarg =
-  LambdaAliasVersionWeight
-  { _lambdaAliasVersionWeightFunctionVersion = functionVersionarg
-  , _lambdaAliasVersionWeightFunctionWeight = functionWeightarg
-  }
-
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-alias-versionweight.html#cfn-lambda-alias-versionweight-functionversion
-lavwFunctionVersion :: Lens' LambdaAliasVersionWeight (Val Text)
-lavwFunctionVersion = lens _lambdaAliasVersionWeightFunctionVersion (\s a -> s { _lambdaAliasVersionWeightFunctionVersion = a })
-
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-alias-versionweight.html#cfn-lambda-alias-versionweight-functionweight
-lavwFunctionWeight :: Lens' LambdaAliasVersionWeight (Val Double)
-lavwFunctionWeight = lens _lambdaAliasVersionWeightFunctionWeight (\s a -> s { _lambdaAliasVersionWeightFunctionWeight = a })
diff --git a/library-gen/Stratosphere/ResourceProperties/Route53HostedZoneQueryLoggingConfig.hs b/library-gen/Stratosphere/ResourceProperties/Route53HostedZoneQueryLoggingConfig.hs
new file mode 100644
--- /dev/null
+++ b/library-gen/Stratosphere/ResourceProperties/Route53HostedZoneQueryLoggingConfig.hs
@@ -0,0 +1,50 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE TupleSections #-}
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-queryloggingconfig.html
+
+module Stratosphere.ResourceProperties.Route53HostedZoneQueryLoggingConfig where
+
+import Control.Lens hiding ((.=))
+import Data.Aeson
+import Data.Maybe (catMaybes)
+import Data.Monoid (mempty)
+import Data.Text
+
+import Stratosphere.Values
+
+
+-- | Full data type definition for Route53HostedZoneQueryLoggingConfig. See
+-- 'route53HostedZoneQueryLoggingConfig' for a more convenient constructor.
+data Route53HostedZoneQueryLoggingConfig =
+  Route53HostedZoneQueryLoggingConfig
+  { _route53HostedZoneQueryLoggingConfigCloudWatchLogsLogGroupArn :: Val Text
+  } deriving (Show, Eq)
+
+instance ToJSON Route53HostedZoneQueryLoggingConfig where
+  toJSON Route53HostedZoneQueryLoggingConfig{..} =
+    object $
+    catMaybes
+    [ (Just . ("CloudWatchLogsLogGroupArn",) . toJSON) _route53HostedZoneQueryLoggingConfigCloudWatchLogsLogGroupArn
+    ]
+
+instance FromJSON Route53HostedZoneQueryLoggingConfig where
+  parseJSON (Object obj) =
+    Route53HostedZoneQueryLoggingConfig <$>
+      (obj .: "CloudWatchLogsLogGroupArn")
+  parseJSON _ = mempty
+
+-- | Constructor for 'Route53HostedZoneQueryLoggingConfig' containing required
+-- fields as arguments.
+route53HostedZoneQueryLoggingConfig
+  :: Val Text -- ^ 'rhzqlcCloudWatchLogsLogGroupArn'
+  -> Route53HostedZoneQueryLoggingConfig
+route53HostedZoneQueryLoggingConfig cloudWatchLogsLogGroupArnarg =
+  Route53HostedZoneQueryLoggingConfig
+  { _route53HostedZoneQueryLoggingConfigCloudWatchLogsLogGroupArn = cloudWatchLogsLogGroupArnarg
+  }
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-queryloggingconfig.html#cfn-route53-hostedzone-queryloggingconfig-cloudwatchlogsloggrouparn
+rhzqlcCloudWatchLogsLogGroupArn :: Lens' Route53HostedZoneQueryLoggingConfig (Val Text)
+rhzqlcCloudWatchLogsLogGroupArn = lens _route53HostedZoneQueryLoggingConfigCloudWatchLogsLogGroupArn (\s a -> s { _route53HostedZoneQueryLoggingConfigCloudWatchLogsLogGroupArn = a })
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
@@ -285,14 +285,18 @@
 import Stratosphere.ResourceProperties.ApiGatewayDeploymentMethodSetting as X
 import Stratosphere.ResourceProperties.ApiGatewayDeploymentStageDescription as X
 import Stratosphere.ResourceProperties.ApiGatewayDocumentationPartLocation as X
+import Stratosphere.ResourceProperties.ApiGatewayDomainNameEndpointConfiguration as X
 import Stratosphere.ResourceProperties.ApiGatewayMethodIntegration as X
 import Stratosphere.ResourceProperties.ApiGatewayMethodIntegrationResponse as X
 import Stratosphere.ResourceProperties.ApiGatewayMethodMethodResponse as X
+import Stratosphere.ResourceProperties.ApiGatewayRestApiEndpointConfiguration as X
 import Stratosphere.ResourceProperties.ApiGatewayRestApiS3Location as X
 import Stratosphere.ResourceProperties.ApiGatewayStageMethodSetting as X
 import Stratosphere.ResourceProperties.ApiGatewayUsagePlanApiStage as X
 import Stratosphere.ResourceProperties.ApiGatewayUsagePlanQuotaSettings as X
 import Stratosphere.ResourceProperties.ApiGatewayUsagePlanThrottleSettings as X
+import Stratosphere.ResourceProperties.ApplicationAutoScalingScalableTargetScalableTargetAction as X
+import Stratosphere.ResourceProperties.ApplicationAutoScalingScalableTargetScheduledAction as X
 import Stratosphere.ResourceProperties.ApplicationAutoScalingScalingPolicyCustomizedMetricSpecification as X
 import Stratosphere.ResourceProperties.ApplicationAutoScalingScalingPolicyMetricDimension as X
 import Stratosphere.ResourceProperties.ApplicationAutoScalingScalingPolicyPredefinedMetricSpecification as X
@@ -448,14 +452,18 @@
 import Stratosphere.ResourceProperties.EC2SpotFleetSpotFleetRequestConfigData as X
 import Stratosphere.ResourceProperties.EC2SpotFleetSpotPlacement as X
 import Stratosphere.ResourceProperties.EC2VPNConnectionVpnTunnelOptionsSpecification as X
+import Stratosphere.ResourceProperties.ECRRepositoryLifecyclePolicy as X
 import Stratosphere.ResourceProperties.ECSServiceDeploymentConfiguration as X
 import Stratosphere.ResourceProperties.ECSServiceLoadBalancer as X
 import Stratosphere.ResourceProperties.ECSServicePlacementConstraint as X
 import Stratosphere.ResourceProperties.ECSServicePlacementStrategy as X
 import Stratosphere.ResourceProperties.ECSTaskDefinitionContainerDefinition as X
+import Stratosphere.ResourceProperties.ECSTaskDefinitionDevice as X
 import Stratosphere.ResourceProperties.ECSTaskDefinitionHostEntry as X
 import Stratosphere.ResourceProperties.ECSTaskDefinitionHostVolumeProperties as X
+import Stratosphere.ResourceProperties.ECSTaskDefinitionKernelCapabilities as X
 import Stratosphere.ResourceProperties.ECSTaskDefinitionKeyValuePair as X
+import Stratosphere.ResourceProperties.ECSTaskDefinitionLinuxParameters as X
 import Stratosphere.ResourceProperties.ECSTaskDefinitionLogConfiguration as X
 import Stratosphere.ResourceProperties.ECSTaskDefinitionMountPoint as X
 import Stratosphere.ResourceProperties.ECSTaskDefinitionPortMapping as X
@@ -538,6 +546,7 @@
 import Stratosphere.ResourceProperties.ElasticsearchDomainEBSOptions as X
 import Stratosphere.ResourceProperties.ElasticsearchDomainElasticsearchClusterConfig as X
 import Stratosphere.ResourceProperties.ElasticsearchDomainSnapshotOptions as X
+import Stratosphere.ResourceProperties.ElasticsearchDomainVPCOptions as X
 import Stratosphere.ResourceProperties.EventsRuleEcsParameters as X
 import Stratosphere.ResourceProperties.EventsRuleInputTransformer as X
 import Stratosphere.ResourceProperties.EventsRuleKinesisParameters as X
@@ -633,8 +642,6 @@
 import Stratosphere.ResourceProperties.KinesisFirehoseDeliveryStreamProcessorParameter as X
 import Stratosphere.ResourceProperties.KinesisFirehoseDeliveryStreamRedshiftDestinationConfiguration as X
 import Stratosphere.ResourceProperties.KinesisFirehoseDeliveryStreamS3DestinationConfiguration as X
-import Stratosphere.ResourceProperties.LambdaAliasAliasRoutingConfiguration as X
-import Stratosphere.ResourceProperties.LambdaAliasVersionWeight as X
 import Stratosphere.ResourceProperties.LambdaFunctionCode as X
 import Stratosphere.ResourceProperties.LambdaFunctionDeadLetterConfig as X
 import Stratosphere.ResourceProperties.LambdaFunctionEnvironment as X
@@ -669,6 +676,7 @@
 import Stratosphere.ResourceProperties.Route53HealthCheckHealthCheckTag as X
 import Stratosphere.ResourceProperties.Route53HostedZoneHostedZoneConfig as X
 import Stratosphere.ResourceProperties.Route53HostedZoneHostedZoneTag as X
+import Stratosphere.ResourceProperties.Route53HostedZoneQueryLoggingConfig as X
 import Stratosphere.ResourceProperties.Route53HostedZoneVPC as X
 import Stratosphere.ResourceProperties.Route53RecordSetAliasTarget as X
 import Stratosphere.ResourceProperties.Route53RecordSetGeoLocation as X
diff --git a/library-gen/Stratosphere/Resources/ApiGatewayApiKey.hs b/library-gen/Stratosphere/Resources/ApiGatewayApiKey.hs
--- a/library-gen/Stratosphere/Resources/ApiGatewayApiKey.hs
+++ b/library-gen/Stratosphere/Resources/ApiGatewayApiKey.hs
@@ -19,8 +19,10 @@
 -- for a more convenient constructor.
 data ApiGatewayApiKey =
   ApiGatewayApiKey
-  { _apiGatewayApiKeyDescription :: Maybe (Val Text)
+  { _apiGatewayApiKeyCustomerId :: Maybe (Val Text)
+  , _apiGatewayApiKeyDescription :: Maybe (Val Text)
   , _apiGatewayApiKeyEnabled :: Maybe (Val Bool)
+  , _apiGatewayApiKeyGenerateDistinctId :: Maybe (Val Bool)
   , _apiGatewayApiKeyName :: Maybe (Val Text)
   , _apiGatewayApiKeyStageKeys :: Maybe [ApiGatewayApiKeyStageKey]
   } deriving (Show, Eq)
@@ -29,8 +31,10 @@
   toJSON ApiGatewayApiKey{..} =
     object $
     catMaybes
-    [ fmap (("Description",) . toJSON) _apiGatewayApiKeyDescription
+    [ fmap (("CustomerId",) . toJSON) _apiGatewayApiKeyCustomerId
+    , fmap (("Description",) . toJSON) _apiGatewayApiKeyDescription
     , fmap (("Enabled",) . toJSON . fmap Bool') _apiGatewayApiKeyEnabled
+    , fmap (("GenerateDistinctId",) . toJSON . fmap Bool') _apiGatewayApiKeyGenerateDistinctId
     , fmap (("Name",) . toJSON) _apiGatewayApiKeyName
     , fmap (("StageKeys",) . toJSON) _apiGatewayApiKeyStageKeys
     ]
@@ -38,8 +42,10 @@
 instance FromJSON ApiGatewayApiKey where
   parseJSON (Object obj) =
     ApiGatewayApiKey <$>
+      (obj .:? "CustomerId") <*>
       (obj .:? "Description") <*>
       fmap (fmap (fmap unBool')) (obj .:? "Enabled") <*>
+      fmap (fmap (fmap unBool')) (obj .:? "GenerateDistinctId") <*>
       (obj .:? "Name") <*>
       (obj .:? "StageKeys")
   parseJSON _ = mempty
@@ -50,24 +56,34 @@
   :: ApiGatewayApiKey
 apiGatewayApiKey  =
   ApiGatewayApiKey
-  { _apiGatewayApiKeyDescription = Nothing
+  { _apiGatewayApiKeyCustomerId = Nothing
+  , _apiGatewayApiKeyDescription = Nothing
   , _apiGatewayApiKeyEnabled = Nothing
+  , _apiGatewayApiKeyGenerateDistinctId = Nothing
   , _apiGatewayApiKeyName = Nothing
   , _apiGatewayApiKeyStageKeys = Nothing
   }
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apigateway-apikey-description
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apikey-customerid
+agakCustomerId :: Lens' ApiGatewayApiKey (Maybe (Val Text))
+agakCustomerId = lens _apiGatewayApiKeyCustomerId (\s a -> s { _apiGatewayApiKeyCustomerId = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apikey-description
 agakDescription :: Lens' ApiGatewayApiKey (Maybe (Val Text))
 agakDescription = lens _apiGatewayApiKeyDescription (\s a -> s { _apiGatewayApiKeyDescription = a })
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apigateway-apikey-enabled
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apikey-enabled
 agakEnabled :: Lens' ApiGatewayApiKey (Maybe (Val Bool))
 agakEnabled = lens _apiGatewayApiKeyEnabled (\s a -> s { _apiGatewayApiKeyEnabled = a })
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apigateway-apikey-name
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apikey-generatedistinctid
+agakGenerateDistinctId :: Lens' ApiGatewayApiKey (Maybe (Val Bool))
+agakGenerateDistinctId = lens _apiGatewayApiKeyGenerateDistinctId (\s a -> s { _apiGatewayApiKeyGenerateDistinctId = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apikey-name
 agakName :: Lens' ApiGatewayApiKey (Maybe (Val Text))
 agakName = lens _apiGatewayApiKeyName (\s a -> s { _apiGatewayApiKeyName = a })
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apigateway-apikey-stagekeys
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apikey-stagekeys
 agakStageKeys :: Lens' ApiGatewayApiKey (Maybe [ApiGatewayApiKeyStageKey])
 agakStageKeys = lens _apiGatewayApiKeyStageKeys (\s a -> s { _apiGatewayApiKeyStageKeys = a })
diff --git a/library-gen/Stratosphere/Resources/ApiGatewayDomainName.hs b/library-gen/Stratosphere/Resources/ApiGatewayDomainName.hs
--- a/library-gen/Stratosphere/Resources/ApiGatewayDomainName.hs
+++ b/library-gen/Stratosphere/Resources/ApiGatewayDomainName.hs
@@ -13,47 +13,62 @@
 import Data.Text
 
 import Stratosphere.Values
-
+import Stratosphere.ResourceProperties.ApiGatewayDomainNameEndpointConfiguration
 
 -- | Full data type definition for ApiGatewayDomainName. See
 -- 'apiGatewayDomainName' for a more convenient constructor.
 data ApiGatewayDomainName =
   ApiGatewayDomainName
-  { _apiGatewayDomainNameCertificateArn :: Val Text
+  { _apiGatewayDomainNameCertificateArn :: Maybe (Val Text)
   , _apiGatewayDomainNameDomainName :: Val Text
+  , _apiGatewayDomainNameEndpointConfiguration :: Maybe ApiGatewayDomainNameEndpointConfiguration
+  , _apiGatewayDomainNameRegionalCertificateArn :: Maybe (Val Text)
   } deriving (Show, Eq)
 
 instance ToJSON ApiGatewayDomainName where
   toJSON ApiGatewayDomainName{..} =
     object $
     catMaybes
-    [ (Just . ("CertificateArn",) . toJSON) _apiGatewayDomainNameCertificateArn
+    [ fmap (("CertificateArn",) . toJSON) _apiGatewayDomainNameCertificateArn
     , (Just . ("DomainName",) . toJSON) _apiGatewayDomainNameDomainName
+    , fmap (("EndpointConfiguration",) . toJSON) _apiGatewayDomainNameEndpointConfiguration
+    , fmap (("RegionalCertificateArn",) . toJSON) _apiGatewayDomainNameRegionalCertificateArn
     ]
 
 instance FromJSON ApiGatewayDomainName where
   parseJSON (Object obj) =
     ApiGatewayDomainName <$>
-      (obj .: "CertificateArn") <*>
-      (obj .: "DomainName")
+      (obj .:? "CertificateArn") <*>
+      (obj .: "DomainName") <*>
+      (obj .:? "EndpointConfiguration") <*>
+      (obj .:? "RegionalCertificateArn")
   parseJSON _ = mempty
 
 -- | Constructor for 'ApiGatewayDomainName' containing required fields as
 -- arguments.
 apiGatewayDomainName
-  :: Val Text -- ^ 'agdnCertificateArn'
-  -> Val Text -- ^ 'agdnDomainName'
+  :: Val Text -- ^ 'agdnDomainName'
   -> ApiGatewayDomainName
-apiGatewayDomainName certificateArnarg domainNamearg =
+apiGatewayDomainName domainNamearg =
   ApiGatewayDomainName
-  { _apiGatewayDomainNameCertificateArn = certificateArnarg
+  { _apiGatewayDomainNameCertificateArn = Nothing
   , _apiGatewayDomainNameDomainName = domainNamearg
+  , _apiGatewayDomainNameEndpointConfiguration = Nothing
+  , _apiGatewayDomainNameRegionalCertificateArn = Nothing
   }
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainname.html#cfn-apigateway-domainname-certificatearn
-agdnCertificateArn :: Lens' ApiGatewayDomainName (Val Text)
+agdnCertificateArn :: Lens' ApiGatewayDomainName (Maybe (Val Text))
 agdnCertificateArn = lens _apiGatewayDomainNameCertificateArn (\s a -> s { _apiGatewayDomainNameCertificateArn = a })
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainname.html#cfn-apigateway-domainname-domainname
 agdnDomainName :: Lens' ApiGatewayDomainName (Val Text)
 agdnDomainName = lens _apiGatewayDomainNameDomainName (\s a -> s { _apiGatewayDomainNameDomainName = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainname.html#cfn-apigateway-domainname-endpointconfiguration
+agdnEndpointConfiguration :: Lens' ApiGatewayDomainName (Maybe ApiGatewayDomainNameEndpointConfiguration)
+agdnEndpointConfiguration = lens _apiGatewayDomainNameEndpointConfiguration (\s a -> s { _apiGatewayDomainNameEndpointConfiguration = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainname.html#cfn-apigateway-domainname-regionalcertificatearn
+agdnRegionalCertificateArn :: Lens' ApiGatewayDomainName (Maybe (Val Text))
+agdnRegionalCertificateArn = lens _apiGatewayDomainNameRegionalCertificateArn (\s a -> s { _apiGatewayDomainNameRegionalCertificateArn = a })
diff --git a/library-gen/Stratosphere/Resources/ApiGatewayRestApi.hs b/library-gen/Stratosphere/Resources/ApiGatewayRestApi.hs
--- a/library-gen/Stratosphere/Resources/ApiGatewayRestApi.hs
+++ b/library-gen/Stratosphere/Resources/ApiGatewayRestApi.hs
@@ -14,6 +14,7 @@
 
 import Stratosphere.Values
 import Stratosphere.ResourceProperties.ApiGatewayRestApiS3Location
+import Stratosphere.ResourceProperties.ApiGatewayRestApiEndpointConfiguration
 
 -- | Full data type definition for ApiGatewayRestApi. See 'apiGatewayRestApi'
 -- for a more convenient constructor.
@@ -24,6 +25,7 @@
   , _apiGatewayRestApiBodyS3Location :: Maybe ApiGatewayRestApiS3Location
   , _apiGatewayRestApiCloneFrom :: Maybe (Val Text)
   , _apiGatewayRestApiDescription :: Maybe (Val Text)
+  , _apiGatewayRestApiEndpointConfiguration :: Maybe ApiGatewayRestApiEndpointConfiguration
   , _apiGatewayRestApiFailOnWarnings :: Maybe (Val Bool)
   , _apiGatewayRestApiMode :: Maybe (Val Text)
   , _apiGatewayRestApiName :: Maybe (Val Text)
@@ -39,6 +41,7 @@
     , fmap (("BodyS3Location",) . toJSON) _apiGatewayRestApiBodyS3Location
     , fmap (("CloneFrom",) . toJSON) _apiGatewayRestApiCloneFrom
     , fmap (("Description",) . toJSON) _apiGatewayRestApiDescription
+    , fmap (("EndpointConfiguration",) . toJSON) _apiGatewayRestApiEndpointConfiguration
     , fmap (("FailOnWarnings",) . toJSON . fmap Bool') _apiGatewayRestApiFailOnWarnings
     , fmap (("Mode",) . toJSON) _apiGatewayRestApiMode
     , fmap (("Name",) . toJSON) _apiGatewayRestApiName
@@ -53,6 +56,7 @@
       (obj .:? "BodyS3Location") <*>
       (obj .:? "CloneFrom") <*>
       (obj .:? "Description") <*>
+      (obj .:? "EndpointConfiguration") <*>
       fmap (fmap (fmap unBool')) (obj .:? "FailOnWarnings") <*>
       (obj .:? "Mode") <*>
       (obj .:? "Name") <*>
@@ -70,6 +74,7 @@
   , _apiGatewayRestApiBodyS3Location = Nothing
   , _apiGatewayRestApiCloneFrom = Nothing
   , _apiGatewayRestApiDescription = Nothing
+  , _apiGatewayRestApiEndpointConfiguration = Nothing
   , _apiGatewayRestApiFailOnWarnings = Nothing
   , _apiGatewayRestApiMode = Nothing
   , _apiGatewayRestApiName = Nothing
@@ -95,6 +100,10 @@
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-description
 agraDescription :: Lens' ApiGatewayRestApi (Maybe (Val Text))
 agraDescription = lens _apiGatewayRestApiDescription (\s a -> s { _apiGatewayRestApiDescription = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-endpointconfiguration
+agraEndpointConfiguration :: Lens' ApiGatewayRestApi (Maybe ApiGatewayRestApiEndpointConfiguration)
+agraEndpointConfiguration = lens _apiGatewayRestApiEndpointConfiguration (\s a -> s { _apiGatewayRestApiEndpointConfiguration = a })
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-failonwarnings
 agraFailOnWarnings :: Lens' ApiGatewayRestApi (Maybe (Val Bool))
diff --git a/library-gen/Stratosphere/Resources/ApplicationAutoScalingScalableTarget.hs b/library-gen/Stratosphere/Resources/ApplicationAutoScalingScalableTarget.hs
--- a/library-gen/Stratosphere/Resources/ApplicationAutoScalingScalableTarget.hs
+++ b/library-gen/Stratosphere/Resources/ApplicationAutoScalingScalableTarget.hs
@@ -13,7 +13,7 @@
 import Data.Text
 
 import Stratosphere.Values
-
+import Stratosphere.ResourceProperties.ApplicationAutoScalingScalableTargetScheduledAction
 
 -- | Full data type definition for ApplicationAutoScalingScalableTarget. See
 -- 'applicationAutoScalingScalableTarget' for a more convenient constructor.
@@ -24,6 +24,7 @@
   , _applicationAutoScalingScalableTargetResourceId :: Val Text
   , _applicationAutoScalingScalableTargetRoleARN :: Val Text
   , _applicationAutoScalingScalableTargetScalableDimension :: Val Text
+  , _applicationAutoScalingScalableTargetScheduledActions :: Maybe [ApplicationAutoScalingScalableTargetScheduledAction]
   , _applicationAutoScalingScalableTargetServiceNamespace :: Val Text
   } deriving (Show, Eq)
 
@@ -36,6 +37,7 @@
     , (Just . ("ResourceId",) . toJSON) _applicationAutoScalingScalableTargetResourceId
     , (Just . ("RoleARN",) . toJSON) _applicationAutoScalingScalableTargetRoleARN
     , (Just . ("ScalableDimension",) . toJSON) _applicationAutoScalingScalableTargetScalableDimension
+    , fmap (("ScheduledActions",) . toJSON) _applicationAutoScalingScalableTargetScheduledActions
     , (Just . ("ServiceNamespace",) . toJSON) _applicationAutoScalingScalableTargetServiceNamespace
     ]
 
@@ -47,6 +49,7 @@
       (obj .: "ResourceId") <*>
       (obj .: "RoleARN") <*>
       (obj .: "ScalableDimension") <*>
+      (obj .:? "ScheduledActions") <*>
       (obj .: "ServiceNamespace")
   parseJSON _ = mempty
 
@@ -67,6 +70,7 @@
   , _applicationAutoScalingScalableTargetResourceId = resourceIdarg
   , _applicationAutoScalingScalableTargetRoleARN = roleARNarg
   , _applicationAutoScalingScalableTargetScalableDimension = scalableDimensionarg
+  , _applicationAutoScalingScalableTargetScheduledActions = Nothing
   , _applicationAutoScalingScalableTargetServiceNamespace = serviceNamespacearg
   }
 
@@ -89,6 +93,10 @@
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html#cfn-applicationautoscaling-scalabletarget-scalabledimension
 aasstScalableDimension :: Lens' ApplicationAutoScalingScalableTarget (Val Text)
 aasstScalableDimension = lens _applicationAutoScalingScalableTargetScalableDimension (\s a -> s { _applicationAutoScalingScalableTargetScalableDimension = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html#cfn-applicationautoscaling-scalabletarget-scheduledactions
+aasstScheduledActions :: Lens' ApplicationAutoScalingScalableTarget (Maybe [ApplicationAutoScalingScalableTargetScheduledAction])
+aasstScheduledActions = lens _applicationAutoScalingScalableTargetScheduledActions (\s a -> s { _applicationAutoScalingScalableTargetScheduledActions = a })
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html#cfn-applicationautoscaling-scalabletarget-servicenamespace
 aasstServiceNamespace :: Lens' ApplicationAutoScalingScalableTarget (Val Text)
diff --git a/library-gen/Stratosphere/Resources/ECRRepository.hs b/library-gen/Stratosphere/Resources/ECRRepository.hs
--- a/library-gen/Stratosphere/Resources/ECRRepository.hs
+++ b/library-gen/Stratosphere/Resources/ECRRepository.hs
@@ -13,13 +13,14 @@
 import Data.Text
 
 import Stratosphere.Values
-
+import Stratosphere.ResourceProperties.ECRRepositoryLifecyclePolicy
 
 -- | Full data type definition for ECRRepository. See 'ecrRepository' for a
 -- more convenient constructor.
 data ECRRepository =
   ECRRepository
-  { _eCRRepositoryRepositoryName :: Maybe (Val Text)
+  { _eCRRepositoryLifecyclePolicy :: Maybe ECRRepositoryLifecyclePolicy
+  , _eCRRepositoryRepositoryName :: Maybe (Val Text)
   , _eCRRepositoryRepositoryPolicyText :: Maybe Object
   } deriving (Show, Eq)
 
@@ -27,13 +28,15 @@
   toJSON ECRRepository{..} =
     object $
     catMaybes
-    [ fmap (("RepositoryName",) . toJSON) _eCRRepositoryRepositoryName
+    [ fmap (("LifecyclePolicy",) . toJSON) _eCRRepositoryLifecyclePolicy
+    , fmap (("RepositoryName",) . toJSON) _eCRRepositoryRepositoryName
     , fmap (("RepositoryPolicyText",) . toJSON) _eCRRepositoryRepositoryPolicyText
     ]
 
 instance FromJSON ECRRepository where
   parseJSON (Object obj) =
     ECRRepository <$>
+      (obj .:? "LifecyclePolicy") <*>
       (obj .:? "RepositoryName") <*>
       (obj .:? "RepositoryPolicyText")
   parseJSON _ = mempty
@@ -43,9 +46,14 @@
   :: ECRRepository
 ecrRepository  =
   ECRRepository
-  { _eCRRepositoryRepositoryName = Nothing
+  { _eCRRepositoryLifecyclePolicy = Nothing
+  , _eCRRepositoryRepositoryName = Nothing
   , _eCRRepositoryRepositoryPolicyText = Nothing
   }
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repository.html#cfn-ecr-repository-lifecyclepolicy
+ecrrLifecyclePolicy :: Lens' ECRRepository (Maybe ECRRepositoryLifecyclePolicy)
+ecrrLifecyclePolicy = lens _eCRRepositoryLifecyclePolicy (\s a -> s { _eCRRepositoryLifecyclePolicy = a })
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repository.html#cfn-ecr-repository-repositoryname
 ecrrRepositoryName :: Lens' ECRRepository (Maybe (Val Text))
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
@@ -29,6 +29,7 @@
   , _eMRClusterBootstrapActions :: Maybe [EMRClusterBootstrapActionConfig]
   , _eMRClusterConfigurations :: Maybe [EMRClusterConfiguration]
   , _eMRClusterCustomAmiId :: Maybe (Val Text)
+  , _eMRClusterEbsRootVolumeSize :: Maybe (Val Integer)
   , _eMRClusterInstances :: EMRClusterJobFlowInstancesConfig
   , _eMRClusterJobFlowRole :: Val Text
   , _eMRClusterLogUri :: Maybe (Val Text)
@@ -51,6 +52,7 @@
     , fmap (("BootstrapActions",) . toJSON) _eMRClusterBootstrapActions
     , fmap (("Configurations",) . toJSON) _eMRClusterConfigurations
     , fmap (("CustomAmiId",) . toJSON) _eMRClusterCustomAmiId
+    , fmap (("EbsRootVolumeSize",) . toJSON . fmap Integer') _eMRClusterEbsRootVolumeSize
     , (Just . ("Instances",) . toJSON) _eMRClusterInstances
     , (Just . ("JobFlowRole",) . toJSON) _eMRClusterJobFlowRole
     , fmap (("LogUri",) . toJSON) _eMRClusterLogUri
@@ -72,6 +74,7 @@
       (obj .:? "BootstrapActions") <*>
       (obj .:? "Configurations") <*>
       (obj .:? "CustomAmiId") <*>
+      fmap (fmap (fmap unInteger')) (obj .:? "EbsRootVolumeSize") <*>
       (obj .: "Instances") <*>
       (obj .: "JobFlowRole") <*>
       (obj .:? "LogUri") <*>
@@ -99,6 +102,7 @@
   , _eMRClusterBootstrapActions = Nothing
   , _eMRClusterConfigurations = Nothing
   , _eMRClusterCustomAmiId = Nothing
+  , _eMRClusterEbsRootVolumeSize = Nothing
   , _eMRClusterInstances = instancesarg
   , _eMRClusterJobFlowRole = jobFlowRolearg
   , _eMRClusterLogUri = Nothing
@@ -134,6 +138,10 @@
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-customamiid
 emrcCustomAmiId :: Lens' EMRCluster (Maybe (Val Text))
 emrcCustomAmiId = lens _eMRClusterCustomAmiId (\s a -> s { _eMRClusterCustomAmiId = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-ebsrootvolumesize
+emrcEbsRootVolumeSize :: Lens' EMRCluster (Maybe (Val Integer))
+emrcEbsRootVolumeSize = lens _eMRClusterEbsRootVolumeSize (\s a -> s { _eMRClusterEbsRootVolumeSize = a })
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-instances
 emrcInstances :: Lens' EMRCluster EMRClusterJobFlowInstancesConfig
diff --git a/library-gen/Stratosphere/Resources/ElastiCacheReplicationGroup.hs b/library-gen/Stratosphere/Resources/ElastiCacheReplicationGroup.hs
--- a/library-gen/Stratosphere/Resources/ElastiCacheReplicationGroup.hs
+++ b/library-gen/Stratosphere/Resources/ElastiCacheReplicationGroup.hs
@@ -20,7 +20,9 @@
 -- 'elastiCacheReplicationGroup' for a more convenient constructor.
 data ElastiCacheReplicationGroup =
   ElastiCacheReplicationGroup
-  { _elastiCacheReplicationGroupAutoMinorVersionUpgrade :: Maybe (Val Bool)
+  { _elastiCacheReplicationGroupAtRestEncryptionEnabled :: Maybe (Val Bool)
+  , _elastiCacheReplicationGroupAuthToken :: Maybe (Val Text)
+  , _elastiCacheReplicationGroupAutoMinorVersionUpgrade :: Maybe (Val Bool)
   , _elastiCacheReplicationGroupAutomaticFailoverEnabled :: Maybe (Val Bool)
   , _elastiCacheReplicationGroupCacheNodeType :: Maybe (Val Text)
   , _elastiCacheReplicationGroupCacheParameterGroupName :: Maybe (Val Text)
@@ -46,13 +48,16 @@
   , _elastiCacheReplicationGroupSnapshotWindow :: Maybe (Val Text)
   , _elastiCacheReplicationGroupSnapshottingClusterId :: Maybe (Val Text)
   , _elastiCacheReplicationGroupTags :: Maybe [Tag]
+  , _elastiCacheReplicationGroupTransitEncryptionEnabled :: Maybe (Val Bool)
   } deriving (Show, Eq)
 
 instance ToJSON ElastiCacheReplicationGroup where
   toJSON ElastiCacheReplicationGroup{..} =
     object $
     catMaybes
-    [ fmap (("AutoMinorVersionUpgrade",) . toJSON . fmap Bool') _elastiCacheReplicationGroupAutoMinorVersionUpgrade
+    [ fmap (("AtRestEncryptionEnabled",) . toJSON . fmap Bool') _elastiCacheReplicationGroupAtRestEncryptionEnabled
+    , fmap (("AuthToken",) . toJSON) _elastiCacheReplicationGroupAuthToken
+    , fmap (("AutoMinorVersionUpgrade",) . toJSON . fmap Bool') _elastiCacheReplicationGroupAutoMinorVersionUpgrade
     , fmap (("AutomaticFailoverEnabled",) . toJSON . fmap Bool') _elastiCacheReplicationGroupAutomaticFailoverEnabled
     , fmap (("CacheNodeType",) . toJSON) _elastiCacheReplicationGroupCacheNodeType
     , fmap (("CacheParameterGroupName",) . toJSON) _elastiCacheReplicationGroupCacheParameterGroupName
@@ -78,11 +83,14 @@
     , fmap (("SnapshotWindow",) . toJSON) _elastiCacheReplicationGroupSnapshotWindow
     , fmap (("SnapshottingClusterId",) . toJSON) _elastiCacheReplicationGroupSnapshottingClusterId
     , fmap (("Tags",) . toJSON) _elastiCacheReplicationGroupTags
+    , fmap (("TransitEncryptionEnabled",) . toJSON . fmap Bool') _elastiCacheReplicationGroupTransitEncryptionEnabled
     ]
 
 instance FromJSON ElastiCacheReplicationGroup where
   parseJSON (Object obj) =
     ElastiCacheReplicationGroup <$>
+      fmap (fmap (fmap unBool')) (obj .:? "AtRestEncryptionEnabled") <*>
+      (obj .:? "AuthToken") <*>
       fmap (fmap (fmap unBool')) (obj .:? "AutoMinorVersionUpgrade") <*>
       fmap (fmap (fmap unBool')) (obj .:? "AutomaticFailoverEnabled") <*>
       (obj .:? "CacheNodeType") <*>
@@ -108,7 +116,8 @@
       fmap (fmap (fmap unInteger')) (obj .:? "SnapshotRetentionLimit") <*>
       (obj .:? "SnapshotWindow") <*>
       (obj .:? "SnapshottingClusterId") <*>
-      (obj .:? "Tags")
+      (obj .:? "Tags") <*>
+      fmap (fmap (fmap unBool')) (obj .:? "TransitEncryptionEnabled")
   parseJSON _ = mempty
 
 -- | Constructor for 'ElastiCacheReplicationGroup' containing required fields
@@ -118,7 +127,9 @@
   -> ElastiCacheReplicationGroup
 elastiCacheReplicationGroup replicationGroupDescriptionarg =
   ElastiCacheReplicationGroup
-  { _elastiCacheReplicationGroupAutoMinorVersionUpgrade = Nothing
+  { _elastiCacheReplicationGroupAtRestEncryptionEnabled = Nothing
+  , _elastiCacheReplicationGroupAuthToken = Nothing
+  , _elastiCacheReplicationGroupAutoMinorVersionUpgrade = Nothing
   , _elastiCacheReplicationGroupAutomaticFailoverEnabled = Nothing
   , _elastiCacheReplicationGroupCacheNodeType = Nothing
   , _elastiCacheReplicationGroupCacheParameterGroupName = Nothing
@@ -144,8 +155,17 @@
   , _elastiCacheReplicationGroupSnapshotWindow = Nothing
   , _elastiCacheReplicationGroupSnapshottingClusterId = Nothing
   , _elastiCacheReplicationGroupTags = Nothing
+  , _elastiCacheReplicationGroupTransitEncryptionEnabled = Nothing
   }
 
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-atrestencryptionenabled
+ecrgAtRestEncryptionEnabled :: Lens' ElastiCacheReplicationGroup (Maybe (Val Bool))
+ecrgAtRestEncryptionEnabled = lens _elastiCacheReplicationGroupAtRestEncryptionEnabled (\s a -> s { _elastiCacheReplicationGroupAtRestEncryptionEnabled = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-authtoken
+ecrgAuthToken :: Lens' ElastiCacheReplicationGroup (Maybe (Val Text))
+ecrgAuthToken = lens _elastiCacheReplicationGroupAuthToken (\s a -> s { _elastiCacheReplicationGroupAuthToken = a })
+
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-autominorversionupgrade
 ecrgAutoMinorVersionUpgrade :: Lens' ElastiCacheReplicationGroup (Maybe (Val Bool))
 ecrgAutoMinorVersionUpgrade = lens _elastiCacheReplicationGroupAutoMinorVersionUpgrade (\s a -> s { _elastiCacheReplicationGroupAutoMinorVersionUpgrade = a })
@@ -249,3 +269,7 @@
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-tags
 ecrgTags :: Lens' ElastiCacheReplicationGroup (Maybe [Tag])
 ecrgTags = lens _elastiCacheReplicationGroupTags (\s a -> s { _elastiCacheReplicationGroupTags = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-transitencryptionenabled
+ecrgTransitEncryptionEnabled :: Lens' ElastiCacheReplicationGroup (Maybe (Val Bool))
+ecrgTransitEncryptionEnabled = lens _elastiCacheReplicationGroupTransitEncryptionEnabled (\s a -> s { _elastiCacheReplicationGroupTransitEncryptionEnabled = a })
diff --git a/library-gen/Stratosphere/Resources/ElasticBeanstalkConfigurationTemplate.hs b/library-gen/Stratosphere/Resources/ElasticBeanstalkConfigurationTemplate.hs
--- a/library-gen/Stratosphere/Resources/ElasticBeanstalkConfigurationTemplate.hs
+++ b/library-gen/Stratosphere/Resources/ElasticBeanstalkConfigurationTemplate.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE TupleSections #-}
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-beanstalk-configurationtemplate.html
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticbeanstalk-configurationtemplate.html
 
 module Stratosphere.Resources.ElasticBeanstalkConfigurationTemplate where
 
@@ -71,30 +71,30 @@
   , _elasticBeanstalkConfigurationTemplateSourceConfiguration = Nothing
   }
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-beanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-applicationname
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticbeanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-applicationname
 ebctApplicationName :: Lens' ElasticBeanstalkConfigurationTemplate (Val Text)
 ebctApplicationName = lens _elasticBeanstalkConfigurationTemplateApplicationName (\s a -> s { _elasticBeanstalkConfigurationTemplateApplicationName = a })
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-beanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-description
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticbeanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-description
 ebctDescription :: Lens' ElasticBeanstalkConfigurationTemplate (Maybe (Val Text))
 ebctDescription = lens _elasticBeanstalkConfigurationTemplateDescription (\s a -> s { _elasticBeanstalkConfigurationTemplateDescription = a })
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-beanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-environmentid
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticbeanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-environmentid
 ebctEnvironmentId :: Lens' ElasticBeanstalkConfigurationTemplate (Maybe (Val Text))
 ebctEnvironmentId = lens _elasticBeanstalkConfigurationTemplateEnvironmentId (\s a -> s { _elasticBeanstalkConfigurationTemplateEnvironmentId = a })
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-beanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-optionsettings
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticbeanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-optionsettings
 ebctOptionSettings :: Lens' ElasticBeanstalkConfigurationTemplate (Maybe [ElasticBeanstalkConfigurationTemplateConfigurationOptionSetting])
 ebctOptionSettings = lens _elasticBeanstalkConfigurationTemplateOptionSettings (\s a -> s { _elasticBeanstalkConfigurationTemplateOptionSettings = a })
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-beanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-platformarn
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticbeanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-platformarn
 ebctPlatformArn :: Lens' ElasticBeanstalkConfigurationTemplate (Maybe (Val Text))
 ebctPlatformArn = lens _elasticBeanstalkConfigurationTemplatePlatformArn (\s a -> s { _elasticBeanstalkConfigurationTemplatePlatformArn = a })
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-beanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-solutionstackname
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticbeanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-solutionstackname
 ebctSolutionStackName :: Lens' ElasticBeanstalkConfigurationTemplate (Maybe (Val Text))
 ebctSolutionStackName = lens _elasticBeanstalkConfigurationTemplateSolutionStackName (\s a -> s { _elasticBeanstalkConfigurationTemplateSolutionStackName = a })
 
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-beanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-sourceconfiguration
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticbeanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-sourceconfiguration
 ebctSourceConfiguration :: Lens' ElasticBeanstalkConfigurationTemplate (Maybe ElasticBeanstalkConfigurationTemplateSourceConfiguration)
 ebctSourceConfiguration = lens _elasticBeanstalkConfigurationTemplateSourceConfiguration (\s a -> s { _elasticBeanstalkConfigurationTemplateSourceConfiguration = a })
diff --git a/library-gen/Stratosphere/Resources/ElasticsearchDomain.hs b/library-gen/Stratosphere/Resources/ElasticsearchDomain.hs
--- a/library-gen/Stratosphere/Resources/ElasticsearchDomain.hs
+++ b/library-gen/Stratosphere/Resources/ElasticsearchDomain.hs
@@ -17,6 +17,7 @@
 import Stratosphere.ResourceProperties.ElasticsearchDomainElasticsearchClusterConfig
 import Stratosphere.ResourceProperties.ElasticsearchDomainSnapshotOptions
 import Stratosphere.ResourceProperties.Tag
+import Stratosphere.ResourceProperties.ElasticsearchDomainVPCOptions
 
 -- | Full data type definition for ElasticsearchDomain. See
 -- 'elasticsearchDomain' for a more convenient constructor.
@@ -30,6 +31,7 @@
   , _elasticsearchDomainElasticsearchVersion :: Maybe (Val Text)
   , _elasticsearchDomainSnapshotOptions :: Maybe ElasticsearchDomainSnapshotOptions
   , _elasticsearchDomainTags :: Maybe [Tag]
+  , _elasticsearchDomainVPCOptions :: Maybe ElasticsearchDomainVPCOptions
   } deriving (Show, Eq)
 
 instance ToJSON ElasticsearchDomain where
@@ -44,6 +46,7 @@
     , fmap (("ElasticsearchVersion",) . toJSON) _elasticsearchDomainElasticsearchVersion
     , fmap (("SnapshotOptions",) . toJSON) _elasticsearchDomainSnapshotOptions
     , fmap (("Tags",) . toJSON) _elasticsearchDomainTags
+    , fmap (("VPCOptions",) . toJSON) _elasticsearchDomainVPCOptions
     ]
 
 instance FromJSON ElasticsearchDomain where
@@ -56,7 +59,8 @@
       (obj .:? "ElasticsearchClusterConfig") <*>
       (obj .:? "ElasticsearchVersion") <*>
       (obj .:? "SnapshotOptions") <*>
-      (obj .:? "Tags")
+      (obj .:? "Tags") <*>
+      (obj .:? "VPCOptions")
   parseJSON _ = mempty
 
 -- | Constructor for 'ElasticsearchDomain' containing required fields as
@@ -73,6 +77,7 @@
   , _elasticsearchDomainElasticsearchVersion = Nothing
   , _elasticsearchDomainSnapshotOptions = Nothing
   , _elasticsearchDomainTags = Nothing
+  , _elasticsearchDomainVPCOptions = Nothing
   }
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-accesspolicies
@@ -106,3 +111,7 @@
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-tags
 edTags :: Lens' ElasticsearchDomain (Maybe [Tag])
 edTags = lens _elasticsearchDomainTags (\s a -> s { _elasticsearchDomainTags = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-vpcoptions
+edVPCOptions :: Lens' ElasticsearchDomain (Maybe ElasticsearchDomainVPCOptions)
+edVPCOptions = lens _elasticsearchDomainVPCOptions (\s a -> s { _elasticsearchDomainVPCOptions = a })
diff --git a/library-gen/Stratosphere/Resources/LambdaAlias.hs b/library-gen/Stratosphere/Resources/LambdaAlias.hs
--- a/library-gen/Stratosphere/Resources/LambdaAlias.hs
+++ b/library-gen/Stratosphere/Resources/LambdaAlias.hs
@@ -13,8 +13,8 @@
 import Data.Text
 
 import Stratosphere.Values
-import Stratosphere.ResourceProperties.LambdaAliasAliasRoutingConfiguration
 
+
 -- | Full data type definition for LambdaAlias. See 'lambdaAlias' for a more
 -- convenient constructor.
 data LambdaAlias =
@@ -23,7 +23,6 @@
   , _lambdaAliasFunctionName :: Val Text
   , _lambdaAliasFunctionVersion :: Val Text
   , _lambdaAliasName :: Val Text
-  , _lambdaAliasRoutingConfig :: Maybe LambdaAliasAliasRoutingConfiguration
   } deriving (Show, Eq)
 
 instance ToJSON LambdaAlias where
@@ -34,7 +33,6 @@
     , (Just . ("FunctionName",) . toJSON) _lambdaAliasFunctionName
     , (Just . ("FunctionVersion",) . toJSON) _lambdaAliasFunctionVersion
     , (Just . ("Name",) . toJSON) _lambdaAliasName
-    , fmap (("RoutingConfig",) . toJSON) _lambdaAliasRoutingConfig
     ]
 
 instance FromJSON LambdaAlias where
@@ -43,8 +41,7 @@
       (obj .:? "Description") <*>
       (obj .: "FunctionName") <*>
       (obj .: "FunctionVersion") <*>
-      (obj .: "Name") <*>
-      (obj .:? "RoutingConfig")
+      (obj .: "Name")
   parseJSON _ = mempty
 
 -- | Constructor for 'LambdaAlias' containing required fields as arguments.
@@ -59,7 +56,6 @@
   , _lambdaAliasFunctionName = functionNamearg
   , _lambdaAliasFunctionVersion = functionVersionarg
   , _lambdaAliasName = namearg
-  , _lambdaAliasRoutingConfig = Nothing
   }
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-alias.html#cfn-lambda-alias-description
@@ -77,7 +73,3 @@
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-alias.html#cfn-lambda-alias-name
 laName :: Lens' LambdaAlias (Val Text)
 laName = lens _lambdaAliasName (\s a -> s { _lambdaAliasName = a })
-
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-alias.html#cfn-lambda-alias-routingconfig
-laRoutingConfig :: Lens' LambdaAlias (Maybe LambdaAliasAliasRoutingConfiguration)
-laRoutingConfig = lens _lambdaAliasRoutingConfig (\s a -> s { _lambdaAliasRoutingConfig = a })
diff --git a/library-gen/Stratosphere/Resources/RDSDBCluster.hs b/library-gen/Stratosphere/Resources/RDSDBCluster.hs
--- a/library-gen/Stratosphere/Resources/RDSDBCluster.hs
+++ b/library-gen/Stratosphere/Resources/RDSDBCluster.hs
@@ -19,7 +19,7 @@
 -- convenient constructor.
 data RDSDBCluster =
   RDSDBCluster
-  { _rDSDBClusterAvailabilityZones :: Maybe (Val Text)
+  { _rDSDBClusterAvailabilityZones :: Maybe (ValList Text)
   , _rDSDBClusterBackupRetentionPeriod :: Maybe (Val Integer)
   , _rDSDBClusterDBClusterParameterGroupName :: Maybe (Val Text)
   , _rDSDBClusterDBSubnetGroupName :: Maybe (Val Text)
@@ -113,7 +113,7 @@
   }
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-availabilityzones
-rdsdbcAvailabilityZones :: Lens' RDSDBCluster (Maybe (Val Text))
+rdsdbcAvailabilityZones :: Lens' RDSDBCluster (Maybe (ValList Text))
 rdsdbcAvailabilityZones = lens _rDSDBClusterAvailabilityZones (\s a -> s { _rDSDBClusterAvailabilityZones = a })
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-backuprententionperiod
diff --git a/library-gen/Stratosphere/Resources/RDSDBInstance.hs b/library-gen/Stratosphere/Resources/RDSDBInstance.hs
--- a/library-gen/Stratosphere/Resources/RDSDBInstance.hs
+++ b/library-gen/Stratosphere/Resources/RDSDBInstance.hs
@@ -52,6 +52,7 @@
   , _rDSDBInstancePreferredMaintenanceWindow :: Maybe (Val Text)
   , _rDSDBInstancePubliclyAccessible :: Maybe (Val Bool)
   , _rDSDBInstanceSourceDBInstanceIdentifier :: Maybe (Val Text)
+  , _rDSDBInstanceSourceRegion :: Maybe (Val Text)
   , _rDSDBInstanceStorageEncrypted :: Maybe (Val Bool)
   , _rDSDBInstanceStorageType :: Maybe (Val Text)
   , _rDSDBInstanceTags :: Maybe [Tag]
@@ -96,6 +97,7 @@
     , fmap (("PreferredMaintenanceWindow",) . toJSON) _rDSDBInstancePreferredMaintenanceWindow
     , fmap (("PubliclyAccessible",) . toJSON . fmap Bool') _rDSDBInstancePubliclyAccessible
     , fmap (("SourceDBInstanceIdentifier",) . toJSON) _rDSDBInstanceSourceDBInstanceIdentifier
+    , fmap (("SourceRegion",) . toJSON) _rDSDBInstanceSourceRegion
     , fmap (("StorageEncrypted",) . toJSON . fmap Bool') _rDSDBInstanceStorageEncrypted
     , fmap (("StorageType",) . toJSON) _rDSDBInstanceStorageType
     , fmap (("Tags",) . toJSON) _rDSDBInstanceTags
@@ -139,6 +141,7 @@
       (obj .:? "PreferredMaintenanceWindow") <*>
       fmap (fmap (fmap unBool')) (obj .:? "PubliclyAccessible") <*>
       (obj .:? "SourceDBInstanceIdentifier") <*>
+      (obj .:? "SourceRegion") <*>
       fmap (fmap (fmap unBool')) (obj .:? "StorageEncrypted") <*>
       (obj .:? "StorageType") <*>
       (obj .:? "Tags") <*>
@@ -185,6 +188,7 @@
   , _rDSDBInstancePreferredMaintenanceWindow = Nothing
   , _rDSDBInstancePubliclyAccessible = Nothing
   , _rDSDBInstanceSourceDBInstanceIdentifier = Nothing
+  , _rDSDBInstanceSourceRegion = Nothing
   , _rDSDBInstanceStorageEncrypted = Nothing
   , _rDSDBInstanceStorageType = Nothing
   , _rDSDBInstanceTags = Nothing
@@ -323,6 +327,10 @@
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-sourcedbinstanceidentifier
 rdsdbiSourceDBInstanceIdentifier :: Lens' RDSDBInstance (Maybe (Val Text))
 rdsdbiSourceDBInstanceIdentifier = lens _rDSDBInstanceSourceDBInstanceIdentifier (\s a -> s { _rDSDBInstanceSourceDBInstanceIdentifier = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-sourceregion
+rdsdbiSourceRegion :: Lens' RDSDBInstance (Maybe (Val Text))
+rdsdbiSourceRegion = lens _rDSDBInstanceSourceRegion (\s a -> s { _rDSDBInstanceSourceRegion = a })
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-storageencrypted
 rdsdbiStorageEncrypted :: Lens' RDSDBInstance (Maybe (Val Bool))
diff --git a/library-gen/Stratosphere/Resources/Route53HostedZone.hs b/library-gen/Stratosphere/Resources/Route53HostedZone.hs
--- a/library-gen/Stratosphere/Resources/Route53HostedZone.hs
+++ b/library-gen/Stratosphere/Resources/Route53HostedZone.hs
@@ -15,6 +15,7 @@
 import Stratosphere.Values
 import Stratosphere.ResourceProperties.Route53HostedZoneHostedZoneConfig
 import Stratosphere.ResourceProperties.Route53HostedZoneHostedZoneTag
+import Stratosphere.ResourceProperties.Route53HostedZoneQueryLoggingConfig
 import Stratosphere.ResourceProperties.Route53HostedZoneVPC
 
 -- | Full data type definition for Route53HostedZone. See 'route53HostedZone'
@@ -24,6 +25,7 @@
   { _route53HostedZoneHostedZoneConfig :: Maybe Route53HostedZoneHostedZoneConfig
   , _route53HostedZoneHostedZoneTags :: Maybe [Route53HostedZoneHostedZoneTag]
   , _route53HostedZoneName :: Val Text
+  , _route53HostedZoneQueryLoggingConfig :: Maybe Route53HostedZoneQueryLoggingConfig
   , _route53HostedZoneVPCs :: Maybe [Route53HostedZoneVPC]
   } deriving (Show, Eq)
 
@@ -34,6 +36,7 @@
     [ fmap (("HostedZoneConfig",) . toJSON) _route53HostedZoneHostedZoneConfig
     , fmap (("HostedZoneTags",) . toJSON) _route53HostedZoneHostedZoneTags
     , (Just . ("Name",) . toJSON) _route53HostedZoneName
+    , fmap (("QueryLoggingConfig",) . toJSON) _route53HostedZoneQueryLoggingConfig
     , fmap (("VPCs",) . toJSON) _route53HostedZoneVPCs
     ]
 
@@ -43,6 +46,7 @@
       (obj .:? "HostedZoneConfig") <*>
       (obj .:? "HostedZoneTags") <*>
       (obj .: "Name") <*>
+      (obj .:? "QueryLoggingConfig") <*>
       (obj .:? "VPCs")
   parseJSON _ = mempty
 
@@ -56,6 +60,7 @@
   { _route53HostedZoneHostedZoneConfig = Nothing
   , _route53HostedZoneHostedZoneTags = Nothing
   , _route53HostedZoneName = namearg
+  , _route53HostedZoneQueryLoggingConfig = Nothing
   , _route53HostedZoneVPCs = Nothing
   }
 
@@ -70,6 +75,10 @@
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone.html#cfn-route53-hostedzone-name
 rhzName :: Lens' Route53HostedZone (Val Text)
 rhzName = lens _route53HostedZoneName (\s a -> s { _route53HostedZoneName = a })
+
+-- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone.html#cfn-route53-hostedzone-queryloggingconfig
+rhzQueryLoggingConfig :: Lens' Route53HostedZone (Maybe Route53HostedZoneQueryLoggingConfig)
+rhzQueryLoggingConfig = lens _route53HostedZoneQueryLoggingConfig (\s a -> s { _route53HostedZoneQueryLoggingConfig = a })
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone.html#cfn-route53-hostedzone-vpcs
 rhzVPCs :: Lens' Route53HostedZone (Maybe [Route53HostedZoneVPC])
diff --git a/stratosphere.cabal b/stratosphere.cabal
--- a/stratosphere.cabal
+++ b/stratosphere.cabal
@@ -3,7 +3,7 @@
 -- see: https://github.com/sol/hpack
 
 name:           stratosphere
-version:        0.12.0
+version:        0.13.0
 synopsis:       EDSL for AWS CloudFormation
 description:    EDSL for AWS CloudFormation
 category:       AWS, Cloud
@@ -64,14 +64,18 @@
       Stratosphere.ResourceProperties.ApiGatewayDeploymentMethodSetting
       Stratosphere.ResourceProperties.ApiGatewayDeploymentStageDescription
       Stratosphere.ResourceProperties.ApiGatewayDocumentationPartLocation
+      Stratosphere.ResourceProperties.ApiGatewayDomainNameEndpointConfiguration
       Stratosphere.ResourceProperties.ApiGatewayMethodIntegration
       Stratosphere.ResourceProperties.ApiGatewayMethodIntegrationResponse
       Stratosphere.ResourceProperties.ApiGatewayMethodMethodResponse
+      Stratosphere.ResourceProperties.ApiGatewayRestApiEndpointConfiguration
       Stratosphere.ResourceProperties.ApiGatewayRestApiS3Location
       Stratosphere.ResourceProperties.ApiGatewayStageMethodSetting
       Stratosphere.ResourceProperties.ApiGatewayUsagePlanApiStage
       Stratosphere.ResourceProperties.ApiGatewayUsagePlanQuotaSettings
       Stratosphere.ResourceProperties.ApiGatewayUsagePlanThrottleSettings
+      Stratosphere.ResourceProperties.ApplicationAutoScalingScalableTargetScalableTargetAction
+      Stratosphere.ResourceProperties.ApplicationAutoScalingScalableTargetScheduledAction
       Stratosphere.ResourceProperties.ApplicationAutoScalingScalingPolicyCustomizedMetricSpecification
       Stratosphere.ResourceProperties.ApplicationAutoScalingScalingPolicyMetricDimension
       Stratosphere.ResourceProperties.ApplicationAutoScalingScalingPolicyPredefinedMetricSpecification
@@ -227,14 +231,18 @@
       Stratosphere.ResourceProperties.EC2SpotFleetSpotFleetRequestConfigData
       Stratosphere.ResourceProperties.EC2SpotFleetSpotPlacement
       Stratosphere.ResourceProperties.EC2VPNConnectionVpnTunnelOptionsSpecification
+      Stratosphere.ResourceProperties.ECRRepositoryLifecyclePolicy
       Stratosphere.ResourceProperties.ECSServiceDeploymentConfiguration
       Stratosphere.ResourceProperties.ECSServiceLoadBalancer
       Stratosphere.ResourceProperties.ECSServicePlacementConstraint
       Stratosphere.ResourceProperties.ECSServicePlacementStrategy
       Stratosphere.ResourceProperties.ECSTaskDefinitionContainerDefinition
+      Stratosphere.ResourceProperties.ECSTaskDefinitionDevice
       Stratosphere.ResourceProperties.ECSTaskDefinitionHostEntry
       Stratosphere.ResourceProperties.ECSTaskDefinitionHostVolumeProperties
+      Stratosphere.ResourceProperties.ECSTaskDefinitionKernelCapabilities
       Stratosphere.ResourceProperties.ECSTaskDefinitionKeyValuePair
+      Stratosphere.ResourceProperties.ECSTaskDefinitionLinuxParameters
       Stratosphere.ResourceProperties.ECSTaskDefinitionLogConfiguration
       Stratosphere.ResourceProperties.ECSTaskDefinitionMountPoint
       Stratosphere.ResourceProperties.ECSTaskDefinitionPortMapping
@@ -274,6 +282,7 @@
       Stratosphere.ResourceProperties.ElasticsearchDomainEBSOptions
       Stratosphere.ResourceProperties.ElasticsearchDomainElasticsearchClusterConfig
       Stratosphere.ResourceProperties.ElasticsearchDomainSnapshotOptions
+      Stratosphere.ResourceProperties.ElasticsearchDomainVPCOptions
       Stratosphere.ResourceProperties.EMRClusterApplication
       Stratosphere.ResourceProperties.EMRClusterAutoScalingPolicy
       Stratosphere.ResourceProperties.EMRClusterBootstrapActionConfig
@@ -412,8 +421,6 @@
       Stratosphere.ResourceProperties.KinesisFirehoseDeliveryStreamProcessorParameter
       Stratosphere.ResourceProperties.KinesisFirehoseDeliveryStreamRedshiftDestinationConfiguration
       Stratosphere.ResourceProperties.KinesisFirehoseDeliveryStreamS3DestinationConfiguration
-      Stratosphere.ResourceProperties.LambdaAliasAliasRoutingConfiguration
-      Stratosphere.ResourceProperties.LambdaAliasVersionWeight
       Stratosphere.ResourceProperties.LambdaFunctionCode
       Stratosphere.ResourceProperties.LambdaFunctionDeadLetterConfig
       Stratosphere.ResourceProperties.LambdaFunctionEnvironment
@@ -448,6 +455,7 @@
       Stratosphere.ResourceProperties.Route53HealthCheckHealthCheckTag
       Stratosphere.ResourceProperties.Route53HostedZoneHostedZoneConfig
       Stratosphere.ResourceProperties.Route53HostedZoneHostedZoneTag
+      Stratosphere.ResourceProperties.Route53HostedZoneQueryLoggingConfig
       Stratosphere.ResourceProperties.Route53HostedZoneVPC
       Stratosphere.ResourceProperties.Route53RecordSetAliasTarget
       Stratosphere.ResourceProperties.Route53RecordSetGeoLocation
