diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`0.0.1`
+`0.1.0`
 
 
 ## Description
@@ -18,9 +18,9 @@
 
 ## Contribute
 
-For any problems, comments, or feedback please create an issue [here on GitHub](https://github.com/brendanhay/amazonka/issues).
+For any problems, comments, or feedback please create an issue [here on GitHub](https://github.com/brendanhay/gogol/issues).
 
-> _Note:_ this library is an auto-generated Haskell package. Please see `amazonka-gen` for more information.
+> _Note:_ this library is an auto-generated Haskell package. Please see `gogol-gen` for more information.
 
 
 ## Licence
diff --git a/gen/Network/Google/CustomSearch.hs b/gen/Network/Google/CustomSearch.hs
--- a/gen/Network/Google/CustomSearch.hs
+++ b/gen/Network/Google/CustomSearch.hs
@@ -7,7 +7,7 @@
 
 -- |
 -- Module      : Network.Google.CustomSearch
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
diff --git a/gen/Network/Google/CustomSearch/Types.hs b/gen/Network/Google/CustomSearch/Types.hs
--- a/gen/Network/Google/CustomSearch/Types.hs
+++ b/gen/Network/Google/CustomSearch/Types.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE DataKinds          #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE NoImplicitPrelude  #-}
@@ -7,7 +8,7 @@
 
 -- |
 -- Module      : Network.Google.CustomSearch.Types
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -214,7 +215,7 @@
 import           Network.Google.Prelude
 
 -- | Default request referring to version 'v1' of the CustomSearch API. This contains the host and root path used as a starting point for constructing service requests.
-customSearchService :: Service
+customSearchService :: ServiceConfig
 customSearchService
   = defaultService (ServiceId "customsearch:v1")
       "www.googleapis.com"
diff --git a/gen/Network/Google/CustomSearch/Types/Product.hs b/gen/Network/Google/CustomSearch/Types/Product.hs
--- a/gen/Network/Google/CustomSearch/Types/Product.hs
+++ b/gen/Network/Google/CustomSearch/Types/Product.hs
@@ -9,7 +9,7 @@
 
 -- |
 -- Module      : Network.Google.CustomSearch.Types.Product
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -22,7 +22,7 @@
 
 --
 -- /See:/ 'promotionImage' smart constructor.
-data PromotionImage = PromotionImage
+data PromotionImage = PromotionImage'
     { _piHeight :: !(Maybe (Textual Int32))
     , _piWidth  :: !(Maybe (Textual Int32))
     , _piSource :: !(Maybe Text)
@@ -40,7 +40,7 @@
 promotionImage
     :: PromotionImage
 promotionImage =
-    PromotionImage
+    PromotionImage'
     { _piHeight = Nothing
     , _piWidth = Nothing
     , _piSource = Nothing
@@ -63,12 +63,12 @@
         parseJSON
           = withObject "PromotionImage"
               (\ o ->
-                 PromotionImage <$>
+                 PromotionImage' <$>
                    (o .:? "height") <*> (o .:? "width") <*>
                      (o .:? "source"))
 
 instance ToJSON PromotionImage where
-        toJSON PromotionImage{..}
+        toJSON PromotionImage'{..}
           = object
               (catMaybes
                  [("height" .=) <$> _piHeight,
@@ -77,7 +77,7 @@
 
 --
 -- /See:/ 'context' smart constructor.
-data Context = Context
+data Context = Context'
     { _cFacets :: !(Maybe [[ContextFacetsItemItem]])
     , _cTitle  :: !(Maybe Text)
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -92,7 +92,7 @@
 context
     :: Context
 context =
-    Context
+    Context'
     { _cFacets = Nothing
     , _cTitle = Nothing
     }
@@ -109,11 +109,11 @@
         parseJSON
           = withObject "Context"
               (\ o ->
-                 Context <$>
+                 Context' <$>
                    (o .:? "facets" .!= mempty) <*> (o .:? "title"))
 
 instance ToJSON Context where
-        toJSON Context{..}
+        toJSON Context'{..}
           = object
               (catMaybes
                  [("facets" .=) <$> _cFacets,
@@ -121,7 +121,7 @@
 
 --
 -- /See:/ 'searchQueries' smart constructor.
-newtype SearchQueries = SearchQueries
+newtype SearchQueries = SearchQueries'
     { _sqAddtional :: HashMap Text [Query]
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -134,7 +134,7 @@
     :: HashMap Text [Query] -- ^ 'sqAddtional'
     -> SearchQueries
 searchQueries pSqAddtional_ =
-    SearchQueries
+    SearchQueries'
     { _sqAddtional = _Coerce # pSqAddtional_
     }
 
@@ -146,14 +146,14 @@
 instance FromJSON SearchQueries where
         parseJSON
           = withObject "SearchQueries"
-              (\ o -> SearchQueries <$> (parseJSONObject o))
+              (\ o -> SearchQueries' <$> (parseJSONObject o))
 
 instance ToJSON SearchQueries where
         toJSON = toJSON . _sqAddtional
 
 --
 -- /See:/ 'resultPagemapAdditionalItem' smart constructor.
-newtype ResultPagemapAdditionalItem = ResultPagemapAdditionalItem
+newtype ResultPagemapAdditionalItem = ResultPagemapAdditionalItem'
     { _rpaiAddtional :: HashMap Text JSONValue
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -166,7 +166,7 @@
     :: HashMap Text JSONValue -- ^ 'rpaiAddtional'
     -> ResultPagemapAdditionalItem
 resultPagemapAdditionalItem pRpaiAddtional_ =
-    ResultPagemapAdditionalItem
+    ResultPagemapAdditionalItem'
     { _rpaiAddtional = _Coerce # pRpaiAddtional_
     }
 
@@ -180,14 +180,14 @@
         parseJSON
           = withObject "ResultPagemapAdditionalItem"
               (\ o ->
-                 ResultPagemapAdditionalItem <$> (parseJSONObject o))
+                 ResultPagemapAdditionalItem' <$> (parseJSONObject o))
 
 instance ToJSON ResultPagemapAdditionalItem where
         toJSON = toJSON . _rpaiAddtional
 
 --
 -- /See:/ 'searchURL' smart constructor.
-data SearchURL = SearchURL
+data SearchURL = SearchURL'
     { _suType     :: !Text
     , _suTemplate :: !Text
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -202,7 +202,7 @@
 searchURL
     :: SearchURL
 searchURL =
-    SearchURL
+    SearchURL'
     { _suType = "application/json"
     , _suTemplate = "https://www.googleapis.com/customsearch/v1?q={searchTerms}&num={count?}&start={startIndex?}&lr={language?}&safe={safe?}&cx={cx?}&cref={cref?}&sort={sort?}&filter={filter?}&gl={gl?}&cr={cr?}&googlehost={googleHost?}&c2coff={disableCnTwTranslation?}&hq={hq?}&hl={hl?}&siteSearch={siteSearch?}&siteSearchFilter={siteSearchFilter?}&exactTerms={exactTerms?}&excludeTerms={excludeTerms?}&linkSite={linkSite?}&orTerms={orTerms?}&relatedSite={relatedSite?}&dateRestrict={dateRestrict?}&lowRange={lowRange?}&highRange={highRange?}&searchType={searchType}&fileType={fileType?}&rights={rights?}&imgSize={imgSize?}&imgType={imgType?}&imgColorType={imgColorType?}&imgDominantColor={imgDominantColor?}&alt=json"
     }
@@ -218,13 +218,13 @@
         parseJSON
           = withObject "SearchURL"
               (\ o ->
-                 SearchURL <$>
+                 SearchURL' <$>
                    (o .:? "type" .!= "application/json") <*>
                      (o .:? "template" .!=
                         "https://www.googleapis.com/customsearch/v1?q={searchTerms}&num={count?}&start={startIndex?}&lr={language?}&safe={safe?}&cx={cx?}&cref={cref?}&sort={sort?}&filter={filter?}&gl={gl?}&cr={cr?}&googlehost={googleHost?}&c2coff={disableCnTwTranslation?}&hq={hq?}&hl={hl?}&siteSearch={siteSearch?}&siteSearchFilter={siteSearchFilter?}&exactTerms={exactTerms?}&excludeTerms={excludeTerms?}&linkSite={linkSite?}&orTerms={orTerms?}&relatedSite={relatedSite?}&dateRestrict={dateRestrict?}&lowRange={lowRange?}&highRange={highRange?}&searchType={searchType}&fileType={fileType?}&rights={rights?}&imgSize={imgSize?}&imgType={imgType?}&imgColorType={imgColorType?}&imgDominantColor={imgDominantColor?}&alt=json"))
 
 instance ToJSON SearchURL where
-        toJSON SearchURL{..}
+        toJSON SearchURL'{..}
           = object
               (catMaybes
                  [Just ("type" .= _suType),
@@ -232,7 +232,7 @@
 
 --
 -- /See:/ 'searchSpelling' smart constructor.
-data SearchSpelling = SearchSpelling
+data SearchSpelling = SearchSpelling'
     { _ssCorrectedQuery     :: !(Maybe Text)
     , _ssHTMLCorrectedQuery :: !(Maybe Text)
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -247,7 +247,7 @@
 searchSpelling
     :: SearchSpelling
 searchSpelling =
-    SearchSpelling
+    SearchSpelling'
     { _ssCorrectedQuery = Nothing
     , _ssHTMLCorrectedQuery = Nothing
     }
@@ -266,12 +266,12 @@
         parseJSON
           = withObject "SearchSpelling"
               (\ o ->
-                 SearchSpelling <$>
+                 SearchSpelling' <$>
                    (o .:? "correctedQuery") <*>
                      (o .:? "htmlCorrectedQuery"))
 
 instance ToJSON SearchSpelling where
-        toJSON SearchSpelling{..}
+        toJSON SearchSpelling'{..}
           = object
               (catMaybes
                  [("correctedQuery" .=) <$> _ssCorrectedQuery,
@@ -279,7 +279,7 @@
 
 --
 -- /See:/ 'resultImage' smart constructor.
-data ResultImage = ResultImage
+data ResultImage = ResultImage'
     { _riThumbnailLink   :: !(Maybe Text)
     , _riHeight          :: !(Maybe (Textual Int32))
     , _riByteSize        :: !(Maybe (Textual Int32))
@@ -309,7 +309,7 @@
 resultImage
     :: ResultImage
 resultImage =
-    ResultImage
+    ResultImage'
     { _riThumbnailLink = Nothing
     , _riHeight = Nothing
     , _riByteSize = Nothing
@@ -360,7 +360,7 @@
         parseJSON
           = withObject "ResultImage"
               (\ o ->
-                 ResultImage <$>
+                 ResultImage' <$>
                    (o .:? "thumbnailLink") <*> (o .:? "height") <*>
                      (o .:? "byteSize")
                      <*> (o .:? "contextLink")
@@ -369,7 +369,7 @@
                      <*> (o .:? "thumbnailWidth"))
 
 instance ToJSON ResultImage where
-        toJSON ResultImage{..}
+        toJSON ResultImage'{..}
           = object
               (catMaybes
                  [("thumbnailLink" .=) <$> _riThumbnailLink,
@@ -382,7 +382,7 @@
 
 --
 -- /See:/ 'resultPagemap' smart constructor.
-newtype ResultPagemap = ResultPagemap
+newtype ResultPagemap = ResultPagemap'
     { _rpAddtional :: HashMap Text [ResultPagemapAdditionalItem]
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -395,7 +395,7 @@
     :: HashMap Text [ResultPagemapAdditionalItem] -- ^ 'rpAddtional'
     -> ResultPagemap
 resultPagemap pRpAddtional_ =
-    ResultPagemap
+    ResultPagemap'
     { _rpAddtional = _Coerce # pRpAddtional_
     }
 
@@ -407,14 +407,14 @@
 instance FromJSON ResultPagemap where
         parseJSON
           = withObject "ResultPagemap"
-              (\ o -> ResultPagemap <$> (parseJSONObject o))
+              (\ o -> ResultPagemap' <$> (parseJSONObject o))
 
 instance ToJSON ResultPagemap where
         toJSON = toJSON . _rpAddtional
 
 --
 -- /See:/ 'result' smart constructor.
-data Result = Result
+data Result = Result'
     { _rMime             :: !(Maybe Text)
     , _rImage            :: !(Maybe ResultImage)
     , _rPagemap          :: !(Maybe ResultPagemap)
@@ -468,7 +468,7 @@
 result
     :: Result
 result =
-    Result
+    Result'
     { _rMime = Nothing
     , _rImage = Nothing
     , _rPagemap = Nothing
@@ -545,7 +545,7 @@
         parseJSON
           = withObject "Result"
               (\ o ->
-                 Result <$>
+                 Result' <$>
                    (o .:? "mime") <*> (o .:? "image") <*>
                      (o .:? "pagemap")
                      <*> (o .:? "displayLink")
@@ -562,7 +562,7 @@
                      <*> (o .:? "title"))
 
 instance ToJSON Result where
-        toJSON Result{..}
+        toJSON Result'{..}
           = object
               (catMaybes
                  [("mime" .=) <$> _rMime, ("image" .=) <$> _rImage,
@@ -581,7 +581,7 @@
 
 --
 -- /See:/ 'resultLabelsItem' smart constructor.
-data ResultLabelsItem = ResultLabelsItem
+data ResultLabelsItem = ResultLabelsItem'
     { _rliName        :: !(Maybe Text)
     , _rliDisplayName :: !(Maybe Text)
     , _rliLabelWithOp :: !(Maybe Text)
@@ -599,7 +599,7 @@
 resultLabelsItem
     :: ResultLabelsItem
 resultLabelsItem =
-    ResultLabelsItem
+    ResultLabelsItem'
     { _rliName = Nothing
     , _rliDisplayName = Nothing
     , _rliLabelWithOp = Nothing
@@ -622,12 +622,12 @@
         parseJSON
           = withObject "ResultLabelsItem"
               (\ o ->
-                 ResultLabelsItem <$>
+                 ResultLabelsItem' <$>
                    (o .:? "name") <*> (o .:? "displayName") <*>
                      (o .:? "label_with_op"))
 
 instance ToJSON ResultLabelsItem where
-        toJSON ResultLabelsItem{..}
+        toJSON ResultLabelsItem'{..}
           = object
               (catMaybes
                  [("name" .=) <$> _rliName,
@@ -636,7 +636,7 @@
 
 --
 -- /See:/ 'searchSearchInformation' smart constructor.
-data SearchSearchInformation = SearchSearchInformation
+data SearchSearchInformation = SearchSearchInformation'
     { _ssiSearchTime            :: !(Maybe (Textual Double))
     , _ssiFormattedSearchTime   :: !(Maybe Text)
     , _ssiTotalResults          :: !(Maybe (Textual Int64))
@@ -657,7 +657,7 @@
 searchSearchInformation
     :: SearchSearchInformation
 searchSearchInformation =
-    SearchSearchInformation
+    SearchSearchInformation'
     { _ssiSearchTime = Nothing
     , _ssiFormattedSearchTime = Nothing
     , _ssiTotalResults = Nothing
@@ -690,14 +690,14 @@
         parseJSON
           = withObject "SearchSearchInformation"
               (\ o ->
-                 SearchSearchInformation <$>
+                 SearchSearchInformation' <$>
                    (o .:? "searchTime") <*>
                      (o .:? "formattedSearchTime")
                      <*> (o .:? "totalResults")
                      <*> (o .:? "formattedTotalResults"))
 
 instance ToJSON SearchSearchInformation where
-        toJSON SearchSearchInformation{..}
+        toJSON SearchSearchInformation'{..}
           = object
               (catMaybes
                  [("searchTime" .=) <$> _ssiSearchTime,
@@ -709,7 +709,7 @@
 
 --
 -- /See:/ 'query' smart constructor.
-data Query = Query
+data Query = Query'
     { _qImgDominantColor       :: !(Maybe Text)
     , _qOutputEncoding         :: !(Maybe Text)
     , _qSiteSearchFilter       :: !(Maybe Text)
@@ -829,7 +829,7 @@
 query
     :: Query
 query =
-    Query
+    Query'
     { _qImgDominantColor = Nothing
     , _qOutputEncoding = Nothing
     , _qSiteSearchFilter = Nothing
@@ -1020,7 +1020,7 @@
         parseJSON
           = withObject "Query"
               (\ o ->
-                 Query <$>
+                 Query' <$>
                    (o .:? "imgDominantColor") <*>
                      (o .:? "outputEncoding")
                      <*> (o .:? "siteSearchFilter")
@@ -1060,7 +1060,7 @@
                      <*> (o .:? "highRange"))
 
 instance ToJSON Query where
-        toJSON Query{..}
+        toJSON Query'{..}
           = object
               (catMaybes
                  [("imgDominantColor" .=) <$> _qImgDominantColor,
@@ -1100,7 +1100,7 @@
 
 --
 -- /See:/ 'promotionBodyLinesItem' smart constructor.
-data PromotionBodyLinesItem = PromotionBodyLinesItem
+data PromotionBodyLinesItem = PromotionBodyLinesItem'
     { _pbliLink      :: !(Maybe Text)
     , _pbliURL       :: !(Maybe Text)
     , _pbliHTMLTitle :: !(Maybe Text)
@@ -1121,7 +1121,7 @@
 promotionBodyLinesItem
     :: PromotionBodyLinesItem
 promotionBodyLinesItem =
-    PromotionBodyLinesItem
+    PromotionBodyLinesItem'
     { _pbliLink = Nothing
     , _pbliURL = Nothing
     , _pbliHTMLTitle = Nothing
@@ -1147,13 +1147,13 @@
         parseJSON
           = withObject "PromotionBodyLinesItem"
               (\ o ->
-                 PromotionBodyLinesItem <$>
+                 PromotionBodyLinesItem' <$>
                    (o .:? "link") <*> (o .:? "url") <*>
                      (o .:? "htmlTitle")
                      <*> (o .:? "title"))
 
 instance ToJSON PromotionBodyLinesItem where
-        toJSON PromotionBodyLinesItem{..}
+        toJSON PromotionBodyLinesItem'{..}
           = object
               (catMaybes
                  [("link" .=) <$> _pbliLink, ("url" .=) <$> _pbliURL,
@@ -1162,7 +1162,7 @@
 
 --
 -- /See:/ 'promotion' smart constructor.
-data Promotion = Promotion
+data Promotion = Promotion'
     { _pImage       :: !(Maybe PromotionImage)
     , _pDisplayLink :: !(Maybe Text)
     , _pBodyLines   :: !(Maybe [PromotionBodyLinesItem])
@@ -1189,7 +1189,7 @@
 promotion
     :: Promotion
 promotion =
-    Promotion
+    Promotion'
     { _pImage = Nothing
     , _pDisplayLink = Nothing
     , _pBodyLines = Nothing
@@ -1225,7 +1225,7 @@
         parseJSON
           = withObject "Promotion"
               (\ o ->
-                 Promotion <$>
+                 Promotion' <$>
                    (o .:? "image") <*> (o .:? "displayLink") <*>
                      (o .:? "bodyLines" .!= mempty)
                      <*> (o .:? "link")
@@ -1233,7 +1233,7 @@
                      <*> (o .:? "title"))
 
 instance ToJSON Promotion where
-        toJSON Promotion{..}
+        toJSON Promotion'{..}
           = object
               (catMaybes
                  [("image" .=) <$> _pImage,
@@ -1245,7 +1245,7 @@
 
 --
 -- /See:/ 'search' smart constructor.
-data Search = Search
+data Search = Search'
     { _sQueries           :: !(Maybe SearchQueries)
     , _sContext           :: !(Maybe Context)
     , _sKind              :: !Text
@@ -1278,7 +1278,7 @@
 search
     :: Search
 search =
-    Search
+    Search'
     { _sQueries = Nothing
     , _sContext = Nothing
     , _sKind = "customsearch#search"
@@ -1325,7 +1325,7 @@
         parseJSON
           = withObject "Search"
               (\ o ->
-                 Search <$>
+                 Search' <$>
                    (o .:? "queries") <*> (o .:? "context") <*>
                      (o .:? "kind" .!= "customsearch#search")
                      <*> (o .:? "url")
@@ -1335,7 +1335,7 @@
                      <*> (o .:? "spelling"))
 
 instance ToJSON Search where
-        toJSON Search{..}
+        toJSON Search'{..}
           = object
               (catMaybes
                  [("queries" .=) <$> _sQueries,
@@ -1348,7 +1348,7 @@
 
 --
 -- /See:/ 'contextFacetsItemItem' smart constructor.
-data ContextFacetsItemItem = ContextFacetsItemItem
+data ContextFacetsItemItem = ContextFacetsItemItem'
     { _cfiiAnchor      :: !(Maybe Text)
     , _cfiiLabelWithOp :: !(Maybe Text)
     , _cfiiLabel       :: !(Maybe Text)
@@ -1366,7 +1366,7 @@
 contextFacetsItemItem
     :: ContextFacetsItemItem
 contextFacetsItemItem =
-    ContextFacetsItemItem
+    ContextFacetsItemItem'
     { _cfiiAnchor = Nothing
     , _cfiiLabelWithOp = Nothing
     , _cfiiLabel = Nothing
@@ -1389,12 +1389,12 @@
         parseJSON
           = withObject "ContextFacetsItemItem"
               (\ o ->
-                 ContextFacetsItemItem <$>
+                 ContextFacetsItemItem' <$>
                    (o .:? "anchor") <*> (o .:? "label_with_op") <*>
                      (o .:? "label"))
 
 instance ToJSON ContextFacetsItemItem where
-        toJSON ContextFacetsItemItem{..}
+        toJSON ContextFacetsItemItem'{..}
           = object
               (catMaybes
                  [("anchor" .=) <$> _cfiiAnchor,
diff --git a/gen/Network/Google/CustomSearch/Types/Sum.hs b/gen/Network/Google/CustomSearch/Types/Sum.hs
--- a/gen/Network/Google/CustomSearch/Types/Sum.hs
+++ b/gen/Network/Google/CustomSearch/Types/Sum.hs
@@ -8,7 +8,7 @@
 
 -- |
 -- Module      : Network.Google.CustomSearch.Types.Sum
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -36,21 +36,21 @@
     | Photo
       -- ^ @photo@
       -- photo
-      deriving (Eq,Ord,Enum,Read,Show,Data,Typeable,Generic)
+      deriving (Eq, Ord, Enum, Read, Show, Data, Typeable, Generic)
 
 instance Hashable CSEListImgType
 
-instance FromText CSEListImgType where
-    fromText = \case
-        "clipart" -> Just CliPart
-        "face" -> Just Face
-        "lineart" -> Just Lineart
-        "news" -> Just News
-        "photo" -> Just Photo
-        _ -> Nothing
+instance FromHttpApiData CSEListImgType where
+    parseQueryParam = \case
+        "clipart" -> Right CliPart
+        "face" -> Right Face
+        "lineart" -> Right Lineart
+        "news" -> Right News
+        "photo" -> Right Photo
+        x -> Left ("Unable to parse CSEListImgType from: " <> x)
 
-instance ToText CSEListImgType where
-    toText = \case
+instance ToHttpApiData CSEListImgType where
+    toQueryParam = \case
         CliPart -> "clipart"
         Face -> "face"
         Lineart -> "lineart"
@@ -72,18 +72,18 @@
     | I
       -- ^ @i@
       -- include
-      deriving (Eq,Ord,Enum,Read,Show,Data,Typeable,Generic)
+      deriving (Eq, Ord, Enum, Read, Show, Data, Typeable, Generic)
 
 instance Hashable CSEListSiteSearchFilter
 
-instance FromText CSEListSiteSearchFilter where
-    fromText = \case
-        "e" -> Just E
-        "i" -> Just I
-        _ -> Nothing
+instance FromHttpApiData CSEListSiteSearchFilter where
+    parseQueryParam = \case
+        "e" -> Right E
+        "i" -> Right I
+        x -> Left ("Unable to parse CSEListSiteSearchFilter from: " <> x)
 
-instance ToText CSEListSiteSearchFilter where
-    toText = \case
+instance ToHttpApiData CSEListSiteSearchFilter where
+    toQueryParam = \case
         E -> "e"
         I -> "i"
 
@@ -126,26 +126,26 @@
     | Yellow
       -- ^ @yellow@
       -- yellow
-      deriving (Eq,Ord,Enum,Read,Show,Data,Typeable,Generic)
+      deriving (Eq, Ord, Enum, Read, Show, Data, Typeable, Generic)
 
 instance Hashable CSEListImgDominantColor
 
-instance FromText CSEListImgDominantColor where
-    fromText = \case
-        "black" -> Just Black
-        "blue" -> Just Blue
-        "brown" -> Just Brown
-        "gray" -> Just Gray
-        "green" -> Just Green
-        "pink" -> Just Pink
-        "purple" -> Just Purple
-        "teal" -> Just Teal
-        "white" -> Just White
-        "yellow" -> Just Yellow
-        _ -> Nothing
+instance FromHttpApiData CSEListImgDominantColor where
+    parseQueryParam = \case
+        "black" -> Right Black
+        "blue" -> Right Blue
+        "brown" -> Right Brown
+        "gray" -> Right Gray
+        "green" -> Right Green
+        "pink" -> Right Pink
+        "purple" -> Right Purple
+        "teal" -> Right Teal
+        "white" -> Right White
+        "yellow" -> Right Yellow
+        x -> Left ("Unable to parse CSEListImgDominantColor from: " <> x)
 
-instance ToText CSEListImgDominantColor where
-    toText = \case
+instance ToHttpApiData CSEListImgDominantColor where
+    toQueryParam = \case
         Black -> "black"
         Blue -> "blue"
         Brown -> "brown"
@@ -174,19 +174,19 @@
     | Off
       -- ^ @off@
       -- Disables safe search filtering.
-      deriving (Eq,Ord,Enum,Read,Show,Data,Typeable,Generic)
+      deriving (Eq, Ord, Enum, Read, Show, Data, Typeable, Generic)
 
 instance Hashable CSEListSafe
 
-instance FromText CSEListSafe where
-    fromText = \case
-        "high" -> Just High
-        "medium" -> Just Medium
-        "off" -> Just Off
-        _ -> Nothing
+instance FromHttpApiData CSEListSafe where
+    parseQueryParam = \case
+        "high" -> Right High
+        "medium" -> Right Medium
+        "off" -> Right Off
+        x -> Left ("Unable to parse CSEListSafe from: " <> x)
 
-instance ToText CSEListSafe where
-    toText = \case
+instance ToHttpApiData CSEListSafe where
+    toQueryParam = \case
         High -> "high"
         Medium -> "medium"
         Off -> "off"
@@ -209,19 +209,19 @@
     | CSELICTMono
       -- ^ @mono@
       -- mono
-      deriving (Eq,Ord,Enum,Read,Show,Data,Typeable,Generic)
+      deriving (Eq, Ord, Enum, Read, Show, Data, Typeable, Generic)
 
 instance Hashable CSEListImgColorType
 
-instance FromText CSEListImgColorType where
-    fromText = \case
-        "color" -> Just CSELICTColor
-        "gray" -> Just CSELICTGray
-        "mono" -> Just CSELICTMono
-        _ -> Nothing
+instance FromHttpApiData CSEListImgColorType where
+    parseQueryParam = \case
+        "color" -> Right CSELICTColor
+        "gray" -> Right CSELICTGray
+        "mono" -> Right CSELICTMono
+        x -> Left ("Unable to parse CSEListImgColorType from: " <> x)
 
-instance ToText CSEListImgColorType where
-    toText = \case
+instance ToHttpApiData CSEListImgColorType where
+    toQueryParam = \case
         CSELICTColor -> "color"
         CSELICTGray -> "gray"
         CSELICTMono -> "mono"
@@ -240,18 +240,18 @@
     | CSELF1
       -- ^ @1@
       -- Turns on duplicate content filter.
-      deriving (Eq,Ord,Enum,Read,Show,Data,Typeable,Generic)
+      deriving (Eq, Ord, Enum, Read, Show, Data, Typeable, Generic)
 
 instance Hashable CSEListFilter
 
-instance FromText CSEListFilter where
-    fromText = \case
-        "0" -> Just CSELF0
-        "1" -> Just CSELF1
-        _ -> Nothing
+instance FromHttpApiData CSEListFilter where
+    parseQueryParam = \case
+        "0" -> Right CSELF0
+        "1" -> Right CSELF1
+        x -> Left ("Unable to parse CSEListFilter from: " <> x)
 
-instance ToText CSEListFilter where
-    toText = \case
+instance ToHttpApiData CSEListFilter where
+    toQueryParam = \case
         CSELF0 -> "0"
         CSELF1 -> "1"
 
@@ -368,51 +368,51 @@
     | LangZhTw
       -- ^ @lang_zh-TW@
       -- Chinese (Traditional)
-      deriving (Eq,Ord,Enum,Read,Show,Data,Typeable,Generic)
+      deriving (Eq, Ord, Enum, Read, Show, Data, Typeable, Generic)
 
 instance Hashable CSEListLr
 
-instance FromText CSEListLr where
-    fromText = \case
-        "lang_ar" -> Just LangAr
-        "lang_bg" -> Just LangBg
-        "lang_ca" -> Just LangCa
-        "lang_cs" -> Just LangCs
-        "lang_da" -> Just LangDa
-        "lang_de" -> Just LangDe
-        "lang_el" -> Just LangEl
-        "lang_en" -> Just LangEn
-        "lang_es" -> Just LangEs
-        "lang_et" -> Just LangEt
-        "lang_fi" -> Just LangFi
-        "lang_fr" -> Just LangFr
-        "lang_hr" -> Just LangHr
-        "lang_hu" -> Just LangHu
-        "lang_id" -> Just LangId
-        "lang_is" -> Just LangIs
-        "lang_it" -> Just LangIt
-        "lang_iw" -> Just LangIw
-        "lang_ja" -> Just LangJa
-        "lang_ko" -> Just LangKo
-        "lang_lt" -> Just LangLT
-        "lang_lv" -> Just LangLv
-        "lang_nl" -> Just LangNl
-        "lang_no" -> Just LangNo
-        "lang_pl" -> Just LangPl
-        "lang_pt" -> Just LangPt
-        "lang_ro" -> Just LangRo
-        "lang_ru" -> Just LangRu
-        "lang_sk" -> Just LangSk
-        "lang_sl" -> Just LangSl
-        "lang_sr" -> Just LangSr
-        "lang_sv" -> Just LangSv
-        "lang_tr" -> Just LangTr
-        "lang_zh-CN" -> Just LangZhCn
-        "lang_zh-TW" -> Just LangZhTw
-        _ -> Nothing
+instance FromHttpApiData CSEListLr where
+    parseQueryParam = \case
+        "lang_ar" -> Right LangAr
+        "lang_bg" -> Right LangBg
+        "lang_ca" -> Right LangCa
+        "lang_cs" -> Right LangCs
+        "lang_da" -> Right LangDa
+        "lang_de" -> Right LangDe
+        "lang_el" -> Right LangEl
+        "lang_en" -> Right LangEn
+        "lang_es" -> Right LangEs
+        "lang_et" -> Right LangEt
+        "lang_fi" -> Right LangFi
+        "lang_fr" -> Right LangFr
+        "lang_hr" -> Right LangHr
+        "lang_hu" -> Right LangHu
+        "lang_id" -> Right LangId
+        "lang_is" -> Right LangIs
+        "lang_it" -> Right LangIt
+        "lang_iw" -> Right LangIw
+        "lang_ja" -> Right LangJa
+        "lang_ko" -> Right LangKo
+        "lang_lt" -> Right LangLT
+        "lang_lv" -> Right LangLv
+        "lang_nl" -> Right LangNl
+        "lang_no" -> Right LangNo
+        "lang_pl" -> Right LangPl
+        "lang_pt" -> Right LangPt
+        "lang_ro" -> Right LangRo
+        "lang_ru" -> Right LangRu
+        "lang_sk" -> Right LangSk
+        "lang_sl" -> Right LangSl
+        "lang_sr" -> Right LangSr
+        "lang_sv" -> Right LangSv
+        "lang_tr" -> Right LangTr
+        "lang_zh-CN" -> Right LangZhCn
+        "lang_zh-TW" -> Right LangZhTw
+        x -> Left ("Unable to parse CSEListLr from: " <> x)
 
-instance ToText CSEListLr where
-    toText = \case
+instance ToHttpApiData CSEListLr where
+    toQueryParam = \case
         LangAr -> "lang_ar"
         LangBg -> "lang_bg"
         LangCa -> "lang_ca"
@@ -460,17 +460,17 @@
     = Image
       -- ^ @image@
       -- custom image search
-      deriving (Eq,Ord,Enum,Read,Show,Data,Typeable,Generic)
+      deriving (Eq, Ord, Enum, Read, Show, Data, Typeable, Generic)
 
 instance Hashable CSEListSearchType
 
-instance FromText CSEListSearchType where
-    fromText = \case
-        "image" -> Just Image
-        _ -> Nothing
+instance FromHttpApiData CSEListSearchType where
+    parseQueryParam = \case
+        "image" -> Right Image
+        x -> Left ("Unable to parse CSEListSearchType from: " <> x)
 
-instance ToText CSEListSearchType where
-    toText = \case
+instance ToHttpApiData CSEListSearchType where
+    toQueryParam = \case
         Image -> "image"
 
 instance FromJSON CSEListSearchType where
@@ -503,23 +503,23 @@
     | CSELISXxlarge
       -- ^ @xxlarge@
       -- xxlarge
-      deriving (Eq,Ord,Enum,Read,Show,Data,Typeable,Generic)
+      deriving (Eq, Ord, Enum, Read, Show, Data, Typeable, Generic)
 
 instance Hashable CSEListImgSize
 
-instance FromText CSEListImgSize where
-    fromText = \case
-        "huge" -> Just CSELISHuge
-        "icon" -> Just CSELISIcon
-        "large" -> Just CSELISLarge
-        "medium" -> Just CSELISMedium
-        "small" -> Just CSELISSmall
-        "xlarge" -> Just CSELISXlarge
-        "xxlarge" -> Just CSELISXxlarge
-        _ -> Nothing
+instance FromHttpApiData CSEListImgSize where
+    parseQueryParam = \case
+        "huge" -> Right CSELISHuge
+        "icon" -> Right CSELISIcon
+        "large" -> Right CSELISLarge
+        "medium" -> Right CSELISMedium
+        "small" -> Right CSELISSmall
+        "xlarge" -> Right CSELISXlarge
+        "xxlarge" -> Right CSELISXxlarge
+        x -> Left ("Unable to parse CSEListImgSize from: " <> x)
 
-instance ToText CSEListImgSize where
-    toText = \case
+instance ToHttpApiData CSEListImgSize where
+    toQueryParam = \case
         CSELISHuge -> "huge"
         CSELISIcon -> "icon"
         CSELISLarge -> "large"
diff --git a/gen/Network/Google/Resource/Search/CSE/List.hs b/gen/Network/Google/Resource/Search/CSE/List.hs
--- a/gen/Network/Google/Resource/Search/CSE/List.hs
+++ b/gen/Network/Google/Resource/Search/CSE/List.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Search.CSE.List
--- Copyright   : (c) 2015 Brendan Hay
+-- Copyright   : (c) 2015-2016 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
 -- Stability   : auto-generated
@@ -145,7 +145,7 @@
 -- search engine used for the search, and the search results.
 --
 -- /See:/ 'cSEList' smart constructor.
-data CSEList = CSEList
+data CSEList = CSEList'
     { _cselImgDominantColor :: !(Maybe CSEListImgDominantColor)
     , _cselSiteSearchFilter :: !(Maybe CSEListSiteSearchFilter)
     , _cselC2coff           :: !(Maybe Text)
@@ -251,7 +251,7 @@
     :: Text -- ^ 'cselQ'
     -> CSEList
 cSEList pCselQ_ =
-    CSEList
+    CSEList'
     { _cselImgDominantColor = Nothing
     , _cselSiteSearchFilter = Nothing
     , _cselC2coff = Nothing
@@ -466,7 +466,8 @@
 
 instance GoogleRequest CSEList where
         type Rs CSEList = Search
-        requestClient CSEList{..}
+        type Scopes CSEList = '[]
+        requestClient CSEList'{..}
           = go (Just _cselQ) _cselImgDominantColor
               _cselSiteSearchFilter
               _cselC2coff
diff --git a/gogol-customsearch.cabal b/gogol-customsearch.cabal
--- a/gogol-customsearch.cabal
+++ b/gogol-customsearch.cabal
@@ -1,5 +1,5 @@
 name:                  gogol-customsearch
-version:               0.0.1
+version:               0.1.0
 synopsis:              Google CustomSearch SDK.
 homepage:              https://github.com/brendanhay/gogol
 bug-reports:           https://github.com/brendanhay/gogol/issues
@@ -7,7 +7,7 @@
 license-file:          LICENSE
 author:                Brendan Hay
 maintainer:            Brendan Hay <brendan.g.hay@gmail.com>
-copyright:             Copyright (c) 2015 Brendan Hay
+copyright:             Copyright (c) 2015-2016 Brendan Hay
 category:              Network, Google, Cloud
 build-type:            Simple
 cabal-version:         >= 1.10
@@ -42,5 +42,5 @@
         , Network.Google.CustomSearch.Types.Sum
 
     build-depends:
-          gogol-core == 0.0.1.*
+          gogol-core == 0.1.0.*
         , base       >= 4.7 && < 5
