diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`1.5.0`
+`1.6.0`
 
 
 ## Description
diff --git a/amazonka-importexport.cabal b/amazonka-importexport.cabal
--- a/amazonka-importexport.cabal
+++ b/amazonka-importexport.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-importexport
-version:               1.5.0
+version:               1.6.0
 synopsis:              Amazon Import/Export SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -7,7 +7,7 @@
 license-file:          LICENSE
 author:                Brendan Hay
 maintainer:            Brendan Hay <brendan.g.hay+amazonka@gmail.com>
-copyright:             Copyright (c) 2013-2017 Brendan Hay
+copyright:             Copyright (c) 2013-2018 Brendan Hay
 category:              Network, AWS, Cloud, Distributed Computing
 build-type:            Simple
 cabal-version:         >= 1.10
@@ -59,7 +59,7 @@
         , Network.AWS.ImportExport.Types.Sum
 
     build-depends:
-          amazonka-core == 1.5.0.*
+          amazonka-core == 1.6.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-importexport-test
@@ -79,8 +79,8 @@
         , Test.AWS.ImportExport.Internal
 
     build-depends:
-          amazonka-core == 1.5.0.*
-        , amazonka-test == 1.5.0.*
+          amazonka-core == 1.6.0.*
+        , amazonka-test == 1.6.0.*
         , amazonka-importexport
         , base
         , bytestring
diff --git a/gen/Network/AWS/ImportExport.hs b/gen/Network/AWS/ImportExport.hs
--- a/gen/Network/AWS/ImportExport.hs
+++ b/gen/Network/AWS/ImportExport.hs
@@ -5,7 +5,7 @@
 
 -- |
 -- Module      : Network.AWS.ImportExport
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
diff --git a/gen/Network/AWS/ImportExport/CancelJob.hs b/gen/Network/AWS/ImportExport/CancelJob.hs
--- a/gen/Network/AWS/ImportExport/CancelJob.hs
+++ b/gen/Network/AWS/ImportExport/CancelJob.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.ImportExport.CancelJob
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -67,11 +67,11 @@
 
 -- | Undocumented member.
 cAPIVersion :: Lens' CancelJob (Maybe Text)
-cAPIVersion = lens _cAPIVersion (\ s a -> s{_cAPIVersion = a});
+cAPIVersion = lens _cAPIVersion (\ s a -> s{_cAPIVersion = a})
 
 -- | Undocumented member.
 cJobId :: Lens' CancelJob Text
-cJobId = lens _cJobId (\ s a -> s{_cJobId = a});
+cJobId = lens _cJobId (\ s a -> s{_cJobId = a})
 
 instance AWSRequest CancelJob where
         type Rs CancelJob = CancelJobResponse
@@ -121,15 +121,15 @@
     -> CancelJobResponse
 cancelJobResponse pResponseStatus_ =
   CancelJobResponse'
-  {_crsSuccess = Nothing, _crsResponseStatus = pResponseStatus_}
+    {_crsSuccess = Nothing, _crsResponseStatus = pResponseStatus_}
 
 
 -- | Undocumented member.
 crsSuccess :: Lens' CancelJobResponse (Maybe Bool)
-crsSuccess = lens _crsSuccess (\ s a -> s{_crsSuccess = a});
+crsSuccess = lens _crsSuccess (\ s a -> s{_crsSuccess = a})
 
 -- | -- | The response status code.
 crsResponseStatus :: Lens' CancelJobResponse Int
-crsResponseStatus = lens _crsResponseStatus (\ s a -> s{_crsResponseStatus = a});
+crsResponseStatus = lens _crsResponseStatus (\ s a -> s{_crsResponseStatus = a})
 
 instance NFData CancelJobResponse where
diff --git a/gen/Network/AWS/ImportExport/CreateJob.hs b/gen/Network/AWS/ImportExport/CreateJob.hs
--- a/gen/Network/AWS/ImportExport/CreateJob.hs
+++ b/gen/Network/AWS/ImportExport/CreateJob.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.ImportExport.CreateJob
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -83,33 +83,33 @@
     -> CreateJob
 createJob pJobType_ pManifest_ pValidateOnly_ =
   CreateJob'
-  { _cjAPIVersion = Nothing
-  , _cjManifestAddendum = Nothing
-  , _cjJobType = pJobType_
-  , _cjManifest = pManifest_
-  , _cjValidateOnly = pValidateOnly_
-  }
+    { _cjAPIVersion = Nothing
+    , _cjManifestAddendum = Nothing
+    , _cjJobType = pJobType_
+    , _cjManifest = pManifest_
+    , _cjValidateOnly = pValidateOnly_
+    }
 
 
 -- | Undocumented member.
 cjAPIVersion :: Lens' CreateJob (Maybe Text)
-cjAPIVersion = lens _cjAPIVersion (\ s a -> s{_cjAPIVersion = a});
+cjAPIVersion = lens _cjAPIVersion (\ s a -> s{_cjAPIVersion = a})
 
 -- | Undocumented member.
 cjManifestAddendum :: Lens' CreateJob (Maybe Text)
