diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`1.3.6`
+`1.3.7`
 
 
 ## Description
diff --git a/amazonka-apigateway.cabal b/amazonka-apigateway.cabal
--- a/amazonka-apigateway.cabal
+++ b/amazonka-apigateway.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-apigateway
-version:               1.3.6
+version:               1.3.7
 synopsis:              Amazon API Gateway SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -122,7 +122,7 @@
         , Network.AWS.APIGateway.Types.Sum
 
     build-depends:
-          amazonka-core == 1.3.6.*
+          amazonka-core == 1.3.7.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-apigateway-test
@@ -142,12 +142,11 @@
         , Test.AWS.APIGateway.Internal
 
     build-depends:
-          amazonka-core == 1.3.6.*
-        , amazonka-test == 1.3.6.*
-        , amazonka-apigateway == 1.3.6.*
+          amazonka-core == 1.3.7.*
+        , amazonka-test == 1.3.7.*
+        , amazonka-apigateway == 1.3.7.*
         , base
         , bytestring
-        , lens
         , tasty
         , tasty-hunit
         , text
diff --git a/gen/Network/AWS/APIGateway/CreateAPIKey.hs b/gen/Network/AWS/APIGateway/CreateAPIKey.hs
--- a/gen/Network/AWS/APIGateway/CreateAPIKey.hs
+++ b/gen/Network/AWS/APIGateway/CreateAPIKey.hs
@@ -47,6 +47,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/CreateBasePathMapping.hs b/gen/Network/AWS/APIGateway/CreateBasePathMapping.hs
--- a/gen/Network/AWS/APIGateway/CreateBasePathMapping.hs
+++ b/gen/Network/AWS/APIGateway/CreateBasePathMapping.hs
@@ -43,6 +43,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/CreateDeployment.hs b/gen/Network/AWS/APIGateway/CreateDeployment.hs
--- a/gen/Network/AWS/APIGateway/CreateDeployment.hs
+++ b/gen/Network/AWS/APIGateway/CreateDeployment.hs
@@ -48,6 +48,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/CreateDomainName.hs b/gen/Network/AWS/APIGateway/CreateDomainName.hs
--- a/gen/Network/AWS/APIGateway/CreateDomainName.hs
+++ b/gen/Network/AWS/APIGateway/CreateDomainName.hs
@@ -45,6 +45,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/CreateModel.hs b/gen/Network/AWS/APIGateway/CreateModel.hs
--- a/gen/Network/AWS/APIGateway/CreateModel.hs
+++ b/gen/Network/AWS/APIGateway/CreateModel.hs
@@ -46,6 +46,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/CreateResource.hs b/gen/Network/AWS/APIGateway/CreateResource.hs
--- a/gen/Network/AWS/APIGateway/CreateResource.hs
+++ b/gen/Network/AWS/APIGateway/CreateResource.hs
@@ -44,6 +44,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/CreateRestAPI.hs b/gen/Network/AWS/APIGateway/CreateRestAPI.hs
--- a/gen/Network/AWS/APIGateway/CreateRestAPI.hs
+++ b/gen/Network/AWS/APIGateway/CreateRestAPI.hs
@@ -43,6 +43,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/CreateStage.hs b/gen/Network/AWS/APIGateway/CreateStage.hs
--- a/gen/Network/AWS/APIGateway/CreateStage.hs
+++ b/gen/Network/AWS/APIGateway/CreateStage.hs
@@ -54,6 +54,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/DeleteAPIKey.hs b/gen/Network/AWS/APIGateway/DeleteAPIKey.hs
--- a/gen/Network/AWS/APIGateway/DeleteAPIKey.hs
+++ b/gen/Network/AWS/APIGateway/DeleteAPIKey.hs
@@ -36,6 +36,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/DeleteBasePathMapping.hs b/gen/Network/AWS/APIGateway/DeleteBasePathMapping.hs
--- a/gen/Network/AWS/APIGateway/DeleteBasePathMapping.hs
+++ b/gen/Network/AWS/APIGateway/DeleteBasePathMapping.hs
@@ -37,6 +37,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/DeleteClientCertificate.hs b/gen/Network/AWS/APIGateway/DeleteClientCertificate.hs
--- a/gen/Network/AWS/APIGateway/DeleteClientCertificate.hs
+++ b/gen/Network/AWS/APIGateway/DeleteClientCertificate.hs
@@ -36,6 +36,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/DeleteDeployment.hs b/gen/Network/AWS/APIGateway/DeleteDeployment.hs
--- a/gen/Network/AWS/APIGateway/DeleteDeployment.hs
+++ b/gen/Network/AWS/APIGateway/DeleteDeployment.hs
@@ -38,6 +38,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/DeleteDomainName.hs b/gen/Network/AWS/APIGateway/DeleteDomainName.hs
--- a/gen/Network/AWS/APIGateway/DeleteDomainName.hs
+++ b/gen/Network/AWS/APIGateway/DeleteDomainName.hs
@@ -36,6 +36,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/DeleteIntegration.hs b/gen/Network/AWS/APIGateway/DeleteIntegration.hs
--- a/gen/Network/AWS/APIGateway/DeleteIntegration.hs
+++ b/gen/Network/AWS/APIGateway/DeleteIntegration.hs
@@ -38,6 +38,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/DeleteIntegrationResponse.hs b/gen/Network/AWS/APIGateway/DeleteIntegrationResponse.hs
--- a/gen/Network/AWS/APIGateway/DeleteIntegrationResponse.hs
+++ b/gen/Network/AWS/APIGateway/DeleteIntegrationResponse.hs
@@ -39,6 +39,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/DeleteMethod.hs b/gen/Network/AWS/APIGateway/DeleteMethod.hs
--- a/gen/Network/AWS/APIGateway/DeleteMethod.hs
+++ b/gen/Network/AWS/APIGateway/DeleteMethod.hs
@@ -38,6 +38,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/DeleteMethodResponse.hs b/gen/Network/AWS/APIGateway/DeleteMethodResponse.hs
--- a/gen/Network/AWS/APIGateway/DeleteMethodResponse.hs
+++ b/gen/Network/AWS/APIGateway/DeleteMethodResponse.hs
@@ -39,6 +39,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/DeleteModel.hs b/gen/Network/AWS/APIGateway/DeleteModel.hs
--- a/gen/Network/AWS/APIGateway/DeleteModel.hs
+++ b/gen/Network/AWS/APIGateway/DeleteModel.hs
@@ -37,6 +37,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/DeleteResource.hs b/gen/Network/AWS/APIGateway/DeleteResource.hs
--- a/gen/Network/AWS/APIGateway/DeleteResource.hs
+++ b/gen/Network/AWS/APIGateway/DeleteResource.hs
@@ -37,6 +37,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/DeleteRestAPI.hs b/gen/Network/AWS/APIGateway/DeleteRestAPI.hs
--- a/gen/Network/AWS/APIGateway/DeleteRestAPI.hs
+++ b/gen/Network/AWS/APIGateway/DeleteRestAPI.hs
@@ -36,6 +36,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/DeleteStage.hs b/gen/Network/AWS/APIGateway/DeleteStage.hs
--- a/gen/Network/AWS/APIGateway/DeleteStage.hs
+++ b/gen/Network/AWS/APIGateway/DeleteStage.hs
@@ -37,6 +37,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/FlushStageCache.hs b/gen/Network/AWS/APIGateway/FlushStageCache.hs
--- a/gen/Network/AWS/APIGateway/FlushStageCache.hs
+++ b/gen/Network/AWS/APIGateway/FlushStageCache.hs
@@ -37,6 +37,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/GenerateClientCertificate.hs b/gen/Network/AWS/APIGateway/GenerateClientCertificate.hs
--- a/gen/Network/AWS/APIGateway/GenerateClientCertificate.hs
+++ b/gen/Network/AWS/APIGateway/GenerateClientCertificate.hs
@@ -42,6 +42,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/GetAPIKey.hs b/gen/Network/AWS/APIGateway/GetAPIKey.hs
--- a/gen/Network/AWS/APIGateway/GetAPIKey.hs
+++ b/gen/Network/AWS/APIGateway/GetAPIKey.hs
@@ -44,6 +44,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/GetAPIKeys.hs b/gen/Network/AWS/APIGateway/GetAPIKeys.hs
--- a/gen/Network/AWS/APIGateway/GetAPIKeys.hs
+++ b/gen/Network/AWS/APIGateway/GetAPIKeys.hs
@@ -43,6 +43,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Pager
 import           Network.AWS.Prelude
 import           Network.AWS.Request
