diff --git a/amazonka-elasticbeanstalk.cabal b/amazonka-elasticbeanstalk.cabal
--- a/amazonka-elasticbeanstalk.cabal
+++ b/amazonka-elasticbeanstalk.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-elasticbeanstalk
-version:               0.0.6
+version:               0.0.7
 synopsis:              Amazon Elastic Beanstalk SDK.
 homepage:              https://github.com/brendanhay/amazonka
 license:               OtherLicense
@@ -76,5 +76,5 @@
     other-modules:
 
     build-depends:
-          amazonka-core == 0.0.6.*
+          amazonka-core == 0.0.7.*
         , base          >= 4.7     && < 5
diff --git a/gen/Network/AWS/ElasticBeanstalk/CreateConfigurationTemplate.hs b/gen/Network/AWS/ElasticBeanstalk/CreateConfigurationTemplate.hs
--- a/gen/Network/AWS/ElasticBeanstalk/CreateConfigurationTemplate.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/CreateConfigurationTemplate.hs
@@ -314,6 +314,6 @@
         <*> x .@? "DeploymentStatus"
         <*> x .@? "Description"
         <*> x .@? "EnvironmentName"
-        <*> x .@  "OptionSettings"
+        <*> x .@? "OptionSettings" .!@ mempty
         <*> x .@? "SolutionStackName"
         <*> x .@? "TemplateName"
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeApplicationVersions.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeApplicationVersions.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeApplicationVersions.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeApplicationVersions.hs
@@ -127,4 +127,4 @@
 
 instance FromXML DescribeApplicationVersionsResponse where
     parseXML = withElement "DescribeApplicationVersionsResult" $ \x -> DescribeApplicationVersionsResponse
-        <$> x .@  "ApplicationVersions"
+        <$> x .@? "ApplicationVersions" .!@ mempty
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeApplications.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeApplications.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeApplications.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeApplications.hs
@@ -119,4 +119,4 @@
 
 instance FromXML DescribeApplicationsResponse where
     parseXML = withElement "DescribeApplicationsResult" $ \x -> DescribeApplicationsResponse
-        <$> x .@  "Applications"
+        <$> x .@? "Applications" .!@ mempty
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationOptions.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationOptions.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationOptions.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationOptions.hs
@@ -166,5 +166,5 @@
 
 instance FromXML DescribeConfigurationOptionsResponse where
     parseXML = withElement "DescribeConfigurationOptionsResult" $ \x -> DescribeConfigurationOptionsResponse
-        <$> x .@  "Options"
+        <$> x .@? "Options" .!@ mempty
         <*> x .@? "SolutionStackName"
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationSettings.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationSettings.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationSettings.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeConfigurationSettings.hs
@@ -155,4 +155,4 @@
 
 instance FromXML DescribeConfigurationSettingsResponse where
     parseXML = withElement "DescribeConfigurationSettingsResult" $ \x -> DescribeConfigurationSettingsResponse
-        <$> x .@  "ConfigurationSettings"
+        <$> x .@? "ConfigurationSettings" .!@ mempty
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironments.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironments.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironments.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeEnvironments.hs
@@ -179,4 +179,4 @@
 
 instance FromXML DescribeEnvironmentsResponse where
     parseXML = withElement "DescribeEnvironmentsResult" $ \x -> DescribeEnvironmentsResponse
-        <$> x .@  "Environments"
+        <$> x .@? "Environments" .!@ mempty
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeEvents.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeEvents.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeEvents.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeEvents.hs
@@ -226,7 +226,7 @@
 
 instance FromXML DescribeEventsResponse where
     parseXML = withElement "DescribeEventsResult" $ \x -> DescribeEventsResponse
-        <$> x .@  "Events"
+        <$> x .@? "Events" .!@ mempty
         <*> x .@? "NextToken"
 
 instance AWSPager DescribeEvents where
diff --git a/gen/Network/AWS/ElasticBeanstalk/ListAvailableSolutionStacks.hs b/gen/Network/AWS/ElasticBeanstalk/ListAvailableSolutionStacks.hs
--- a/gen/Network/AWS/ElasticBeanstalk/ListAvailableSolutionStacks.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/ListAvailableSolutionStacks.hs
@@ -102,5 +102,5 @@
 
 instance FromXML ListAvailableSolutionStacksResponse where
     parseXML = withElement "ListAvailableSolutionStacksResult" $ \x -> ListAvailableSolutionStacksResponse
-        <$> x .@  "SolutionStackDetails"
-        <*> x .@  "SolutionStacks"
+        <$> x .@? "SolutionStackDetails" .!@ mempty
+        <*> x .@? "SolutionStacks" .!@ mempty
diff --git a/gen/Network/AWS/ElasticBeanstalk/RetrieveEnvironmentInfo.hs b/gen/Network/AWS/ElasticBeanstalk/RetrieveEnvironmentInfo.hs
--- a/gen/Network/AWS/ElasticBeanstalk/RetrieveEnvironmentInfo.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/RetrieveEnvironmentInfo.hs
@@ -149,4 +149,4 @@
 
 instance FromXML RetrieveEnvironmentInfoResponse where
     parseXML = withElement "RetrieveEnvironmentInfoResult" $ \x -> RetrieveEnvironmentInfoResponse
