diff --git a/amazonka-redshift.cabal b/amazonka-redshift.cabal
--- a/amazonka-redshift.cabal
+++ b/amazonka-redshift.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-redshift
-version:               0.0.6
+version:               0.0.7
 synopsis:              Amazon Redshift SDK.
 homepage:              https://github.com/brendanhay/amazonka
 license:               OtherLicense
@@ -99,5 +99,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/Redshift/DescribeClusterParameterGroups.hs b/gen/Network/AWS/Redshift/DescribeClusterParameterGroups.hs
--- a/gen/Network/AWS/Redshift/DescribeClusterParameterGroups.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusterParameterGroups.hs
@@ -201,7 +201,7 @@
 instance FromXML DescribeClusterParameterGroupsResponse where
     parseXML = withElement "DescribeClusterParameterGroupsResult" $ \x -> DescribeClusterParameterGroupsResponse
         <$> x .@? "Marker"
-        <*> x .@  "ParameterGroups"
+        <*> x .@? "ParameterGroups" .!@ mempty
 
 instance AWSPager DescribeClusterParameterGroups where
     page rq rs
diff --git a/gen/Network/AWS/Redshift/DescribeClusterParameters.hs b/gen/Network/AWS/Redshift/DescribeClusterParameters.hs
--- a/gen/Network/AWS/Redshift/DescribeClusterParameters.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusterParameters.hs
@@ -178,7 +178,7 @@
 instance FromXML DescribeClusterParametersResponse where
     parseXML = withElement "DescribeClusterParametersResult" $ \x -> DescribeClusterParametersResponse
         <$> x .@? "Marker"
-        <*> x .@  "Parameters"
+        <*> x .@? "Parameters" .!@ mempty
 
 instance AWSPager DescribeClusterParameters where
     page rq rs
diff --git a/gen/Network/AWS/Redshift/DescribeClusterSecurityGroups.hs b/gen/Network/AWS/Redshift/DescribeClusterSecurityGroups.hs
--- a/gen/Network/AWS/Redshift/DescribeClusterSecurityGroups.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusterSecurityGroups.hs
@@ -205,7 +205,7 @@
 
 instance FromXML DescribeClusterSecurityGroupsResponse where
     parseXML = withElement "DescribeClusterSecurityGroupsResult" $ \x -> DescribeClusterSecurityGroupsResponse
-        <$> x .@  "ClusterSecurityGroups"
+        <$> x .@? "ClusterSecurityGroups" .!@ mempty
         <*> x .@? "Marker"
 
 instance AWSPager DescribeClusterSecurityGroups where
diff --git a/gen/Network/AWS/Redshift/DescribeClusterSnapshots.hs b/gen/Network/AWS/Redshift/DescribeClusterSnapshots.hs
--- a/gen/Network/AWS/Redshift/DescribeClusterSnapshots.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusterSnapshots.hs
@@ -262,7 +262,7 @@
 instance FromXML DescribeClusterSnapshotsResponse where
     parseXML = withElement "DescribeClusterSnapshotsResult" $ \x -> DescribeClusterSnapshotsResponse
         <$> x .@? "Marker"
-        <*> x .@  "Snapshots"
+        <*> x .@? "Snapshots" .!@ mempty
 
 instance AWSPager DescribeClusterSnapshots where
     page rq rs
diff --git a/gen/Network/AWS/Redshift/DescribeClusterSubnetGroups.hs b/gen/Network/AWS/Redshift/DescribeClusterSubnetGroups.hs
--- a/gen/Network/AWS/Redshift/DescribeClusterSubnetGroups.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusterSubnetGroups.hs
@@ -197,7 +197,7 @@
 
 instance FromXML DescribeClusterSubnetGroupsResponse where
     parseXML = withElement "DescribeClusterSubnetGroupsResult" $ \x -> DescribeClusterSubnetGroupsResponse
-        <$> x .@  "ClusterSubnetGroups"
+        <$> x .@? "ClusterSubnetGroups" .!@ mempty
         <*> x .@? "Marker"
 
 instance AWSPager DescribeClusterSubnetGroups where
diff --git a/gen/Network/AWS/Redshift/DescribeClusterVersions.hs b/gen/Network/AWS/Redshift/DescribeClusterVersions.hs
--- a/gen/Network/AWS/Redshift/DescribeClusterVersions.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusterVersions.hs
@@ -175,7 +175,7 @@
 
 instance FromXML DescribeClusterVersionsResponse where
     parseXML = withElement "DescribeClusterVersionsResult" $ \x -> DescribeClusterVersionsResponse