diff --git a/gen/Network/AWS/APIGateway/GetAccount.hs b/gen/Network/AWS/APIGateway/GetAccount.hs
--- a/gen/Network/AWS/APIGateway/GetAccount.hs
+++ b/gen/Network/AWS/APIGateway/GetAccount.hs
@@ -37,6 +37,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/GetBasePathMapping.hs b/gen/Network/AWS/APIGateway/GetBasePathMapping.hs
--- a/gen/Network/AWS/APIGateway/GetBasePathMapping.hs
+++ b/gen/Network/AWS/APIGateway/GetBasePathMapping.hs
@@ -41,6 +41,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/GetBasePathMappings.hs b/gen/Network/AWS/APIGateway/GetBasePathMappings.hs
--- a/gen/Network/AWS/APIGateway/GetBasePathMappings.hs
+++ b/gen/Network/AWS/APIGateway/GetBasePathMappings.hs
@@ -44,6 +44,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Pager
 import           Network.AWS.Prelude
 import           Network.AWS.Request
diff --git a/gen/Network/AWS/APIGateway/GetClientCertificate.hs b/gen/Network/AWS/APIGateway/GetClientCertificate.hs
--- a/gen/Network/AWS/APIGateway/GetClientCertificate.hs
+++ b/gen/Network/AWS/APIGateway/GetClientCertificate.hs
@@ -42,6 +42,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/GetClientCertificates.hs b/gen/Network/AWS/APIGateway/GetClientCertificates.hs
--- a/gen/Network/AWS/APIGateway/GetClientCertificates.hs
+++ b/gen/Network/AWS/APIGateway/GetClientCertificates.hs
@@ -43,6 +43,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Pager
 import           Network.AWS.Prelude
 import           Network.AWS.Request