-cjManifestAddendum = lens _cjManifestAddendum (\ s a -> s{_cjManifestAddendum = a});
+cjManifestAddendum = lens _cjManifestAddendum (\ s a -> s{_cjManifestAddendum = a})
 
 -- | Undocumented member.
 cjJobType :: Lens' CreateJob JobType
-cjJobType = lens _cjJobType (\ s a -> s{_cjJobType = a});
+cjJobType = lens _cjJobType (\ s a -> s{_cjJobType = a})
 
 -- | Undocumented member.
 cjManifest :: Lens' CreateJob Text
-cjManifest = lens _cjManifest (\ s a -> s{_cjManifest = a});
+cjManifest = lens _cjManifest (\ s a -> s{_cjManifest = a})
 
 -- | Undocumented member.
 cjValidateOnly :: Lens' CreateJob Bool
-cjValidateOnly = lens _cjValidateOnly (\ s a -> s{_cjValidateOnly = a});
+cjValidateOnly = lens _cjValidateOnly (\ s a -> s{_cjValidateOnly = a})
 
 instance AWSRequest CreateJob where
         type Rs CreateJob = CreateJobResponse
@@ -184,42 +184,42 @@
     -> CreateJobResponse
 createJobResponse pResponseStatus_ =
   CreateJobResponse'
-  { _cjrsSignature = Nothing
-  , _cjrsJobType = Nothing
-  , _cjrsJobId = Nothing
-  , _cjrsSignatureFileContents = Nothing
-  , _cjrsWarningMessage = Nothing
-  , _cjrsArtifactList = Nothing
-  , _cjrsResponseStatus = pResponseStatus_
-  }
+    { _cjrsSignature = Nothing
+    , _cjrsJobType = Nothing
+    , _cjrsJobId = Nothing
+    , _cjrsSignatureFileContents = Nothing
+    , _cjrsWarningMessage = Nothing
+    , _cjrsArtifactList = Nothing
+    , _cjrsResponseStatus = pResponseStatus_
+    }
 
 
 -- | Undocumented member.
 cjrsSignature :: Lens' CreateJobResponse (Maybe Text)
-cjrsSignature = lens _cjrsSignature (\ s a -> s{_cjrsSignature = a});
+cjrsSignature = lens _cjrsSignature (\ s a -> s{_cjrsSignature = a})
 
 -- | Undocumented member.
 cjrsJobType :: Lens' CreateJobResponse (Maybe JobType)
-cjrsJobType = lens _cjrsJobType (\ s a -> s{_cjrsJobType = a});
+cjrsJobType = lens _cjrsJobType (\ s a -> s{_cjrsJobType = a})
 
 -- | Undocumented member.
 cjrsJobId :: Lens' CreateJobResponse (Maybe Text)
-cjrsJobId = lens _cjrsJobId (\ s a -> s{_cjrsJobId = a});
+cjrsJobId = lens _cjrsJobId (\ s a -> s{_cjrsJobId = a})
 
 -- | Undocumented member.
 cjrsSignatureFileContents :: Lens' CreateJobResponse (Maybe Text)
-cjrsSignatureFileContents = lens _cjrsSignatureFileContents (\ s a -> s{_cjrsSignatureFileContents = a});
+cjrsSignatureFileContents = lens _cjrsSignatureFileContents (\ s a -> s{_cjrsSignatureFileContents = a})
 
 -- | Undocumented member.
 cjrsWarningMessage :: Lens' CreateJobResponse (Maybe Text)
-cjrsWarningMessage = lens _cjrsWarningMessage (\ s a -> s{_cjrsWarningMessage = a});
+cjrsWarningMessage = lens _cjrsWarningMessage (\ s a -> s{_cjrsWarningMessage = a})
 
 -- | Undocumented member.
 cjrsArtifactList :: Lens' CreateJobResponse [Artifact]
-cjrsArtifactList = lens _cjrsArtifactList (\ s a -> s{_cjrsArtifactList = a}) . _Default . _Coerce;
+cjrsArtifactList = lens _cjrsArtifactList (\ s a -> s{_cjrsArtifactList = a}) . _Default . _Coerce
 
 -- | -- | The response status code.
 cjrsResponseStatus :: Lens' CreateJobResponse Int
-cjrsResponseStatus = lens _cjrsResponseStatus (\ s a -> s{_cjrsResponseStatus = a});
+cjrsResponseStatus = lens _cjrsResponseStatus (\ s a -> s{_cjrsResponseStatus = a})
 
 instance NFData CreateJobResponse where
diff --git a/gen/Network/AWS/ImportExport/GetShippingLabel.hs b/gen/Network/AWS/ImportExport/GetShippingLabel.hs
--- a/gen/Network/AWS/ImportExport/GetShippingLabel.hs
+++ b/gen/Network/AWS/ImportExport/GetShippingLabel.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.ImportExport.GetShippingLabel
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -102,68 +102,68 @@
     :: GetShippingLabel
 getShippingLabel =
   GetShippingLabel'