-        <$> x .@  "ClusterVersions"
+        <$> x .@? "ClusterVersions" .!@ mempty
         <*> x .@? "Marker"
 
 instance AWSPager DescribeClusterVersions where
diff --git a/gen/Network/AWS/Redshift/DescribeClusters.hs b/gen/Network/AWS/Redshift/DescribeClusters.hs
--- a/gen/Network/AWS/Redshift/DescribeClusters.hs
+++ b/gen/Network/AWS/Redshift/DescribeClusters.hs
@@ -199,7 +199,7 @@
 
 instance FromXML DescribeClustersResponse where
     parseXML = withElement "DescribeClustersResult" $ \x -> DescribeClustersResponse
-        <$> x .@  "Clusters"
+        <$> x .@? "Clusters" .!@ mempty
         <*> x .@? "Marker"
 
 instance AWSPager DescribeClusters where
diff --git a/gen/Network/AWS/Redshift/DescribeEventCategories.hs b/gen/Network/AWS/Redshift/DescribeEventCategories.hs
--- a/gen/Network/AWS/Redshift/DescribeEventCategories.hs
+++ b/gen/Network/AWS/Redshift/DescribeEventCategories.hs
@@ -118,4 +118,4 @@
 
 instance FromXML DescribeEventCategoriesResponse where
     parseXML = withElement "DescribeEventCategoriesResult" $ \x -> DescribeEventCategoriesResponse
-        <$> x .@  "EventCategoriesMapList"
+        <$> x .@? "EventCategoriesMapList" .!@ mempty
diff --git a/gen/Network/AWS/Redshift/DescribeEventSubscriptions.hs b/gen/Network/AWS/Redshift/DescribeEventSubscriptions.hs
--- a/gen/Network/AWS/Redshift/DescribeEventSubscriptions.hs
+++ b/gen/Network/AWS/Redshift/DescribeEventSubscriptions.hs
@@ -156,7 +156,7 @@
 
 instance FromXML DescribeEventSubscriptionsResponse where
     parseXML = withElement "DescribeEventSubscriptionsResult" $ \x -> DescribeEventSubscriptionsResponse
-        <$> x .@  "EventSubscriptionsList"
+        <$> x .@? "EventSubscriptionsList" .!@ mempty
         <*> x .@? "Marker"
 
 instance AWSPager DescribeEventSubscriptions where
diff --git a/gen/Network/AWS/Redshift/DescribeEvents.hs b/gen/Network/AWS/Redshift/DescribeEvents.hs
--- a/gen/Network/AWS/Redshift/DescribeEvents.hs
+++ b/gen/Network/AWS/Redshift/DescribeEvents.hs
@@ -222,7 +222,7 @@
 
 instance FromXML DescribeEventsResponse where
     parseXML = withElement "DescribeEventsResult" $ \x -> DescribeEventsResponse
-        <$> x .@  "Events"
+        <$> x .@? "Events" .!@ mempty
         <*> x .@? "Marker"
 
 instance AWSPager DescribeEvents where
diff --git a/gen/Network/AWS/Redshift/DescribeHsmClientCertificates.hs b/gen/Network/AWS/Redshift/DescribeHsmClientCertificates.hs
--- a/gen/Network/AWS/Redshift/DescribeHsmClientCertificates.hs
+++ b/gen/Network/AWS/Redshift/DescribeHsmClientCertificates.hs
@@ -200,7 +200,7 @@
 
 instance FromXML DescribeHsmClientCertificatesResponse where
     parseXML = withElement "DescribeHsmClientCertificatesResult" $ \x -> DescribeHsmClientCertificatesResponse
-        <$> x .@  "HsmClientCertificates"
+        <$> x .@? "HsmClientCertificates" .!@ mempty
         <*> x .@? "Marker"
 
 instance AWSPager DescribeHsmClientCertificates where
diff --git a/gen/Network/AWS/Redshift/DescribeHsmConfigurations.hs b/gen/Network/AWS/Redshift/DescribeHsmConfigurations.hs
--- a/gen/Network/AWS/Redshift/DescribeHsmConfigurations.hs
+++ b/gen/Network/AWS/Redshift/DescribeHsmConfigurations.hs
@@ -197,7 +197,7 @@
 
 instance FromXML DescribeHsmConfigurationsResponse where
     parseXML = withElement "DescribeHsmConfigurationsResult" $ \x -> DescribeHsmConfigurationsResponse