-        <$> x .@  "EnvironmentInfo"
+        <$> x .@? "EnvironmentInfo" .!@ mempty
diff --git a/gen/Network/AWS/ElasticBeanstalk/Types.hs b/gen/Network/AWS/ElasticBeanstalk/Types.hs
--- a/gen/Network/AWS/ElasticBeanstalk/Types.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/Types.hs
@@ -359,11 +359,11 @@
 instance FromXML ApplicationDescription where
     parseXML x = ApplicationDescription
         <$> x .@? "ApplicationName"
-        <*> x .@  "ConfigurationTemplates"
+        <*> x .@? "ConfigurationTemplates" .!@ mempty
         <*> x .@? "DateCreated"
         <*> x .@? "DateUpdated"
         <*> x .@? "Description"
-        <*> x .@  "Versions"
+        <*> x .@? "Versions" .!@ mempty
 
 instance ToQuery ApplicationDescription where
     toQuery ApplicationDescription{..} = mconcat
@@ -855,7 +855,7 @@
         <*> x .@? "DeploymentStatus"
         <*> x .@? "Description"
         <*> x .@? "EnvironmentName"
-        <*> x .@  "OptionSettings"
+        <*> x .@? "OptionSettings" .!@ mempty
         <*> x .@? "SolutionStackName"
         <*> x .@? "TemplateName"
 
@@ -1063,13 +1063,13 @@
 
 instance FromXML EnvironmentResourceDescription where
     parseXML x = EnvironmentResourceDescription
-        <$> x .@  "AutoScalingGroups"
+        <$> x .@? "AutoScalingGroups" .!@ mempty
         <*> x .@? "EnvironmentName"
-        <*> x .@  "Instances"
-        <*> x .@  "LaunchConfigurations"
-        <*> x .@  "LoadBalancers"
-        <*> x .@  "Queues"
-        <*> x .@  "Triggers"
+        <*> x .@? "Instances" .!@ mempty
+        <*> x .@? "LaunchConfigurations" .!@ mempty
+        <*> x .@? "LoadBalancers" .!@ mempty
+        <*> x .@? "Queues" .!@ mempty
+        <*> x .@? "Triggers" .!@ mempty
 
 instance ToQuery EnvironmentResourceDescription where
     toQuery EnvironmentResourceDescription{..} = mconcat
@@ -1194,7 +1194,7 @@
 instance FromXML LoadBalancerDescription where
     parseXML x = LoadBalancerDescription
         <$> x .@? "Domain"
-        <*> x .@  "Listeners"
+        <*> x .@? "Listeners" .!@ mempty
         <*> x .@? "LoadBalancerName"
 
 instance ToQuery LoadBalancerDescription where
@@ -1539,7 +1539,7 @@
         <*> x .@? "Namespace"
         <*> x .@? "Regex"
         <*> x .@? "UserDefined"
-        <*> x .@  "ValueOptions"
+        <*> x .@? "ValueOptions" .!@ mempty
         <*> x .@? "ValueType"
 
 instance ToQuery ConfigurationOptionDescription where
@@ -2163,7 +2163,7 @@
 
 instance FromXML SolutionStackDescription where
     parseXML x = SolutionStackDescription
-        <$> x .@  "PermittedFileTypes"
+        <$> x .@? "PermittedFileTypes" .!@ mempty
         <*> x .@? "SolutionStackName"
 
 instance ToQuery SolutionStackDescription where
diff --git a/gen/Network/AWS/ElasticBeanstalk/UpdateConfigurationTemplate.hs b/gen/Network/AWS/ElasticBeanstalk/UpdateConfigurationTemplate.hs
--- a/gen/Network/AWS/ElasticBeanstalk/UpdateConfigurationTemplate.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/UpdateConfigurationTemplate.hs
@@ -268,6 +268,6 @@
         <*> x .@? "DeploymentStatus"
         <*> x .@? "Description"
         <*> x .@? "EnvironmentName"
-        <*> x .@  "OptionSettings"
+        <*> x .@? "OptionSettings" .!@ mempty
         <*> x .@? "SolutionStackName"
         <*> x .@? "TemplateName"
diff --git a/gen/Network/AWS/ElasticBeanstalk/ValidateConfigurationSettings.hs b/gen/Network/AWS/ElasticBeanstalk/ValidateConfigurationSettings.hs
--- a/gen/Network/AWS/ElasticBeanstalk/ValidateConfigurationSettings.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/ValidateConfigurationSettings.hs
@@ -154,4 +154,4 @@
 
 instance FromXML ValidateConfigurationSettingsResponse where
     parseXML = withElement "ValidateConfigurationSettingsResult" $ \x -> ValidateConfigurationSettingsResponse
-        <$> x .@  "Messages"
+        <$> x .@? "Messages" .!@ mempty