-  { _gslStreet3 = Nothing
-  , _gslAPIVersion = Nothing
-  , _gslCountry = Nothing
-  , _gslStateOrProvince = Nothing
-  , _gslPostalCode = Nothing
-  , _gslStreet2 = Nothing
-  , _gslName = Nothing
-  , _gslCompany = Nothing
-  , _gslPhoneNumber = Nothing
-  , _gslCity = Nothing
-  , _gslStreet1 = Nothing
-  , _gslJobIds = mempty
-  }
+    { _gslStreet3 = Nothing
+    , _gslAPIVersion = Nothing
+    , _gslCountry = Nothing
+    , _gslStateOrProvince = Nothing
+    , _gslPostalCode = Nothing
+    , _gslStreet2 = Nothing
+    , _gslName = Nothing
+    , _gslCompany = Nothing
+    , _gslPhoneNumber = Nothing
+    , _gslCity = Nothing
+    , _gslStreet1 = Nothing
+    , _gslJobIds = mempty
+    }
 
 
 -- | Undocumented member.
 gslStreet3 :: Lens' GetShippingLabel (Maybe Text)
-gslStreet3 = lens _gslStreet3 (\ s a -> s{_gslStreet3 = a});
+gslStreet3 = lens _gslStreet3 (\ s a -> s{_gslStreet3 = a})
 
 -- | Undocumented member.
 gslAPIVersion :: Lens' GetShippingLabel (Maybe Text)
-gslAPIVersion = lens _gslAPIVersion (\ s a -> s{_gslAPIVersion = a});
+gslAPIVersion = lens _gslAPIVersion (\ s a -> s{_gslAPIVersion = a})
 
 -- | Undocumented member.
 gslCountry :: Lens' GetShippingLabel (Maybe Text)
-gslCountry = lens _gslCountry (\ s a -> s{_gslCountry = a});
+gslCountry = lens _gslCountry (\ s a -> s{_gslCountry = a})
 
 -- | Undocumented member.
 gslStateOrProvince :: Lens' GetShippingLabel (Maybe Text)
-gslStateOrProvince = lens _gslStateOrProvince (\ s a -> s{_gslStateOrProvince = a});
+gslStateOrProvince = lens _gslStateOrProvince (\ s a -> s{_gslStateOrProvince = a})
 
 -- | Undocumented member.
 gslPostalCode :: Lens' GetShippingLabel (Maybe Text)
-gslPostalCode = lens _gslPostalCode (\ s a -> s{_gslPostalCode = a});
+gslPostalCode = lens _gslPostalCode (\ s a -> s{_gslPostalCode = a})
 
 -- | Undocumented member.
 gslStreet2 :: Lens' GetShippingLabel (Maybe Text)
-gslStreet2 = lens _gslStreet2 (\ s a -> s{_gslStreet2 = a});
+gslStreet2 = lens _gslStreet2 (\ s a -> s{_gslStreet2 = a})
 
 -- | Undocumented member.
 gslName :: Lens' GetShippingLabel (Maybe Text)
-gslName = lens _gslName (\ s a -> s{_gslName = a});
+gslName = lens _gslName (\ s a -> s{_gslName = a})
 
 -- | Undocumented member.
 gslCompany :: Lens' GetShippingLabel (Maybe Text)
-gslCompany = lens _gslCompany (\ s a -> s{_gslCompany = a});
+gslCompany = lens _gslCompany (\ s a -> s{_gslCompany = a})
 
 -- | Undocumented member.
 gslPhoneNumber :: Lens' GetShippingLabel (Maybe Text)
-gslPhoneNumber = lens _gslPhoneNumber (\ s a -> s{_gslPhoneNumber = a});
+gslPhoneNumber = lens _gslPhoneNumber (\ s a -> s{_gslPhoneNumber = a})
 
 -- | Undocumented member.
 gslCity :: Lens' GetShippingLabel (Maybe Text)
-gslCity = lens _gslCity (\ s a -> s{_gslCity = a});
+gslCity = lens _gslCity (\ s a -> s{_gslCity = a})
 
 -- | Undocumented member.
 gslStreet1 :: Lens' GetShippingLabel (Maybe Text)
-gslStreet1 = lens _gslStreet1 (\ s a -> s{_gslStreet1 = a});
+gslStreet1 = lens _gslStreet1 (\ s a -> s{_gslStreet1 = a})
 
 -- | Undocumented member.
 gslJobIds :: Lens' GetShippingLabel [Text]
-gslJobIds = lens _gslJobIds (\ s a -> s{_gslJobIds = a}) . _Coerce;
+gslJobIds = lens _gslJobIds (\ s a -> s{_gslJobIds = a}) . _Coerce
 
 instance AWSRequest GetShippingLabel where
         type Rs GetShippingLabel = GetShippingLabelResponse
@@ -224,22 +224,22 @@
     -> GetShippingLabelResponse
 getShippingLabelResponse pResponseStatus_ =
   GetShippingLabelResponse'
