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/Fitness.hs b/gen/Network/Google/Fitness.hs
--- a/gen/Network/Google/Fitness.hs
+++ b/gen/Network/Google/Fitness.hs
@@ -7,7 +7,7 @@
 
 -- |
 -- Module      : Network.Google.Fitness
--- 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
@@ -20,6 +20,14 @@
     (
     -- * Service Configuration
       fitnessService
+
+    -- * OAuth Scopes
+    , fitnessBodyReadScope
+    , fitnessActivityReadScope
+    , fitnessActivityWriteScope
+    , fitnessLocationReadScope
+    , fitnessLocationWriteScope
+    , fitnessBodyWriteScope
 
     -- * API Declaration
     , FitnessAPI
diff --git a/gen/Network/Google/Fitness/Types.hs b/gen/Network/Google/Fitness/Types.hs
--- a/gen/Network/Google/Fitness/Types.hs
+++ b/gen/Network/Google/Fitness/Types.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE DataKinds          #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE NoImplicitPrelude  #-}
@@ -7,7 +8,7 @@
 
 -- |
 -- Module      : Network.Google.Fitness.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
@@ -198,31 +199,31 @@
 import           Network.Google.Prelude
 
 -- | Default request referring to version 'v1' of the Fitness. This contains the host and root path used as a starting point for constructing service requests.
-fitnessService :: Service
+fitnessService :: ServiceConfig
 fitnessService
   = defaultService (ServiceId "fitness:v1")
       "www.googleapis.com"
 
 -- | View body sensor information in Google Fit
-fitnessBodyReadScope :: OAuthScope
-fitnessBodyReadScope = "https://www.googleapis.com/auth/fitness.body.read";
+fitnessBodyReadScope :: Proxy '["https://www.googleapis.com/auth/fitness.body.read"]
+fitnessBodyReadScope = Proxy;
 
 -- | View your activity information in Google Fit
-fitnessActivityReadScope :: OAuthScope
-fitnessActivityReadScope = "https://www.googleapis.com/auth/fitness.activity.read";
+fitnessActivityReadScope :: Proxy '["https://www.googleapis.com/auth/fitness.activity.read"]
+fitnessActivityReadScope = Proxy;
 
 -- | View and store your activity information in Google Fit
-fitnessActivityWriteScope :: OAuthScope
-fitnessActivityWriteScope = "https://www.googleapis.com/auth/fitness.activity.write";
+fitnessActivityWriteScope :: Proxy '["https://www.googleapis.com/auth/fitness.activity.write"]
+fitnessActivityWriteScope = Proxy;
 
 -- | View your stored location data in Google Fit
-fitnessLocationReadScope :: OAuthScope
-fitnessLocationReadScope = "https://www.googleapis.com/auth/fitness.location.read";
+fitnessLocationReadScope :: Proxy '["https://www.googleapis.com/auth/fitness.location.read"]
+fitnessLocationReadScope = Proxy;
 
 -- | View and store your location data in Google Fit
-fitnessLocationWriteScope :: OAuthScope
-fitnessLocationWriteScope = "https://www.googleapis.com/auth/fitness.location.write";
+fitnessLocationWriteScope :: Proxy '["https://www.googleapis.com/auth/fitness.location.write"]
+fitnessLocationWriteScope = Proxy;
 
 -- | View and store body sensor data in Google Fit
-fitnessBodyWriteScope :: OAuthScope
-fitnessBodyWriteScope = "https://www.googleapis.com/auth/fitness.body.write";
+fitnessBodyWriteScope :: Proxy '["https://www.googleapis.com/auth/fitness.body.write"]
+fitnessBodyWriteScope = Proxy;
diff --git a/gen/Network/Google/Fitness/Types/Product.hs b/gen/Network/Google/Fitness/Types/Product.hs
--- a/gen/Network/Google/Fitness/Types/Product.hs
+++ b/gen/Network/Google/Fitness/Types/Product.hs
@@ -9,7 +9,7 @@
 
 -- |
 -- Module      : Network.Google.Fitness.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
@@ -26,7 +26,7 @@
 -- one dataset.
 --
 -- /See:/ 'dataSet' smart constructor.
-data DataSet = DataSet
+data DataSet = DataSet'
     { _dsNextPageToken  :: !(Maybe Text)
     , _dsDataSourceId   :: !(Maybe Text)
     , _dsPoint          :: !(Maybe [DataPoint])
@@ -50,7 +50,7 @@
 dataSet
     :: DataSet
 dataSet =
-    DataSet
+    DataSet'
     { _dsNextPageToken = Nothing
     , _dsDataSourceId = Nothing
     , _dsPoint = Nothing
@@ -105,14 +105,14 @@
         parseJSON
           = withObject "DataSet"
               (\ o ->
-                 DataSet <$>
+                 DataSet' <$>
                    (o .:? "nextPageToken") <*> (o .:? "dataSourceId")
                      <*> (o .:? "point" .!= mempty)
                      <*> (o .:? "minStartTimeNs")
                      <*> (o .:? "maxEndTimeNs"))
 
 instance ToJSON DataSet where
-        toJSON DataSet{..}
+        toJSON DataSet'{..}
           = object
               (catMaybes
                  [("nextPageToken" .=) <$> _dsNextPageToken,
@@ -125,7 +125,7 @@
 -- google3\/java\/com\/google\/android\/apps\/heart\/platform\/api\/Application.java
 --
 -- /See:/ 'application' smart constructor.
-data Application = Application
+data Application = Application'
     { _aPackageName :: !(Maybe Text)
     , _aName        :: !(Maybe Text)
     , _aVersion     :: !(Maybe Text)
@@ -146,7 +146,7 @@
 application
     :: Application
 application =
-    Application
+    Application'
     { _aPackageName = Nothing
     , _aName = Nothing
     , _aVersion = Nothing
@@ -182,13 +182,13 @@
         parseJSON
           = withObject "Application"
               (\ o ->
-                 Application <$>
+                 Application' <$>
                    (o .:? "packageName") <*> (o .:? "name") <*>
                      (o .:? "version")
                      <*> (o .:? "detailsUrl"))
 
 instance ToJSON Application where
-        toJSON Application{..}
+        toJSON Application'{..}
           = object
               (catMaybes
                  [("packageName" .=) <$> _aPackageName,
@@ -197,7 +197,7 @@
 
 --
 -- /See:/ 'aggregateResponse' smart constructor.
-newtype AggregateResponse = AggregateResponse
+newtype AggregateResponse = AggregateResponse'
     { _arBucket :: Maybe [AggregateBucket]
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -209,7 +209,7 @@
 aggregateResponse
     :: AggregateResponse
 aggregateResponse =
-    AggregateResponse
+    AggregateResponse'
     { _arBucket = Nothing
     }
 
@@ -224,16 +224,16 @@
         parseJSON
           = withObject "AggregateResponse"
               (\ o ->
-                 AggregateResponse <$> (o .:? "bucket" .!= mempty))
+                 AggregateResponse' <$> (o .:? "bucket" .!= mempty))
 
 instance ToJSON AggregateResponse where
-        toJSON AggregateResponse{..}
+        toJSON AggregateResponse'{..}
           = object (catMaybes [("bucket" .=) <$> _arBucket])
 
 -- | The specification of which data to aggregate.
 --
 -- /See:/ 'aggregateBy' smart constructor.
-data AggregateBy = AggregateBy
+data AggregateBy = AggregateBy'
     { _abDataTypeName :: !(Maybe Text)
     , _abDataSourceId :: !(Maybe Text)
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -248,7 +248,7 @@
 aggregateBy
     :: AggregateBy
 aggregateBy =
-    AggregateBy
+    AggregateBy'
     { _abDataTypeName = Nothing
     , _abDataSourceId = Nothing
     }
@@ -275,11 +275,11 @@
         parseJSON
           = withObject "AggregateBy"
               (\ o ->
-                 AggregateBy <$>
+                 AggregateBy' <$>
                    (o .:? "dataTypeName") <*> (o .:? "dataSourceId"))
 
 instance ToJSON AggregateBy where
-        toJSON AggregateBy{..}
+        toJSON AggregateBy'{..}
           = object
               (catMaybes
                  [("dataTypeName" .=) <$> _abDataTypeName,
@@ -287,7 +287,7 @@
 
 --
 -- /See:/ 'bucketByActivity' smart constructor.
-data BucketByActivity = BucketByActivity
+data BucketByActivity = BucketByActivity'
     { _bbaMinDurationMillis    :: !(Maybe (Textual Int64))
     , _bbaActivityDataSourceId :: !(Maybe Text)
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -302,7 +302,7 @@
 bucketByActivity
     :: BucketByActivity
 bucketByActivity =
-    BucketByActivity
+    BucketByActivity'
     { _bbaMinDurationMillis = Nothing
     , _bbaActivityDataSourceId = Nothing
     }
@@ -327,12 +327,12 @@
         parseJSON
           = withObject "BucketByActivity"
               (\ o ->
-                 BucketByActivity <$>
+                 BucketByActivity' <$>
                    (o .:? "minDurationMillis") <*>
                      (o .:? "activityDataSourceId"))
 
 instance ToJSON BucketByActivity where
-        toJSON BucketByActivity{..}
+        toJSON BucketByActivity'{..}
           = object
               (catMaybes
                  [("minDurationMillis" .=) <$> _bbaMinDurationMillis,
@@ -341,7 +341,7 @@
 
 --
 -- /See:/ 'aggregateRequest' smart constructor.
-data AggregateRequest = AggregateRequest
+data AggregateRequest = AggregateRequest'
     { _arEndTimeMillis           :: !(Maybe (Textual Int64))
     , _arAggregateBy             :: !(Maybe [AggregateBy])
     , _arBucketBySession         :: !(Maybe BucketBySession)
@@ -371,7 +371,7 @@
 aggregateRequest
     :: AggregateRequest
 aggregateRequest =
-    AggregateRequest
+    AggregateRequest'
     { _arEndTimeMillis = Nothing
     , _arAggregateBy = Nothing
     , _arBucketBySession = Nothing
@@ -448,7 +448,7 @@
         parseJSON
           = withObject "AggregateRequest"
               (\ o ->
-                 AggregateRequest <$>
+                 AggregateRequest' <$>
                    (o .:? "endTimeMillis") <*>
                      (o .:? "aggregateBy" .!= mempty)
                      <*> (o .:? "bucketBySession")
@@ -458,7 +458,7 @@
                      <*> (o .:? "bucketByActivitySegment"))
 
 instance ToJSON AggregateRequest where
-        toJSON AggregateRequest{..}
+        toJSON AggregateRequest'{..}
           = object
               (catMaybes
                  [("endTimeMillis" .=) <$> _arEndTimeMillis,
@@ -483,7 +483,7 @@
 -- different analysis models for each device\/version.
 --
 -- /See:/ 'device' smart constructor.
-data Device = Device
+data Device = Device'
     { _dManufacturer :: !(Maybe Text)
     , _dUid          :: !(Maybe Text)
     , _dModel        :: !(Maybe Text)
@@ -507,7 +507,7 @@
 device
     :: Device
 device =
-    Device
+    Device'
     { _dManufacturer = Nothing
     , _dUid = Nothing
     , _dModel = Nothing
@@ -544,14 +544,14 @@
         parseJSON
           = withObject "Device"
               (\ o ->
-                 Device <$>
+                 Device' <$>
                    (o .:? "manufacturer") <*> (o .:? "uid") <*>
                      (o .:? "model")
                      <*> (o .:? "version")
                      <*> (o .:? "type"))
 
 instance ToJSON Device where
-        toJSON Device{..}
+        toJSON Device'{..}
           = object
               (catMaybes
                  [("manufacturer" .=) <$> _dManufacturer,
@@ -564,7 +564,7 @@
 -- or a floating point value.
 --
 -- /See:/ 'value' smart constructor.
-data Value = Value
+data Value = Value'
     { _vMapVal    :: !(Maybe [ValueMapValEntry])
     , _vFpVal     :: !(Maybe (Textual Double))
     , _vIntVal    :: !(Maybe (Textual Int32))
@@ -585,7 +585,7 @@
 value
     :: Value
 value =
-    Value
+    Value'
     { _vMapVal = Nothing
     , _vFpVal = Nothing
     , _vIntVal = Nothing
@@ -624,13 +624,13 @@
         parseJSON
           = withObject "Value"
               (\ o ->
-                 Value <$>
+                 Value' <$>
                    (o .:? "mapVal" .!= mempty) <*> (o .:? "fpVal") <*>
                      (o .:? "intVal")
                      <*> (o .:? "stringVal"))
 
 instance ToJSON Value where
-        toJSON Value{..}
+        toJSON Value'{..}
           = object
               (catMaybes
                  [("mapVal" .=) <$> _vMapVal,
@@ -639,7 +639,7 @@
 
 --
 -- /See:/ 'bucketBySession' smart constructor.
-newtype BucketBySession = BucketBySession
+newtype BucketBySession = BucketBySession'
     { _bbsMinDurationMillis :: Maybe (Textual Int64)
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -651,7 +651,7 @@
 bucketBySession
     :: BucketBySession
 bucketBySession =
-    BucketBySession
+    BucketBySession'
     { _bbsMinDurationMillis = Nothing
     }
 
@@ -667,10 +667,10 @@
         parseJSON
           = withObject "BucketBySession"
               (\ o ->
-                 BucketBySession <$> (o .:? "minDurationMillis"))
+                 BucketBySession' <$> (o .:? "minDurationMillis"))
 
 instance ToJSON BucketBySession where
-        toJSON BucketBySession{..}
+        toJSON BucketBySession'{..}
           = object
               (catMaybes
                  [("minDurationMillis" .=) <$> _bbsMinDurationMillis])
@@ -686,7 +686,7 @@
 -- field of the data type.
 --
 -- /See:/ 'dataPoint' smart constructor.
-data DataPoint = DataPoint
+data DataPoint = DataPoint'
     { _dpOriginDataSourceId    :: !(Maybe Text)
     , _dpRawTimestampNanos     :: !(Maybe (Textual Int64))
     , _dpDataTypeName          :: !(Maybe Text)
@@ -719,7 +719,7 @@
 dataPoint
     :: DataPoint
 dataPoint =
-    DataPoint
+    DataPoint'
     { _dpOriginDataSourceId = Nothing
     , _dpRawTimestampNanos = Nothing
     , _dpDataTypeName = Nothing
@@ -799,7 +799,7 @@
         parseJSON
           = withObject "DataPoint"
               (\ o ->
-                 DataPoint <$>
+                 DataPoint' <$>
                    (o .:? "originDataSourceId") <*>
                      (o .:? "rawTimestampNanos")
                      <*> (o .:? "dataTypeName")
@@ -810,7 +810,7 @@
                      <*> (o .:? "startTimeNanos"))
 
 instance ToJSON DataPoint where
-        toJSON DataPoint{..}
+        toJSON DataPoint'{..}
           = object
               (catMaybes
                  [("originDataSourceId" .=) <$> _dpOriginDataSourceId,
@@ -825,7 +825,7 @@
 
 --
 -- /See:/ 'listSessionsResponse' smart constructor.
-data ListSessionsResponse = ListSessionsResponse
+data ListSessionsResponse = ListSessionsResponse'
     { _lsrNextPageToken  :: !(Maybe Text)
     , _lsrDeletedSession :: !(Maybe [Session])
     , _lsrSession        :: !(Maybe [Session])
@@ -843,7 +843,7 @@
 listSessionsResponse
     :: ListSessionsResponse
 listSessionsResponse =
-    ListSessionsResponse
+    ListSessionsResponse'
     { _lsrNextPageToken = Nothing
     , _lsrDeletedSession = Nothing
     , _lsrSession = Nothing
@@ -879,13 +879,13 @@
         parseJSON
           = withObject "ListSessionsResponse"
               (\ o ->
-                 ListSessionsResponse <$>
+                 ListSessionsResponse' <$>
                    (o .:? "nextPageToken") <*>
                      (o .:? "deletedSession" .!= mempty)
                      <*> (o .:? "session" .!= mempty))
 
 instance ToJSON ListSessionsResponse where
-        toJSON ListSessionsResponse{..}
+        toJSON ListSessionsResponse'{..}
           = object
               (catMaybes
                  [("nextPageToken" .=) <$> _lsrNextPageToken,
@@ -894,7 +894,7 @@
 
 --
 -- /See:/ 'aggregateBucket' smart constructor.
-data AggregateBucket = AggregateBucket
+data AggregateBucket = AggregateBucket'
     { _abEndTimeMillis   :: !(Maybe (Textual Int64))
     , _abDataSet         :: !(Maybe [DataSet])
     , _abActivity        :: !(Maybe (Textual Int32))
@@ -921,7 +921,7 @@
 aggregateBucket
     :: AggregateBucket
 aggregateBucket =
-    AggregateBucket
+    AggregateBucket'
     { _abEndTimeMillis = Nothing
     , _abDataSet = Nothing
     , _abActivity = Nothing
@@ -973,7 +973,7 @@
         parseJSON
           = withObject "AggregateBucket"
               (\ o ->
-                 AggregateBucket <$>
+                 AggregateBucket' <$>
                    (o .:? "endTimeMillis") <*>
                      (o .:? "dataset" .!= mempty)
                      <*> (o .:? "activity")
@@ -982,7 +982,7 @@
                      <*> (o .:? "session"))
 
 instance ToJSON AggregateBucket where
-        toJSON AggregateBucket{..}
+        toJSON AggregateBucket'{..}
           = object
               (catMaybes
                  [("endTimeMillis" .=) <$> _abEndTimeMillis,
@@ -997,7 +997,7 @@
 -- supports.
 --
 -- /See:/ 'mapValue' smart constructor.
-newtype MapValue = MapValue
+newtype MapValue = MapValue'
     { _mvFpVal :: Maybe (Textual Double)
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -1009,7 +1009,7 @@
 mapValue
     :: MapValue
 mapValue =
-    MapValue
+    MapValue'
     { _mvFpVal = Nothing
     }
 
@@ -1022,15 +1022,15 @@
 instance FromJSON MapValue where
         parseJSON
           = withObject "MapValue"
-              (\ o -> MapValue <$> (o .:? "fpVal"))
+              (\ o -> MapValue' <$> (o .:? "fpVal"))
 
 instance ToJSON MapValue where
-        toJSON MapValue{..}
+        toJSON MapValue'{..}
           = object (catMaybes [("fpVal" .=) <$> _mvFpVal])
 
 --
 -- /See:/ 'listDataSourcesResponse' smart constructor.
-newtype ListDataSourcesResponse = ListDataSourcesResponse
+newtype ListDataSourcesResponse = ListDataSourcesResponse'
     { _ldsrDataSource :: Maybe [DataSource]
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -1042,7 +1042,7 @@
 listDataSourcesResponse
     :: ListDataSourcesResponse
 listDataSourcesResponse =
-    ListDataSourcesResponse
+    ListDataSourcesResponse'
     { _ldsrDataSource = Nothing
     }
 
@@ -1058,11 +1058,11 @@
         parseJSON
           = withObject "ListDataSourcesResponse"
               (\ o ->
-                 ListDataSourcesResponse <$>
+                 ListDataSourcesResponse' <$>
                    (o .:? "dataSource" .!= mempty))
 
 instance ToJSON ListDataSourcesResponse where
-        toJSON ListDataSourcesResponse{..}
+        toJSON ListDataSourcesResponse'{..}
           = object
               (catMaybes [("dataSource" .=) <$> _ldsrDataSource])
 
@@ -1073,7 +1073,7 @@
 -- code and not used for wire comms or stored in any way.
 --
 -- /See:/ 'dataTypeField' smart constructor.
-data DataTypeField = DataTypeField
+data DataTypeField = DataTypeField'
     { _dtfFormat   :: !(Maybe DataTypeFieldFormat)
     , _dtfName     :: !(Maybe Text)
     , _dtfOptional :: !(Maybe Bool)
@@ -1091,7 +1091,7 @@
 dataTypeField
     :: DataTypeField
 dataTypeField =
-    DataTypeField
+    DataTypeField'
     { _dtfFormat = Nothing
     , _dtfName = Nothing
     , _dtfOptional = Nothing
@@ -1115,12 +1115,12 @@
         parseJSON
           = withObject "DataTypeField"
               (\ o ->
-                 DataTypeField <$>
+                 DataTypeField' <$>
                    (o .:? "format") <*> (o .:? "name") <*>
                      (o .:? "optional"))
 
 instance ToJSON DataTypeField where
-        toJSON DataTypeField{..}
+        toJSON DataTypeField'{..}
           = object
               (catMaybes
                  [("format" .=) <$> _dtfFormat,
@@ -1143,7 +1143,7 @@
 -- stream.
 --
 -- /See:/ 'dataSource' smart constructor.
-data DataSource = DataSource
+data DataSource = DataSource'
     { _dsApplication    :: !(Maybe Application)
     , _dsDevice         :: !(Maybe Device)
     , _dsName           :: !(Maybe Text)
@@ -1173,7 +1173,7 @@
 dataSource
     :: DataSource
 dataSource =
-    DataSource
+    DataSource'
     { _dsApplication = Nothing
     , _dsDevice = Nothing
     , _dsName = Nothing
@@ -1253,7 +1253,7 @@
         parseJSON
           = withObject "DataSource"
               (\ o ->
-                 DataSource <$>
+                 DataSource' <$>
                    (o .:? "application") <*> (o .:? "device") <*>
                      (o .:? "name")
                      <*> (o .:? "dataType")
@@ -1262,7 +1262,7 @@
                      <*> (o .:? "dataStreamId"))
 
 instance ToJSON DataSource where
-        toJSON DataSource{..}
+        toJSON DataSource'{..}
           = object
               (catMaybes
                  [("application" .=) <$> _dsApplication,
@@ -1274,7 +1274,7 @@
 
 --
 -- /See:/ 'valueMapValEntry' smart constructor.
-data ValueMapValEntry = ValueMapValEntry
+data ValueMapValEntry = ValueMapValEntry'
     { _vmveValue :: !(Maybe MapValue)
     , _vmveKey   :: !(Maybe Text)
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -1289,7 +1289,7 @@
 valueMapValEntry
     :: ValueMapValEntry
 valueMapValEntry =
-    ValueMapValEntry
+    ValueMapValEntry'
     { _vmveValue = Nothing
     , _vmveKey = Nothing
     }
@@ -1305,11 +1305,11 @@
         parseJSON
           = withObject "ValueMapValEntry"
               (\ o ->
-                 ValueMapValEntry <$>
+                 ValueMapValEntry' <$>
                    (o .:? "value") <*> (o .:? "key"))
 
 instance ToJSON ValueMapValEntry where
-        toJSON ValueMapValEntry{..}
+        toJSON ValueMapValEntry'{..}
           = object
               (catMaybes
                  [("value" .=) <$> _vmveValue,
@@ -1317,7 +1317,7 @@
 
 --
 -- /See:/ 'bucketByTime' smart constructor.
-newtype BucketByTime = BucketByTime
+newtype BucketByTime = BucketByTime'
     { _bbtDurationMillis :: Maybe (Textual Int64)
     } deriving (Eq,Show,Data,Typeable,Generic)
 
@@ -1329,7 +1329,7 @@
 bucketByTime
     :: BucketByTime
 bucketByTime =
-    BucketByTime
+    BucketByTime'
     { _bbtDurationMillis = Nothing
     }
 
@@ -1345,10 +1345,10 @@
 instance FromJSON BucketByTime where
         parseJSON
           = withObject "BucketByTime"
-              (\ o -> BucketByTime <$> (o .:? "durationMillis"))
+              (\ o -> BucketByTime' <$> (o .:? "durationMillis"))
 
 instance ToJSON BucketByTime where
-        toJSON BucketByTime{..}
+        toJSON BucketByTime'{..}
           = object
               (catMaybes
                  [("durationMillis" .=) <$> _bbtDurationMillis])
@@ -1357,7 +1357,7 @@
 -- google3\/java\/com\/google\/android\/apps\/heart\/platform\/api\/DataType.java
 --
 -- /See:/ 'dataType' smart constructor.
-data DataType = DataType
+data DataType = DataType'
     { _dtField :: !(Maybe [DataTypeField])
     , _dtName  :: !(Maybe Text)
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -1372,7 +1372,7 @@
 dataType
     :: DataType
 dataType =
-    DataType
+    DataType'
     { _dtField = Nothing
     , _dtName = Nothing
     }
@@ -1392,11 +1392,11 @@
         parseJSON
           = withObject "DataType"
               (\ o ->
-                 DataType <$>
+                 DataType' <$>
                    (o .:? "field" .!= mempty) <*> (o .:? "name"))
 
 instance ToJSON DataType where
-        toJSON DataType{..}
+        toJSON DataType'{..}
           = object
               (catMaybes
                  [("field" .=) <$> _dtField, ("name" .=) <$> _dtName])
@@ -1405,7 +1405,7 @@
 -- interval information.
 --
 -- /See:/ 'session' smart constructor.
-data Session = Session
+data Session = Session'
     { _sEndTimeMillis      :: !(Maybe (Textual Int64))
     , _sActiveTimeMillis   :: !(Maybe (Textual Int64))
     , _sApplication        :: !(Maybe Application)
@@ -1441,7 +1441,7 @@
 session
     :: Session
 session =
-    Session
+    Session'
     { _sEndTimeMillis = Nothing
     , _sActiveTimeMillis = Nothing
     , _sApplication = Nothing
@@ -1515,7 +1515,7 @@
         parseJSON
           = withObject "Session"
               (\ o ->
-                 Session <$>
+                 Session' <$>
                    (o .:? "endTimeMillis") <*>
                      (o .:? "activeTimeMillis")
                      <*> (o .:? "application")
@@ -1527,7 +1527,7 @@
                      <*> (o .:? "description"))
 
 instance ToJSON Session where
-        toJSON Session{..}
+        toJSON Session'{..}
           = object
               (catMaybes
                  [("endTimeMillis" .=) <$> _sEndTimeMillis,
diff --git a/gen/Network/Google/Fitness/Types/Sum.hs b/gen/Network/Google/Fitness/Types/Sum.hs
--- a/gen/Network/Google/Fitness/Types/Sum.hs
+++ b/gen/Network/Google/Fitness/Types/Sum.hs
@@ -8,7 +8,7 @@
 
 -- |
 -- Module      : Network.Google.Fitness.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
@@ -31,21 +31,21 @@
       -- ^ @time@
     | ABTUnknown
       -- ^ @unknown@
-      deriving (Eq,Ord,Enum,Read,Show,Data,Typeable,Generic)
+      deriving (Eq, Ord, Enum, Read, Show, Data, Typeable, Generic)
 
 instance Hashable AggregateBucketType
 
-instance FromText AggregateBucketType where
-    fromText = \case
-        "activitySegment" -> Just ABTActivitySegment
-        "activityType" -> Just ABTActivityType
-        "session" -> Just ABTSession
-        "time" -> Just ABTTime
-        "unknown" -> Just ABTUnknown
-        _ -> Nothing
+instance FromHttpApiData AggregateBucketType where
+    parseQueryParam = \case
+        "activitySegment" -> Right ABTActivitySegment
+        "activityType" -> Right ABTActivityType
+        "session" -> Right ABTSession
+        "time" -> Right ABTTime
+        "unknown" -> Right ABTUnknown
+        x -> Left ("Unable to parse AggregateBucketType from: " <> x)
 
-instance ToText AggregateBucketType where
-    toText = \case
+instance ToHttpApiData AggregateBucketType where
+    toQueryParam = \case
         ABTActivitySegment -> "activitySegment"
         ABTActivityType -> "activityType"
         ABTSession -> "session"
@@ -65,18 +65,18 @@
       -- ^ @derived@
     | Raw
       -- ^ @raw@
-      deriving (Eq,Ord,Enum,Read,Show,Data,Typeable,Generic)
+      deriving (Eq, Ord, Enum, Read, Show, Data, Typeable, Generic)
 
 instance Hashable DataSourceType
 
-instance FromText DataSourceType where
-    fromText = \case
-        "derived" -> Just Derived
-        "raw" -> Just Raw
-        _ -> Nothing
+instance FromHttpApiData DataSourceType where
+    parseQueryParam = \case
+        "derived" -> Right Derived
+        "raw" -> Right Raw
+        x -> Left ("Unable to parse DataSourceType from: " <> x)
 
-instance ToText DataSourceType where
-    toText = \case
+instance ToHttpApiData DataSourceType where
+    toQueryParam = \case
         Derived -> "derived"
         Raw -> "raw"
 
@@ -100,22 +100,22 @@
       -- ^ @unknown@
     | Watch
       -- ^ @watch@
-      deriving (Eq,Ord,Enum,Read,Show,Data,Typeable,Generic)
+      deriving (Eq, Ord, Enum, Read, Show, Data, Typeable, Generic)
 
 instance Hashable DeviceType
 
-instance FromText DeviceType where
-    fromText = \case
-        "chestStrap" -> Just ChestStrap
-        "phone" -> Just Phone
-        "scale" -> Just Scale
-        "tablet" -> Just Tablet
-        "unknown" -> Just Unknown
-        "watch" -> Just Watch
-        _ -> Nothing
+instance FromHttpApiData DeviceType where
+    parseQueryParam = \case
+        "chestStrap" -> Right ChestStrap
+        "phone" -> Right Phone
+        "scale" -> Right Scale
+        "tablet" -> Right Tablet
+        "unknown" -> Right Unknown
+        "watch" -> Right Watch
+        x -> Left ("Unable to parse DeviceType from: " <> x)
 
-instance ToText DeviceType where
-    toText = \case
+instance ToHttpApiData DeviceType where
+    toQueryParam = \case
         ChestStrap -> "chestStrap"
         Phone -> "phone"
         Scale -> "scale"
@@ -131,7 +131,9 @@
 
 -- | The different supported formats for each field in a data type.
 data DataTypeFieldFormat
-    = FloatList
+    = Blob
+      -- ^ @blob@
+    | FloatList
       -- ^ @floatList@
     | FloatPoint
       -- ^ @floatPoint@
@@ -143,22 +145,24 @@
       -- ^ @map@
     | String
       -- ^ @string@
-      deriving (Eq,Ord,Enum,Read,Show,Data,Typeable,Generic)
+      deriving (Eq, Ord, Enum, Read, Show, Data, Typeable, Generic)
 
 instance Hashable DataTypeFieldFormat
 
-instance FromText DataTypeFieldFormat where
-    fromText = \case
-        "floatList" -> Just FloatList
-        "floatPoint" -> Just FloatPoint
-        "integer" -> Just Integer
-        "integerList" -> Just IntegerList
-        "map" -> Just Map
-        "string" -> Just String
-        _ -> Nothing
+instance FromHttpApiData DataTypeFieldFormat where
+    parseQueryParam = \case
+        "blob" -> Right Blob
+        "floatList" -> Right FloatList
+        "floatPoint" -> Right FloatPoint
+        "integer" -> Right Integer
+        "integerList" -> Right IntegerList
+        "map" -> Right Map
+        "string" -> Right String
+        x -> Left ("Unable to parse DataTypeFieldFormat from: " <> x)
 
-instance ToText DataTypeFieldFormat where
-    toText = \case
+instance ToHttpApiData DataTypeFieldFormat where
+    toQueryParam = \case
+        Blob -> "blob"
         FloatList -> "floatList"
         FloatPoint -> "floatPoint"
         Integer -> "integer"
diff --git a/gen/Network/Google/Resource/Fitness/Users/DataSet/Aggregate.hs b/gen/Network/Google/Resource/Fitness/Users/DataSet/Aggregate.hs
--- a/gen/Network/Google/Resource/Fitness/Users/DataSet/Aggregate.hs
+++ b/gen/Network/Google/Resource/Fitness/Users/DataSet/Aggregate.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Fitness.Users.DataSet.Aggregate
--- 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
@@ -61,7 +61,7 @@
 -- request.
 --
 -- /See:/ 'usersDataSetAggregate' smart constructor.
-data UsersDataSetAggregate = UsersDataSetAggregate
+data UsersDataSetAggregate = UsersDataSetAggregate'
     { _udsaPayload :: !AggregateRequest
     , _udsaUserId  :: !Text
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -78,7 +78,7 @@
     -> Text -- ^ 'udsaUserId'
     -> UsersDataSetAggregate
 usersDataSetAggregate pUdsaPayload_ pUdsaUserId_ =
-    UsersDataSetAggregate
+    UsersDataSetAggregate'
     { _udsaPayload = pUdsaPayload_
     , _udsaUserId = pUdsaUserId_
     }
@@ -96,7 +96,14 @@
 
 instance GoogleRequest UsersDataSetAggregate where
         type Rs UsersDataSetAggregate = AggregateResponse
-        requestClient UsersDataSetAggregate{..}
+        type Scopes UsersDataSetAggregate =
+             '["https://www.googleapis.com/auth/fitness.activity.read",
+               "https://www.googleapis.com/auth/fitness.activity.write",
+               "https://www.googleapis.com/auth/fitness.body.read",
+               "https://www.googleapis.com/auth/fitness.body.write",
+               "https://www.googleapis.com/auth/fitness.location.read",
+               "https://www.googleapis.com/auth/fitness.location.write"]
+        requestClient UsersDataSetAggregate'{..}
           = go _udsaUserId (Just AltJSON) _udsaPayload
               fitnessService
           where go
diff --git a/gen/Network/Google/Resource/Fitness/Users/DataSources/Create.hs b/gen/Network/Google/Resource/Fitness/Users/DataSources/Create.hs
--- a/gen/Network/Google/Resource/Fitness/Users/DataSources/Create.hs
+++ b/gen/Network/Google/Resource/Fitness/Users/DataSources/Create.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Fitness.Users.DataSources.Create
--- 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
@@ -68,7 +68,7 @@
 -- when read by any other developer reading public data types.
 --
 -- /See:/ 'usersDataSourcesCreate' smart constructor.
-data UsersDataSourcesCreate = UsersDataSourcesCreate
+data UsersDataSourcesCreate = UsersDataSourcesCreate'
     { _udscPayload :: !DataSource
     , _udscUserId  :: !Text
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -85,7 +85,7 @@
     -> Text -- ^ 'udscUserId'
     -> UsersDataSourcesCreate
 usersDataSourcesCreate pUdscPayload_ pUdscUserId_ =
-    UsersDataSourcesCreate
+    UsersDataSourcesCreate'
     { _udscPayload = pUdscPayload_
     , _udscUserId = pUdscUserId_
     }
@@ -103,7 +103,11 @@
 
 instance GoogleRequest UsersDataSourcesCreate where
         type Rs UsersDataSourcesCreate = DataSource
-        requestClient UsersDataSourcesCreate{..}
+        type Scopes UsersDataSourcesCreate =
+             '["https://www.googleapis.com/auth/fitness.activity.write",
+               "https://www.googleapis.com/auth/fitness.body.write",
+               "https://www.googleapis.com/auth/fitness.location.write"]
+        requestClient UsersDataSourcesCreate'{..}
           = go _udscUserId (Just AltJSON) _udscPayload
               fitnessService
           where go
diff --git a/gen/Network/Google/Resource/Fitness/Users/DataSources/DataSets/Delete.hs b/gen/Network/Google/Resource/Fitness/Users/DataSources/DataSets/Delete.hs
--- a/gen/Network/Google/Resource/Fitness/Users/DataSources/DataSets/Delete.hs
+++ b/gen/Network/Google/Resource/Fitness/Users/DataSources/DataSets/Delete.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Fitness.Users.DataSources.DataSets.Delete
--- 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
@@ -73,7 +73,7 @@
 -- will be deleted.
 --
 -- /See:/ 'usersDataSourcesDataSetsDelete' smart constructor.
-data UsersDataSourcesDataSetsDelete = UsersDataSourcesDataSetsDelete
+data UsersDataSourcesDataSetsDelete = UsersDataSourcesDataSetsDelete'
     { _udsdsdDataSourceId       :: !Text
     , _udsdsdUserId             :: !Text
     , _udsdsdDataSetId          :: !Text
@@ -100,7 +100,7 @@
     -> Text -- ^ 'udsdsdDataSetId'
     -> UsersDataSourcesDataSetsDelete
 usersDataSourcesDataSetsDelete pUdsdsdDataSourceId_ pUdsdsdUserId_ pUdsdsdDataSetId_ =
-    UsersDataSourcesDataSetsDelete
+    UsersDataSourcesDataSetsDelete'
     { _udsdsdDataSourceId = pUdsdsdDataSourceId_
     , _udsdsdUserId = pUdsdsdUserId_
     , _udsdsdDataSetId = pUdsdsdDataSetId_
@@ -146,7 +146,11 @@
 instance GoogleRequest UsersDataSourcesDataSetsDelete
          where
         type Rs UsersDataSourcesDataSetsDelete = ()
-        requestClient UsersDataSourcesDataSetsDelete{..}
+        type Scopes UsersDataSourcesDataSetsDelete =
+             '["https://www.googleapis.com/auth/fitness.activity.write",
+               "https://www.googleapis.com/auth/fitness.body.write",
+               "https://www.googleapis.com/auth/fitness.location.write"]
+        requestClient UsersDataSourcesDataSetsDelete'{..}
           = go _udsdsdUserId _udsdsdDataSourceId
               _udsdsdDataSetId
               _udsdsdModifiedTimeMillis
diff --git a/gen/Network/Google/Resource/Fitness/Users/DataSources/DataSets/Get.hs b/gen/Network/Google/Resource/Fitness/Users/DataSources/DataSets/Get.hs
--- a/gen/Network/Google/Resource/Fitness/Users/DataSources/DataSets/Get.hs
+++ b/gen/Network/Google/Resource/Fitness/Users/DataSources/DataSets/Get.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Fitness.Users.DataSources.DataSets.Get
--- 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
@@ -69,7 +69,7 @@
 -- or equal to the dataset start time.
 --
 -- /See:/ 'usersDataSourcesDataSetsGet' smart constructor.
-data UsersDataSourcesDataSetsGet = UsersDataSourcesDataSetsGet
+data UsersDataSourcesDataSetsGet = UsersDataSourcesDataSetsGet'
     { _udsdsgDataSourceId :: !Text
     , _udsdsgUserId       :: !Text
     , _udsdsgDataSetId    :: !Text
@@ -96,7 +96,7 @@
     -> Text -- ^ 'udsdsgDataSetId'
     -> UsersDataSourcesDataSetsGet
 usersDataSourcesDataSetsGet pUdsdsgDataSourceId_ pUdsdsgUserId_ pUdsdsgDataSetId_ =
-    UsersDataSourcesDataSetsGet
+    UsersDataSourcesDataSetsGet'
     { _udsdsgDataSourceId = pUdsdsgDataSourceId_
     , _udsdsgUserId = pUdsdsgUserId_
     , _udsdsgDataSetId = pUdsdsgDataSetId_
@@ -146,7 +146,14 @@
 instance GoogleRequest UsersDataSourcesDataSetsGet
          where
         type Rs UsersDataSourcesDataSetsGet = DataSet
-        requestClient UsersDataSourcesDataSetsGet{..}
+        type Scopes UsersDataSourcesDataSetsGet =
+             '["https://www.googleapis.com/auth/fitness.activity.read",
+               "https://www.googleapis.com/auth/fitness.activity.write",
+               "https://www.googleapis.com/auth/fitness.body.read",
+               "https://www.googleapis.com/auth/fitness.body.write",
+               "https://www.googleapis.com/auth/fitness.location.read",
+               "https://www.googleapis.com/auth/fitness.location.write"]
+        requestClient UsersDataSourcesDataSetsGet'{..}
           = go _udsdsgUserId _udsdsgDataSourceId
               _udsdsgDataSetId
               _udsdsgLimit
diff --git a/gen/Network/Google/Resource/Fitness/Users/DataSources/DataSets/Patch.hs b/gen/Network/Google/Resource/Fitness/Users/DataSources/DataSets/Patch.hs
--- a/gen/Network/Google/Resource/Fitness/Users/DataSources/DataSets/Patch.hs
+++ b/gen/Network/Google/Resource/Fitness/Users/DataSources/DataSets/Patch.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Fitness.Users.DataSources.DataSets.Patch
--- 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
@@ -67,7 +67,7 @@
 -- than one dataset. This method does not use patch semantics.
 --
 -- /See:/ 'usersDataSourcesDataSetsPatch' smart constructor.
-data UsersDataSourcesDataSetsPatch = UsersDataSourcesDataSetsPatch
+data UsersDataSourcesDataSetsPatch = UsersDataSourcesDataSetsPatch'
     { _udsdspDataSourceId      :: !Text
     , _udsdspPayload           :: !DataSet
     , _udsdspUserId            :: !Text
@@ -95,7 +95,7 @@
     -> Text -- ^ 'udsdspDataSetId'
     -> UsersDataSourcesDataSetsPatch
 usersDataSourcesDataSetsPatch pUdsdspDataSourceId_ pUdsdspPayload_ pUdsdspUserId_ pUdsdspDataSetId_ =
-    UsersDataSourcesDataSetsPatch
+    UsersDataSourcesDataSetsPatch'
     { _udsdspDataSourceId = pUdsdspDataSourceId_
     , _udsdspPayload = pUdsdspPayload_
     , _udsdspUserId = pUdsdspUserId_
@@ -142,7 +142,11 @@
 instance GoogleRequest UsersDataSourcesDataSetsPatch
          where
         type Rs UsersDataSourcesDataSetsPatch = DataSet
-        requestClient UsersDataSourcesDataSetsPatch{..}
+        type Scopes UsersDataSourcesDataSetsPatch =
+             '["https://www.googleapis.com/auth/fitness.activity.write",
+               "https://www.googleapis.com/auth/fitness.body.write",
+               "https://www.googleapis.com/auth/fitness.location.write"]
+        requestClient UsersDataSourcesDataSetsPatch'{..}
           = go _udsdspUserId _udsdspDataSourceId
               _udsdspDataSetId
               _udsdspCurrentTimeMillis
diff --git a/gen/Network/Google/Resource/Fitness/Users/DataSources/Delete.hs b/gen/Network/Google/Resource/Fitness/Users/DataSources/Delete.hs
--- a/gen/Network/Google/Resource/Fitness/Users/DataSources/Delete.hs
+++ b/gen/Network/Google/Resource/Fitness/Users/DataSources/Delete.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Fitness.Users.DataSources.Delete
--- 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
@@ -54,7 +54,7 @@
 -- | Delete the data source if there are no datapoints associated with it
 --
 -- /See:/ 'usersDataSourcesDelete' smart constructor.
-data UsersDataSourcesDelete = UsersDataSourcesDelete
+data UsersDataSourcesDelete = UsersDataSourcesDelete'
     { _udsdDataSourceId :: !Text
     , _udsdUserId       :: !Text
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -71,7 +71,7 @@
     -> Text -- ^ 'udsdUserId'
     -> UsersDataSourcesDelete
 usersDataSourcesDelete pUdsdDataSourceId_ pUdsdUserId_ =
-    UsersDataSourcesDelete
+    UsersDataSourcesDelete'
     { _udsdDataSourceId = pUdsdDataSourceId_
     , _udsdUserId = pUdsdUserId_
     }
@@ -90,7 +90,11 @@
 
 instance GoogleRequest UsersDataSourcesDelete where
         type Rs UsersDataSourcesDelete = DataSource
-        requestClient UsersDataSourcesDelete{..}
+        type Scopes UsersDataSourcesDelete =
+             '["https://www.googleapis.com/auth/fitness.activity.write",
+               "https://www.googleapis.com/auth/fitness.body.write",
+               "https://www.googleapis.com/auth/fitness.location.write"]
+        requestClient UsersDataSourcesDelete'{..}
           = go _udsdUserId _udsdDataSourceId (Just AltJSON)
               fitnessService
           where go
diff --git a/gen/Network/Google/Resource/Fitness/Users/DataSources/Get.hs b/gen/Network/Google/Resource/Fitness/Users/DataSources/Get.hs
--- a/gen/Network/Google/Resource/Fitness/Users/DataSources/Get.hs
+++ b/gen/Network/Google/Resource/Fitness/Users/DataSources/Get.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Fitness.Users.DataSources.Get
--- 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
@@ -54,7 +54,7 @@
 -- | Returns a data source identified by a data stream ID.
 --
 -- /See:/ 'usersDataSourcesGet' smart constructor.
-data UsersDataSourcesGet = UsersDataSourcesGet
+data UsersDataSourcesGet = UsersDataSourcesGet'
     { _udsgDataSourceId :: !Text
     , _udsgUserId       :: !Text
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -71,7 +71,7 @@
     -> Text -- ^ 'udsgUserId'
     -> UsersDataSourcesGet
 usersDataSourcesGet pUdsgDataSourceId_ pUdsgUserId_ =
-    UsersDataSourcesGet
+    UsersDataSourcesGet'
     { _udsgDataSourceId = pUdsgDataSourceId_
     , _udsgUserId = pUdsgUserId_
     }
@@ -90,7 +90,14 @@
 
 instance GoogleRequest UsersDataSourcesGet where
         type Rs UsersDataSourcesGet = DataSource
-        requestClient UsersDataSourcesGet{..}
+        type Scopes UsersDataSourcesGet =
+             '["https://www.googleapis.com/auth/fitness.activity.read",
+               "https://www.googleapis.com/auth/fitness.activity.write",
+               "https://www.googleapis.com/auth/fitness.body.read",
+               "https://www.googleapis.com/auth/fitness.body.write",
+               "https://www.googleapis.com/auth/fitness.location.read",
+               "https://www.googleapis.com/auth/fitness.location.write"]
+        requestClient UsersDataSourcesGet'{..}
           = go _udsgUserId _udsgDataSourceId (Just AltJSON)
               fitnessService
           where go
diff --git a/gen/Network/Google/Resource/Fitness/Users/DataSources/List.hs b/gen/Network/Google/Resource/Fitness/Users/DataSources/List.hs
--- a/gen/Network/Google/Resource/Fitness/Users/DataSources/List.hs
+++ b/gen/Network/Google/Resource/Fitness/Users/DataSources/List.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Fitness.Users.DataSources.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
@@ -61,7 +61,7 @@
 -- using other scopes.
 --
 -- /See:/ 'usersDataSourcesList' smart constructor.
-data UsersDataSourcesList = UsersDataSourcesList
+data UsersDataSourcesList = UsersDataSourcesList'
     { _udslDataTypeName :: !(Maybe [Text])
     , _udslUserId       :: !Text
     } deriving (Eq,Show,Data,Typeable,Generic)
@@ -77,7 +77,7 @@
     :: Text -- ^ 'udslUserId'
     -> UsersDataSourcesList
 usersDataSourcesList pUdslUserId_ =
-    UsersDataSourcesList
+    UsersDataSourcesList'
     { _udslDataTypeName = Nothing
     , _udslUserId = pUdslUserId_
     }
@@ -100,7 +100,14 @@
 instance GoogleRequest UsersDataSourcesList where
         type Rs UsersDataSourcesList =
              ListDataSourcesResponse
-        requestClient UsersDataSourcesList{..}
+        type Scopes UsersDataSourcesList =
+             '["https://www.googleapis.com/auth/fitness.activity.read",
+               "https://www.googleapis.com/auth/fitness.activity.write",
+               "https://www.googleapis.com/auth/fitness.body.read",
+               "https://www.googleapis.com/auth/fitness.body.write",
+               "https://www.googleapis.com/auth/fitness.location.read",
+               "https://www.googleapis.com/auth/fitness.location.write"]
+        requestClient UsersDataSourcesList'{..}
           = go _udslUserId (_udslDataTypeName ^. _Default)
               (Just AltJSON)
               fitnessService
diff --git a/gen/Network/Google/Resource/Fitness/Users/DataSources/Patch.hs b/gen/Network/Google/Resource/Fitness/Users/DataSources/Patch.hs
--- a/gen/Network/Google/Resource/Fitness/Users/DataSources/Patch.hs
+++ b/gen/Network/Google/Resource/Fitness/Users/DataSources/Patch.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Fitness.Users.DataSources.Patch
--- 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
@@ -67,7 +67,7 @@
 -- semantics.
 --
 -- /See:/ 'usersDataSourcesPatch' smart constructor.
-data UsersDataSourcesPatch = UsersDataSourcesPatch
+data UsersDataSourcesPatch = UsersDataSourcesPatch'
     { _udspDataSourceId :: !Text
     , _udspPayload      :: !DataSource
     , _udspUserId       :: !Text
@@ -88,7 +88,7 @@
     -> Text -- ^ 'udspUserId'
     -> UsersDataSourcesPatch
 usersDataSourcesPatch pUdspDataSourceId_ pUdspPayload_ pUdspUserId_ =
-    UsersDataSourcesPatch
+    UsersDataSourcesPatch'
     { _udspDataSourceId = pUdspDataSourceId_
     , _udspPayload = pUdspPayload_
     , _udspUserId = pUdspUserId_
@@ -113,7 +113,11 @@
 
 instance GoogleRequest UsersDataSourcesPatch where
         type Rs UsersDataSourcesPatch = DataSource
-        requestClient UsersDataSourcesPatch{..}
+        type Scopes UsersDataSourcesPatch =
+             '["https://www.googleapis.com/auth/fitness.activity.write",
+               "https://www.googleapis.com/auth/fitness.body.write",
+               "https://www.googleapis.com/auth/fitness.location.write"]
+        requestClient UsersDataSourcesPatch'{..}
           = go _udspUserId _udspDataSourceId (Just AltJSON)
               _udspPayload
               fitnessService
diff --git a/gen/Network/Google/Resource/Fitness/Users/DataSources/Update.hs b/gen/Network/Google/Resource/Fitness/Users/DataSources/Update.hs
--- a/gen/Network/Google/Resource/Fitness/Users/DataSources/Update.hs
+++ b/gen/Network/Google/Resource/Fitness/Users/DataSources/Update.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Fitness.Users.DataSources.Update
--- 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
@@ -64,7 +64,7 @@
 -- identified by their data stream ID.
 --
 -- /See:/ 'usersDataSourcesUpdate' smart constructor.
-data UsersDataSourcesUpdate = UsersDataSourcesUpdate
+data UsersDataSourcesUpdate = UsersDataSourcesUpdate'
     { _udsuDataSourceId :: !Text
     , _udsuPayload      :: !DataSource
     , _udsuUserId       :: !Text
@@ -85,7 +85,7 @@
     -> Text -- ^ 'udsuUserId'
     -> UsersDataSourcesUpdate
 usersDataSourcesUpdate pUdsuDataSourceId_ pUdsuPayload_ pUdsuUserId_ =
-    UsersDataSourcesUpdate
+    UsersDataSourcesUpdate'
     { _udsuDataSourceId = pUdsuDataSourceId_
     , _udsuPayload = pUdsuPayload_
     , _udsuUserId = pUdsuUserId_
@@ -110,7 +110,11 @@
 
 instance GoogleRequest UsersDataSourcesUpdate where
         type Rs UsersDataSourcesUpdate = DataSource
-        requestClient UsersDataSourcesUpdate{..}
+        type Scopes UsersDataSourcesUpdate =
+             '["https://www.googleapis.com/auth/fitness.activity.write",
+               "https://www.googleapis.com/auth/fitness.body.write",
+               "https://www.googleapis.com/auth/fitness.location.write"]
+        requestClient UsersDataSourcesUpdate'{..}
           = go _udsuUserId _udsuDataSourceId (Just AltJSON)
               _udsuPayload
               fitnessService
diff --git a/gen/Network/Google/Resource/Fitness/Users/Sessions/Delete.hs b/gen/Network/Google/Resource/Fitness/Users/Sessions/Delete.hs
--- a/gen/Network/Google/Resource/Fitness/Users/Sessions/Delete.hs
+++ b/gen/Network/Google/Resource/Fitness/Users/Sessions/Delete.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Fitness.Users.Sessions.Delete
--- 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
@@ -56,7 +56,7 @@
 -- | Deletes a session specified by the given session ID.
 --
 -- /See:/ 'usersSessionsDelete' smart constructor.
-data UsersSessionsDelete = UsersSessionsDelete
+data UsersSessionsDelete = UsersSessionsDelete'
     { _usdUserId            :: !Text
     , _usdCurrentTimeMillis :: !(Maybe (Textual Int64))
     , _usdSessionId         :: !Text
@@ -76,7 +76,7 @@
     -> Text -- ^ 'usdSessionId'
     -> UsersSessionsDelete
 usersSessionsDelete pUsdUserId_ pUsdSessionId_ =
-    UsersSessionsDelete
+    UsersSessionsDelete'
     { _usdUserId = pUsdUserId_
     , _usdCurrentTimeMillis = Nothing
     , _usdSessionId = pUsdSessionId_
@@ -102,7 +102,9 @@
 
 instance GoogleRequest UsersSessionsDelete where
         type Rs UsersSessionsDelete = ()
-        requestClient UsersSessionsDelete{..}
+        type Scopes UsersSessionsDelete =
+             '["https://www.googleapis.com/auth/fitness.activity.write"]
+        requestClient UsersSessionsDelete'{..}
           = go _usdUserId _usdSessionId _usdCurrentTimeMillis
               (Just AltJSON)
               fitnessService
diff --git a/gen/Network/Google/Resource/Fitness/Users/Sessions/List.hs b/gen/Network/Google/Resource/Fitness/Users/Sessions/List.hs
--- a/gen/Network/Google/Resource/Fitness/Users/Sessions/List.hs
+++ b/gen/Network/Google/Resource/Fitness/Users/Sessions/List.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Fitness.Users.Sessions.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
@@ -61,7 +61,7 @@
 -- | Lists sessions previously created.
 --
 -- /See:/ 'usersSessionsList' smart constructor.
-data UsersSessionsList = UsersSessionsList
+data UsersSessionsList = UsersSessionsList'
     { _uslStartTime      :: !(Maybe Text)
     , _uslUserId         :: !Text
     , _uslEndTime        :: !(Maybe Text)
@@ -86,7 +86,7 @@
     :: Text -- ^ 'uslUserId'
     -> UsersSessionsList
 usersSessionsList pUslUserId_ =
-    UsersSessionsList
+    UsersSessionsList'
     { _uslStartTime = Nothing
     , _uslUserId = pUslUserId_
     , _uslEndTime = Nothing
@@ -129,7 +129,14 @@
 
 instance GoogleRequest UsersSessionsList where
         type Rs UsersSessionsList = ListSessionsResponse
-        requestClient UsersSessionsList{..}
+        type Scopes UsersSessionsList =
+             '["https://www.googleapis.com/auth/fitness.activity.read",
+               "https://www.googleapis.com/auth/fitness.activity.write",
+               "https://www.googleapis.com/auth/fitness.body.read",
+               "https://www.googleapis.com/auth/fitness.body.write",
+               "https://www.googleapis.com/auth/fitness.location.read",
+               "https://www.googleapis.com/auth/fitness.location.write"]
+        requestClient UsersSessionsList'{..}
           = go _uslUserId _uslStartTime _uslEndTime
               _uslPageToken
               _uslIncludeDeleted
diff --git a/gen/Network/Google/Resource/Fitness/Users/Sessions/Update.hs b/gen/Network/Google/Resource/Fitness/Users/Sessions/Update.hs
--- a/gen/Network/Google/Resource/Fitness/Users/Sessions/Update.hs
+++ b/gen/Network/Google/Resource/Fitness/Users/Sessions/Update.hs
@@ -14,7 +14,7 @@
 
 -- |
 -- Module      : Network.Google.Resource.Fitness.Users.Sessions.Update
--- 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
@@ -58,7 +58,7 @@
 -- | Updates or insert a given session.
 --
 -- /See:/ 'usersSessionsUpdate' smart constructor.
-data UsersSessionsUpdate = UsersSessionsUpdate
+data UsersSessionsUpdate = UsersSessionsUpdate'
     { _usuPayload           :: !Session
     , _usuUserId            :: !Text
     , _usuCurrentTimeMillis :: !(Maybe (Textual Int64))
@@ -82,7 +82,7 @@
     -> Text -- ^ 'usuSessionId'
     -> UsersSessionsUpdate
 usersSessionsUpdate pUsuPayload_ pUsuUserId_ pUsuSessionId_ =
-    UsersSessionsUpdate
+    UsersSessionsUpdate'
     { _usuPayload = pUsuPayload_
     , _usuUserId = pUsuUserId_
     , _usuCurrentTimeMillis = Nothing
@@ -114,7 +114,9 @@
 
 instance GoogleRequest UsersSessionsUpdate where
         type Rs UsersSessionsUpdate = Session
-        requestClient UsersSessionsUpdate{..}
+        type Scopes UsersSessionsUpdate =
+             '["https://www.googleapis.com/auth/fitness.activity.write"]
+        requestClient UsersSessionsUpdate'{..}
           = go _usuUserId _usuSessionId _usuCurrentTimeMillis
               (Just AltJSON)
               _usuPayload
diff --git a/gogol-fitness.cabal b/gogol-fitness.cabal
--- a/gogol-fitness.cabal
+++ b/gogol-fitness.cabal
@@ -1,5 +1,5 @@
 name:                  gogol-fitness
-version:               0.0.1
+version:               0.1.0
 synopsis:              Google Fitness 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
@@ -54,5 +54,5 @@
         , Network.Google.Fitness.Types.Sum
 
     build-depends:
-          gogol-core == 0.0.1.*
+          gogol-core == 0.1.0.*
         , base       >= 4.7 && < 5