diff --git a/gen/Network/AWS/APIGateway/GetDeployment.hs b/gen/Network/AWS/APIGateway/GetDeployment.hs
--- a/gen/Network/AWS/APIGateway/GetDeployment.hs
+++ b/gen/Network/AWS/APIGateway/GetDeployment.hs
@@ -42,6 +42,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/GetDeployments.hs b/gen/Network/AWS/APIGateway/GetDeployments.hs
--- a/gen/Network/AWS/APIGateway/GetDeployments.hs
+++ b/gen/Network/AWS/APIGateway/GetDeployments.hs
@@ -44,6 +44,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Pager
 import           Network.AWS.Prelude
 import           Network.AWS.Request
diff --git a/gen/Network/AWS/APIGateway/GetDomainName.hs b/gen/Network/AWS/APIGateway/GetDomainName.hs
--- a/gen/Network/AWS/APIGateway/GetDomainName.hs
+++ b/gen/Network/AWS/APIGateway/GetDomainName.hs
@@ -42,6 +42,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/GetDomainNames.hs b/gen/Network/AWS/APIGateway/GetDomainNames.hs
--- a/gen/Network/AWS/APIGateway/GetDomainNames.hs
+++ b/gen/Network/AWS/APIGateway/GetDomainNames.hs
@@ -43,6 +43,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Pager
 import           Network.AWS.Prelude
 import           Network.AWS.Request