-  { _gslrsShippingLabelURL = Nothing
-  , _gslrsWarning = Nothing
-  , _gslrsResponseStatus = pResponseStatus_
-  }
+    { _gslrsShippingLabelURL = Nothing
+    , _gslrsWarning = Nothing
+    , _gslrsResponseStatus = pResponseStatus_
+    }
 
 
 -- | Undocumented member.
 gslrsShippingLabelURL :: Lens' GetShippingLabelResponse (Maybe Text)
-gslrsShippingLabelURL = lens _gslrsShippingLabelURL (\ s a -> s{_gslrsShippingLabelURL = a});
+gslrsShippingLabelURL = lens _gslrsShippingLabelURL (\ s a -> s{_gslrsShippingLabelURL = a})
 
 -- | Undocumented member.
 gslrsWarning :: Lens' GetShippingLabelResponse (Maybe Text)
-gslrsWarning = lens _gslrsWarning (\ s a -> s{_gslrsWarning = a});
+gslrsWarning = lens _gslrsWarning (\ s a -> s{_gslrsWarning = a})
 
 -- | -- | The response status code.
 gslrsResponseStatus :: Lens' GetShippingLabelResponse Int
-gslrsResponseStatus = lens _gslrsResponseStatus (\ s a -> s{_gslrsResponseStatus = a});
+gslrsResponseStatus = lens _gslrsResponseStatus (\ s a -> s{_gslrsResponseStatus = a})
 
 instance NFData GetShippingLabelResponse where
diff --git a/gen/Network/AWS/ImportExport/GetStatus.hs b/gen/Network/AWS/ImportExport/GetStatus.hs
--- a/gen/Network/AWS/ImportExport/GetStatus.hs
+++ b/gen/Network/AWS/ImportExport/GetStatus.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.ImportExport.GetStatus
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -82,11 +82,11 @@
 
 -- | Undocumented member.
 gsAPIVersion :: Lens' GetStatus (Maybe Text)
-gsAPIVersion = lens _gsAPIVersion (\ s a -> s{_gsAPIVersion = a});
+gsAPIVersion = lens _gsAPIVersion (\ s a -> s{_gsAPIVersion = a})
 
 -- | Undocumented member.
 gsJobId :: Lens' GetStatus Text
-gsJobId = lens _gsJobId (\ s a -> s{_gsJobId = a});
+gsJobId = lens _gsJobId (\ s a -> s{_gsJobId = a})
 
 instance AWSRequest GetStatus where
         type Rs GetStatus = GetStatusResponse
@@ -198,92 +198,92 @@
     -> GetStatusResponse
 getStatusResponse pResponseStatus_ =
   GetStatusResponse'
-  { _gsrsCarrier = Nothing
-  , _gsrsTrackingNumber = Nothing
-  , _gsrsSignature = Nothing
-  , _gsrsJobType = Nothing
-  , _gsrsJobId = Nothing
-  , _gsrsSignatureFileContents = Nothing
-  , _gsrsErrorCount = Nothing
-  , _gsrsCurrentManifest = Nothing
-  , _gsrsArtifactList = Nothing
-  , _gsrsLogBucket = Nothing
-  , _gsrsCreationDate = Nothing
-  , _gsrsProgressCode = Nothing
-  , _gsrsLocationCode = Nothing
-  , _gsrsLogKey = Nothing
-  , _gsrsLocationMessage = Nothing
-  , _gsrsProgressMessage = Nothing
-  , _gsrsResponseStatus = pResponseStatus_
-  }
+    { _gsrsCarrier = Nothing
+    , _gsrsTrackingNumber = Nothing
+    , _gsrsSignature = Nothing
+    , _gsrsJobType = Nothing
+    , _gsrsJobId = Nothing
+    , _gsrsSignatureFileContents = Nothing
+    , _gsrsErrorCount = Nothing
+    , _gsrsCurrentManifest = Nothing
+    , _gsrsArtifactList = Nothing
+    , _gsrsLogBucket = Nothing
+    , _gsrsCreationDate = Nothing
+    , _gsrsProgressCode = Nothing
+    , _gsrsLocationCode = Nothing
+    , _gsrsLogKey = Nothing
+    , _gsrsLocationMessage = Nothing
+    , _gsrsProgressMessage = Nothing
+    , _gsrsResponseStatus = pResponseStatus_
+    }
 
 
 -- | Undocumented member.
 gsrsCarrier :: Lens' GetStatusResponse (Maybe Text)
-gsrsCarrier = lens _gsrsCarrier (\ s a -> s{_gsrsCarrier = a});
+gsrsCarrier = lens _gsrsCarrier (\ s a -> s{_gsrsCarrier = a})
 
 -- | Undocumented member.
 gsrsTrackingNumber :: Lens' GetStatusResponse (Maybe Text)
-gsrsTrackingNumber = lens _gsrsTrackingNumber (\ s a -> s{_gsrsTrackingNumber = a});
+gsrsTrackingNumber = lens _gsrsTrackingNumber (\ s a -> s{_gsrsTrackingNumber = a})
 
 -- | Undocumented member.
 gsrsSignature :: Lens' GetStatusResponse (Maybe Text)