-        <$> x .@  "HsmConfigurations"
+        <$> x .@? "HsmConfigurations" .!@ mempty
         <*> x .@? "Marker"
 
 instance AWSPager DescribeHsmConfigurations where
diff --git a/gen/Network/AWS/Redshift/DescribeOrderableClusterOptions.hs b/gen/Network/AWS/Redshift/DescribeOrderableClusterOptions.hs
--- a/gen/Network/AWS/Redshift/DescribeOrderableClusterOptions.hs
+++ b/gen/Network/AWS/Redshift/DescribeOrderableClusterOptions.hs
@@ -177,7 +177,7 @@
 instance FromXML DescribeOrderableClusterOptionsResponse where
     parseXML = withElement "DescribeOrderableClusterOptionsResult" $ \x -> DescribeOrderableClusterOptionsResponse
         <$> x .@? "Marker"
-        <*> x .@  "OrderableClusterOptions"
+        <*> x .@? "OrderableClusterOptions" .!@ mempty
 
 instance AWSPager DescribeOrderableClusterOptions where
     page rq rs
diff --git a/gen/Network/AWS/Redshift/DescribeReservedNodeOfferings.hs b/gen/Network/AWS/Redshift/DescribeReservedNodeOfferings.hs
--- a/gen/Network/AWS/Redshift/DescribeReservedNodeOfferings.hs
+++ b/gen/Network/AWS/Redshift/DescribeReservedNodeOfferings.hs
@@ -161,7 +161,7 @@
 instance FromXML DescribeReservedNodeOfferingsResponse where
     parseXML = withElement "DescribeReservedNodeOfferingsResult" $ \x -> DescribeReservedNodeOfferingsResponse
         <$> x .@? "Marker"
-        <*> x .@  "ReservedNodeOfferings"
+        <*> x .@? "ReservedNodeOfferings" .!@ mempty
 
 instance AWSPager DescribeReservedNodeOfferings where
     page rq rs
diff --git a/gen/Network/AWS/Redshift/DescribeReservedNodes.hs b/gen/Network/AWS/Redshift/DescribeReservedNodes.hs
--- a/gen/Network/AWS/Redshift/DescribeReservedNodes.hs
+++ b/gen/Network/AWS/Redshift/DescribeReservedNodes.hs
@@ -152,7 +152,7 @@
 instance FromXML DescribeReservedNodesResponse where
     parseXML = withElement "DescribeReservedNodesResult" $ \x -> DescribeReservedNodesResponse
         <$> x .@? "Marker"
-        <*> x .@  "ReservedNodes"
+        <*> x .@? "ReservedNodes" .!@ mempty
 
 instance AWSPager DescribeReservedNodes where
     page rq rs
diff --git a/gen/Network/AWS/Redshift/DescribeResize.hs b/gen/Network/AWS/Redshift/DescribeResize.hs
--- a/gen/Network/AWS/Redshift/DescribeResize.hs
+++ b/gen/Network/AWS/Redshift/DescribeResize.hs
@@ -264,9 +264,9 @@
         <$> x .@? "AvgResizeRateInMegaBytesPerSecond"
         <*> x .@? "ElapsedTimeInSeconds"
         <*> x .@? "EstimatedTimeToCompletionInSeconds"
-        <*> x .@  "ImportTablesCompleted"
-        <*> x .@  "ImportTablesInProgress"
-        <*> x .@  "ImportTablesNotStarted"
+        <*> x .@? "ImportTablesCompleted" .!@ mempty
+        <*> x .@? "ImportTablesInProgress" .!@ mempty
+        <*> x .@? "ImportTablesNotStarted" .!@ mempty
         <*> x .@? "ProgressInMegaBytes"
         <*> x .@? "Status"
         <*> x .@? "TargetClusterType"
diff --git a/gen/Network/AWS/Redshift/DescribeTags.hs b/gen/Network/AWS/Redshift/DescribeTags.hs
--- a/gen/Network/AWS/Redshift/DescribeTags.hs
+++ b/gen/Network/AWS/Redshift/DescribeTags.hs
@@ -210,4 +210,4 @@
 instance FromXML DescribeTagsResponse where
     parseXML = withElement "DescribeTagsResult" $ \x -> DescribeTagsResponse
         <$> x .@? "Marker"