diff --git a/gen/Network/AWS/APIGateway/GetIntegration.hs b/gen/Network/AWS/APIGateway/GetIntegration.hs
--- a/gen/Network/AWS/APIGateway/GetIntegration.hs
+++ b/gen/Network/AWS/APIGateway/GetIntegration.hs
@@ -48,6 +48,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/GetIntegrationResponse.hs b/gen/Network/AWS/APIGateway/GetIntegrationResponse.hs
--- a/gen/Network/AWS/APIGateway/GetIntegrationResponse.hs
+++ b/gen/Network/AWS/APIGateway/GetIntegrationResponse.hs
@@ -44,6 +44,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/GetMethod.hs b/gen/Network/AWS/APIGateway/GetMethod.hs
--- a/gen/Network/AWS/APIGateway/GetMethod.hs
+++ b/gen/Network/AWS/APIGateway/GetMethod.hs
@@ -46,6 +46,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/GetMethodResponse.hs b/gen/Network/AWS/APIGateway/GetMethodResponse.hs
--- a/gen/Network/AWS/APIGateway/GetMethodResponse.hs
+++ b/gen/Network/AWS/APIGateway/GetMethodResponse.hs
@@ -43,6 +43,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/GetModel.hs b/gen/Network/AWS/APIGateway/GetModel.hs
--- a/gen/Network/AWS/APIGateway/GetModel.hs
+++ b/gen/Network/AWS/APIGateway/GetModel.hs
@@ -44,6 +44,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/GetModelTemplate.hs b/gen/Network/AWS/APIGateway/GetModelTemplate.hs
--- a/gen/Network/AWS/APIGateway/GetModelTemplate.hs
+++ b/gen/Network/AWS/APIGateway/GetModelTemplate.hs
@@ -41,6 +41,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/GetModels.hs b/gen/Network/AWS/APIGateway/GetModels.hs
--- a/gen/Network/AWS/APIGateway/GetModels.hs
+++ b/gen/Network/AWS/APIGateway/GetModels.hs
@@ -44,6 +44,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Pager
 import           Network.AWS.Prelude
 import           Network.AWS.Request
diff --git a/gen/Network/AWS/APIGateway/GetResource.hs b/gen/Network/AWS/APIGateway/GetResource.hs
--- a/gen/Network/AWS/APIGateway/GetResource.hs
+++ b/gen/Network/AWS/APIGateway/GetResource.hs
@@ -43,6 +43,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/GetResources.hs b/gen/Network/AWS/APIGateway/GetResources.hs
--- a/gen/Network/AWS/APIGateway/GetResources.hs
+++ b/gen/Network/AWS/APIGateway/GetResources.hs
@@ -44,6 +44,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Pager
 import           Network.AWS.Prelude
 import           Network.AWS.Request
diff --git a/gen/Network/AWS/APIGateway/GetRestAPI.hs b/gen/Network/AWS/APIGateway/GetRestAPI.hs
--- a/gen/Network/AWS/APIGateway/GetRestAPI.hs
+++ b/gen/Network/AWS/APIGateway/GetRestAPI.hs
@@ -41,6 +41,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/GetRestAPIs.hs b/gen/Network/AWS/APIGateway/GetRestAPIs.hs
--- a/gen/Network/AWS/APIGateway/GetRestAPIs.hs
+++ b/gen/Network/AWS/APIGateway/GetRestAPIs.hs
@@ -43,6 +43,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Pager
 import           Network.AWS.Prelude
 import           Network.AWS.Request