-gsrsSignature = lens _gsrsSignature (\ s a -> s{_gsrsSignature = a});
+gsrsSignature = lens _gsrsSignature (\ s a -> s{_gsrsSignature = a})
 
 -- | Undocumented member.
 gsrsJobType :: Lens' GetStatusResponse (Maybe JobType)
-gsrsJobType = lens _gsrsJobType (\ s a -> s{_gsrsJobType = a});
+gsrsJobType = lens _gsrsJobType (\ s a -> s{_gsrsJobType = a})
 
 -- | Undocumented member.
 gsrsJobId :: Lens' GetStatusResponse (Maybe Text)
-gsrsJobId = lens _gsrsJobId (\ s a -> s{_gsrsJobId = a});
+gsrsJobId = lens _gsrsJobId (\ s a -> s{_gsrsJobId = a})
 
 -- | Undocumented member.
 gsrsSignatureFileContents :: Lens' GetStatusResponse (Maybe Text)
-gsrsSignatureFileContents = lens _gsrsSignatureFileContents (\ s a -> s{_gsrsSignatureFileContents = a});
+gsrsSignatureFileContents = lens _gsrsSignatureFileContents (\ s a -> s{_gsrsSignatureFileContents = a})
 
 -- | Undocumented member.
 gsrsErrorCount :: Lens' GetStatusResponse (Maybe Int)
-gsrsErrorCount = lens _gsrsErrorCount (\ s a -> s{_gsrsErrorCount = a});
+gsrsErrorCount = lens _gsrsErrorCount (\ s a -> s{_gsrsErrorCount = a})
 
 -- | Undocumented member.
 gsrsCurrentManifest :: Lens' GetStatusResponse (Maybe Text)
-gsrsCurrentManifest = lens _gsrsCurrentManifest (\ s a -> s{_gsrsCurrentManifest = a});
+gsrsCurrentManifest = lens _gsrsCurrentManifest (\ s a -> s{_gsrsCurrentManifest = a})
 
 -- | Undocumented member.
 gsrsArtifactList :: Lens' GetStatusResponse [Artifact]
-gsrsArtifactList = lens _gsrsArtifactList (\ s a -> s{_gsrsArtifactList = a}) . _Default . _Coerce;
+gsrsArtifactList = lens _gsrsArtifactList (\ s a -> s{_gsrsArtifactList = a}) . _Default . _Coerce
 
 -- | Undocumented member.
 gsrsLogBucket :: Lens' GetStatusResponse (Maybe Text)
-gsrsLogBucket = lens _gsrsLogBucket (\ s a -> s{_gsrsLogBucket = a});
+gsrsLogBucket = lens _gsrsLogBucket (\ s a -> s{_gsrsLogBucket = a})
 
 -- | Undocumented member.
 gsrsCreationDate :: Lens' GetStatusResponse (Maybe UTCTime)
-gsrsCreationDate = lens _gsrsCreationDate (\ s a -> s{_gsrsCreationDate = a}) . mapping _Time;
+gsrsCreationDate = lens _gsrsCreationDate (\ s a -> s{_gsrsCreationDate = a}) . mapping _Time
 
 -- | Undocumented member.
 gsrsProgressCode :: Lens' GetStatusResponse (Maybe Text)
-gsrsProgressCode = lens _gsrsProgressCode (\ s a -> s{_gsrsProgressCode = a});
+gsrsProgressCode = lens _gsrsProgressCode (\ s a -> s{_gsrsProgressCode = a})
 
 -- | Undocumented member.
 gsrsLocationCode :: Lens' GetStatusResponse (Maybe Text)
-gsrsLocationCode = lens _gsrsLocationCode (\ s a -> s{_gsrsLocationCode = a});
+gsrsLocationCode = lens _gsrsLocationCode (\ s a -> s{_gsrsLocationCode = a})
 
 -- | Undocumented member.
 gsrsLogKey :: Lens' GetStatusResponse (Maybe Text)
-gsrsLogKey = lens _gsrsLogKey (\ s a -> s{_gsrsLogKey = a});
+gsrsLogKey = lens _gsrsLogKey (\ s a -> s{_gsrsLogKey = a})
 
 -- | Undocumented member.
 gsrsLocationMessage :: Lens' GetStatusResponse (Maybe Text)
-gsrsLocationMessage = lens _gsrsLocationMessage (\ s a -> s{_gsrsLocationMessage = a});
+gsrsLocationMessage = lens _gsrsLocationMessage (\ s a -> s{_gsrsLocationMessage = a})
 
 -- | Undocumented member.
 gsrsProgressMessage :: Lens' GetStatusResponse (Maybe Text)
-gsrsProgressMessage = lens _gsrsProgressMessage (\ s a -> s{_gsrsProgressMessage = a});
+gsrsProgressMessage = lens _gsrsProgressMessage (\ s a -> s{_gsrsProgressMessage = a})
 
 -- | -- | The response status code.
 gsrsResponseStatus :: Lens' GetStatusResponse Int