-        <*> x .@  "TaggedResources"
+        <*> x .@? "TaggedResources" .!@ mempty
diff --git a/gen/Network/AWS/Redshift/Types.hs b/gen/Network/AWS/Redshift/Types.hs
--- a/gen/Network/AWS/Redshift/Types.hs
+++ b/gen/Network/AWS/Redshift/Types.hs
@@ -677,7 +677,7 @@
 
 instance FromXML Snapshot where
     parseXML x = Snapshot
-        <$> x .@  "AccountsWithRestoreAccess"
+        <$> x .@? "AccountsWithRestoreAccess" .!@ mempty
         <*> x .@? "ActualIncrementalBackupSizeInMegaBytes"
         <*> x .@? "AvailabilityZone"
         <*> x .@? "BackupProgressInMegaBytes"
@@ -701,7 +701,7 @@
         <*> x .@? "SnapshotType"
         <*> x .@? "SourceRegion"
         <*> x .@? "Status"
-        <*> x .@  "Tags"
+        <*> x .@? "Tags" .!@ mempty
         <*> x .@? "TotalBackupSizeInMegaBytes"
         <*> x .@? "VpcId"
 
@@ -787,7 +787,7 @@
         <$> x .@? "Description"
         <*> x .@? "ParameterGroupFamily"
         <*> x .@? "ParameterGroupName"
-        <*> x .@  "Tags"
+        <*> x .@? "Tags" .!@ mempty
 
 instance ToQuery ClusterParameterGroup where
     toQuery ClusterParameterGroup{..} = mconcat
@@ -960,7 +960,7 @@
 instance FromXML Event where
     parseXML x = Event
         <$> x .@? "Date"
-        <*> x .@  "EventCategories"
+        <*> x .@? "EventCategories" .!@ mempty
         <*> x .@? "EventId"
         <*> x .@? "Message"
         <*> x .@? "Severity"
@@ -1102,7 +1102,7 @@
     parseXML x = HsmClientCertificate
         <$> x .@? "HsmClientCertificateIdentifier"
         <*> x .@? "HsmClientCertificatePublicKey"
-        <*> x .@  "Tags"
+        <*> x .@? "Tags" .!@ mempty
 
 instance ToQuery HsmClientCertificate where
     toQuery HsmClientCertificate{..} = mconcat
@@ -1418,11 +1418,11 @@
         <*> x .@? "AvailabilityZone"
         <*> x .@? "ClusterCreateTime"
         <*> x .@? "ClusterIdentifier"
-        <*> x .@  "ClusterNodes"
-        <*> x .@  "ClusterParameterGroups"
+        <*> x .@? "ClusterNodes" .!@ mempty
+        <*> x .@? "ClusterParameterGroups" .!@ mempty
         <*> x .@? "ClusterPublicKey"
         <*> x .@? "ClusterRevisionNumber"
-        <*> x .@  "ClusterSecurityGroups"
+        <*> x .@? "ClusterSecurityGroups" .!@ mempty
         <*> x .@? "ClusterSnapshotCopyStatus"
         <*> x .@? "ClusterStatus"
         <*> x .@? "ClusterSubnetGroupName"
@@ -1441,9 +1441,9 @@
         <*> x .@? "PreferredMaintenanceWindow"
         <*> x .@? "PubliclyAccessible"
         <*> x .@? "RestoreStatus"
-        <*> x .@  "Tags"
+        <*> x .@? "Tags" .!@ mempty
         <*> x .@? "VpcId"
-        <*> x .@  "VpcSecurityGroups"
+        <*> x .@? "VpcSecurityGroups" .!@ mempty
 
 instance ToQuery Cluster where
     toQuery Cluster{..} = mconcat
@@ -1582,7 +1582,7 @@
         <$> x .@? "EC2SecurityGroupName"
         <*> x .@? "EC2SecurityGroupOwnerId"
         <*> x .@? "Status"
-        <*> x .@  "Tags"
+        <*> x .@? "Tags" .!@ mempty
 
 instance ToQuery EC2SecurityGroup where
     toQuery EC2SecurityGroup{..} = mconcat
@@ -1640,7 +1640,7 @@
 
 instance FromXML OrderableClusterOption where
     parseXML x = OrderableClusterOption
-        <$> x .@  "AvailabilityZones"
+        <$> x .@? "AvailabilityZones" .!@ mempty
         <*> x .@? "ClusterType"
         <*> x .@? "ClusterVersion"
         <*> x .@? "NodeType"