diff --git a/gen/Network/AWS/APIGateway/GetSDK.hs b/gen/Network/AWS/APIGateway/GetSDK.hs
--- a/gen/Network/AWS/APIGateway/GetSDK.hs
+++ b/gen/Network/AWS/APIGateway/GetSDK.hs
@@ -44,6 +44,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/GetStage.hs b/gen/Network/AWS/APIGateway/GetStage.hs
--- a/gen/Network/AWS/APIGateway/GetStage.hs
+++ b/gen/Network/AWS/APIGateway/GetStage.hs
@@ -49,6 +49,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/GetStages.hs b/gen/Network/AWS/APIGateway/GetStages.hs
--- a/gen/Network/AWS/APIGateway/GetStages.hs
+++ b/gen/Network/AWS/APIGateway/GetStages.hs
@@ -40,6 +40,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/PutIntegration.hs b/gen/Network/AWS/APIGateway/PutIntegration.hs
--- a/gen/Network/AWS/APIGateway/PutIntegration.hs
+++ b/gen/Network/AWS/APIGateway/PutIntegration.hs
@@ -56,6 +56,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/PutIntegrationResponse.hs b/gen/Network/AWS/APIGateway/PutIntegrationResponse.hs
--- a/gen/Network/AWS/APIGateway/PutIntegrationResponse.hs
+++ b/gen/Network/AWS/APIGateway/PutIntegrationResponse.hs
@@ -47,6 +47,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/PutMethod.hs b/gen/Network/AWS/APIGateway/PutMethod.hs
--- a/gen/Network/AWS/APIGateway/PutMethod.hs
+++ b/gen/Network/AWS/APIGateway/PutMethod.hs
@@ -50,6 +50,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/PutMethodResponse.hs b/gen/Network/AWS/APIGateway/PutMethodResponse.hs
--- a/gen/Network/AWS/APIGateway/PutMethodResponse.hs
+++ b/gen/Network/AWS/APIGateway/PutMethodResponse.hs
@@ -45,6 +45,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/TestInvokeMethod.hs b/gen/Network/AWS/APIGateway/TestInvokeMethod.hs
--- a/gen/Network/AWS/APIGateway/TestInvokeMethod.hs
+++ b/gen/Network/AWS/APIGateway/TestInvokeMethod.hs
@@ -50,6 +50,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/Types.hs b/gen/Network/AWS/APIGateway/Types.hs
--- a/gen/Network/AWS/APIGateway/Types.hs
+++ b/gen/Network/AWS/APIGateway/Types.hs
@@ -206,6 +206,7 @@
 
 import           Network.AWS.APIGateway.Types.Product
 import           Network.AWS.APIGateway.Types.Sum
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Sign.V4
 
diff --git a/gen/Network/AWS/APIGateway/Types/Product.hs b/gen/Network/AWS/APIGateway/Types/Product.hs
--- a/gen/Network/AWS/APIGateway/Types/Product.hs
+++ b/gen/Network/AWS/APIGateway/Types/Product.hs
@@ -18,6 +18,7 @@
 module Network.AWS.APIGateway.Types.Product where
 
 import           Network.AWS.APIGateway.Types.Sum
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 
 -- | A resource that can be distributed to callers for executing Method
diff --git a/gen/Network/AWS/APIGateway/Types/Sum.hs b/gen/Network/AWS/APIGateway/Types/Sum.hs
--- a/gen/Network/AWS/APIGateway/Types/Sum.hs
+++ b/gen/Network/AWS/APIGateway/Types/Sum.hs
@@ -29,7 +29,7 @@
     | D28_4
     | D58_2
     | D6_1
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText CacheClusterSize where
     parser = takeLowerText >>= \case
@@ -73,7 +73,7 @@
     | DeleteInProgress
     | FlushInProgress
     | NotAvailable
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText CacheClusterStatus where
     parser = takeLowerText >>= \case
@@ -106,7 +106,7 @@
     = AWS
     | HTTP
     | Mock
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText IntegrationType where
     parser = takeLowerText >>= \case
@@ -140,7 +140,7 @@
     | Remove
     | Replace
     | Test
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText Op where
     parser = takeLowerText >>= \case