-gsrsResponseStatus = lens _gsrsResponseStatus (\ s a -> s{_gsrsResponseStatus = a});
+gsrsResponseStatus = lens _gsrsResponseStatus (\ s a -> s{_gsrsResponseStatus = a})
 
 instance NFData GetStatusResponse where
diff --git a/gen/Network/AWS/ImportExport/ListJobs.hs b/gen/Network/AWS/ImportExport/ListJobs.hs
--- a/gen/Network/AWS/ImportExport/ListJobs.hs
+++ b/gen/Network/AWS/ImportExport/ListJobs.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.ImportExport.ListJobs
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -75,15 +75,15 @@
 
 -- | Undocumented member.
 ljAPIVersion :: Lens' ListJobs (Maybe Text)
-ljAPIVersion = lens _ljAPIVersion (\ s a -> s{_ljAPIVersion = a});
+ljAPIVersion = lens _ljAPIVersion (\ s a -> s{_ljAPIVersion = a})
 
 -- | Undocumented member.
 ljMarker :: Lens' ListJobs (Maybe Text)
-ljMarker = lens _ljMarker (\ s a -> s{_ljMarker = a});
+ljMarker = lens _ljMarker (\ s a -> s{_ljMarker = a})
 
 -- | Undocumented member.
 ljMaxJobs :: Lens' ListJobs (Maybe Int)
-ljMaxJobs = lens _ljMaxJobs (\ s a -> s{_ljMaxJobs = a});
+ljMaxJobs = lens _ljMaxJobs (\ s a -> s{_ljMaxJobs = a})
 
 instance AWSPager ListJobs where
         page rq rs
@@ -149,22 +149,22 @@
     -> ListJobsResponse
 listJobsResponse pResponseStatus_ =
   ListJobsResponse'
-  { _ljrsJobs = Nothing
-  , _ljrsIsTruncated = Nothing
-  , _ljrsResponseStatus = pResponseStatus_
-  }
+    { _ljrsJobs = Nothing
+    , _ljrsIsTruncated = Nothing
+    , _ljrsResponseStatus = pResponseStatus_
+    }
 
 
 -- | Undocumented member.
 ljrsJobs :: Lens' ListJobsResponse [Job]
-ljrsJobs = lens _ljrsJobs (\ s a -> s{_ljrsJobs = a}) . _Default . _Coerce;
+ljrsJobs = lens _ljrsJobs (\ s a -> s{_ljrsJobs = a}) . _Default . _Coerce
 
 -- | Undocumented member.
 ljrsIsTruncated :: Lens' ListJobsResponse (Maybe Bool)
-ljrsIsTruncated = lens _ljrsIsTruncated (\ s a -> s{_ljrsIsTruncated = a});
+ljrsIsTruncated = lens _ljrsIsTruncated (\ s a -> s{_ljrsIsTruncated = a})
 
 -- | -- | The response status code.
 ljrsResponseStatus :: Lens' ListJobsResponse Int
-ljrsResponseStatus = lens _ljrsResponseStatus (\ s a -> s{_ljrsResponseStatus = a});
+ljrsResponseStatus = lens _ljrsResponseStatus (\ s a -> s{_ljrsResponseStatus = a})
 
 instance NFData ListJobsResponse where
diff --git a/gen/Network/AWS/ImportExport/Types.hs b/gen/Network/AWS/ImportExport/Types.hs
--- a/gen/Network/AWS/ImportExport/Types.hs
+++ b/gen/Network/AWS/ImportExport/Types.hs
@@ -4,7 +4,7 @@
 
 -- |
 -- Module      : Network.AWS.ImportExport.Types
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -65,24 +65,24 @@
 importExport :: Service
 importExport =
   Service
-  { _svcAbbrev = "ImportExport"
-  , _svcSigner = v2
-  , _svcPrefix = "importexport"
-  , _svcVersion = "2010-06-01"
-  , _svcEndpoint = defaultEndpoint importExport
-  , _svcTimeout = Just 70
-  , _svcCheck = statusSuccess
-  , _svcError = parseXMLError "ImportExport"
-  , _svcRetry = retry
-  }
+    { _svcAbbrev = "ImportExport"
+    , _svcSigner = v2
+    , _svcPrefix = "importexport"
+    , _svcVersion = "2010-06-01"
+    , _svcEndpoint = defaultEndpoint importExport
+    , _svcTimeout = Just 70
+    , _svcCheck = statusSuccess
+    , _svcError = parseXMLError "ImportExport"
+    , _svcRetry = retry
+    }
   where
     retry =
       Exponential
-      { _retryBase = 5.0e-2
-      , _retryGrowth = 2
-      , _retryAttempts = 5
-      , _retryCheck = check
-      }
+        { _retryBase = 5.0e-2
+        , _retryGrowth = 2
+        , _retryAttempts = 5
+        , _retryCheck = check
+        }
     check e
       | has (hasCode "ThrottledException" . hasStatus 400) e =
         Just "throttled_exception"
@@ -91,6 +91,8 @@
         Just "throttling_exception"
       | has (hasCode "Throttling" . hasStatus 400) e = Just "throttling"
       | has (hasStatus 504) e = Just "gateway_timeout"
