diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`1.1.0`
+`1.2.0`
 
 
 ## Description
diff --git a/amazonka-cloudsearch.cabal b/amazonka-cloudsearch.cabal
--- a/amazonka-cloudsearch.cabal
+++ b/amazonka-cloudsearch.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-cloudsearch
-version:               1.1.0
+version:               1.2.0
 synopsis:              Amazon CloudSearch SDK.
 homepage:              https://github.com/brendanhay/amazonka
 license:               OtherLicense
@@ -85,7 +85,7 @@
         , Network.AWS.CloudSearch.Types.Sum
 
     build-depends:
-          amazonka-core == 1.1.0.*
+          amazonka-core == 1.2.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-cloudsearch-test
@@ -104,9 +104,9 @@
         , Test.AWS.CloudSearch.Internal
 
     build-depends:
-          amazonka-core == 1.1.0
-        , amazonka-test == 1.1.0
-        , amazonka-cloudsearch == 1.1.0
+          amazonka-core == 1.2.0
+        , amazonka-test == 1.2.0
+        , amazonka-cloudsearch == 1.2.0
         , base
         , bytestring
         , lens
diff --git a/gen/Network/AWS/CloudSearch.hs b/gen/Network/AWS/CloudSearch.hs
--- a/gen/Network/AWS/CloudSearch.hs
+++ b/gen/Network/AWS/CloudSearch.hs
@@ -28,8 +28,8 @@
 -- /See:/ <http://docs.aws.amazon.com/cloudsearch/latest/developerguide/what-is-cloudsearch.html AWS API Reference>
 module Network.AWS.CloudSearch
     (
-    -- * Service
-      CloudSearch
+    -- * Service Configuration
+      cloudSearch
 
     -- * Errors
     -- $errors
diff --git a/gen/Network/AWS/CloudSearch/BuildSuggesters.hs b/gen/Network/AWS/CloudSearch/BuildSuggesters.hs
--- a/gen/Network/AWS/CloudSearch/BuildSuggesters.hs
+++ b/gen/Network/AWS/CloudSearch/BuildSuggesters.hs
@@ -71,9 +71,8 @@
 bsDomainName = lens _bsDomainName (\ s a -> s{_bsDomainName = a});
 
 instance AWSRequest BuildSuggesters where
-        type Sv BuildSuggesters = CloudSearch
         type Rs BuildSuggesters = BuildSuggestersResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "BuildSuggestersResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/CreateDomain.hs b/gen/Network/AWS/CloudSearch/CreateDomain.hs
--- a/gen/Network/AWS/CloudSearch/CreateDomain.hs
+++ b/gen/Network/AWS/CloudSearch/CreateDomain.hs
@@ -74,9 +74,8 @@
 cdDomainName = lens _cdDomainName (\ s a -> s{_cdDomainName = a});
 
 instance AWSRequest CreateDomain where
-        type Sv CreateDomain = CloudSearch
         type Rs CreateDomain = CreateDomainResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "CreateDomainResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/DefineAnalysisScheme.hs b/gen/Network/AWS/CloudSearch/DefineAnalysisScheme.hs
--- a/gen/Network/AWS/CloudSearch/DefineAnalysisScheme.hs
+++ b/gen/Network/AWS/CloudSearch/DefineAnalysisScheme.hs
@@ -84,10 +84,9 @@
 dasaAnalysisScheme = lens _dasaAnalysisScheme (\ s a -> s{_dasaAnalysisScheme = a});
 
 instance AWSRequest DefineAnalysisScheme where
-        type Sv DefineAnalysisScheme = CloudSearch
         type Rs DefineAnalysisScheme =
              DefineAnalysisSchemeResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "DefineAnalysisSchemeResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/DefineExpression.hs b/gen/Network/AWS/CloudSearch/DefineExpression.hs
--- a/gen/Network/AWS/CloudSearch/DefineExpression.hs
+++ b/gen/Network/AWS/CloudSearch/DefineExpression.hs
@@ -84,9 +84,8 @@
 dExpression = lens _dExpression (\ s a -> s{_dExpression = a});
 
 instance AWSRequest DefineExpression where
-        type Sv DefineExpression = CloudSearch
         type Rs DefineExpression = DefineExpressionResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "DefineExpressionResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/DefineIndexField.hs b/gen/Network/AWS/CloudSearch/DefineIndexField.hs
--- a/gen/Network/AWS/CloudSearch/DefineIndexField.hs
+++ b/gen/Network/AWS/CloudSearch/DefineIndexField.hs
@@ -88,9 +88,8 @@
 defeIndexField = lens _defeIndexField (\ s a -> s{_defeIndexField = a});
 
 instance AWSRequest DefineIndexField where
-        type Sv DefineIndexField = CloudSearch
         type Rs DefineIndexField = DefineIndexFieldResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "DefineIndexFieldResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/DefineSuggester.hs b/gen/Network/AWS/CloudSearch/DefineSuggester.hs
--- a/gen/Network/AWS/CloudSearch/DefineSuggester.hs
+++ b/gen/Network/AWS/CloudSearch/DefineSuggester.hs
@@ -86,9 +86,8 @@
 defSuggester = lens _defSuggester (\ s a -> s{_defSuggester = a});
 
 instance AWSRequest DefineSuggester where
-        type Sv DefineSuggester = CloudSearch
         type Rs DefineSuggester = DefineSuggesterResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "DefineSuggesterResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/DeleteAnalysisScheme.hs b/gen/Network/AWS/CloudSearch/DeleteAnalysisScheme.hs
--- a/gen/Network/AWS/CloudSearch/DeleteAnalysisScheme.hs
+++ b/gen/Network/AWS/CloudSearch/DeleteAnalysisScheme.hs
@@ -82,10 +82,9 @@
 dasAnalysisSchemeName = lens _dasAnalysisSchemeName (\ s a -> s{_dasAnalysisSchemeName = a});
 
 instance AWSRequest DeleteAnalysisScheme where
-        type Sv DeleteAnalysisScheme = CloudSearch
         type Rs DeleteAnalysisScheme =
              DeleteAnalysisSchemeResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "DeleteAnalysisSchemeResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/DeleteDomain.hs b/gen/Network/AWS/CloudSearch/DeleteDomain.hs
--- a/gen/Network/AWS/CloudSearch/DeleteDomain.hs
+++ b/gen/Network/AWS/CloudSearch/DeleteDomain.hs
@@ -72,9 +72,8 @@
 dddDomainName = lens _dddDomainName (\ s a -> s{_dddDomainName = a});
 
 instance AWSRequest DeleteDomain where
-        type Sv DeleteDomain = CloudSearch
         type Rs DeleteDomain = DeleteDomainResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "DeleteDomainResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/DeleteExpression.hs b/gen/Network/AWS/CloudSearch/DeleteExpression.hs
--- a/gen/Network/AWS/CloudSearch/DeleteExpression.hs
+++ b/gen/Network/AWS/CloudSearch/DeleteExpression.hs
@@ -83,9 +83,8 @@
 delExpressionName = lens _delExpressionName (\ s a -> s{_delExpressionName = a});
 
 instance AWSRequest DeleteExpression where
-        type Sv DeleteExpression = CloudSearch
         type Rs DeleteExpression = DeleteExpressionResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "DeleteExpressionResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/DeleteIndexField.hs b/gen/Network/AWS/CloudSearch/DeleteIndexField.hs
--- a/gen/Network/AWS/CloudSearch/DeleteIndexField.hs
+++ b/gen/Network/AWS/CloudSearch/DeleteIndexField.hs
@@ -84,9 +84,8 @@
 difiIndexFieldName = lens _difiIndexFieldName (\ s a -> s{_difiIndexFieldName = a});
 
 instance AWSRequest DeleteIndexField where
-        type Sv DeleteIndexField = CloudSearch
         type Rs DeleteIndexField = DeleteIndexFieldResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "DeleteIndexFieldResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/DeleteSuggester.hs b/gen/Network/AWS/CloudSearch/DeleteSuggester.hs
--- a/gen/Network/AWS/CloudSearch/DeleteSuggester.hs
+++ b/gen/Network/AWS/CloudSearch/DeleteSuggester.hs
@@ -82,9 +82,8 @@
 ddSuggesterName = lens _ddSuggesterName (\ s a -> s{_ddSuggesterName = a});
 
 instance AWSRequest DeleteSuggester where
-        type Sv DeleteSuggester = CloudSearch
         type Rs DeleteSuggester = DeleteSuggesterResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "DeleteSuggesterResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/DescribeAnalysisSchemes.hs b/gen/Network/AWS/CloudSearch/DescribeAnalysisSchemes.hs
--- a/gen/Network/AWS/CloudSearch/DescribeAnalysisSchemes.hs
+++ b/gen/Network/AWS/CloudSearch/DescribeAnalysisSchemes.hs
@@ -98,10 +98,9 @@
 dassDomainName = lens _dassDomainName (\ s a -> s{_dassDomainName = a});
 
 instance AWSRequest DescribeAnalysisSchemes where
-        type Sv DescribeAnalysisSchemes = CloudSearch
         type Rs DescribeAnalysisSchemes =
              DescribeAnalysisSchemesResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "DescribeAnalysisSchemesResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/DescribeAvailabilityOptions.hs b/gen/Network/AWS/CloudSearch/DescribeAvailabilityOptions.hs
--- a/gen/Network/AWS/CloudSearch/DescribeAvailabilityOptions.hs
+++ b/gen/Network/AWS/CloudSearch/DescribeAvailabilityOptions.hs
@@ -86,10 +86,9 @@
 daoDomainName = lens _daoDomainName (\ s a -> s{_daoDomainName = a});
 
 instance AWSRequest DescribeAvailabilityOptions where
-        type Sv DescribeAvailabilityOptions = CloudSearch
         type Rs DescribeAvailabilityOptions =
              DescribeAvailabilityOptionsResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper
               "DescribeAvailabilityOptionsResult"
diff --git a/gen/Network/AWS/CloudSearch/DescribeDomains.hs b/gen/Network/AWS/CloudSearch/DescribeDomains.hs
--- a/gen/Network/AWS/CloudSearch/DescribeDomains.hs
+++ b/gen/Network/AWS/CloudSearch/DescribeDomains.hs
@@ -77,9 +77,8 @@
 ddDomainNames = lens _ddDomainNames (\ s a -> s{_ddDomainNames = a}) . _Default . _Coerce;
 
 instance AWSRequest DescribeDomains where
-        type Sv DescribeDomains = CloudSearch
         type Rs DescribeDomains = DescribeDomainsResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "DescribeDomainsResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/DescribeExpressions.hs b/gen/Network/AWS/CloudSearch/DescribeExpressions.hs
--- a/gen/Network/AWS/CloudSearch/DescribeExpressions.hs
+++ b/gen/Network/AWS/CloudSearch/DescribeExpressions.hs
@@ -98,10 +98,9 @@
 deDomainName = lens _deDomainName (\ s a -> s{_deDomainName = a});
 
 instance AWSRequest DescribeExpressions where
-        type Sv DescribeExpressions = CloudSearch
         type Rs DescribeExpressions =
              DescribeExpressionsResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "DescribeExpressionsResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/DescribeIndexFields.hs b/gen/Network/AWS/CloudSearch/DescribeIndexFields.hs
--- a/gen/Network/AWS/CloudSearch/DescribeIndexFields.hs
+++ b/gen/Network/AWS/CloudSearch/DescribeIndexFields.hs
@@ -98,10 +98,9 @@
 difDomainName = lens _difDomainName (\ s a -> s{_difDomainName = a});
 
 instance AWSRequest DescribeIndexFields where
-        type Sv DescribeIndexFields = CloudSearch
         type Rs DescribeIndexFields =
              DescribeIndexFieldsResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "DescribeIndexFieldsResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/DescribeScalingParameters.hs b/gen/Network/AWS/CloudSearch/DescribeScalingParameters.hs
--- a/gen/Network/AWS/CloudSearch/DescribeScalingParameters.hs
+++ b/gen/Network/AWS/CloudSearch/DescribeScalingParameters.hs
@@ -73,10 +73,9 @@
 dspDomainName = lens _dspDomainName (\ s a -> s{_dspDomainName = a});
 
 instance AWSRequest DescribeScalingParameters where
-        type Sv DescribeScalingParameters = CloudSearch
         type Rs DescribeScalingParameters =
              DescribeScalingParametersResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "DescribeScalingParametersResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/DescribeServiceAccessPolicies.hs b/gen/Network/AWS/CloudSearch/DescribeServiceAccessPolicies.hs
--- a/gen/Network/AWS/CloudSearch/DescribeServiceAccessPolicies.hs
+++ b/gen/Network/AWS/CloudSearch/DescribeServiceAccessPolicies.hs
@@ -88,10 +88,9 @@
 
 instance AWSRequest DescribeServiceAccessPolicies
          where
-        type Sv DescribeServiceAccessPolicies = CloudSearch
         type Rs DescribeServiceAccessPolicies =
              DescribeServiceAccessPoliciesResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper
               "DescribeServiceAccessPoliciesResult"
diff --git a/gen/Network/AWS/CloudSearch/DescribeSuggesters.hs b/gen/Network/AWS/CloudSearch/DescribeSuggesters.hs
--- a/gen/Network/AWS/CloudSearch/DescribeSuggesters.hs
+++ b/gen/Network/AWS/CloudSearch/DescribeSuggesters.hs
@@ -98,10 +98,9 @@
 dssDomainName = lens _dssDomainName (\ s a -> s{_dssDomainName = a});
 
 instance AWSRequest DescribeSuggesters where
-        type Sv DescribeSuggesters = CloudSearch
         type Rs DescribeSuggesters =
              DescribeSuggestersResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "DescribeSuggestersResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/IndexDocuments.hs b/gen/Network/AWS/CloudSearch/IndexDocuments.hs
--- a/gen/Network/AWS/CloudSearch/IndexDocuments.hs
+++ b/gen/Network/AWS/CloudSearch/IndexDocuments.hs
@@ -71,9 +71,8 @@
 idDomainName = lens _idDomainName (\ s a -> s{_idDomainName = a});
 
 instance AWSRequest IndexDocuments where
-        type Sv IndexDocuments = CloudSearch
         type Rs IndexDocuments = IndexDocumentsResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "IndexDocumentsResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/ListDomainNames.hs b/gen/Network/AWS/CloudSearch/ListDomainNames.hs
--- a/gen/Network/AWS/CloudSearch/ListDomainNames.hs
+++ b/gen/Network/AWS/CloudSearch/ListDomainNames.hs
@@ -53,9 +53,8 @@
 listDomainNames = ListDomainNames'
 
 instance AWSRequest ListDomainNames where
-        type Sv ListDomainNames = CloudSearch
         type Rs ListDomainNames = ListDomainNamesResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "ListDomainNamesResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/Types.hs b/gen/Network/AWS/CloudSearch/Types.hs
--- a/gen/Network/AWS/CloudSearch/Types.hs
+++ b/gen/Network/AWS/CloudSearch/Types.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TypeFamilies      #-}
 
 -- Derived from AWS service descriptions, licensed under Apache 2.0.
 
@@ -13,8 +12,8 @@
 --
 module Network.AWS.CloudSearch.Types
     (
-    -- * Service
-      CloudSearch
+    -- * Service Configuration
+      cloudSearch
 
     -- * Errors
     , _BaseException
@@ -291,41 +290,38 @@
 import           Network.AWS.Prelude
 import           Network.AWS.Sign.V4
 
--- | Version @2013-01-01@ of the Amazon CloudSearch SDK.
-data CloudSearch
-
-instance AWSService CloudSearch where
-    type Sg CloudSearch = V4
-    service = const svc
-      where
-        svc =
-            Service
-            { _svcAbbrev = "CloudSearch"
-            , _svcPrefix = "cloudsearch"
-            , _svcVersion = "2013-01-01"
-            , _svcEndpoint = defaultEndpoint svc
-            , _svcTimeout = Just 70
-            , _svcStatus = statusSuccess
-            , _svcError = parseXMLError
-            , _svcRetry = retry
-            }
-        retry =
-            Exponential
-            { _retryBase = 5.0e-2
-            , _retryGrowth = 2
-            , _retryAttempts = 5
-            , _retryCheck = check
-            }
-        check e
-          | has (hasCode "BandwidthLimitExceeded" . hasStatus 509) e =
-              Just "request_limit_exceeded"
-          | has (hasCode "ThrottlingException" . hasStatus 400) e =
-              Just "throttling_exception"
-          | has (hasCode "Throttling" . hasStatus 400) e = Just "throttling"
-          | has (hasStatus 503) e = Just "service_unavailable"
-          | has (hasStatus 500) e = Just "general_server_error"
-          | has (hasStatus 509) e = Just "limit_exceeded"
-          | otherwise = Nothing
+-- | API version '2013-01-01' of the Amazon CloudSearch SDK configuration.
+cloudSearch :: Service
+cloudSearch =
+    Service
+    { _svcAbbrev = "CloudSearch"
+    , _svcSigner = v4
+    , _svcPrefix = "cloudsearch"
+    , _svcVersion = "2013-01-01"
+    , _svcEndpoint = defaultEndpoint cloudSearch
+    , _svcTimeout = Just 70
+    , _svcCheck = statusSuccess
+    , _svcError = parseXMLError
+    , _svcRetry = retry
+    }
+  where
+    retry =
+        Exponential
+        { _retryBase = 5.0e-2
+        , _retryGrowth = 2
+        , _retryAttempts = 5
+        , _retryCheck = check
+        }
+    check e
+      | has (hasCode "BandwidthLimitExceeded" . hasStatus 509) e =
+          Just "request_limit_exceeded"
+      | has (hasCode "ThrottlingException" . hasStatus 400) e =
+          Just "throttling_exception"
+      | has (hasCode "Throttling" . hasStatus 400) e = Just "throttling"
+      | has (hasStatus 503) e = Just "service_unavailable"
+      | has (hasStatus 500) e = Just "general_server_error"
+      | has (hasStatus 509) e = Just "limit_exceeded"
+      | otherwise = Nothing
 
 -- | An error occurred while processing the request.
 _BaseException :: AsError a => Getting (First ServiceError) a ServiceError
diff --git a/gen/Network/AWS/CloudSearch/Types/Product.hs b/gen/Network/AWS/CloudSearch/Types/Product.hs
--- a/gen/Network/AWS/CloudSearch/Types/Product.hs
+++ b/gen/Network/AWS/CloudSearch/Types/Product.hs
@@ -2,7 +2,6 @@
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE RecordWildCards    #-}
-{-# LANGUAGE TypeFamilies       #-}
 
 {-# OPTIONS_GHC -fno-warn-unused-imports #-}
 
diff --git a/gen/Network/AWS/CloudSearch/UpdateAvailabilityOptions.hs b/gen/Network/AWS/CloudSearch/UpdateAvailabilityOptions.hs
--- a/gen/Network/AWS/CloudSearch/UpdateAvailabilityOptions.hs
+++ b/gen/Network/AWS/CloudSearch/UpdateAvailabilityOptions.hs
@@ -89,10 +89,9 @@
 uaoMultiAZ = lens _uaoMultiAZ (\ s a -> s{_uaoMultiAZ = a});
 
 instance AWSRequest UpdateAvailabilityOptions where
-        type Sv UpdateAvailabilityOptions = CloudSearch
         type Rs UpdateAvailabilityOptions =
              UpdateAvailabilityOptionsResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "UpdateAvailabilityOptionsResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/UpdateScalingParameters.hs b/gen/Network/AWS/CloudSearch/UpdateScalingParameters.hs
--- a/gen/Network/AWS/CloudSearch/UpdateScalingParameters.hs
+++ b/gen/Network/AWS/CloudSearch/UpdateScalingParameters.hs
@@ -88,10 +88,9 @@
 uspScalingParameters = lens _uspScalingParameters (\ s a -> s{_uspScalingParameters = a});
 
 instance AWSRequest UpdateScalingParameters where
-        type Sv UpdateScalingParameters = CloudSearch
         type Rs UpdateScalingParameters =
              UpdateScalingParametersResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper "UpdateScalingParametersResult"
               (\ s h x ->
diff --git a/gen/Network/AWS/CloudSearch/UpdateServiceAccessPolicies.hs b/gen/Network/AWS/CloudSearch/UpdateServiceAccessPolicies.hs
--- a/gen/Network/AWS/CloudSearch/UpdateServiceAccessPolicies.hs
+++ b/gen/Network/AWS/CloudSearch/UpdateServiceAccessPolicies.hs
@@ -83,10 +83,9 @@
 usapAccessPolicies = lens _usapAccessPolicies (\ s a -> s{_usapAccessPolicies = a});
 
 instance AWSRequest UpdateServiceAccessPolicies where
-        type Sv UpdateServiceAccessPolicies = CloudSearch
         type Rs UpdateServiceAccessPolicies =
              UpdateServiceAccessPoliciesResponse
-        request = postQuery
+        request = postQuery cloudSearch
         response
           = receiveXMLWrapper
               "UpdateServiceAccessPoliciesResult"
diff --git a/test/Test/AWS/Gen/CloudSearch.hs b/test/Test/AWS/Gen/CloudSearch.hs
--- a/test/Test/AWS/Gen/CloudSearch.hs
+++ b/test/Test/AWS/Gen/CloudSearch.hs
@@ -306,142 +306,166 @@
 testDescribeAvailabilityOptionsResponse = res
     "DescribeAvailabilityOptionsResponse"
     "fixture/DescribeAvailabilityOptionsResponse"
+    cloudSearch
     (Proxy :: Proxy DescribeAvailabilityOptions)
 
 testDescribeExpressionsResponse :: DescribeExpressionsResponse -> TestTree
 testDescribeExpressionsResponse = res
     "DescribeExpressionsResponse"
     "fixture/DescribeExpressionsResponse"
+    cloudSearch
     (Proxy :: Proxy DescribeExpressions)
 
 testDefineExpressionResponse :: DefineExpressionResponse -> TestTree
 testDefineExpressionResponse = res
     "DefineExpressionResponse"
     "fixture/DefineExpressionResponse"
+    cloudSearch
     (Proxy :: Proxy DefineExpression)
 
 testDescribeScalingParametersResponse :: DescribeScalingParametersResponse -> TestTree
 testDescribeScalingParametersResponse = res
     "DescribeScalingParametersResponse"
     "fixture/DescribeScalingParametersResponse"
+    cloudSearch
     (Proxy :: Proxy DescribeScalingParameters)
 
 testDescribeServiceAccessPoliciesResponse :: DescribeServiceAccessPoliciesResponse -> TestTree
 testDescribeServiceAccessPoliciesResponse = res
     "DescribeServiceAccessPoliciesResponse"
     "fixture/DescribeServiceAccessPoliciesResponse"
+    cloudSearch
     (Proxy :: Proxy DescribeServiceAccessPolicies)
 
 testDescribeSuggestersResponse :: DescribeSuggestersResponse -> TestTree
 testDescribeSuggestersResponse = res
     "DescribeSuggestersResponse"
     "fixture/DescribeSuggestersResponse"
+    cloudSearch
     (Proxy :: Proxy DescribeSuggesters)
 
 testUpdateAvailabilityOptionsResponse :: UpdateAvailabilityOptionsResponse -> TestTree
 testUpdateAvailabilityOptionsResponse = res
     "UpdateAvailabilityOptionsResponse"
     "fixture/UpdateAvailabilityOptionsResponse"
+    cloudSearch
     (Proxy :: Proxy UpdateAvailabilityOptions)
 
 testDeleteExpressionResponse :: DeleteExpressionResponse -> TestTree
 testDeleteExpressionResponse = res
     "DeleteExpressionResponse"
     "fixture/DeleteExpressionResponse"
+    cloudSearch
     (Proxy :: Proxy DeleteExpression)
 
 testDescribeDomainsResponse :: DescribeDomainsResponse -> TestTree
 testDescribeDomainsResponse = res
     "DescribeDomainsResponse"
     "fixture/DescribeDomainsResponse"
+    cloudSearch
     (Proxy :: Proxy DescribeDomains)
 
 testDefineSuggesterResponse :: DefineSuggesterResponse -> TestTree
 testDefineSuggesterResponse = res
     "DefineSuggesterResponse"
     "fixture/DefineSuggesterResponse"
+    cloudSearch
     (Proxy :: Proxy DefineSuggester)
 
 testDeleteAnalysisSchemeResponse :: DeleteAnalysisSchemeResponse -> TestTree
 testDeleteAnalysisSchemeResponse = res
     "DeleteAnalysisSchemeResponse"
     "fixture/DeleteAnalysisSchemeResponse"
+    cloudSearch
     (Proxy :: Proxy DeleteAnalysisScheme)
 
 testListDomainNamesResponse :: ListDomainNamesResponse -> TestTree
 testListDomainNamesResponse = res
     "ListDomainNamesResponse"
     "fixture/ListDomainNamesResponse"
+    cloudSearch
     (Proxy :: Proxy ListDomainNames)
 
 testDescribeAnalysisSchemesResponse :: DescribeAnalysisSchemesResponse -> TestTree
 testDescribeAnalysisSchemesResponse = res
     "DescribeAnalysisSchemesResponse"
     "fixture/DescribeAnalysisSchemesResponse"
+    cloudSearch
     (Proxy :: Proxy DescribeAnalysisSchemes)
 
 testCreateDomainResponse :: CreateDomainResponse -> TestTree
 testCreateDomainResponse = res
     "CreateDomainResponse"
     "fixture/CreateDomainResponse"
+    cloudSearch
     (Proxy :: Proxy CreateDomain)
 
 testDefineAnalysisSchemeResponse :: DefineAnalysisSchemeResponse -> TestTree
 testDefineAnalysisSchemeResponse = res
     "DefineAnalysisSchemeResponse"
     "fixture/DefineAnalysisSchemeResponse"
+    cloudSearch
     (Proxy :: Proxy DefineAnalysisScheme)
 
 testDeleteSuggesterResponse :: DeleteSuggesterResponse -> TestTree
 testDeleteSuggesterResponse = res
     "DeleteSuggesterResponse"
     "fixture/DeleteSuggesterResponse"
+    cloudSearch
     (Proxy :: Proxy DeleteSuggester)
 
 testDescribeIndexFieldsResponse :: DescribeIndexFieldsResponse -> TestTree
 testDescribeIndexFieldsResponse = res
     "DescribeIndexFieldsResponse"
     "fixture/DescribeIndexFieldsResponse"
+    cloudSearch
     (Proxy :: Proxy DescribeIndexFields)
 
 testIndexDocumentsResponse :: IndexDocumentsResponse -> TestTree
 testIndexDocumentsResponse = res
     "IndexDocumentsResponse"
     "fixture/IndexDocumentsResponse"
+    cloudSearch
     (Proxy :: Proxy IndexDocuments)
 
 testDeleteIndexFieldResponse :: DeleteIndexFieldResponse -> TestTree
 testDeleteIndexFieldResponse = res
     "DeleteIndexFieldResponse"
     "fixture/DeleteIndexFieldResponse"
+    cloudSearch
     (Proxy :: Proxy DeleteIndexField)
 
 testBuildSuggestersResponse :: BuildSuggestersResponse -> TestTree
 testBuildSuggestersResponse = res
     "BuildSuggestersResponse"
     "fixture/BuildSuggestersResponse"
+    cloudSearch
     (Proxy :: Proxy BuildSuggesters)
 
 testUpdateScalingParametersResponse :: UpdateScalingParametersResponse -> TestTree
 testUpdateScalingParametersResponse = res
     "UpdateScalingParametersResponse"
     "fixture/UpdateScalingParametersResponse"
+    cloudSearch
     (Proxy :: Proxy UpdateScalingParameters)
 
 testUpdateServiceAccessPoliciesResponse :: UpdateServiceAccessPoliciesResponse -> TestTree
 testUpdateServiceAccessPoliciesResponse = res
     "UpdateServiceAccessPoliciesResponse"
     "fixture/UpdateServiceAccessPoliciesResponse"
+    cloudSearch
     (Proxy :: Proxy UpdateServiceAccessPolicies)
 
 testDefineIndexFieldResponse :: DefineIndexFieldResponse -> TestTree
 testDefineIndexFieldResponse = res
     "DefineIndexFieldResponse"
     "fixture/DefineIndexFieldResponse"
+    cloudSearch
     (Proxy :: Proxy DefineIndexField)
 
 testDeleteDomainResponse :: DeleteDomainResponse -> TestTree
 testDeleteDomainResponse = res
     "DeleteDomainResponse"
     "fixture/DeleteDomainResponse"
+    cloudSearch
     (Proxy :: Proxy DeleteDomain)