diff --git a/gen/Network/AWS/APIGateway/UpdateAPIKey.hs b/gen/Network/AWS/APIGateway/UpdateAPIKey.hs
--- a/gen/Network/AWS/APIGateway/UpdateAPIKey.hs
+++ b/gen/Network/AWS/APIGateway/UpdateAPIKey.hs
@@ -45,6 +45,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/UpdateAccount.hs b/gen/Network/AWS/APIGateway/UpdateAccount.hs
--- a/gen/Network/AWS/APIGateway/UpdateAccount.hs
+++ b/gen/Network/AWS/APIGateway/UpdateAccount.hs
@@ -39,6 +39,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/UpdateBasePathMapping.hs b/gen/Network/AWS/APIGateway/UpdateBasePathMapping.hs
--- a/gen/Network/AWS/APIGateway/UpdateBasePathMapping.hs
+++ b/gen/Network/AWS/APIGateway/UpdateBasePathMapping.hs
@@ -42,6 +42,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/UpdateClientCertificate.hs b/gen/Network/AWS/APIGateway/UpdateClientCertificate.hs
--- a/gen/Network/AWS/APIGateway/UpdateClientCertificate.hs
+++ b/gen/Network/AWS/APIGateway/UpdateClientCertificate.hs
@@ -43,6 +43,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/UpdateDeployment.hs b/gen/Network/AWS/APIGateway/UpdateDeployment.hs
--- a/gen/Network/AWS/APIGateway/UpdateDeployment.hs
+++ b/gen/Network/AWS/APIGateway/UpdateDeployment.hs
@@ -43,6 +43,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/UpdateDomainName.hs b/gen/Network/AWS/APIGateway/UpdateDomainName.hs
--- a/gen/Network/AWS/APIGateway/UpdateDomainName.hs
+++ b/gen/Network/AWS/APIGateway/UpdateDomainName.hs
@@ -42,6 +42,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/UpdateIntegration.hs b/gen/Network/AWS/APIGateway/UpdateIntegration.hs
--- a/gen/Network/AWS/APIGateway/UpdateIntegration.hs
+++ b/gen/Network/AWS/APIGateway/UpdateIntegration.hs
@@ -49,6 +49,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/UpdateIntegrationResponse.hs b/gen/Network/AWS/APIGateway/UpdateIntegrationResponse.hs
--- a/gen/Network/AWS/APIGateway/UpdateIntegrationResponse.hs
+++ b/gen/Network/AWS/APIGateway/UpdateIntegrationResponse.hs
@@ -45,6 +45,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/UpdateMethod.hs b/gen/Network/AWS/APIGateway/UpdateMethod.hs
--- a/gen/Network/AWS/APIGateway/UpdateMethod.hs
+++ b/gen/Network/AWS/APIGateway/UpdateMethod.hs
@@ -47,6 +47,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/UpdateMethodResponse.hs b/gen/Network/AWS/APIGateway/UpdateMethodResponse.hs
--- a/gen/Network/AWS/APIGateway/UpdateMethodResponse.hs
+++ b/gen/Network/AWS/APIGateway/UpdateMethodResponse.hs
@@ -44,6 +44,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/UpdateModel.hs b/gen/Network/AWS/APIGateway/UpdateModel.hs
--- a/gen/Network/AWS/APIGateway/UpdateModel.hs
+++ b/gen/Network/AWS/APIGateway/UpdateModel.hs
@@ -44,6 +44,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/UpdateResource.hs b/gen/Network/AWS/APIGateway/UpdateResource.hs
--- a/gen/Network/AWS/APIGateway/UpdateResource.hs
+++ b/gen/Network/AWS/APIGateway/UpdateResource.hs
@@ -44,6 +44,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/UpdateRestAPI.hs b/gen/Network/AWS/APIGateway/UpdateRestAPI.hs
--- a/gen/Network/AWS/APIGateway/UpdateRestAPI.hs
+++ b/gen/Network/AWS/APIGateway/UpdateRestAPI.hs
@@ -42,6 +42,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/UpdateStage.hs b/gen/Network/AWS/APIGateway/UpdateStage.hs
--- a/gen/Network/AWS/APIGateway/UpdateStage.hs
+++ b/gen/Network/AWS/APIGateway/UpdateStage.hs
@@ -50,6 +50,7 @@
 
 import           Network.AWS.APIGateway.Types
 import           Network.AWS.APIGateway.Types.Product
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/APIGateway/Waiters.hs b/gen/Network/AWS/APIGateway/Waiters.hs
--- a/gen/Network/AWS/APIGateway/Waiters.hs
+++ b/gen/Network/AWS/APIGateway/Waiters.hs
@@ -16,5 +16,6 @@
 module Network.AWS.APIGateway.Waiters where
 
 import           Network.AWS.APIGateway.Types
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Waiter