+      | has (hasCode "RequestThrottledException" . hasStatus 400) e =
+        Just "request_throttled_exception"
       | has (hasStatus 502) e = Just "bad_gateway"
       | has (hasStatus 503) e = Just "service_unavailable"
       | has (hasStatus 500) e = Just "general_server_error"
diff --git a/gen/Network/AWS/ImportExport/Types/Product.hs b/gen/Network/AWS/ImportExport/Types/Product.hs
--- a/gen/Network/AWS/ImportExport/Types/Product.hs
+++ b/gen/Network/AWS/ImportExport/Types/Product.hs
@@ -9,7 +9,7 @@
 
 -- |
 -- Module      : Network.AWS.ImportExport.Types.Product
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -44,11 +44,11 @@
 
 -- | Undocumented member.
 aURL :: Lens' Artifact (Maybe Text)
-aURL = lens _aURL (\ s a -> s{_aURL = a});
+aURL = lens _aURL (\ s a -> s{_aURL = a})
 
 -- | Undocumented member.
 aDescription :: Lens' Artifact (Maybe Text)
-aDescription = lens _aDescription (\ s a -> s{_aDescription = a});
+aDescription = lens _aDescription (\ s a -> s{_aDescription = a})
 
 instance FromXML Artifact where
         parseXML x
@@ -89,28 +89,28 @@
     -> Job
 job pJobType_ pJobId_ pIsCanceled_ pCreationDate_ =
   Job'
-  { _jobJobType = pJobType_
-  , _jobJobId = pJobId_
-  , _jobIsCanceled = pIsCanceled_
-  , _jobCreationDate = _Time # pCreationDate_
-  }
+    { _jobJobType = pJobType_
+    , _jobJobId = pJobId_
+    , _jobIsCanceled = pIsCanceled_
+    , _jobCreationDate = _Time # pCreationDate_
+    }
 
 
 -- | Undocumented member.
 jobJobType :: Lens' Job JobType
-jobJobType = lens _jobJobType (\ s a -> s{_jobJobType = a});
+jobJobType = lens _jobJobType (\ s a -> s{_jobJobType = a})
 
 -- | Undocumented member.
 jobJobId :: Lens' Job Text
-jobJobId = lens _jobJobId (\ s a -> s{_jobJobId = a});
+jobJobId = lens _jobJobId (\ s a -> s{_jobJobId = a})
 
 -- | Undocumented member.
 jobIsCanceled :: Lens' Job Bool
-jobIsCanceled = lens _jobIsCanceled (\ s a -> s{_jobIsCanceled = a});
+jobIsCanceled = lens _jobIsCanceled (\ s a -> s{_jobIsCanceled = a})
 
 -- | Undocumented member.
 jobCreationDate :: Lens' Job UTCTime
-jobCreationDate = lens _jobCreationDate (\ s a -> s{_jobCreationDate = a}) . _Time;
+jobCreationDate = lens _jobCreationDate (\ s a -> s{_jobCreationDate = a}) . _Time
 
 instance FromXML Job where
         parseXML x
diff --git a/gen/Network/AWS/ImportExport/Types/Sum.hs b/gen/Network/AWS/ImportExport/Types/Sum.hs
--- a/gen/Network/AWS/ImportExport/Types/Sum.hs
+++ b/gen/Network/AWS/ImportExport/Types/Sum.hs
@@ -9,7 +9,7 @@
 
 -- |
 -- Module      : Network.AWS.ImportExport.Types.Sum
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
diff --git a/gen/Network/AWS/ImportExport/UpdateJob.hs b/gen/Network/AWS/ImportExport/UpdateJob.hs
--- a/gen/Network/AWS/ImportExport/UpdateJob.hs
+++ b/gen/Network/AWS/ImportExport/UpdateJob.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.ImportExport.UpdateJob
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -81,33 +81,33 @@
     -> UpdateJob
 updateJob pJobId_ pManifest_ pJobType_ pValidateOnly_ =
   UpdateJob'
-  { _ujAPIVersion = Nothing
-  , _ujJobId = pJobId_
-  , _ujManifest = pManifest_
-  , _ujJobType = pJobType_
-  , _ujValidateOnly = pValidateOnly_
-  }
+    { _ujAPIVersion = Nothing
+    , _ujJobId = pJobId_
+    , _ujManifest = pManifest_
+    , _ujJobType = pJobType_
+    , _ujValidateOnly = pValidateOnly_
+    }
 
 
 -- | Undocumented member.
 ujAPIVersion :: Lens' UpdateJob (Maybe Text)
-ujAPIVersion = lens _ujAPIVersion (\ s a -> s{_ujAPIVersion = a});
+ujAPIVersion = lens _ujAPIVersion (\ s a -> s{_ujAPIVersion = a})
 
 -- | Undocumented member.
 ujJobId :: Lens' UpdateJob Text
-ujJobId = lens _ujJobId (\ s a -> s{_ujJobId = a});
+ujJobId = lens _ujJobId (\ s a -> s{_ujJobId = a})
 
 -- | Undocumented member.
 ujManifest :: Lens' UpdateJob Text