@@ -1836,9 +1836,9 @@
     parseXML x = ClusterSecurityGroup
         <$> x .@? "ClusterSecurityGroupName"
         <*> x .@? "Description"
-        <*> x .@  "EC2SecurityGroups"
-        <*> x .@  "IPRanges"
-        <*> x .@  "Tags"
+        <*> x .@? "EC2SecurityGroups" .!@ mempty
+        <*> x .@? "IPRanges" .!@ mempty
+        <*> x .@? "Tags" .!@ mempty
 
 instance ToQuery ClusterSecurityGroup where
     toQuery ClusterSecurityGroup{..} = mconcat
@@ -1894,7 +1894,7 @@
     parseXML x = DefaultClusterParameters
         <$> x .@? "Marker"
         <*> x .@? "ParameterGroupFamily"
-        <*> x .@  "Parameters"
+        <*> x .@? "Parameters" .!@ mempty
 
 instance ToQuery DefaultClusterParameters where
     toQuery DefaultClusterParameters{..} = mconcat
@@ -1970,8 +1970,8 @@
         <$> x .@? "ClusterSubnetGroupName"
         <*> x .@? "Description"
         <*> x .@? "SubnetGroupStatus"
-        <*> x .@  "Subnets"
-        <*> x .@  "Tags"
+        <*> x .@? "Subnets" .!@ mempty
+        <*> x .@? "Tags" .!@ mempty
         <*> x .@? "VpcId"
 
 instance ToQuery ClusterSubnetGroup where
@@ -2034,7 +2034,7 @@
 
 instance FromXML EventInfoMap where
     parseXML x = EventInfoMap
-        <$> x .@  "EventCategories"
+        <$> x .@? "EventCategories" .!@ mempty
         <*> x .@? "EventDescription"
         <*> x .@? "EventId"
         <*> x .@? "Severity"
@@ -2178,7 +2178,7 @@
         <*> x .@? "FixedPrice"
         <*> x .@? "NodeType"
         <*> x .@? "OfferingType"
-        <*> x .@  "RecurringCharges"
+        <*> x .@? "RecurringCharges" .!@ mempty
         <*> x .@? "ReservedNodeOfferingId"
         <*> x .@? "UsagePrice"
 
@@ -2322,7 +2322,7 @@
         <*> x .@? "NodeCount"
         <*> x .@? "NodeType"
         <*> x .@? "OfferingType"
-        <*> x .@  "RecurringCharges"
+        <*> x .@? "RecurringCharges" .!@ mempty
         <*> x .@? "ReservedNodeId"
         <*> x .@? "ReservedNodeOfferingId"
         <*> x .@? "StartTime"
@@ -2614,14 +2614,14 @@
         <$> x .@? "CustSubscriptionId"
         <*> x .@? "CustomerAwsId"
         <*> x .@? "Enabled"
-        <*> x .@  "EventCategoriesList"
+        <*> x .@? "EventCategoriesList" .!@ mempty
         <*> x .@? "Severity"
         <*> x .@? "SnsTopicArn"
-        <*> x .@  "SourceIdsList"
+        <*> x .@? "SourceIdsList" .!@ mempty
         <*> x .@? "SourceType"
         <*> x .@? "Status"
         <*> x .@? "SubscriptionCreationTime"
-        <*> x .@  "Tags"
+        <*> x .@? "Tags" .!@ mempty
 
 instance ToQuery EventSubscription where
     toQuery EventSubscription{..} = mconcat
@@ -2945,7 +2945,7 @@
     parseXML x = IPRange
         <$> x .@? "CIDRIP"
         <*> x .@? "Status"
-        <*> x .@  "Tags"
+        <*> x .@? "Tags" .!@ mempty
 
 instance ToQuery IPRange where
     toQuery IPRange{..} = mconcat
@@ -3038,7 +3038,7 @@
 
 instance FromXML EventCategoriesMap where
     parseXML x = EventCategoriesMap
-        <$> x .@  "Events"
+        <$> x .@? "Events" .!@ mempty
         <*> x .@? "SourceType"
 
 instance ToQuery EventCategoriesMap where
@@ -3108,7 +3108,7 @@
         <*> x .@? "HsmConfigurationIdentifier"
         <*> x .@? "HsmIpAddress"
         <*> x .@? "HsmPartitionName"
-        <*> x .@  "Tags"
+        <*> x .@? "Tags" .!@ mempty
 
 instance ToQuery HsmConfiguration where
     toQuery HsmConfiguration{..} = mconcat