-ujManifest = lens _ujManifest (\ s a -> s{_ujManifest = a});
+ujManifest = lens _ujManifest (\ s a -> s{_ujManifest = a})
 
 -- | Undocumented member.
 ujJobType :: Lens' UpdateJob JobType
-ujJobType = lens _ujJobType (\ s a -> s{_ujJobType = a});
+ujJobType = lens _ujJobType (\ s a -> s{_ujJobType = a})
 
 -- | Undocumented member.
 ujValidateOnly :: Lens' UpdateJob Bool
-ujValidateOnly = lens _ujValidateOnly (\ s a -> s{_ujValidateOnly = a});
+ujValidateOnly = lens _ujValidateOnly (\ s a -> s{_ujValidateOnly = a})
 
 instance AWSRequest UpdateJob where
         type Rs UpdateJob = UpdateJobResponse
@@ -168,27 +168,27 @@
     -> UpdateJobResponse
 updateJobResponse pResponseStatus_ =
   UpdateJobResponse'
-  { _ujrsSuccess = Nothing
-  , _ujrsWarningMessage = Nothing
-  , _ujrsArtifactList = Nothing
-  , _ujrsResponseStatus = pResponseStatus_
-  }
+    { _ujrsSuccess = Nothing
+    , _ujrsWarningMessage = Nothing
+    , _ujrsArtifactList = Nothing
+    , _ujrsResponseStatus = pResponseStatus_
+    }
 
 
 -- | Undocumented member.
 ujrsSuccess :: Lens' UpdateJobResponse (Maybe Bool)
-ujrsSuccess = lens _ujrsSuccess (\ s a -> s{_ujrsSuccess = a});
+ujrsSuccess = lens _ujrsSuccess (\ s a -> s{_ujrsSuccess = a})
 
 -- | Undocumented member.
 ujrsWarningMessage :: Lens' UpdateJobResponse (Maybe Text)
-ujrsWarningMessage = lens _ujrsWarningMessage (\ s a -> s{_ujrsWarningMessage = a});
+ujrsWarningMessage = lens _ujrsWarningMessage (\ s a -> s{_ujrsWarningMessage = a})
 
 -- | Undocumented member.
 ujrsArtifactList :: Lens' UpdateJobResponse [Artifact]
-ujrsArtifactList = lens _ujrsArtifactList (\ s a -> s{_ujrsArtifactList = a}) . _Default . _Coerce;
+ujrsArtifactList = lens _ujrsArtifactList (\ s a -> s{_ujrsArtifactList = a}) . _Default . _Coerce
 
 -- | -- | The response status code.
 ujrsResponseStatus :: Lens' UpdateJobResponse Int
-ujrsResponseStatus = lens _ujrsResponseStatus (\ s a -> s{_ujrsResponseStatus = a});
+ujrsResponseStatus = lens _ujrsResponseStatus (\ s a -> s{_ujrsResponseStatus = a})
 
 instance NFData UpdateJobResponse where
diff --git a/gen/Network/AWS/ImportExport/Waiters.hs b/gen/Network/AWS/ImportExport/Waiters.hs
--- a/gen/Network/AWS/ImportExport/Waiters.hs
+++ b/gen/Network/AWS/ImportExport/Waiters.hs
@@ -7,7 +7,7 @@
 
 -- |
 -- Module      : Network.AWS.ImportExport.Waiters
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
diff --git a/test/Main.hs b/test/Main.hs
--- a/test/Main.hs
+++ b/test/Main.hs
@@ -2,7 +2,7 @@
 
 -- |
 -- Module      : Main
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
diff --git a/test/Test/AWS/Gen/ImportExport.hs b/test/Test/AWS/Gen/ImportExport.hs
--- a/test/Test/AWS/Gen/ImportExport.hs
+++ b/test/Test/AWS/Gen/ImportExport.hs
@@ -5,7 +5,7 @@
 
 -- |
 -- Module      : Test.AWS.Gen.ImportExport
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
diff --git a/test/Test/AWS/ImportExport.hs b/test/Test/AWS/ImportExport.hs
--- a/test/Test/AWS/ImportExport.hs
+++ b/test/Test/AWS/ImportExport.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 
 -- Module      : Test.AWS.ImportExport
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : This Source Code Form is subject to the terms of
 --               the Mozilla Public License, v. 2.0.
 --               A copy of the MPL can be found in the LICENSE file or
diff --git a/test/Test/AWS/ImportExport/Internal.hs b/test/Test/AWS/ImportExport/Internal.hs
--- a/test/Test/AWS/ImportExport/Internal.hs
+++ b/test/Test/AWS/ImportExport/Internal.hs
@@ -2,7 +2,7 @@
 {-# OPTIONS_GHC -fno-warn-unused-imports #-}
 
 -- Module      : Test.AWS.ImportExport.Internal
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : This Source Code Form is subject to the terms of
 --               the Mozilla Public License, v. 2.0.
 --               A copy of the MPL can be found in the LICENSE file or