Index: Src/GoogleApis.Authentication.OAuth2.Tests/GoogleApis.Authentication.OAuth2.Tests.csproj
===================================================================
--- a/Src/GoogleApis.Authentication.OAuth2.Tests/GoogleApis.Authentication.OAuth2.Tests.csproj
+++ b/Src/GoogleApis.Authentication.OAuth2.Tests/GoogleApis.Authentication.OAuth2.Tests.csproj
@@ -116,5 +116,9 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.8\tools\Microsoft.Bcl.Build.targets" />
+  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
 </Project>
\ No newline at end of file
Index: Src/GoogleApis.Authentication.OAuth2.Tests/Properties/AssemblyInfo.cs
===================================================================
--- a/Src/GoogleApis.Authentication.OAuth2.Tests/Properties/AssemblyInfo.cs
+++ b/Src/GoogleApis.Authentication.OAuth2.Tests/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("GoogleApis.Authentication.OAuth2.Tests")]
+[assembly: AssemblyTitle("Google.Apis.Authentication.OAuth2.Tests")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Google")]
-[assembly: AssemblyProduct("GoogleApis.Authentication.OAuth2.Tests")]
+[assembly: AssemblyCompany("Google Inc")]
+[assembly: AssemblyProduct("")]
 [assembly: AssemblyCopyright("Copyright © Google Inc 2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
Index: Src/GoogleApis.Authentication.OAuth2.Tests/packages.config
===================================================================
--- a/Src/GoogleApis.Authentication.OAuth2.Tests/packages.config
+++ b/Src/GoogleApis.Authentication.OAuth2.Tests/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Microsoft.Bcl" version="1.0.19" targetFramework="net40" />
   <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="net40" />
-  <package id="Microsoft.Bcl.Build" version="1.0.8" targetFramework="net40" />
+  <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="net40" />
   <package id="Microsoft.Net.Http" version="2.1.10" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="5.0.5" targetFramework="net40" />
   <package id="NUnit" version="2.6.2" targetFramework="net40" />
Index: Src/GoogleApis.Authentication.OAuth2/GoogleApis.Authentication.OAuth2.csproj
===================================================================
--- a/Src/GoogleApis.Authentication.OAuth2/GoogleApis.Authentication.OAuth2.csproj
+++ b/Src/GoogleApis.Authentication.OAuth2/GoogleApis.Authentication.OAuth2.csproj
@@ -99,7 +99,11 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.8\tools\Microsoft.Bcl.Build.targets" />
+  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
Index: Src/GoogleApis.Authentication.OAuth2/OAuth2Authenticator.cs
===================================================================
--- a/Src/GoogleApis.Authentication.OAuth2/OAuth2Authenticator.cs
+++ b/Src/GoogleApis.Authentication.OAuth2/OAuth2Authenticator.cs
@@ -17,6 +17,7 @@
 using System;
 using System.Net;
 using System.Net.Http;
+using System.Threading.Tasks;
 
 using DotNetOpenAuth.OAuth2;
 
@@ -34,9 +35,7 @@
         private readonly TClient tokenProvider;
         private bool noCaching;
 
-        /// <summary>
-        /// Creates a new OAuth2 authenticator.
-        /// </summary>
+        /// <summary>Creates a new OAuth2 authenticator.</summary>
         /// <param name="tokenProvider">The client which is used for requesting access and refresh tokens.</param>
         /// <param name="authProvider">The method which provides the initial authorization for the provider.</param>
         public OAuth2Authenticator(TClient tokenProvider,
@@ -49,9 +48,7 @@
             this.authProvider = authProvider;
         }
 
-        /// <summary>
-        /// The current state of this authenticator
-        /// </summary>
+        /// <summary>The current state of this authenticator.</summary>
         public IAuthorizationState State { get; private set; }
 
         /// <summary>
@@ -125,11 +122,16 @@
         }
 
         /// <summary> 
-        /// Override handle response to refresh the token when Unauthorized status code is received. 
+        /// Overrides handle response to refresh the token when Unauthorized status code is received. 
         /// </summary>
-        public bool HandleResponse(HandleUnsuccessfulResponseArgs args)
+        public Task<bool> HandleResponseAsync(HandleUnsuccessfulResponseArgs args)
         {
-            return args.Response.StatusCode == HttpStatusCode.Unauthorized && tokenProvider.RefreshToken(State, null);
+            var result = args.Response.StatusCode == HttpStatusCode.Unauthorized &&
+                tokenProvider.RefreshToken(State, null);
+
+            TaskCompletionSource<bool> tcs = new TaskCompletionSource<bool>();
+            tcs.SetResult(result);
+            return tcs.Task;
         }
     }
 }
\ No newline at end of file
Index: Src/GoogleApis.Authentication.OAuth2/Properties/AssemblyInfo.cs
===================================================================
--- a/Src/GoogleApis.Authentication.OAuth2/Properties/AssemblyInfo.cs
+++ b/Src/GoogleApis.Authentication.OAuth2/Properties/AssemblyInfo.cs
@@ -20,7 +20,7 @@
 // Information about this assembly is defined by the following attributes. 
 // Change them to the values specific to your project.
 
-[assembly: AssemblyTitle("GoogleApis.Authentication.OAuth2")]
+[assembly: AssemblyTitle("Google.Apis.Authentication.OAuth2")]
 [assembly: AssemblyDescription("OAuth2 Authentication Library")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Google Inc")]
Index: Src/GoogleApis.Authentication.OAuth2/packages.config
===================================================================
--- a/Src/GoogleApis.Authentication.OAuth2/packages.config
+++ b/Src/GoogleApis.Authentication.OAuth2/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Microsoft.Bcl" version="1.0.19" targetFramework="net40" />
   <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="net40" />
-  <package id="Microsoft.Bcl.Build" version="1.0.8" targetFramework="net40" />
+  <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="net40" />
   <package id="Microsoft.Net.Http" version="2.1.10" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="5.0.5" targetFramework="net40" />
 </packages>
\ No newline at end of file
Index: Src/GoogleApis.DotNet4/Apis/Util/Store/FileDataStore.cs
===================================================================
new file mode 100644
--- /dev/null
+++ b/Src/GoogleApis.DotNet4/Apis/Util/Store/FileDataStore.cs
@@ -0,0 +1,151 @@
+/*
+Copyright 2011 Google Inc
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+
+using Google.Apis.Util.Store;
+using Google.Apis.Json;
+
+namespace Google.Apis.Apis.Util.Store
+{
+    /// <summary>
+    /// File data store that implements <seealso cref="IDataStore"/>. This store creates a different file for each 
+    /// combination of type and key.
+    /// </summary>
+    public class FileDataStore : IDataStore
+    {
+        readonly string folderPath;
+        /// <summary>Gets the full folder path.</summary>
+        public string FolderPath { get { return folderPath; } }
+
+        /// <summary>
+        /// Constructs a new file data store with the specified folder. This folder is created (if it doesn't exist 
+        /// yet) under <seealso cref="Environment.SpecialFolder.ApplicationData"/>.
+        /// </summary>
+        /// <param name="folder">Folder name</param>
+        public FileDataStore(string folder)
+        {
+            folderPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), folder);
+            if (!Directory.Exists(folderPath))
+            {
+                Directory.CreateDirectory(folderPath);
+            }
+        }
+
+        /// <summary>
+        /// Stores the given value for the given key. It creates a new file (named <see cref="GetStoredKey"/>) in 
+        /// <see cref="FolderPath"/>.
+        /// </summary>
+        /// <typeparam name="T">The type to store in the data store</typeparam>
+        /// <param name="key">The key</param>
+        /// <param name="value">The value to store in the data store</param>
+        public Task Store<T>(string key, T value)
+        {
+            if (string.IsNullOrEmpty(key))
+            {
+                throw new ArgumentException("Key MUST have a value");
+            }
+
+            var serialized = NewtonsoftJsonSerializer.Instance.Serialize(value);
+            var filePath = Path.Combine(folderPath, GetStoredKey(key, typeof(T)));
+            File.WriteAllText(filePath, serialized);
+            return TaskEx.Delay(0);
+        }
+
+        /// <summary>
+        /// Deletes the given key. It deletes the <see cref="GetStoredKey"/> named file in <see cref="FolderPath"/>.
+        /// </summary>
+        /// <param name="key">The key to delete from the data store</param>
+        /// <param name="t">The type of the stored value</param>
+        public Task Delete(string key, Type t)
+        {
+            if (string.IsNullOrEmpty(key))
+            {
+                throw new ArgumentException("Key MUST have a value");
+            }
+            if (t == null)
+            {
+                throw new ArgumentException("Type can't be null");
+            }
+
+            var filePath = Path.Combine(folderPath, GetStoredKey(key, t));
+            if (File.Exists(filePath))
+            {
+                File.Delete(filePath);
+            }
+            return TaskEx.Delay(0);
+        }
+
+        /// <summary>
+        /// Returns the stored value for the given key or <c>null</c> if the matching file (<see cref="GetStoredKey"/>
+        /// in <see cref="FolderPath"/> doesn't exist.
+        /// </summary>
+        /// <typeparam name="T">The type to retrieve</typeparam>
+        /// <param name="key">The key to retrieve from the data store</param>
+        /// <returns>The stored object</returns>
+        public Task<T> Get<T>(string key)
+        {
+            if (string.IsNullOrEmpty(key))
+            {
+                throw new ArgumentException("Key MUST have a value");
+            }
+
+            TaskCompletionSource<T> tcs = new TaskCompletionSource<T>();
+            var filePath = Path.Combine(folderPath, GetStoredKey(key, typeof(T)));
+            if (File.Exists(filePath))
+            {
+                try
+                {
+                    var obj = File.ReadAllText(filePath);
+                    tcs.SetResult(NewtonsoftJsonSerializer.Instance.Deserialize<T>(obj));
+                }
+                catch (Exception ex)
+                {
+                    tcs.SetException(ex);
+                }
+            }
+            else
+            {
+                tcs.SetResult(default(T));
+            }
+            return tcs.Task;
+        }
+
+        /// <summary>
+        /// Clears all values in the data store. This method deletes all files in <see cref="FolderPath"/>.
+        /// </summary>
+        public Task Clear()
+        {
+            if (Directory.Exists(folderPath))
+            {
+                Directory.Delete(folderPath, true);
+                Directory.CreateDirectory(folderPath);
+            }
+
+            return TaskEx.Delay(0);
+        }
+
+        /// <summary>Creates a unique stored key based on the key and the class type.</summary>
+        /// <param name="key">The object key</param>
+        /// <param name="t">The type to store or retrieve</param>
+        public static string GetStoredKey(string key, Type t)
+        {
+            return string.Format("{0}-{1}", t.FullName, key);
+        }
+    }
+}
Index: Src/GoogleApis.DotNet4/GoogleApis.DotNet4.csproj
===================================================================
--- a/Src/GoogleApis.DotNet4/GoogleApis.DotNet4.csproj
+++ b/Src/GoogleApis.DotNet4/GoogleApis.DotNet4.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Google.Apis</RootNamespace>
+    <RootNamespace>Google</RootNamespace>
     <AssemblyName>Google.Apis.PlatformServices</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -78,6 +78,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Apis\Logging\Log4NetLogger.cs" />
+    <Compile Include="Apis\Util\Store\FileDataStore.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -91,7 +92,11 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.8\tools\Microsoft.Bcl.Build.targets" />
+  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
Index: Src/GoogleApis.DotNet4/Properties/AssemblyInfo.cs
===================================================================
--- a/Src/GoogleApis.DotNet4/Properties/AssemblyInfo.cs
+++ b/Src/GoogleApis.DotNet4/Properties/AssemblyInfo.cs
@@ -20,7 +20,7 @@
 // Information about this assembly is defined by the following attributes. 
 // Change them to the values specific to your project.
 
-[assembly: AssemblyTitle("GoogleApis.FullProfile")]
+[assembly: AssemblyTitle("Google.Apis.PlatformServices")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Google Inc")]
Index: Src/GoogleApis.DotNet4/packages.config
===================================================================
--- a/Src/GoogleApis.DotNet4/packages.config
+++ b/Src/GoogleApis.DotNet4/packages.config
@@ -3,6 +3,6 @@
   <package id="log4net" version="2.0.0" targetFramework="net40" />
   <package id="Microsoft.Bcl" version="1.0.19" targetFramework="net40" />
   <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="net40" />
-  <package id="Microsoft.Bcl.Build" version="1.0.8" targetFramework="net40" />
+  <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="net40" />
   <package id="Microsoft.Net.Http" version="2.1.10" targetFramework="net40" />
 </packages>
\ No newline at end of file
Index: Src/GoogleApis.Tests/Apis/Http/ConfigurableMessageHandlerTest.cs
===================================================================
--- a/Src/GoogleApis.Tests/Apis/Http/ConfigurableMessageHandlerTest.cs
+++ b/Src/GoogleApis.Tests/Apis/Http/ConfigurableMessageHandlerTest.cs
@@ -33,22 +33,24 @@
 
 namespace Google.Apis.Tests.Apis.Http
 {
-    /// <summary> Tests for <see cref="Google.Apis.Http.ConfigurableMessageHandler"/>. </summary>
+    /// <summary>Tests for <see cref="Google.Apis.Http.ConfigurableMessageHandler"/>.</summary>
     [TestFixture]
     public class ConfigurableMessageHandlerTest
     {
         #region Handlers
 
-        /// <summary> Unsuccessful handler which always returns <c>true</c>. </summary>
+        /// <summary>Unsuccessful handler which always returns <c>true</c>.</summary>
         private class TrueUnsuccessfulResponseHandler : IHttpUnsuccessfulResponseHandler
         {
-            public bool HandleResponse(HandleUnsuccessfulResponseArgs args)
+            public Task<bool> HandleResponseAsync(HandleUnsuccessfulResponseArgs args)
             {
-                return true;
+                TaskCompletionSource<bool> tcs = new TaskCompletionSource<bool>();
+                tcs.SetResult(true);
+                return tcs.Task;
             }
         }
 
-        /// <summary> Message handler which returns a new successful (and empty) response. </summary>
+        /// <summary>Message handler which returns a new successful (and empty) response.</summary>
         private class MockMessageHandler : HttpMessageHandler
         {
             protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request,
@@ -64,13 +66,13 @@
 
         #region Redirect
 
-        /// <summary> Redirect message handler which return redirect response. </summary>
+        /// <summary>Redirect message handler which return redirect response.</summary>
         private class RedirectMessageHandler : CountableMessageHandler
         {
-            /// <summary> Gets or sets the redirect location Uri string. </summary>
+            /// <summary>Gets or sets the redirect location Uri string.</summary>
             private string Location { get; set; }
 
-            /// <summary> Constructs a new redirect message handler with the given location. </summary>
+            /// <summary>Constructs a new redirect message handler with the given location.</summary>
             public RedirectMessageHandler(string location)
             {
                 Location = location;
@@ -110,7 +112,7 @@
             }
         }
 
-        /// <summary> Tests that the message handler handles redirect messages successfully. </summary>
+        /// <summary>Tests that the message handler handles redirect messages successfully.</summary>
         [Test]
         public void SendAsync_Redirect()
         {
@@ -136,7 +138,7 @@
             }
         }
 
-        /// <summary> 
+        /// <summary>
         /// Tests that the message handler doesn't handle redirect messages when follow redirect is <c>false</c>. 
         /// </summary>
         [Test]
@@ -171,12 +173,12 @@
 
         #region Execute interceptor
 
-        /// <summary> 
+        /// <summary>
         /// Mock interceptor handler which verifies that an interceptor is being called on a request. 
         /// </summary>
         private class InterceptorMessageHandler : CountableMessageHandler
         {
-            /// <summary> Gets or sets an injected response message which will be returned on send. </summary>
+            /// <summary>Gets or sets an injected response message which will be returned on send.</summary>
             public HttpResponseMessage InjectedResponseMessage { get; set; }
 
             const string InjectedHeader = "Some-Header";
@@ -192,27 +194,28 @@
                 return tcs.Task;
             }
 
-            /// <summary> A mock interceptor which inject a header to a request. </summary>
+            /// <summary>A mock interceptor which inject a header to a request.</summary>
             internal class Interceptor : IHttpExecuteInterceptor
             {
                 public int Calls { get; set; }
 
-                public void Intercept(HttpRequestMessage request)
+                public Task InterceptAsync(HttpRequestMessage request, CancellationToken token)
                 {
                     ++Calls;
                     request.Headers.Add(InjectedHeader, InjectedValue);
+                    return TaskEx.Delay(0);
                 }
             }
         }
 
-        /// <summary> Tests that execute interceptor is called on successful response. </summary>
+        /// <summary>Tests that execute interceptor is called on successful response.</summary>
         [Test]
         public void SendAsync_ExecuteInterceptor()
         {
             SubtestSendAsyncExecuteInterceptor(HttpStatusCode.OK);
         }
 
-        /// <summary> 
+        /// <summary>
         /// Tests that execute interceptor is called once on unsuccessful request. In this test unsuccessful response 
         /// handler isn't plugged to the handler. 
         /// </summary>
@@ -222,7 +225,7 @@
             SubtestSendAsyncExecuteInterceptor(HttpStatusCode.BadRequest);
         }
 
-        /// <summary> Tests that execute interceptor is called. </summary>
+        /// <summary>Tests that execute interceptor is called.</summary>
         private void SubtestSendAsyncExecuteInterceptor(HttpStatusCode code)
         {
             var handler = new InterceptorMessageHandler();
@@ -245,7 +248,7 @@
             }
         }
 
-        /// <summary> 
+        /// <summary>
         /// Tests that execute interceptor is called for each request. In this case an unsuccessful response handler is 
         /// plugged to the handler
         /// </summary>
@@ -277,18 +280,18 @@
 
         #region Unsuccessful reponse handler
 
-        /// <summary> 
+        /// <summary>
         /// Mock unsuccessful response handler which verifies that unsuccessful response handler is being called.
         /// </summary>
         private class UnsuccessfulResponseMessageHandler : CountableMessageHandler
         {
-            /// <summary> Gets or sets the status code to return on the response.</summary>
+            /// <summary>Gets or sets the status code to return on the response.</summary>
             public HttpStatusCode ResponseStatusCode { get; set; }
 
-            /// <summary> Gets or sets the cancellation token source.</summary>
+            /// <summary>Gets or sets the cancellation token source.</summary>
             public CancellationTokenSource CancellationTokenSource { get; set; }
 
-            /// <summary> 
+            /// <summary>
             /// Gets or sets the request number to invoke the Cancel method on <see cref="CancellationTokenSource"/>.
             /// </summary>
             public int CancelRequestNum { get; set; }
@@ -306,20 +309,22 @@
                 return tcs.Task;
             }
 
-            /// <summary> Unsuccessful response handler which "handles" only service unavailable responses. </summary>
+            /// <summary>Unsuccessful response handler which "handles" only service unavailable responses.</summary>
             internal class ServiceUnavailableResponseHandler : IHttpUnsuccessfulResponseHandler
             {
                 public int Calls { get; set; }
 
-                public bool HandleResponse(HandleUnsuccessfulResponseArgs args)
+                public Task<bool> HandleResponseAsync(HandleUnsuccessfulResponseArgs args)
                 {
                     ++Calls;
-                    return args.Response.StatusCode.Equals(HttpStatusCode.ServiceUnavailable);
+                    TaskCompletionSource<bool> tcs = new TaskCompletionSource<bool>();
+                    tcs.SetResult(args.Response.StatusCode.Equals(HttpStatusCode.ServiceUnavailable));
+                    return tcs.Task;
                 }
             }
         }
 
-        /// <summary> Test helper for testing unsuccessful response handlers. </summary>
+        /// <summary>Test helper for testing unsuccessful response handlers.</summary>
         private void SubtestSendAsyncUnsuccessfulReponseHanlder(HttpStatusCode code)
         {
             var handler = new UnsuccessfulResponseMessageHandler { ResponseStatusCode = code };
@@ -351,14 +356,14 @@
             }
         }
 
-        /// <summary> Tests that unsuccessful response handler isn't called when the response is successful. </summary>
+        /// <summary>Tests that unsuccessful response handler isn't called when the response is successful.</summary>
         [Test]
         public void SendAsync_UnsuccessfulReponseHanlder_SuccessfulReponse()
         {
             SubtestSendAsyncUnsuccessfulReponseHanlder(HttpStatusCode.OK);
         }
 
-        /// <summary> 
+        /// <summary>
         /// Tests that unsuccessful response handler is called when the response is unsuccessful, but the handler can't
         /// handle the abnormal response (e.g. different status code).
         /// </summary>
@@ -368,7 +373,7 @@
             SubtestSendAsyncUnsuccessfulReponseHanlder(HttpStatusCode.BadGateway);
         }
 
-        /// <summary> 
+        /// <summary>
         /// Tests that unsuccessful response handler is called when the response is unsuccessful and the handler can 
         /// handle the abnormal response (e.g. same status code).
         /// </summary>
@@ -378,7 +383,7 @@
             SubtestSendAsyncUnsuccessfulReponseHanlder(HttpStatusCode.ServiceUnavailable);
         }
 
-        /// <summary> Tests abnormal response when unsuccessful response handler isn't plugged. </summary>
+        /// <summary>Tests abnormal response when unsuccessful response handler isn't plugged.</summary>
         [Test]
         public void SendAsync_AbnormalResponse_WithoutUnsuccessfulReponseHandler()
         {
@@ -402,7 +407,7 @@
 
         #region Exception Handler
 
-        /// <summary> Mock exception message handler which verifies that exception handler is being called. </summary>
+        /// <summary>Mock exception message handler which verifies that exception handler is being called.</summary>
         private class ExceptionMessageHandler : CountableMessageHandler
         {
             public ExceptionMessageHandler()
@@ -410,15 +415,15 @@
                 Exception = new Exception(ExceptionMessage);
             }
 
-            /// <summary> Gets or sets indication if exception should be thrown. </summary>
+            /// <summary>Gets or sets indication if exception should be thrown.</summary>
             public bool ThrowException { get; set; }
 
-            /// <summary> 
+            /// <summary>
             /// Gets or sets a specific exception to throw. Default value is <seealso cref="System.Exception"/> 
-            /// with <see cref="ExceptionMessage"/>. </summary>
+            /// with <see cref="ExceptionMessage"/>.</summary>
             public Exception Exception { get; set; }
 
-            /// <summary> 
+            /// <summary>
             /// The exception message which is thrown in case <see cref="ThrowException"/> is <c>true</c>. 
             /// </summary>
             public const string ExceptionMessage = "Exception from execute";
@@ -436,7 +441,7 @@
                 return tcs.Task;
             }
 
-            /// <summary> Mock Exception handler which "handles" the exception. </summary>
+            /// <summary>Mock Exception handler which "handles" the exception.</summary>
             internal class ExceptionHandler : IHttpExceptionHandler
             {
                 public int Calls { get; set; }
@@ -447,15 +452,17 @@
                     Handle = handle;
                 }
 
-                public bool HandleException(HandleExceptionArgs args)
+                public Task<bool> HandleExceptionAsync(HandleExceptionArgs args)
                 {
                     ++Calls;
-                    return Handle;
+                    TaskCompletionSource<bool> tcs = new TaskCompletionSource<bool>();
+                    tcs.SetResult(Handle);
+                    return tcs.Task;
                 }
             }
         }
 
-        /// <summary> Subtest for exception handler which tests that exception handler is invoked. </summary>
+        /// <summary>Subtest for exception handler which tests that exception handler is invoked.</summary>
         private void SubtestSendAsyncExceptionHandler(bool throwException, bool handle)
         {
             var handler = new ExceptionMessageHandler { ThrowException = throwException };
@@ -497,14 +504,14 @@
         }
 
 
-        /// <summary> Tests that the exception handler isn't called on successful response. </summary>
+        /// <summary>Tests that the exception handler isn't called on successful response.</summary>
         [Test]
         public void SendAsync_ExceptionHandler_SuccessReponse()
         {
             SubtestSendAsyncExceptionHandler(false, true);
         }
 
-        /// <summary> 
+        /// <summary>
         /// Tests that the exception handler is called when exception is thrown on execute, but it can't handle the 
         /// exception. 
         /// </summary>
@@ -514,7 +521,7 @@
             SubtestSendAsyncExceptionHandler(true, false);
         }
 
-        /// <summary> 
+        /// <summary>
         /// Tests that the exception handler is called when exception is thrown on execute, and it handles the 
         /// exception. 
         /// </summary>
@@ -524,7 +531,7 @@
             SubtestSendAsyncExceptionHandler(true, true);
         }
 
-        /// <summary> Tests an exception is thrown on execute and there is no exception handler. </summary>
+        /// <summary>Tests an exception is thrown on execute and there is no exception handler.</summary>
         [Test]
         public void SendAsync_ThrowException_WithoutExceptionHandler()
         {
@@ -558,7 +565,7 @@
 
         #region Exception
 
-        /// <summary> 
+        /// <summary>
         /// Tests that back-off handler works as expected when exception is thrown. 
         /// Use default max time span (2 minutes).
         /// </summary>
@@ -570,7 +577,7 @@
             SubtestSendAsync_BackOffExceptionHandler(true, initializer);
         }
 
-        /// <summary> 
+        /// <summary>
         /// Tests that back-off handler works as expected when exception is thrown. 
         /// Max time span is set to 200 milliseconds (as a result the back-off handler can't handle the exception).
         /// </summary>
@@ -584,7 +591,7 @@
             SubtestSendAsync_BackOffExceptionHandler(true, initializer);
         }
 
-        /// <summary> 
+        /// <summary>
         /// Tests that back-off handler works as expected when exception is thrown. 
         /// Max time span is set to 1 hour.
         /// </summary>
@@ -598,7 +605,7 @@
             SubtestSendAsync_BackOffExceptionHandler(true, initializer);
         }
 
-        /// <summary> 
+        /// <summary>
         /// Tests that back-off handler works as expected when 
         /// <seealso cref="System.Threading.Tasks.TaskCanceledException"/>> is thrown. 
         /// </summary>
@@ -623,7 +630,7 @@
             SubtestSendAsync_BackOffExceptionHandler(true, initializer, new InvalidCastException());
         }
 
-        /// <summary> Tests that back-off handler works as expected when exception isn't thrown. </summary>
+        /// <summary>Tests that back-off handler works as expected when exception isn't thrown.</summary>
         [Test]
         public void SendAsync_BackOffExceptionHandler_DontThrow()
         {
@@ -631,7 +638,7 @@
             SubtestSendAsync_BackOffExceptionHandler(false, initializer);
         }
 
-        /// <summary> Subtest that back-off handler works as expected when exception is or isn't thrown. </summary>
+        /// <summary>Subtest that back-off handler works as expected when exception is or isn't thrown.</summary>
         private void SubtestSendAsync_BackOffExceptionHandler(bool throwException,
             BackOffHandler.Initializer initializer, Exception exceptionToThrow = null)
         {
@@ -686,7 +693,7 @@
 
         #region Unsuccessful Response Handler
 
-        /// <summary> 
+        /// <summary>
         /// Tests that back-off handler works as expected when the server returns 5xx and the maximum time span is set
         /// to 5 seconds.
         /// </summary>
@@ -700,7 +707,7 @@
             SubtestSendAsync_BackOffUnsuccessfulResponseHandler(HttpStatusCode.ServiceUnavailable, initializer);
         }
 
-        /// <summary> 
+        /// <summary>
         /// Tests that back-off handler works as expected when the server returns 5xx and the maximum time span is set
         /// to 10 hours.
         /// </summary>
@@ -714,7 +721,7 @@
             SubtestSendAsync_BackOffUnsuccessfulResponseHandler(HttpStatusCode.ServiceUnavailable, initializer);
         }
 
-        /// <summary> 
+        /// <summary>
         /// Tests that back-off handler isn't be called when the server returns a successful response.
         /// </summary>
         [Test]
@@ -724,7 +731,7 @@
             SubtestSendAsync_BackOffUnsuccessfulResponseHandler(HttpStatusCode.OK, initializer);
         }
 
-        /// <summary> Tests that back-off handler is canceled when cancellation token is used.</summary>
+        /// <summary>Tests that back-off handler is canceled when cancellation token is used.</summary>
         [Test]
         public void SendAsync_BackOffUnsuccessfulResponseHandler_Cancel()
         {
@@ -737,7 +744,7 @@
             SubtestSendAsync_BackOffUnsuccessfulResponseHandler(HttpStatusCode.ServiceUnavailable, initializer, 6);
         }
 
-        /// <summary> 
+        /// <summary>
         /// Subtest that back-off handler works as expected when a successful or abnormal response is returned.
         /// For testing the back-off handler in case of a canceled request, set the <code>cancelRequestNum</code>
         /// parameter to the index of the request you want to cancel.
@@ -813,7 +820,7 @@
 
         #region Content
 
-        /// <summary> Mock message handler which verifies that the content is correct on retry. </summary>
+        /// <summary>Mock message handler which verifies that the content is correct on retry.</summary>
         private class ContentMessageHandler : CountableMessageHandler
         {
             public const int NumFails = 4;
@@ -832,7 +839,7 @@
             }
         }
 
-        /// <summary> 
+        /// <summary>
         /// Defines the different content types we test in <see cref="SubtestSendAsyncRetryContent"/>.
         /// </summary>
         private enum ContentType
@@ -842,7 +849,7 @@
             ByteArray
         }
 
-        /// <summary> Tests that retry works with different kind of contents (String, Stream and ByteArray). </summary>
+        /// <summary>Tests that retry works with different kind of contents (String, Stream and ByteArray).</summary>
         private void SubtestSendAsyncRetryContent(ContentType type)
         {
             var content = "test-content";
@@ -882,21 +889,21 @@
             }
         }
 
-        /// <summary> Tests that a string content works as expected on retry. </summary>
+        /// <summary>Tests that a string content works as expected on retry.</summary>
         [Test]
         public void SendAsync_Retry_CorrectStringContent()
         {
             SubtestSendAsyncRetryContent(ContentType.String);
         }
 
-        /// <summary> Tests that a stream content works as expected on retry. </summary>
+        /// <summary>Tests that a stream content works as expected on retry.</summary>
         [Test]
         public void SendAsync_Retry_CorrectStreamContent()
         {
             SubtestSendAsyncRetryContent(ContentType.Stream);
         }
 
-        /// <summary> Tests that a byte array content works as expected on retry. </summary>
+        /// <summary>Tests that a byte array content works as expected on retry.</summary>
         [Test]
         public void SendAsync_Retry_CorrectByteArrayContent()
         {
@@ -905,7 +912,7 @@
 
         #endregion
 
-        /// <summary> Tests setting number of tries. </summary>
+        /// <summary>Tests setting number of tries.</summary>
         [Test]
         public void NumTries_Setter()
         {
@@ -946,7 +953,7 @@
             }
         }
 
-        /// <summary> 
+        /// <summary>
         /// Tests the number of tries in case of unsuccessful response when unsuccessful response handler is plugged to 
         /// the message handler. 
         /// </summary>
@@ -990,7 +997,7 @@
             }
         }
 
-        /// <summary> Tests that the configurable message handler sets the User-Agent header. </summary>
+        /// <summary>Tests that the configurable message handler sets the User-Agent header.</summary>
         [Test]
         public void SendAsync_UserAgent()
         {
Index: Src/GoogleApis.Tests/Apis/Requests/ClientServiceRequestTest.cs
===================================================================
--- a/Src/GoogleApis.Tests/Apis/Requests/ClientServiceRequestTest.cs
+++ b/Src/GoogleApis.Tests/Apis/Requests/ClientServiceRequestTest.cs
@@ -38,7 +38,7 @@
 
 namespace Google.Apis.Tests.Apis.Requests
 {
-    /// <summary> Tests for the <see cref="Google.Apis.Requests.ClientServiceRequest"/>. </summary>
+    /// <summary>Tests for the <see cref="Google.Apis.Requests.ClientServiceRequest"/>.</summary>
     [TestFixture]
     public class ClientServiceRequestTest
     {
@@ -49,7 +49,7 @@
             // ApplicationContext.RegisterLogger(new Google.Apis.Logging.Log4NetLogger());
         }
 
-        /// <summary> Helper method to get a string from the stream. </summary>
+        /// <summary>Helper method to get a string from the stream.</summary>
         private static string ExtractStringFromStream(Stream stream)
         {
             var buffer = new byte[1000];
@@ -57,7 +57,7 @@
             return Encoding.UTF8.GetString(buffer, 0, len);
         }
 
-        /// <summary> A mock response class. </summary>
+        /// <summary>A mock response class.</summary>
         class MockResponse : IDirectResponseSchema
         {
             [Newtonsoft.Json.JsonPropertyAttribute("etag")]
@@ -81,7 +81,7 @@
             }
         }
 
-        /// <summary> A mock request class. </summary>
+        /// <summary>A mock request class.</summary>
         class MockRequest : IDirectResponseSchema
         {
             [Newtonsoft.Json.JsonPropertyAttribute("etag")]
@@ -102,10 +102,10 @@
             }
         }
 
-        /// <summary> A mock service request which returns <see cref="MockResponse"/>. </summary>
+        /// <summary>A mock service request which returns <see cref="MockResponse"/>.</summary>
         class TestClientServiceRequest : ClientServiceRequest<MockResponse>
         {
-            /// <summary> Gets or sets a request number. It's used on concurrent tests. </summary>
+            /// <summary>Gets or sets a request number. It's used on concurrent tests.</summary>
             public int CallNum { get; set; }
             private string httpMethod;
             private object body;
@@ -139,7 +139,7 @@
             }
         }
 
-        /// <summary> A mock message handler which returns an error. </summary>
+        /// <summary>A mock message handler which returns an error.</summary>
         class ErrorMessageHanlder : CountableMessageHandler
         {
             public string ExpectedError =
@@ -176,22 +176,22 @@
             }
         }
 
-        /// <summary> Tests message handler which tests the content on the request and the response. </summary>
-        class TestBodyMessageHnalder : CountableMessageHandler
+        /// <summary>Tests message handler which tests the content on the request and the response.</summary>
+        class TestBodyMessageHandler : CountableMessageHandler
         {
-            /// <summary> Gets or sets indication is GZip is eanbled. </summary>
+            /// <summary>Gets or sets indication is GZip is eanbled.</summary>
             public bool GZipEnabled { get; set; }
 
-            /// <summary> Gets or sets the expected request object. </summary>
+            /// <summary>Gets or sets the expected request object.</summary>
             public MockRequest ExpectedRequestObject { get; set; }
 
-            /// <summary> Gets or sets the returned response object </summary>
+            /// <summary>Gets or sets the returned response object </summary>
             public MockResponse ResponseObject { get; set; }
 
-            /// <summary> Gets or sets the Serializer which is used to serialize and deserialize messages. </summary>
+            /// <summary>Gets or sets the Serializer which is used to serialize and deserialize messages.</summary>
             public ISerializer Serializer { get; set; }
 
-            /// <summary> Gets the thread id in which this handler was invoked. </summary>
+            /// <summary>Gets the thread id in which this handler was invoked.</summary>
             public int ThreadId { get; private set; }
 
             public string ResponseETag = "\"some-etag-here\"";
@@ -203,7 +203,7 @@
                 var mediaType = "application/json";
                 string strObject = null;
 
-                // if gzip enabled the request content is a gzip stream, otherwise it's a string content
+                // If gzip enabled the request content is a gzip stream, otherwise it's a string content.
                 if (GZipEnabled)
                 {
                     Assert.That(request.Content, Is.AssignableFrom<StreamContent>());
@@ -227,11 +227,11 @@
                         CharSet = Encoding.UTF8.WebName
                     }));
 
-                // deserialize the requested object and check it's equal to the expected object
+                // Deserialize the requested object and check it's equal to the expected object.
                 var obj = Serializer.Deserialize<MockRequest>(strObject);
                 Assert.That(obj, Is.EqualTo(ExpectedRequestObject));
 
-                // return the response (with ETag)
+                // Return the response (with ETag).
                 var response = new HttpResponseMessage();
                 var serializedObject = Serializer.Serialize(ResponseObject);
                 response.Content = new StringContent(serializedObject, Encoding.UTF8, mediaType);
@@ -240,7 +240,7 @@
             }
         }
 
-        /// <summary> 
+        /// <summary>
         /// A mock exception which is thrown from a mock message handler in case it is configured to throw exceptions. 
         /// </summary>
         class InvalidOperationMockException : Exception
@@ -251,7 +251,7 @@
             }
         }
 
-        /// <summary> A message handler which returns an Http response message or throw an exception. </summary>
+        /// <summary>A message handler which returns a HTTP response message or throw an exception.</summary>
         class MockMessageHandler : CountableMessageHandler
         {
             private bool ThrowException { get; set; }
@@ -274,13 +274,13 @@
             }
         }
 
-        /// <summary> A message handler which is used to cancel an Http request in the middle.</summary>
+        /// <summary>A message handler which is used to cancel a HTTP request in the middle.</summary>
         class CancelRedirectMessageHandler : CountableMessageHandler
         {
-            /// <summary> The cancellation token we are going to use to cancel a request.</summary>
+            /// <summary>The cancellation token we are going to use to cancel a request.</summary>
             public CancellationTokenSource CancellationTokenSource { get; set; }
 
-            /// <summary> The request index we are going to cancel.</summary>
+            /// <summary>The request index we are going to cancel.</summary>
             public int CancelRequestNum { get; set; }
 
             protected override Task<HttpResponseMessage> SendAsyncCore(HttpRequestMessage request,
@@ -303,13 +303,13 @@
             }
         }
 
-        /// <summary> 
+        /// <summary>
         /// A message handler which checks concurrent calls (each odd request will succeeded, and even request will 
         /// fail on the first try and will succeeded in the second try.
         /// </summary>
         class ConcurrentCallsHandler : CountableMessageHandler
         {
-            /// <summary> Gets or sets the Serializer which is used to serialize and deserialize messages. </summary>
+            /// <summary>Gets or sets the Serializer which is used to serialize and deserialize messages.</summary>
             public ISerializer Serializer { get; set; }
 
             protected override Task<HttpResponseMessage> SendAsyncCore(HttpRequestMessage request,
@@ -335,16 +335,18 @@
                 return tcs.Task;
             }
 
-            /// <summary> Unsuccessful response handler which "handles" service unavailable responses. </summary>
+            /// <summary>Unsuccessful response handler which "handles" service unavailable responses.</summary>
             internal class ServiceUnavailableUnsuccessfulResponseHandler : IHttpUnsuccessfulResponseHandler
             {
-                public bool HandleResponse(HandleUnsuccessfulResponseArgs args)
+                public Task<bool> HandleResponseAsync(HandleUnsuccessfulResponseArgs args)
                 {
-                    return args.Response.StatusCode == System.Net.HttpStatusCode.ServiceUnavailable;
+                    TaskCompletionSource<bool> tcs = new TaskCompletionSource<bool>();
+                    tcs.SetResult(args.Response.StatusCode.Equals(HttpStatusCode.ServiceUnavailable));
+                    return tcs.Task;
                 }
             }
 
-            /// <summary> 
+            /// <summary>
             /// Adds service unavailable unsuccessful response handler to the configurable message handler.
             /// </summary>
             internal class Initializer : IConfigurableHttpClientInitializer
@@ -359,7 +361,7 @@
 
         #region Execute (and ExecuteAsync)
 
-        /// <summary> Tests that canceling a outgoing request to the server works as expected.</summary>
+        /// <summary>Tests that canceling a outgoing request to the server works as expected.</summary>
         [Test]
         public void ExecuteAsync_Cancel()
         {
@@ -399,13 +401,14 @@
                 {
                     if (ex.InnerException is TaskCanceledException)
                     {
-                        // we expect a task canceled exception in case the canceled request is less or equal total
-                        // number of retries
+                        // We expect a task canceled exception in case the canceled request is less or equal total
+                        // number of retries.
                         Assert.False(cancelRequestNum > service.HttpClient.MessageHandler.NumTries);
                     }
                     else
                     {
-                        // exception should be thrown as a result of casting to MockResponse object
+                        // Canceled exception wasn't thrown, in that case the cancel request number is bigger than
+                        // the actual number of tries.
                         Assert.True(cancelRequestNum > service.HttpClient.MessageHandler.NumTries);
                     }
                 }
@@ -415,6 +418,7 @@
             }
         }
 
+        /// <summary>Tests the execute method in case the service was disposed.</summary>
         [Test]
         public void Execute_DisposeService()
         {
@@ -435,20 +439,24 @@
             Assert.Throws<ObjectDisposedException>(() => request.Execute());
         }
 
-        /// <summary> A subtest for testing GZip and sync-async calls. </summary>
+        /// <summary>A subtest for testing GZip and sync-async calls.</summary>
+        /// <param name="gzip">Defines if GZip is enabled</param>
+        /// <param name="async">Defines which method is going to be called (Execute or ExecuteAsync)</param>
         private void SubtestExecute_GZip(bool gzip, bool async)
         {
-            var handler = new TestBodyMessageHnalder()
-                {
-                    GZipEnabled = gzip,
-                    ResponseObject = new MockResponse { Id = 100, Name = "sample name" },
-                    ExpectedRequestObject = new MockRequest { Name = "long long name" }
-                };
+            var handler = new TestBodyMessageHandler()
+            {
+                GZipEnabled = gzip,
+                ResponseObject = new MockResponse { Id = 100, Name = "sample name" },
+                ExpectedRequestObject = new MockRequest { Name = "long long name" }
+            };
+
             var initializer = new BaseClientService.Initializer()
-                {
-                    GZipEnabled = gzip,
-                    HttpClientFactory = new MockHttpClientFactory(handler)
-                };
+            {
+                GZipEnabled = gzip,
+                HttpClientFactory = new MockHttpClientFactory(handler)
+            };
+
             using (var service = new MockClientService(initializer))
             {
                 handler.Serializer = service.Serializer;
@@ -467,61 +475,63 @@
                     Assert.AreEqual(Thread.CurrentThread.ManagedThreadId, handler.ThreadId);
                 }
 
-                // NOTICE: even if GZipEnabled is true, we don't need to extract the real string from the GZip stream,
+                // Note: Even if GZipEnabled is true, we don't need to extract the real string from the GZip stream,
                 // because in a real request we use HttpClientHandler which its AutomaticDecompression is set to 
                 // System.Net.DecompressionMethods.GZip.
 
                 Assert.That(handler.Calls, Is.EqualTo(1));
-                // the returned response should contain ETag, check that the service add the right ETag property on 
-                // the response
+                // The returned response should contain ETag, check that the service adds the right ETag property on 
+                // the response.
                 handler.ResponseObject.ETag = handler.ResponseETag;
                 Assert.That(response, Is.EqualTo(handler.ResponseObject));
             }
         }
 
-        /// <summary> Tests execute when GZip is enabled. </summary>
+        /// <summary>Tests execute when GZip is enabled.</summary>
         [Test]
         public void Execute_GZipEnabled()
         {
             SubtestExecute_GZip(true, false);
         }
 
-        /// <summary> Tests execute when GZip is disabled. </summary>
+        /// <summary>Tests execute when GZip is disabled.</summary>
         [Test]
         public void Execute_GZipDisabled()
         {
             SubtestExecute_GZip(false, false);
         }
 
-        /// <summary> Tests async execute when GZip is enabled. </summary>
+        /// <summary>Tests async execute when GZip is enabled.</summary>
         [Test]
         public void ExecuteAsync_GZipEnabled()
         {
             SubtestExecute_GZip(true, true);
         }
 
-        /// <summary> Tests async execute when GZip is disabled. </summary>
+        /// <summary>Tests async execute when GZip is disabled.</summary>
         [Test]
         public void ExecuteAsync_GZipDisabled()
         {
             SubtestExecute_GZip(false, true);
         }
 
-        /// <summary> Tests execute with unicode characters. </summary>
+        /// <summary>Tests execute with unicode characters.</summary>
         [Test]
         public void Execute_UnicodeCharacters()
         {
-            var handler = new TestBodyMessageHnalder()
-                {
-                    GZipEnabled = false,
-                    ResponseObject = new MockResponse { Id = 100, Name = @"مرحبا العالم" },
-                    ExpectedRequestObject = new MockRequest { Name = @"مرحبا العالم! 您好，世界！" }
-                };
+            var handler = new TestBodyMessageHandler()
+            {
+                GZipEnabled = false,
+                ResponseObject = new MockResponse { Id = 100, Name = @"مرحبا العالم" },
+                ExpectedRequestObject = new MockRequest { Name = @"مرحبا العالم! 您好，世界！" }
+            };
+
             var initializer = new BaseClientService.Initializer()
-                {
-                    GZipEnabled = false,
-                    HttpClientFactory = new MockHttpClientFactory(handler)
-                };
+            {
+                GZipEnabled = false,
+                HttpClientFactory = new MockHttpClientFactory(handler)
+            };
+
             using (var service = new MockClientService(initializer))
             {
                 handler.Serializer = service.Serializer;
@@ -529,17 +539,17 @@
                 var request = new TestClientServiceRequest(service, "GET", handler.ExpectedRequestObject);
                 var response = request.Execute();
                 Assert.That(handler.Calls, Is.EqualTo(1));
-                // the returned response should contain ETag, check that the service add the right ETag property on 
-                // the response
+                // The returned response should contain ETag, check that the service add the right ETag property on 
+                // the response.
                 handler.ResponseObject.ETag = handler.ResponseETag;
                 Assert.That(response, Is.EqualTo(handler.ResponseObject));
             }
         }
 
-        /// <summary> 
-        /// A subtest for testing execute when an exception is thrown during sending the request, with or without 
-        /// back-off. If back-off handler is attached to the service's message handler, there are going to be 3 tries 
-        /// (3 is the default value of <seealso cref="ConfigurableMessageHandler.NumTries" />) before the operation 
+        /// <summary>
+        /// A subtest for testing Execute when an exception is thrown while sending the request. This is tested with
+        /// and without back-off. If back-off handler is attached to the service's message handler, there should be 3
+        /// tries (the default value of <seealso cref="ConfigurableMessageHandler.NumTries"/>) before the operation 
         /// fails.
         /// </summary>
         /// <param name="backOff">Indicates if back-off handler is attached to the service.</param>
@@ -547,14 +557,13 @@
         {
             var handler = new MockMessageHandler(true);
             var initializer = new BaseClientService.Initializer()
-                {
-                    HttpClientFactory = new MockHttpClientFactory(handler)
-                };
+            {
+                HttpClientFactory = new MockHttpClientFactory(handler)
+            };
 
-            // sets the default exponential back-off policy by the input
+            // Set the default exponential back-off policy by the input.
             initializer.DefaultExponentialBackOffPolicy = backOff ?
-                BaseClientService.ExponentialBackOffPolicy.Exception :
-                BaseClientService.ExponentialBackOffPolicy.None;
+                ExponentialBackOffPolicy.Exception : ExponentialBackOffPolicy.None;
 
             using (var service = new MockClientService(initializer))
             {
@@ -566,7 +575,7 @@
             }
         }
 
-        /// <summary> 
+        /// <summary>
         /// Tests execute when an exception is thrown during a request and exponential back-off is enabled.
         /// </summary>
         [Test]
@@ -575,7 +584,7 @@
             SubtestExecute_ThrowException(true);
         }
 
-        /// <summary> 
+        /// <summary>
         /// Tests execute when an exception is thrown during a request and exponential back-off is disabled.
         /// </summary>
         [Test]
@@ -584,10 +593,10 @@
             SubtestExecute_ThrowException(false);
         }
 
-        /// <summary> 
-        /// A subtest for testing async execute when an exception is thrown during sending the request, with or without 
-        /// back-off handler. If back-off handler is attached to the service's message handler, there are going to be 3
-        /// tries (3 is the default value of <seealso cref="ConfigurableMessageHandler.NumTries" />) before the 
+        /// <summary>
+        /// A subtest for testing ExecuteAsync  when an exception is thrown while sending the request. This is tested 
+        /// with and without back-off. If back-off handler is attached to the service's message handler, there should 
+        /// be 3 tries (the default value of <seealso cref="ConfigurableMessageHandler.NumTries"/>) before the 
         /// operation fails.
         /// </summary>
         /// <param name="backOff">Indicates if back-off handler is attached to the service.</param>
@@ -599,10 +608,9 @@
                 HttpClientFactory = new MockHttpClientFactory(handler)
             };
 
-            // configure the back-off behavior by the input
+            // Configure the back-off behavior by the input.
             initializer.DefaultExponentialBackOffPolicy = backOff ?
-                BaseClientService.ExponentialBackOffPolicy.Exception :
-                BaseClientService.ExponentialBackOffPolicy.None;
+                ExponentialBackOffPolicy.Exception : ExponentialBackOffPolicy.None;
 
             using (var service = new MockClientService(initializer))
             {
@@ -623,7 +631,7 @@
             }
         }
 
-        /// <summary> 
+        /// <summary>
         /// Tests async execute when an exception is thrown during a request and exponential back-off is enabled.
         /// </summary>
         [Test]
@@ -632,7 +640,7 @@
             SubtestExecuteAsync_ThrowException(true);
         }
 
-        /// <summary> 
+        /// <summary>
         /// Tests async execute when an exception is thrown during a request and exponential back-off is disabled.
         /// </summary>
         [Test]
@@ -641,15 +649,16 @@
             SubtestExecuteAsync_ThrowException(false);
         }
 
-        /// <summary> Tests execute when server returned an error. </summary>
+        /// <summary>Tests execute when server returned an error.</summary>
         [Test]
         public void Execute_Error()
         {
             var handler = new ErrorMessageHanlder();
             var initializer = new BaseClientService.Initializer()
-                {
-                    HttpClientFactory = new MockHttpClientFactory(handler)
-                };
+            {
+                HttpClientFactory = new MockHttpClientFactory(handler)
+            };
+
             using (var service = new MockClientService(initializer))
             {
                 var request = new TestClientServiceRequest(service, "GET", null);
@@ -666,15 +675,16 @@
             }
         }
 
-        /// <summary> Tests execute when server returned an error. </summary>
+        /// <summary>Tests execute when server returned an error.</summary>
         [Test]
         public void ExecuteAsync_Error()
         {
             var handler = new ErrorMessageHanlder();
             var initializer = new BaseClientService.Initializer
-                {
-                    HttpClientFactory = new MockHttpClientFactory(handler)
-                };
+            {
+                HttpClientFactory = new MockHttpClientFactory(handler)
+            };
+
             using (var service = new MockClientService(initializer))
             {
                 var request = new TestClientServiceRequest(service, "GET", null);
@@ -698,17 +708,17 @@
             }
         }
 
-        /// <summary> Tests async execution of multiple request simultaneously. </summary>
+        /// <summary>Tests async execution of multiple request simultaneously.</summary>
         [Test]
         public void ExecuteAsync_Simultaneously()
         {
             var tasks = new List<Task<MockResponse>>();
             var handler = new ConcurrentCallsHandler();
             var initializer = new BaseClientService.Initializer()
-                {
-                    HttpClientFactory = new MockHttpClientFactory(handler),
-                    HttpClientInitializer = new ConcurrentCallsHandler.Initializer()
-                };
+            {
+                HttpClientFactory = new MockHttpClientFactory(handler),
+                HttpClientInitializer = new ConcurrentCallsHandler.Initializer()
+            };
 
             using (var service = new MockClientService(initializer))
             {
@@ -746,20 +756,22 @@
 
         #region ExecuteStream (and ExecuteAsStreamAsync)
 
-        /// <summary> A subtest for testing execute as stream (async and sync). </summary>
+        /// <summary>A subtest for testing execute as stream (async and sync).</summary>
         private void SubtestExecuteAsStream(bool async)
         {
-            var handler = new TestBodyMessageHnalder
-                {
-                    GZipEnabled = false,
-                    ResponseObject = new MockResponse { Id = 100, Name = "sample name" },
-                    ExpectedRequestObject = new MockRequest { Name = "long long name" }
-                };
+            var handler = new TestBodyMessageHandler
+            {
+                GZipEnabled = false,
+                ResponseObject = new MockResponse { Id = 100, Name = "sample name" },
+                ExpectedRequestObject = new MockRequest { Name = "long long name" }
+            };
+
             var initializer = new BaseClientService.Initializer
-                {
-                    GZipEnabled = false,
-                    HttpClientFactory = new MockHttpClientFactory(handler)
-                };
+            {
+                GZipEnabled = false,
+                HttpClientFactory = new MockHttpClientFactory(handler)
+            };
+
             using (var service = new MockClientService(initializer))
             {
                 handler.Serializer = service.Serializer;
@@ -782,7 +794,7 @@
                     Assert.AreEqual(Thread.CurrentThread.ManagedThreadId, handler.ThreadId);
                 }
 
-                // read the object
+                // Read the object.
                 var str = ExtractStringFromStream(stream);
                 response = service.Serializer.Deserialize<MockResponse>(str);
 
@@ -791,14 +803,14 @@
             }
         }
 
-        /// <summary> Tests execute stream. </summary>
+        /// <summary>Tests execute stream.</summary>
         [Test]
         public void ExecuteAsStream()
         {
             SubtestExecuteAsStream(false);
         }
 
-        /// <summary> Tests execute stream (async). </summary>
+        /// <summary>Tests execute stream (async).</summary>
         [Test]
         public void ExecuteAsStreamAsync()
         {
@@ -811,7 +823,7 @@
 
         #region Query Parameters
 
-        /// <summary> Client request which contains query parameters. </summary>
+        /// <summary>Client request which contains query parameters.</summary>
         class ClientServiceRequestWithQueryParameters : TestClientServiceRequest
         {
             [RequestParameterAttribute("required", Google.Apis.Util.RequestParameterType.Query)]
@@ -836,50 +848,50 @@
                 : base(service, method, body)
             {
                 RequestParameters.Add("required", new Parameter
-                    {
-                        Name = "required",
-                        IsRequired = true,
-                        ParameterType = "query"
-                    });
+                {
+                    Name = "required",
+                    IsRequired = true,
+                    ParameterType = "query"
+                });
                 RequestParameters.Add("optionalWithValue", new Parameter
-                    {
-                        Name = "optionalWithValue",
-                        IsRequired = false,
-                        ParameterType = "query",
-                        DefaultValue = "DoesNotDisplay"
-                    });
+                {
+                    Name = "optionalWithValue",
+                    IsRequired = false,
+                    ParameterType = "query",
+                    DefaultValue = "DoesNotDisplay"
+                });
                 RequestParameters.Add("optionalWithValue2", new Parameter
-                    {
-                        Name = "optionalWithValue",
-                        IsRequired = false,
-                        ParameterType = "query",
-                        DefaultValue = "DoesNotDisplay"
-                    });
+                {
+                    Name = "optionalWithValue",
+                    IsRequired = false,
+                    ParameterType = "query",
+                    DefaultValue = "DoesNotDisplay"
+                });
                 RequestParameters.Add("optionalWithNull", new Parameter
-                    {
-                        Name = "optionalWithNull",
-                        IsRequired = false,
-                        ParameterType = "query",
-                        DefaultValue = "c"
-                    });
+                {
+                    Name = "optionalWithNull",
+                    IsRequired = false,
+                    ParameterType = "query",
+                    DefaultValue = "c"
+                });
                 RequestParameters.Add("optionalEmpty", new Parameter
-                    {
-                        Name = "optionalEmpty",
-                        IsRequired = false,
-                        ParameterType = "query",
-                        DefaultValue = "d"
-                    });
+                {
+                    Name = "optionalEmpty",
+                    IsRequired = false,
+                    ParameterType = "query",
+                    DefaultValue = "d"
+                });
                 RequestParameters.Add("optionalNotPressent", new Parameter
-                    {
-                        Name = "optionalNotPressent",
-                        IsRequired = false,
-                        ParameterType = "query",
-                        DefaultValue = "DoesNotDisplay"
-                    });
+                {
+                    Name = "optionalNotPressent",
+                    IsRequired = false,
+                    ParameterType = "query",
+                    DefaultValue = "DoesNotDisplay"
+                });
             }
         }
 
-        /// <summary> Tests build request with query parameters. </summary>
+        /// <summary>Tests build request with query parameters.</summary>
         [Test]
         public void CreateRequest_QueryParameters()
         {
@@ -897,7 +909,7 @@
             }
         }
 
-        /// <summary> Tests build request with missing required query parameter. </summary>
+        /// <summary>Tests build request with missing required query parameter.</summary>
         [Test]
         public void CreateRequest_QueryParameterIsMissing()
         {
@@ -922,7 +934,7 @@
 
         #region Path Parameters
 
-        /// <summary> Client request which contains path parameters. </summary>
+        /// <summary>Client request which contains path parameters.</summary>
         class ClientServiceRequestWithPathParameters : TestClientServiceRequest
         {
             [RequestParameter("path1", RequestParameterType.Path)]
@@ -954,7 +966,7 @@
             }
         }
 
-        /// <summary> Tests build request with path parameters. </summary>
+        /// <summary>Tests build request with path parameters.</summary>
         [Test]
         public void CreateRequest_PathParameters()
         {
@@ -977,14 +989,15 @@
         private const string SimpleDeveloperKey = "ABC123";
         private const string ComplexDeveloperKey = "?&^%  ABC123";
 
-        /// <summary> Tests build request with simple developer key. </summary>
+        /// <summary>Tests build request with simple developer key.</summary>
         [Test]
         public void CreateRequest_DeveloperKey()
         {
             var initializer = new BaseClientService.Initializer
-                {
-                    ApiKey = SimpleDeveloperKey
-                };
+            {
+                ApiKey = SimpleDeveloperKey
+            };
+
             using (var service = new MockClientService(initializer, "https://build_request_params"))
             {
                 var request = new TestClientServiceRequest(service, "GET", null);
@@ -994,14 +1007,15 @@
             }
         }
 
-        /// <summary> Tests build request with complex developer key. </summary>
+        /// <summary>Tests build request with complex developer key.</summary>
         [Test]
         public void CreateRequest_DeveloperKey_RequiresEscape()
         {
             var initializer = new BaseClientService.Initializer
-                {
-                    ApiKey = ComplexDeveloperKey
-                };
+            {
+                ApiKey = ComplexDeveloperKey
+            };
+
             using (var service = new MockClientService(initializer, "https://build_request_params"))
             {
                 var request = new TestClientServiceRequest(service, "GET", null);
@@ -1017,7 +1031,7 @@
 
         #region Supported Methods
 
-        /// <summary> Tests if invalid method throws an exception. </summary>
+        /// <summary>Tests if invalid method throws an exception.</summary>
         [Test]
         public void CreateRequest_UnsupportedMethods()
         {
@@ -1028,7 +1042,7 @@
             }
         }
 
-        /// <summary> Tests that valid method doesn't throw an exception. </summary>
+        /// <summary>Tests that valid method doesn't throw an exception.</summary>
         [Test]
         public void CreateRequest_SupportedMethods()
         {
@@ -1052,20 +1066,20 @@
 
         #region ETag
 
-        /// <summary> Tests the create request method with different ETags. </summary>
+        /// <summary>Tests the create request method with different ETags.</summary>
         [Test]
         public void CreateRequest_ETag()
         {
             var body = new MockRequest { Name = "long long name" };
             using (var service = new MockClientService())
             {
-                // no ETag (ETag = null)
+                // No ETag (ETag = null).
                 var request = new TestClientServiceRequest(service, HttpConsts.Get, body);
                 var httpRequest = request.CreateRequest();
                 Assert.That(httpRequest.Headers.IfMatch.Count, Is.EqualTo(0));
                 Assert.That(httpRequest.Headers.IfNoneMatch.Count, Is.EqualTo(0));
 
-                // ETag has a value, but ETag action is ignored
+                // ETag has a value, but ETag action is ignored.
                 body.ETag = "\"ETAG_HERE\"";
                 request = new TestClientServiceRequest(service, HttpConsts.Get, body);
                 request.ETagAction = ETagAction.Ignore;
@@ -1073,21 +1087,21 @@
                 Assert.That(httpRequest.Headers.IfMatch.Count, Is.EqualTo(0));
                 Assert.That(httpRequest.Headers.IfNoneMatch.Count, Is.EqualTo(0));
 
-                // ETag has a value, so use default action (Get -> If-None-Match)
+                // ETag has a value, so use default action (Get -> If-None-Match).
                 request = new TestClientServiceRequest(service, HttpConsts.Get, body);
                 httpRequest = request.CreateRequest();
                 Assert.That(httpRequest.Headers.IfMatch.Count, Is.EqualTo(0));
                 Assert.That(httpRequest.Headers.IfNoneMatch.Count, Is.EqualTo(1));
                 Assert.That(httpRequest.Headers.IfNoneMatch.First(), Is.EqualTo(new EntityTagHeaderValue(body.ETag)));
 
-                // ETag has a value, so use default action (Post -> If-Match)
+                // ETag has a value, so use default action (Post -> If-Match).
                 request = new TestClientServiceRequest(service, HttpConsts.Post, body);
                 httpRequest = request.CreateRequest();
                 Assert.That(httpRequest.Headers.IfNoneMatch.Count, Is.EqualTo(0));
                 Assert.That(httpRequest.Headers.IfMatch.Count, Is.EqualTo(1));
                 Assert.That(httpRequest.Headers.IfMatch.First(), Is.EqualTo(new EntityTagHeaderValue(body.ETag)));
 
-                // ETag has a value, default is override, use the specified ETag action
+                // ETag has a value, default is override, use the specified ETag action.
                 request = new TestClientServiceRequest(service, HttpConsts.Post, body);
                 request.ETagAction = ETagAction.IfNoneMatch;
                 httpRequest = request.CreateRequest();
@@ -1095,7 +1109,7 @@
                 Assert.That(httpRequest.Headers.IfNoneMatch.Count, Is.EqualTo(1));
                 Assert.That(httpRequest.Headers.IfNoneMatch.First(), Is.EqualTo(new EntityTagHeaderValue(body.ETag)));
 
-                // ETag has a value, default is override, use the specified ETag action
+                // ETag has a value, default is override, use the specified ETag action.
                 request = new TestClientServiceRequest(service, HttpConsts.Get, body);
                 request.ETagAction = ETagAction.IfMatch;
                 httpRequest = request.CreateRequest();
@@ -1105,7 +1119,7 @@
             }
         }
 
-        /// <summary> Tests that get default ETag action works as expected. </summary>
+        /// <summary>Tests that get default ETag action works as expected.</summary>
         [Test]
         public void GetDefaultETagActionTest()
         {
Index: Src/GoogleApis.Tests/Apis/Requests/Parameters/ParameterCollectionTest.cs
===================================================================
rename from Src/GoogleApis.Tests/Apis/Requests/ParameterCollectionTest.cs
rename to Src/GoogleApis.Tests/Apis/Requests/Parameters/ParameterCollectionTest.cs
--- a/Src/GoogleApis.Tests/Apis/Requests/ParameterCollectionTest.cs
+++ b/Src/GoogleApis.Tests/Apis/Requests/Parameters/ParameterCollectionTest.cs
@@ -19,29 +19,23 @@
 
 using NUnit.Framework;
 
-using Google.Apis.Requests;
+using Google.Apis.Requests.Parameters;
 using Google.Apis.Util;
 
 namespace Google.Apis.Tests.Apis.Requests
 {
-    /// <summary>
-    /// Tests for the ParameterCollection class.
-    /// </summary>
+    /// <summary>Tests for the ParameterCollection class.</summary>
     [TestFixture]
     public class ParameterCollectionTest
     {
-        /// <summary>
-        /// Tests the constructors.
-        /// </summary>
+        /// <summary>Tests the constructors.</summary>
         [Test]
         public void ConstructTest()
         {
             Assert.DoesNotThrow(() => new ParameterCollection());
         }
 
-        /// <summary>
-        /// Confirm that different counts of items can be added to the collection.
-        /// </summary>
+        /// <summary>Confirm that different counts of items can be added to the collection.</summary>
         [Test]
         public void MultipleAddTest()
         {
@@ -63,9 +57,7 @@
             CollectionAssert.AreEqual(new[] { "dwarf" }, col.GetAllMatches("white"));
         }
 
-        /// <summary>
-        /// Checks that duplicates are supported.
-        /// </summary>
+        /// <summary>Checks that duplicates are supported.</summary>
         [Test]
         public void DuplicateTest()
         {
@@ -77,7 +69,7 @@
             CollectionAssert.AreEqual(new[] { "cookie", "bar", "pudding" }, col.GetAllMatches("chocolate"));
         }
 
-        /// <summary> Tests the FromQueryString method and confirms that duplicates are possible. </summary>
+        /// <summary>Tests the FromQueryString method and confirms that duplicates are possible.</summary>
         [Test]
         public void FromQueryStringTest()
         {
@@ -88,7 +80,7 @@
             CollectionAssert.AreEqual(new[] { "bar" }, collection.GetAllMatches("chocolate"));
         }
 
-        /// <summary> Tests the FromQueryString method throws exception on invalid input. </summary>
+        /// <summary>Tests the FromQueryString method throws exception on invalid input.</summary>
         [Test]
         public void FromQueryStringTest_Invalid()
         {
@@ -96,9 +88,7 @@
             Assert.Throws<ArgumentException>(() => ParameterCollection.FromQueryString(query));
         }
 
-        /// <summary>
-        /// Tests the FromQueryString method.
-        /// </summary>
+        /// <summary>Tests the FromQueryString method.</summary>
         [Test]
         public void FromDictionaryTest()
         {
Index: Src/GoogleApis.Tests/Apis/Requests/Parameters/ParameterValidatorTest.cs
===================================================================
rename from Src/GoogleApis.Tests/Apis/Requests/ParameterValidatorTest.cs
rename to Src/GoogleApis.Tests/Apis/Requests/Parameters/ParameterValidatorTest.cs
--- a/Src/GoogleApis.Tests/Apis/Requests/ParameterValidatorTest.cs
+++ b/Src/GoogleApis.Tests/Apis/Requests/Parameters/ParameterValidatorTest.cs
@@ -14,21 +14,19 @@
 limitations under the License.
 */
 
-using System.Collections.Generic;
 
 using NUnit.Framework;
 
 using Google.Apis.Discovery;
-using Google.Apis.Requests;
-using Google.Apis.Testing;
+using Google.Apis.Requests.Parameters;
 
 namespace Google.Apis.Tests.Apis.Requests
 {
-    /// <summary> Tests <see cref="Google.Api.Requests.ParameterValidator"/>. </summary>
+    /// <summary>Tests <see cref="Google.Api.Requests.ParameterValidator"/>.</summary>
     [TestFixture]
     public class ParameterValidatorTest
     {
-        /// <summary> Tests that validate regex returns <c>false</c> on empty parameter sets. </summary>
+        /// <summary>Tests that validate regex returns <c>false</c> on empty parameter sets.</summary>
         [Test]
         public void ValidateRegexEmptyNeedsDataTest()
         {
@@ -36,7 +34,7 @@
             Assert.IsFalse(ParameterValidator.ValidateRegex(parameter, ""));
         }
 
-        /// <summary> Tests validate regex. </summary>
+        /// <summary>Tests validate regex.</summary>
         [Test]
         public void ValidateRegexTest()
         {
Index: Src/GoogleApis.Tests/Apis/Services/BaseClientServiceTest.cs
===================================================================
--- a/Src/GoogleApis.Tests/Apis/Services/BaseClientServiceTest.cs
+++ b/Src/GoogleApis.Tests/Apis/Services/BaseClientServiceTest.cs
@@ -37,11 +37,11 @@
 
 namespace Google.Apis.Tests.Apis.Services
 {
-    /// <summary> Test for the BaseClientService class. </summary>
+    /// <summary>Test for the BaseClientService class.</summary>
     [TestFixture]
     public class BaseClientServiceTest
     {
-        /// <summary> A Json schema for testing serialization/deserialization. </summary>
+        /// <summary>A Json schema for testing serialization/deserialization.</summary>
         internal class MockJsonSchema : IDirectResponseSchema
         {
             [JsonProperty("kind")]
@@ -58,7 +58,8 @@
             public string ETag { get; set; }
         }
 
-        private void CheckDeserializationResults(MockJsonSchema result)
+        /// <summary>Validates the deserialization result.</summary>
+        private void CheckDeserializationResult(MockJsonSchema result)
         {
             Assert.NotNull(result);
             Assert.That(result.Kind, Is.EqualTo("urlshortener#url"));
@@ -66,29 +67,23 @@
             Assert.That(result.Status, Is.Null);
         }
 
-        private IClientService CreateClientServiceV_03()
-        {
-            return CreateClientService(DiscoveryVersion.Version_0_3);
-        }
-
-        private IClientService CreateClientServiceV_1()
-        {
-            return CreateClientService(DiscoveryVersion.Version_1_0);
-        }
-
-        private IClientService CreateClientService(DiscoveryVersion version)
+        /// <summary>Creates a client service for the given features.</summary>
+        private IClientService CreateClientService(Features? features = null)
         {
             var client = new MockClientService();
-            if (version == DiscoveryVersion.Version_0_3)
-                client.SetFeatures(new[] { Features.LegacyDataResponse.GetStringValue() });
+            if (features.HasValue)
+            {
+                client.SetFeatures(new[] { features.Value.GetStringValue() });
+            }
+
             return client;
         }
 
-        /// <summary> This tests the v0.3 deserialization of the BaseService. </summary>
+        /// <summary>This tests deserialization with data wrapping.</summary>
         [Test]
-        public void TestDeserializationV0_3()
+        public void TestDeserialization_WithDataWrapping()
         {
-            const string ResponseV0_3 =
+            const string Response =
                 @"{ ""data"" : 
                      {
                         ""kind"": ""urlshortener#url"",
@@ -96,70 +91,70 @@
                      } 
                   }";
 
-            var client = CreateClientServiceV_03();
+            var client = CreateClientService(Features.LegacyDataResponse);
 
             // Check that the default serializer is set.
             Assert.IsInstanceOf<NewtonsoftJsonSerializer>(client.Serializer);
 
             // Check that the response is decoded correctly.
-            var stream = new MemoryStream(Encoding.Default.GetBytes(ResponseV0_3));
+            var stream = new MemoryStream(Encoding.Default.GetBytes(Response));
             var response = new HttpResponseMessage { Content = new StreamContent(stream) };
-            CheckDeserializationResults(client.DeserializeResponse<MockJsonSchema>(response).Result);
+            CheckDeserializationResult(client.DeserializeResponse<MockJsonSchema>(response).Result);
         }
 
 
-        /// <summary> This tests the v1 Deserialization of the BaseService. </summary>
+        /// <summary>This tests Deserialization without data wrapping.</summary>
         [Test]
-        public void TestDeserializationV1()
+        public void TestDeserialization_WithoutDataWrapping()
         {
-            const string ResponseV1 = @"{""kind"":""urlshortener#url"",""longUrl"":""http://google.com/""}";
+            const string Response = @"{""kind"":""urlshortener#url"",""longUrl"":""http://google.com/""}";
 
             // by default the request provider doesn't contain the LegacyDataResponse
-            var client = CreateClientServiceV_1();
+            var client = CreateClientService();
 
             // Check that the default serializer is set
             Assert.IsInstanceOf<NewtonsoftJsonSerializer>(client.Serializer);
 
             // Check that the response is decoded correctly
-            var stream = new MemoryStream(Encoding.Default.GetBytes(ResponseV1));
+            var stream = new MemoryStream(Encoding.Default.GetBytes(Response));
             var response = new HttpResponseMessage { Content = new StreamContent(stream) };
-            CheckDeserializationResults(
+            CheckDeserializationResult(
                 client.DeserializeResponse<MockJsonSchema>(response).Result);
         }
 
-        /// <summary> Tests if serialization works. </summary>
+        /// <summary>Tests serialization with data wrapping.</summary>
         [Test]
-        public void TestSerializationV0_3()
+        public void TestSerialization_WithDataWrapping()
         {
-            const string ResponseV0_3 =
+            const string Response =
                 "{\"data\":{\"kind\":\"urlshortener#url\",\"longUrl\":\"http://google.com/\"}}";
 
             MockJsonSchema schema = new MockJsonSchema();
             schema.Kind = "urlshortener#url";
             schema.LongURL = "http://google.com/";
 
-            var client = CreateClientServiceV_03();
+            var client = CreateClientService(Features.LegacyDataResponse);
 
             // Check if a response is serialized correctly
             string result = client.SerializeObject(schema);
-            Assert.AreEqual(ResponseV0_3, result);
+            Assert.AreEqual(Response, result);
         }
 
-        /// <summary> Tests if serialization works. </summary>
+        /// <summary>Tests serialization without data wrapping.</summary>
         [Test]
-        public void TestSerializationV1()
+        public void TestSerialization_WithoutDataWrapping()
         {
-            const string ResponseV1 = @"{""kind"":""urlshortener#url"",""longUrl"":""http://google.com/""}";
+            const string Response = @"{""kind"":""urlshortener#url"",""longUrl"":""http://google.com/""}";
 
             MockJsonSchema schema = new MockJsonSchema();
             schema.Kind = "urlshortener#url";
             schema.LongURL = "http://google.com/";
 
-            var client = CreateClientServiceV_1();
+            var client = CreateClientService();
 
-            // Check if a response is serialized correctly
+            // Check if a response is serialized correctly.
             string result = client.SerializeObject(schema);
-            Assert.AreEqual(ResponseV1, result);
+            Assert.AreEqual(Response, result);
         }
 
         /// <summary>
@@ -168,21 +163,21 @@
         [Test]
         public void TestDeserializationString()
         {
-            const string ResponseV1 = @"{""kind"":""urlshortener#url"",""longUrl"":""http://google.com/""}";
+            const string Response = @"{""kind"":""urlshortener#url"",""longUrl"":""http://google.com/""}";
 
             MockClientService client = new MockClientService();
 
             // Check that the response is decoded correctly
-            var stream = new MemoryStream(Encoding.Default.GetBytes(ResponseV1));
+            var stream = new MemoryStream(Encoding.Default.GetBytes(Response));
             var response = new HttpResponseMessage { Content = new StreamContent(stream) };
             string result = client.DeserializeResponse<string>(response).Result;
-            Assert.AreEqual(ResponseV1, result);
+            Assert.AreEqual(Response, result);
         }
 
-        /// <summary> Tests the deserialization for server error responses. </summary>
+        /// <summary>Tests deserialization for server error response.</summary>
         [Test]
         public void TestErrorDeserialization(
-          [Values(DiscoveryVersion.Version_0_3, DiscoveryVersion.Version_1_0)] DiscoveryVersion version)
+          [Values(Features.LegacyDataResponse, null)] Features? features)
         {
             const string ErrorResponse =
                 @"{
@@ -201,7 +196,7 @@
                     }
                 }";
 
-            var client = CreateClientService(version);
+            var client = CreateClientService(features);
 
             using (var stream = new MemoryStream(Encoding.Default.GetBytes(ErrorResponse)))
             {
@@ -215,9 +210,9 @@
 
         #region Authentication
 
-        /// <summary> 
-        /// Mock authentication message handler which returns unauthorized response in the first call, and in the 
-        /// second call it returns a successful response.
+        /// <summary>
+        /// A mock authentication message handler which returns an unauthorized response in the first call, and a 
+        /// successful response in the second.
         /// </summary>
         class MockAuthenticationMessageHandler : CountableMessageHandler
         {
@@ -251,12 +246,13 @@
             }
         }
 
-        /// <summary> Mock Authenticator which adds Authorization header to a request on the second call. </summary>
+        /// <summary>A mock Authenticator which adds Authorization header to a request on the second call.</summary>
         class Authenticator : IAuthenticator
         {
+            /// <summary>Gets ot set the number of calls to <see cref="ApplyAuthenticationToRequest"/>.</summary>
             public int ApplyCalls { get; set; }
 
-            public void ApplyAuthenticationToRequest(System.Net.HttpWebRequest request)
+            public void ApplyAuthenticationToRequest(HttpWebRequest request)
             {
                 ApplyCalls++;
                 switch (ApplyCalls)
@@ -273,38 +269,43 @@
             }
         }
 
-        /// <summary> Mock Authenticator which handles unsuccessful response by "refreshing" the token. </summary>
+        /// <summary>Mock Authenticator which handles unsuccessful response by "refreshing" the token.</summary>
         class AuthenticatorUnsuccessfulHandler : Authenticator, IHttpUnsuccessfulResponseHandler
         {
+            /// <summary>Gets or sets the number of calls to <see cref="HandleResponseAsync"/>.</summary>
             public int HandleCalls { get; set; }
 
-            public bool HandleResponse(HandleUnsuccessfulResponseArgs args)
+            public Task<bool> HandleResponseAsync(HandleUnsuccessfulResponseArgs args)
             {
                 HandleCalls++;
-                // Mock a refresh token process here... (second apply will attach SecondToken authorization)
-                return true;
+                // Mock a refresh token process here... (second apply will attach SecondToken authorization).
+                TaskCompletionSource<bool> tcs = new TaskCompletionSource<bool>();
+                tcs.SetResult(true);
+                return tcs.Task;
             }
         }
 
-        /// <summary> 
-        /// Tests that authenticator helpers invokes both apply authentication and handle response methods on the 
-        /// authentication instance.
+        /// <summary>
+        /// Tests that the authenticator helpers, when invoked, both apply authentication and handle response methods 
+        /// on the authentication instance.
         /// </summary>
         [Test]
         public void Test_Authentication_UnsuccessfulHandler()
         {
             var handler = new MockAuthenticationMessageHandler();
             var authenticator = new AuthenticatorUnsuccessfulHandler();
-            using (var service = new MockClientService(new BaseClientService.Initializer()
-                {
-                    HttpClientFactory = new MockHttpClientFactory(handler),
-                    Authenticator = authenticator
-                }))
+            var initializer = new BaseClientService.Initializer()
+            {
+                HttpClientFactory = new MockHttpClientFactory(handler),
+                Authenticator = authenticator
+            };
+
+            using (var service = new MockClientService(initializer))
             {
                 var response = service.HttpClient.SendAsync(
                     new HttpRequestMessage(HttpMethod.Get, "https://test")).Result;
-                // the authenticator handles unsuccessful response handler by "refreshing" the token, so the request
-                // will success
+                // The authenticator handles unsuccessful response handler by "refreshing" the token, so the request
+                // will success.
                 Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.OK));
                 Assert.That(handler.Calls, Is.EqualTo(2));
                 Assert.That(authenticator.ApplyCalls, Is.EqualTo(2));
@@ -312,24 +313,26 @@
             }
         }
 
-        /// <summary> 
-        /// Tests an authenticator which doesn't implement unsuccessful response handler, and as a result the request
-        /// fails (when the token is invalid).
+        /// <summary>
+        /// Tests an authenticator which doesn't implement an unsuccessful response handler. The request should fail 
+        /// when the token is invalid.
         /// </summary>
         [Test]
         public void Test_Authentication()
         {
             var handler = new MockAuthenticationMessageHandler();
             var authenticator = new Authenticator();
-            using (var service = new MockClientService(new BaseClientService.Initializer()
-                {
-                    HttpClientFactory = new MockHttpClientFactory(handler),
-                    Authenticator = authenticator
-                }))
+            var initializer = new BaseClientService.Initializer()
+            {
+                HttpClientFactory = new MockHttpClientFactory(handler),
+                Authenticator = authenticator
+            };
+
+            using (var service = new MockClientService(initializer))
             {
                 var response = service.HttpClient.SendAsync(
                     new HttpRequestMessage(HttpMethod.Get, "https://test")).Result;
-                // the authenticator doesn't implement unsuccessful response handler, so the request fails
+                // The authenticator doesn't implement unsuccessful response handler, so the request fails.
                 Assert.That(response.StatusCode, Is.EqualTo(HttpStatusCode.Unauthorized));
                 Assert.That(handler.Calls, Is.EqualTo(1));
                 Assert.That(authenticator.ApplyCalls, Is.EqualTo(1));
@@ -340,6 +343,9 @@
 
         #region Constructor
 
+        /// <summary>
+        /// Tests the default values of <seealso cref="Google.Apis.Services.BaseClientService"/>
+        /// </summary>
         [Test]
         public void Constructor_DefaultValues()
         {
@@ -349,12 +355,12 @@
             Assert.That(service.Authenticator, Is.EqualTo(NullAuthenticator.Instance));
             Assert.True(service.GZipEnabled);
 
-            // back-off handler for unsuccessful response (503) is added by default
+            // Back-off handler for unsuccessful response (503) is added by default.
             Assert.That(service.HttpClient.MessageHandler.UnsuccessfulResponseHandlers.Count, Is.EqualTo(1));
             Assert.That(service.HttpClient.MessageHandler.UnsuccessfulResponseHandlers[0],
                 Is.InstanceOf<BackOffHandler>());
 
-            // one execute interceptor (for adding the "Authenticate" header
+            // One execute interceptor (for adding the "Authenticate" header,
             Assert.That(service.HttpClient.MessageHandler.ExecuteInterceptors.Count, Is.EqualTo(1));
             Assert.That(service.HttpClient.MessageHandler.ExecuteInterceptors[0],
                 Is.InstanceOf<AuthenticatorInterceptor>());
Index: Src/GoogleApis.Tests/Apis/Utils/ExponentialBackOffTest.cs
===================================================================
--- a/Src/GoogleApis.Tests/Apis/Utils/ExponentialBackOffTest.cs
+++ b/Src/GoogleApis.Tests/Apis/Utils/ExponentialBackOffTest.cs
@@ -25,11 +25,11 @@
 
 namespace Google.Apis.Tests.Apis.Utils
 {
-    /// <summary> Tests for <see cref="Google.Apis.Util.ExponentialBackOff"/>. </summary>
+    /// <summary>Tests for <see cref="Google.Apis.Util.ExponentialBackOff"/>.</summary>
     [TestFixture]
     public class ExponentialBackOffTest
     {
-        /// <summary> Tests setting invalid value as <c>currentRetry</c> parameter. </summary>
+        /// <summary>Tests setting invalid value as <c>currentRetry</c> parameter.</summary>
         [Test]
         public void GetNextBackOff_InvalidValue()
         {
@@ -49,21 +49,21 @@
             catch (ArgumentOutOfRangeException) { }
         }
 
-        /// <summary> Tests constructor with invalid time span object (<0 or >1sec). </summary>
+        /// <summary>Tests constructor with invalid time span object (less then 0 or greater than 1sec).</summary>
         [Test]
         public void Constructor_InvalidValue()
         {
-            // invalid delta
+            // Invalid delta.
             SubtestConstructor_InvalidValue(TimeSpan.FromMilliseconds(-1));
             SubtestConstructor_InvalidValue(TimeSpan.FromDays(-1));
             SubtestConstructor_InvalidValue(TimeSpan.FromMilliseconds(1001));
-            // invalid max
+            // Invalid max.
             SubtestConstructor_InvalidValue(TimeSpan.FromMilliseconds(500), -1);
             SubtestConstructor_InvalidValue(TimeSpan.FromMilliseconds(500), 21);
 
         }
 
-        /// <summary> A helper subtest to test invalid value given to the constructor. </summary>
+        /// <summary>A helper subtest to test invalid value given to the constructor.</summary>
         private void SubtestConstructor_InvalidValue(TimeSpan ts, int max = 10)
         {
             try
@@ -74,7 +74,7 @@
             catch (ArgumentOutOfRangeException) { }
         }
 
-        /// <summary> Tests next back-off time span maximum, minimum and average values for tries 1 to 15. </summary>
+        /// <summary>Tests next back-off time span maximum, minimum and average values for tries 1 to 15.</summary>
         [Test]
         public void GetNextBackOff_Retry1To15()
         {
@@ -86,10 +86,10 @@
             }
         }
 
-        /// <summary> Test helper for testing retrying using exponential back-off.</summary>
+        /// <summary>Test helper for testing retrying using exponential back-off.</summary>
         /// <param name="retry">Index of current retry.</param>
         /// <param name="delta">The delta the exponential back-off uses. 
-        /// <seealso cref="ExponentialBack.DeltaBackOff"/> for more details.
+        /// <seealso cref="ExponentialBackOff.DeltaBackOff"/> for more details.
         /// </param>
         /// <param name="epsilon">Used for checking the average result of the input retry [In milliseconds].</param>
         private void SubtestGetNextBackOff(int retry, Nullable<TimeSpan> delta = null, int epsilon = 20)
@@ -113,7 +113,7 @@
             Assert.That(avarage, Is.InRange(expectedMiliis - epsilon, expectedMiliis + epsilon));
         }
 
-        /// <summary> Tests next back-off time span with specific maximum of retries. </summary>
+        /// <summary>Tests next back-off time span with specific maximum of retries.</summary>
         [Test]
         public void GetNextBackOff_MaxNumRetries()
         {
@@ -122,7 +122,7 @@
             SubtestGetNextBackOff_MaxNumRetries(11);
         }
 
-        /// <summary> A helper test for testing the <c>GetNextBackOff</c> logic. </summary>
+        /// <summary>A helper test for testing the <c>GetNextBackOff</c> logic.</summary>
         private void SubtestGetNextBackOff_MaxNumRetries(int max)
         {
             ExponentialBackOff backOff = new ExponentialBackOff(TimeSpan.Zero, max);
Index: Src/GoogleApis.Tests/GoogleApis.Tests.csproj
===================================================================
--- a/Src/GoogleApis.Tests/GoogleApis.Tests.csproj
+++ b/Src/GoogleApis.Tests/GoogleApis.Tests.csproj
@@ -121,6 +121,8 @@
     <Compile Include="Apis\Json\JsonReaderTests.cs" />
     <Compile Include="Apis\Json\JsonTokenTests.cs" />
     <Compile Include="Apis\Json\TokenStreamTest.cs" />
+    <Compile Include="Apis\Requests\Parameters\ParameterCollectionTest.cs" />
+    <Compile Include="Apis\Requests\Parameters\ParameterValidatorTest.cs" />
     <Compile Include="Apis\Requests\RequestBuilderTest.cs" />
     <Compile Include="Apis\Services\BaseClientServiceTest.cs" />
     <Compile Include="Apis\Logging\NullLoggerTests.cs" />
@@ -128,12 +130,10 @@
     <Compile Include="Apis\Upload\ResumableUploadTest.cs" />
     <Compile Include="Apis\Utils\ExponentialBackOffTest.cs" />
     <Compile Include="Apis\Utils\StringValueAttributeTest.cs" />
-    <Compile Include="Apis\Requests\ParameterCollectionTest.cs" />
     <Compile Include="Apis\Utils\RepeatableTest.cs" />
     <Compile Include="ApplicationContextTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="GoogleApiExceptionTests.cs" />
-    <Compile Include="Apis\Requests\ParameterValidatorTest.cs" />
     <Compile Include="Apis\Utils\UtilitiesTest.cs" />
     <Compile Include="[Mock]\CountableMessageHandler.cs" />
     <Compile Include="[Mock]\MockBackOffHandler.cs" />
@@ -143,7 +143,7 @@
   <ItemGroup>
     <ProjectReference Include="..\GoogleApis.DotNet4\GoogleApis.DotNet4.csproj">
       <Project>{c4da0abe-2c2e-4bb8-9881-5ff80b0c1afd}</Project>
-      <Name>GoogleApis.FullProfile</Name>
+      <Name>GoogleApis.DotNet4</Name>
     </ProjectReference>
     <ProjectReference Include="..\GoogleApis\GoogleApis.csproj">
       <Project>{826cf988-eee8-4b75-8f53-b7e851a17baa}</Project>
@@ -182,5 +182,9 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.8\tools\Microsoft.Bcl.Build.targets" />
+  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
 </Project>
\ No newline at end of file
Index: Src/GoogleApis.Tests/Properties/AssemblyInfo.cs
===================================================================
--- a/Src/GoogleApis.Tests/Properties/AssemblyInfo.cs
+++ b/Src/GoogleApis.Tests/Properties/AssemblyInfo.cs
@@ -19,7 +19,7 @@
 // Information about this assembly is defined by the following attributes. 
 // Change them to the values specific to your project.
 
-[assembly: AssemblyTitle("GoogleApis.Tests")]
+[assembly: AssemblyTitle("Google.Apis.Tests")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Google Inc")]
Index: Src/GoogleApis.Tests/[Mock]/MockBackOffHandler.cs
===================================================================
--- a/Src/GoogleApis.Tests/[Mock]/MockBackOffHandler.cs
+++ b/Src/GoogleApis.Tests/[Mock]/MockBackOffHandler.cs
@@ -17,35 +17,37 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
+using System.Threading.Tasks;
 
 using Google.Apis.Http;
 using Google.Apis.Util;
 
 namespace Google.Apis.Testing
 {
-    /// <summary> Base mock back-off handler which contains a list of all waited time spans. </summary>
+    /// <summary>Base mock back-off handler which contains a list of all waited time spans.</summary>
     public class MockBackOffHandler : BackOffHandler
     {
-        /// <summary> A list of all the waited time spans. </summary>
+        /// <summary>A list of all the waited time spans.</summary>
         public List<TimeSpan> Waits { get; set; }
 
-        /// <summary> Constructs a new back-off handler by the given back-off. </summary>
+        /// <summary>Constructs a new back-off handler by the given back-off.</summary>
         public MockBackOffHandler(IBackOff backOff)
             : base(backOff)
         {
             Waits = new List<TimeSpan>();
         }
 
-        /// <summary> Constructs a new back-off handler by the given initializer. </summary>
+        /// <summary>Constructs a new back-off handler by the given initializer.</summary>
         public MockBackOffHandler(BackOffHandler.Initializer initializer)
             : base(initializer)
         {
             Waits = new List<TimeSpan>();
         }
 
-        protected override void Wait(TimeSpan ts, CancellationToken cancellationToken)
+        protected override Task Wait(TimeSpan ts, CancellationToken cancellationToken)
         {
             Waits.Add(ts);
+            return TaskEx.Delay(0);
         }
     }
 }
Index: Src/GoogleApis.Tests/[Mock]/MockHttpClientFactory.cs
===================================================================
--- a/Src/GoogleApis.Tests/[Mock]/MockHttpClientFactory.cs
+++ b/Src/GoogleApis.Tests/[Mock]/MockHttpClientFactory.cs
@@ -21,7 +21,7 @@
 namespace Google.Apis.Testing
 {
     /// <summary>
-    /// Mock Http client factory which gets a specific message handler (for mocking) and use for creating the Http 
+    /// Mock HTTP client factory which gets a specific message handler (for mocking) and use for creating the HTTP
     /// client.
     /// </summary>
     public class MockHttpClientFactory : HttpClientFactory
Index: Src/GoogleApis.Tests/packages.config
===================================================================
--- a/Src/GoogleApis.Tests/packages.config
+++ b/Src/GoogleApis.Tests/packages.config
@@ -3,7 +3,7 @@
   <package id="log4net" version="2.0.0" targetFramework="net40" />
   <package id="Microsoft.Bcl" version="1.0.19" targetFramework="net40" />
   <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="net40" />
-  <package id="Microsoft.Bcl.Build" version="1.0.8" targetFramework="net40" />
+  <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="net40" />
   <package id="Microsoft.Net.Http" version="2.1.10" targetFramework="net40" />
   <package id="Moq" version="4.0.10827" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="5.0.5" targetFramework="net40" />
Index: Src/GoogleApis/Apis/Authentication/AuthenticatorHelpers.cs
===================================================================
--- a/Src/GoogleApis/Apis/Authentication/AuthenticatorHelpers.cs
+++ b/Src/GoogleApis/Apis/Authentication/AuthenticatorHelpers.cs
@@ -20,6 +20,8 @@
 using System.Net;
 using System.Net.Http;
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 
 using Google.Apis.Http;
 using Google.Apis.Testing;
@@ -39,7 +41,7 @@
             Authenticator = authenticator;
         }
 
-        public void Intercept(HttpRequestMessage request)
+        public Task InterceptAsync(HttpRequestMessage request, CancellationToken cancellationToken)
         {
             // we create a regular WebHttpRequest because our Authenticator (and DotNetOpenAuth) implementation
             // works with it only. 
@@ -52,6 +54,8 @@
                 request.Headers.Remove(authorization);
                 request.Headers.Add(authorization, request2.Headers[authorization]);
             }
+
+            return TaskEx.Delay(0);
         }
     }
 
Index: Src/GoogleApis/Apis/Discovery/DiscoveryVersion.cs
===================================================================
--- a/Src/GoogleApis/Apis/Discovery/DiscoveryVersion.cs
+++ b/Src/GoogleApis/Apis/Discovery/DiscoveryVersion.cs
@@ -14,12 +14,19 @@
 limitations under the License.
 */
 
+using System;
+
 namespace Google.Apis.Discovery
 {
     /// <summary> An enumeration of all supported discovery versions.</summary>
     public enum DiscoveryVersion
     {
+        /// <summary>Discovery version 1.0.</summary>
         Version_1_0,
+
+        /// <summary>Discovery version 0.3.</summary>
+        [Obsolete("Discovery version 0.3 is not supported any more and it's going to be removed in 1.7.0-beta, " +
+            "Use Version_1_0 instead.")]
         Version_0_3,
     }
 }
\ No newline at end of file
Index: Src/GoogleApis/Apis/Http/BackOffHandler.cs
===================================================================
--- a/Src/GoogleApis/Apis/Http/BackOffHandler.cs
+++ b/Src/GoogleApis/Apis/Http/BackOffHandler.cs
@@ -18,49 +18,50 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+
 using Google.Apis.Logging;
 using Google.Apis.Util;
 
 namespace Google.Apis.Http
 {
     /// <summary>
-    /// A thread-safe back-off handler which handles an abnormal Http response or an exception with 
+    /// A thread-safe back-off handler which handles an abnormal HTTP response or an exception with 
     /// <see cref="IBackOff"/>.
     /// </summary>
     public class BackOffHandler : IHttpUnsuccessfulResponseHandler, IHttpExceptionHandler
     {
         private static readonly ILogger Logger = ApplicationContext.Logger.ForType<BackOffHandler>();
 
-        /// <summary> An initializer class to initialize a back-off handler. </summary>
+        /// <summary>An initializer class to initialize a back-off handler.</summary>
         public class Initializer
         {
-            /// <summary> Gets the back-off policy used by this back-off handler. </summary>
+            /// <summary>Gets the back-off policy used by this back-off handler.</summary>
             public IBackOff BackOff { get; private set; }
 
-            /// <summary> 
+            /// <summary>
             /// Gets or sets the maximum time span to wait. If the back-off instance returns a greater time span then 
-            /// this value, this handler returns <c>false</c> to both <see cref="HandleException"/> and 
-            /// <see cref="HandleResponse"/>. Default value is 5 seconds per a retry request.
+            /// this value, this handler returns <c>false</c> to both <see cref="HandleExceptionAsync"/> and 
+            /// <see cref="HandleResponseAsync"/>. Default value is 5 seconds per a retry request.
             /// </summary>
             public TimeSpan MaxTimeSpan { get; set; }
 
-            /// <summary> 
+            /// <summary>
             /// Gets or sets a delegate function which indicates if this back-off handler should handle an abnormal 
-            /// Http response. The default is <see cref="DefaultHandleUnsuccessfulResponse"/>. 
+            /// HTTP response. The default is <see cref="DefaultHandleUnsuccessfulResponseFunc"/>. 
             /// </summary>
             public Func<HttpResponseMessage, bool> HandleUnsuccessfulResponseFunc { get; set; }
 
-            /// <summary> 
+            /// <summary>
             /// Gets or sets a delegate function which indicates if this back-off handler should handle an exception. 
-            /// The  default is <see cref="DefaultHandleException"/>. 
+            /// The default is <see cref="DefaultHandleExceptionFunc"/>. 
             /// </summary>
             public Func<Exception, bool> HandleExceptionFunc { get; set; }
 
-            /// <summary> Default function which handles server errors (503). </summary>
+            /// <summary>Default function which handles server errors (503).</summary>
             public static readonly Func<HttpResponseMessage, bool> DefaultHandleUnsuccessfulResponseFunc =
                 (r) => (int)r.StatusCode == 503;
 
-            /// <summary> 
+            /// <summary>
             /// Default function which handles exception which aren't 
             /// <seealso cref="System.Threading.Tasks.TaskCanceledException"/> or 
             /// <seealso cref="System.OperationCanceledException"/>. Those exceptions represent a task or an operation
@@ -69,7 +70,7 @@
             public static readonly Func<Exception, bool> DefaultHandleExceptionFunc =
                 (ex) => !(ex is TaskCanceledException || ex is OperationCanceledException);
 
-            /// <summary> Constructs a new initializer by the given back-off. </summary>
+            /// <summary>Constructs a new initializer by the given back-off.</summary>
             public Initializer(IBackOff backOff)
             {
                 BackOff = backOff;
@@ -79,34 +80,35 @@
             }
         }
 
-        /// <summary> Gets the back-off policy used by this back-off handler. </summary>
+        /// <summary>Gets the back-off policy used by this back-off handler.</summary>
         public IBackOff BackOff { get; private set; }
 
-        /// <summary> 
+        /// <summary>
         /// Gets the maximum time span to wait. If the back-off instance returns a greater time span, the handle method
         /// returns <c>false</c>. Default value is 5 seconds per a retry request.
         /// </summary>
         public TimeSpan MaxTimeSpan { get; private set; }
 
-        /// <summary> 
-        /// Gets a delegate function which indicates if this back-off handler should handle an abnormal Http response. 
-        /// The default is <see cref="DefaultHandleUnsuccessfulResponse"/>. 
+        /// <summary>
+        /// Gets a delegate function which indicates if this back-off handler should handle an abnormal HTTP response. 
+        /// The default is <see cref="DefaultHandleUnsuccessfulResponseFunc"/>. 
         /// </summary>
         public Func<HttpResponseMessage, bool> HandleUnsuccessfulResponseFunc { get; private set; }
 
-        /// <summary> 
+        /// <summary>
         /// Gets a delegate function which indicates if this back-off handler should handle an exception. The 
-        /// default is <see cref="DefaultHandleException"/>. 
+        /// default is <see cref="DefaultHandleExceptionFunc"/>. 
         /// </summary>
         public Func<Exception, bool> HandleExceptionFunc { get; private set; }
 
-        /// <summary> Constructs a new back-off handler with the given back-off. </summary>
+        /// <summary>Constructs a new back-off handler with the given back-off.</summary>
+        /// <param name="backOff">The back-off policy</param>
         public BackOffHandler(IBackOff backOff)
             : this(new Initializer(backOff))
         {
         }
 
-        /// <summary> Constructs a new back-off handler with the given initializer. </summary>
+        /// <summary>Constructs a new back-off handler with the given initializer.</summary>
         public BackOffHandler(Initializer initializer)
         {
             BackOff = initializer.BackOff;
@@ -117,22 +119,22 @@
 
         #region IHttpUnsuccessfulResponseHandler
 
-        public virtual bool HandleResponse(HandleUnsuccessfulResponseArgs args)
+        public virtual async Task<bool> HandleResponseAsync(HandleUnsuccessfulResponseArgs args)
         {
             // if the func returns true try to handle this current failed try
             return HandleUnsuccessfulResponseFunc != null && HandleUnsuccessfulResponseFunc(args.Response) &&
-                Handle(args.SupportsRetry, args.CurrentFailedTry, args.CancellationToken);
+                await HandleAsync(args.SupportsRetry, args.CurrentFailedTry, args.CancellationToken);
         }
 
         #endregion
 
         #region IHttpExceptionHandler
 
-        public virtual bool HandleException(HandleExceptionArgs args)
+        public virtual async Task<bool> HandleExceptionAsync(HandleExceptionArgs args)
         {
             // if the func returns true try to handle this current failed try
             return HandleExceptionFunc != null && HandleExceptionFunc(args.Exception) &&
-                Handle(args.SupportsRetry, args.CurrentFailedTry, args.CancellationToken);
+                await HandleAsync(args.SupportsRetry, args.CurrentFailedTry, args.CancellationToken);
         }
 
         #endregion
@@ -143,7 +145,8 @@
         /// block for x milliseconds (x is defined by the <see cref="BackOff"/> instance), and this handler returns 
         /// <c>true</c>.
         /// </summary>
-        private bool Handle(bool supportsRetry, int currentFailedTry, CancellationToken cancellationToken)
+        private async Task<bool> HandleAsync(bool supportsRetry, int currentFailedTry,
+            CancellationToken cancellationToken)
         {
             if (!supportsRetry || BackOff.MaxNumOfRetries < currentFailedTry)
             {
@@ -156,22 +159,18 @@
                 return false;
             }
 
-            Wait(ts, cancellationToken);
+            await Wait(ts, cancellationToken);
             Logger.Debug("Back-Off handled the error. Waited {0}ms before next retry...", ts.TotalMilliseconds);
             return true;
         }
 
-        /// <summary> Waits the given time span. Override this method is recommended for mocking purposes.</summary>
+        /// <summary>Waits the given time span. Override this method is recommended for mocking purposes.</summary>
         /// <param name="ts">TimeSpan to wait (and block the current thread)</param>
         /// <param name="cancellationToken">The cancellation token in case the user wants to cancel the operation in 
         /// the middle</param>
-        protected virtual void Wait(TimeSpan ts, CancellationToken cancellationToken)
+        protected virtual async Task Wait(TimeSpan ts, CancellationToken cancellationToken)
         {
-            try
-            {
-                TaskEx.Delay(ts, cancellationToken).Wait();
-            }
-            catch (Exception) { }
+            await TaskEx.Delay(ts, cancellationToken);
         }
     }
 }
Index: Src/GoogleApis/Apis/Http/ConfigurableHttpClient.cs
===================================================================
--- a/Src/GoogleApis/Apis/Http/ConfigurableHttpClient.cs
+++ b/Src/GoogleApis/Apis/Http/ConfigurableHttpClient.cs
@@ -14,24 +14,20 @@
 limitations under the License.
 */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net.Http;
-using System.Text;
 
 namespace Google.Apis.Http
 {
     /// <summary> 
-    /// Configurable Http client inherits from <see cref="System.Net.Http.HttpClient"/> and contains a reference to 
+    /// Configurable HTTP client inherits from <see cref="System.Net.Http.HttpClient"/> and contains a reference to 
     /// <see cref="Google.Apis.Http.ConfigurableMessageHandler"/>.
     /// </summary>
     public class ConfigurableHttpClient : HttpClient
     {
-        /// <summary> Gets the configurable message handler. </summary>
+        /// <summary>Gets the configurable message handler.</summary>
         public ConfigurableMessageHandler MessageHandler { get; private set; }
 
-        /// <summary> Constructs a new Http client. </summary>
+        /// <summary>Constructs a new HTTP client.</summary>
         public ConfigurableHttpClient(ConfigurableMessageHandler handler)
             : base(handler)
         {
Index: Src/GoogleApis/Apis/Http/ConfigurableMessageHandler.cs
===================================================================
--- a/Src/GoogleApis/Apis/Http/ConfigurableMessageHandler.cs
+++ b/Src/GoogleApis/Apis/Http/ConfigurableMessageHandler.cs
@@ -29,54 +29,54 @@
 namespace Google.Apis.Http
 {
     /// <summary>
-    /// This message handler contains the main logic of our Http requests. It contains a list of 
+    /// This message handler contains the main logic of our HTTP requests. It contains a list of 
     /// <see cref="IHttpUnsuccessfulResponseHandler"/>s for handling abnormal responses, a list of 
     /// <see cref="IHttpExceptionHandler"/>s for handling exception in a request and a list of 
     /// <see cref="IHttpExecuteInterceptor"/>s for intercepting a request before it has been sent to the server.
-    /// It also contains important properties like num of retires, follow redirect, etc.
+    /// It also contains important properties like number of tires, follow redirect, etc.
     /// </summary>
     public class ConfigurableMessageHandler : DelegatingHandler
     {
-        /// <summary> The class logger. </summary>
+        /// <summary>The class logger.</summary>
         private static readonly ILogger Logger = ApplicationContext.Logger.ForType<ConfigurableMessageHandler>();
 
-        /// <summary> Maximum allowed number of tries. </summary>
+        /// <summary>Maximum allowed number of tries.</summary>
         [VisibleForTestOnly]
         internal const int MaxAllowedNumTries = 20;
 
-        /// <summary> The current API version of this client library. </summary>
+        /// <summary>The current API version of this client library.</summary>
         private static readonly string ApiVersion = Google.Apis.Util.Utilities.GetLibraryVersion();
 
-        /// <summary> The User-Agent suffix header which contains the <seealso cref="ApiVersion"/>. </summary>
+        /// <summary>The User-Agent suffix header which contains the <seealso cref="ApiVersion"/>.</summary>
         private static readonly string UserAgentSuffix = "google-api-dotnet-client/" + ApiVersion + " (gzip)";
 
         #region IHttpUnsuccessfulResponseHandler, IHttpExceptionHandler and IHttpExecuteInterceptor lists
 
-        /// <summary> A list of <see cref="IHttpUnsuccessfulResponseHandler"/>. </summary>
+        /// <summary>A list of <see cref="IHttpUnsuccessfulResponseHandler"/>.</summary>
         private readonly IList<IHttpUnsuccessfulResponseHandler> unsuccessfulResponseHandlers =
             new List<IHttpUnsuccessfulResponseHandler>();
 
-        /// <summary> A list of <see cref="IHttpExceptionHandler"/>. </summary>
+        /// <summary>A list of <see cref="IHttpExceptionHandler"/>.</summary>
         private readonly IList<IHttpExceptionHandler> exceptionHandlers =
             new List<IHttpExceptionHandler>();
 
-        /// <summary> A list of <see cref="IHttpExecuteInterceptor"/>. </summary>
+        /// <summary>A list of <see cref="IHttpExecuteInterceptor"/>.</summary>
         private readonly IList<IHttpExecuteInterceptor> executeInterceptors =
             new List<IHttpExecuteInterceptor>();
 
-        /// <summary> Gets a list of <see cref="IHttpUnsuccessfulResponseHandler"/>. </summary>
+        /// <summary>Gets a list of <see cref="IHttpUnsuccessfulResponseHandler"/>.</summary>
         public IList<IHttpUnsuccessfulResponseHandler> UnsuccessfulResponseHandlers
         {
             get { return unsuccessfulResponseHandlers; }
         }
 
-        /// <summary> Gets a list of <see cref="IHttpExceptionHandler"/>. </summary>
+        /// <summary>Gets a list of <see cref="IHttpExceptionHandler"/>.</summary>
         public IList<IHttpExceptionHandler> ExceptionHandlers
         {
             get { return exceptionHandlers; }
         }
 
-        /// <summary> Gets a list of <see cref="IHttpExecuteInterceptor"/>. </summary>
+        /// <summary>Gets a list of <see cref="IHttpExecuteInterceptor"/>.</summary>
         public IList<IHttpExecuteInterceptor> ExecuteInterceptors
         {
             get { return executeInterceptors; }
@@ -84,13 +84,13 @@
 
         #endregion
 
-        /// <summary> Number of tries. Default is <c>3</c>. </summary>
+        /// <summary>Number of tries. Default is <c>3</c>.</summary>
         private int numTries = 3;
 
-        /// <summary> 
+        /// <summary>
         /// Gets or sets the number of tries that will be allowed to execute. Retries occur as a result of either
         /// <see cref="IHttpUnsuccessfulResponseHandler"/> or <see cref="IHttpExceptionHandler"/> which handles the
-        /// abnormal Http response or exception, before being terminated. 
+        /// abnormal HTTP response or exception, before being terminated. 
         /// Set <c>1</c> for not retrying requests. The default value is <c>3</c>".
         /// </summary>
         public int NumTries
@@ -106,19 +106,19 @@
             }
         }
 
-        /// <summary> 
+        /// <summary>
         /// Gets or sets whether the handler should follow a redirect when a redirect response is received. Default 
         /// value is <c>true</c>.
         /// </summary>
         public bool FollowRedirect { get; set; }
 
-        /// <summary> Gets or sets whether logging is enabled. Default value is <c>true</c>. </summary>
+        /// <summary>Gets or sets whether logging is enabled. Default value is <c>true</c>.</summary>
         public bool IsLoggingEnabled { get; set; }
 
-        /// <summary> Gets or sets the application name which will be used on the User-Agent header. </summary>
+        /// <summary>Gets or sets the application name which will be used on the User-Agent header.</summary>
         public string ApplicationName { get; set; }
 
-        /// <summary> Constructs a new configurable message handler </summary>
+        /// <summary>Constructs a new configurable message handler </summary>
         public ConfigurableMessageHandler(HttpMessageHandler httpMessageHandler)
             : base(httpMessageHandler)
         {
@@ -140,14 +140,14 @@
             int triesRemaining = NumTries;
             Exception lastException = null;
 
-            // set User-Agent header
+            // Set User-Agent header.
             var userAgent = (ApplicationName == null ? "" : ApplicationName + " ") + UserAgentSuffix;
             // TODO: setting the User-Agent won't work on Silverlight. We may need to create a special callback here to 
-            // set it correctly. Also check what happen in WP?
+            // set it correctly.
             request.Headers.Add("User-Agent", userAgent);
 
             HttpResponseMessage response = null;
-            do // while (triesRemaining > 0)
+            do // While (triesRemaining > 0)
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
@@ -158,17 +158,15 @@
                 }
                 lastException = null;
 
-                // intercept the request
-                // TODO(peleyal): rethink if each execute interceptor should be implemented as DelegateHandler, and 
-                // then remove this execute interceptor!
+                // Intercept the request.
                 foreach (var interceptor in executeInterceptors)
                 {
-                    interceptor.Intercept(request);
+                    await interceptor.InterceptAsync(request, cancellationToken).ConfigureAwait(false);
                 }
 
                 try
                 {
-                    // send the request!
+                    // Send the request!
                     response = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
                 }
                 catch (Exception ex)
@@ -176,31 +174,31 @@
                     lastException = ex;
                 }
 
-                // decrease the number of retries
+                // Decrease the number of retries.
                 triesRemaining--;
 
-                // exception was thrown , try to handle it
+                // Exception was thrown, try to handle it.
                 if (response == null)
                 {
                     var exceptionHandled = false;
 
-                    // try to handle the exception with each handler
+                    // Try to handle the exception with each handler.
                     foreach (var handler in exceptionHandlers)
                     {
-                        exceptionHandled |= handler.HandleException(new HandleExceptionArgs
+                        exceptionHandled |= await handler.HandleExceptionAsync(new HandleExceptionArgs
                             {
                                 Request = request,
                                 Exception = lastException,
                                 TotalTries = NumTries,
                                 CurrentFailedTry = NumTries - triesRemaining,
                                 CancellationToken = cancellationToken
-                            });
+                            }).ConfigureAwait(false);
                     }
 
                     if (!exceptionHandled)
                     {
                         Logger.Error(lastException,
-                            "Exception was thrown while executing an Http request and it wasn't handled");
+                            "Exception was thrown while executing a HTTP request and it wasn't handled");
                         throw lastException;
                     }
                     else if (loggable)
@@ -213,24 +211,24 @@
                 {
                     if (response.IsSuccessStatusCode)
                     {
-                        // no need to retry, the response was successful
+                        // No need to retry, the response was successful.
                         triesRemaining = 0;
                     }
                     else
                     {
                         bool errorHandled = false;
 
-                        // try to handle the abnormal Http response with each handler
+                        // Try to handle the abnormal HTTP response with each handler.
                         foreach (var handler in unsuccessfulResponseHandlers)
                         {
-                            errorHandled |= handler.HandleResponse(new HandleUnsuccessfulResponseArgs
+                            errorHandled |= await handler.HandleResponseAsync(new HandleUnsuccessfulResponseArgs
                                 {
                                     Request = request,
                                     Response = response,
                                     TotalTries = NumTries,
                                     CurrentFailedTry = NumTries - triesRemaining,
                                     CancellationToken = cancellationToken
-                                });
+                                }).ConfigureAwait(false);
                         }
 
                         if (!errorHandled)
@@ -252,7 +250,7 @@
                                         response.StatusCode);
                                 }
 
-                                // no need to retry, because no handler handled the abnormal response
+                                // No need to retry, because no handler handled the abnormal response.
                                 triesRemaining = 0;
                             }
                         }
@@ -263,12 +261,12 @@
                         }
                     }
                 }
-            } while (triesRemaining > 0); // not a success status code but it was handled
+            } while (triesRemaining > 0); // Not a successful status code but it was handled.
 
-            // if the response is null, we should throw the last exception
+            // If the response is null, we should throw the last exception.
             if (response == null)
             {
-                Logger.Error(lastException, "Exception was thrown while executing an Http request");
+                Logger.Error(lastException, "Exception was thrown while executing a HTTP request");
                 throw lastException;
             }
             else if (!response.IsSuccessStatusCode)
@@ -302,7 +300,7 @@
             {
                 request.Method = HttpMethod.Get;
             }
-            // clear Authorization and If-* headers
+            // Clear Authorization and If-* headers.
             request.Headers.Remove("Authorization");
             request.Headers.IfMatch.Clear();
             request.Headers.IfNoneMatch.Clear();
Index: Src/GoogleApis/Apis/Http/ExponentialBackOffInitializer.cs
===================================================================
new file mode 100644
--- /dev/null
+++ b/Src/GoogleApis/Apis/Http/ExponentialBackOffInitializer.cs
@@ -0,0 +1,75 @@
+/*
+Copyright 2013 Google Inc
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Google.Apis.Http
+{
+    /// <summary> 
+    /// Indicates if exponential back-off is used automatically on exceptions in a service requests and\or when 503 
+    /// responses is returned form the server.
+    /// </summary>
+    [Flags]
+    public enum ExponentialBackOffPolicy
+    {
+        None = 0,
+        Exception = 1,
+        UnsuccessfulResponse503 = 2
+    }
+
+    /// <summary>
+    /// An initializer which adds exponential back-off as exception handler and\or unsuccessful response handler by
+    /// the given <seealso cref="ExponentialBackOffPolicy"/>.
+    /// </summary>
+    public class ExponentialBackOffInitializer : IConfigurableHttpClientInitializer
+    {
+        /// <summary>Gets or sets the used back-off policy.</summary>
+        private ExponentialBackOffPolicy Policy { get; set; }
+
+        /// <summary>Gets or sets the back-off handler creation function.</summary>
+        private Func<BackOffHandler> CreateBackOff { get; set; }
+
+        /// <summary>
+        /// Constructs a new back-off initializer with the given policy and back-off handler create function.
+        /// </summary>
+        public ExponentialBackOffInitializer(ExponentialBackOffPolicy policy, Func<BackOffHandler> createBackOff)
+        {
+            Policy = policy;
+            CreateBackOff = createBackOff;
+        }
+
+        public void Initialize(ConfigurableHttpClient httpClient)
+        {
+            var backOff = CreateBackOff();
+
+            // Add exception handler and\or unsuccessful response handler.
+            if ((Policy & ExponentialBackOffPolicy.Exception) == ExponentialBackOffPolicy.Exception)
+            {
+                httpClient.MessageHandler.ExceptionHandlers.Add(backOff);
+            }
+
+            if ((Policy & ExponentialBackOffPolicy.UnsuccessfulResponse503) ==
+                ExponentialBackOffPolicy.UnsuccessfulResponse503)
+            {
+                httpClient.MessageHandler.UnsuccessfulResponseHandlers.Add(backOff);
+            }
+        }
+    }
+
+}
Index: Src/GoogleApis/Apis/Http/HttpClientFactory.cs
===================================================================
--- a/Src/GoogleApis/Apis/Http/HttpClientFactory.cs
+++ b/Src/GoogleApis/Apis/Http/HttpClientFactory.cs
@@ -24,22 +24,22 @@
 
 namespace Google.Apis.Http
 {
-    /// <summary> The default implementation of the Http client factory. </summary>
+    /// <summary> The default implementation of the HTTP client factory. </summary>
     public class HttpClientFactory : IHttpClientFactory
     {
-        /// <summary> The class logger. </summary>
+        /// <summary>The class logger.</summary>
         private static readonly ILogger Logger = ApplicationContext.Logger.ForType<HttpClientFactory>();
 
         public ConfigurableHttpClient CreateHttpClient(CreateHttpClientArgs args)
         {
-            // create the handler
+            // Create the handler.
             var handler = CreateHandler(args);
             var configurableHandler = new ConfigurableMessageHandler(handler)
                 {
                     ApplicationName = args.ApplicationName
                 };
 
-            // create the client
+            // Create the client.
             var client = new ConfigurableHttpClient(configurableHandler);
             foreach (var initializer in args.Initializers)
             {
@@ -50,20 +50,20 @@
         }
 
         /// <summary> 
-        /// Creates an Http message handler by the given arguments. Override this method to mock a message handler.
+        /// Creates a HTTP message handler by the given arguments. Override this method to mock a message handler.
         /// </summary>
         protected virtual HttpMessageHandler CreateHandler(CreateHttpClientArgs args)
         {
             var handler = new HttpClientHandler();
 
-            // if the framework supports redirect configuration, set it to false, because ConfigurableMessageHnalder 
-            // handles redirect
+            // If the framework supports redirect configuration, set it to false, because ConfigurableMessageHnalder 
+            // handles redirect.
             if (handler.SupportsRedirectConfiguration)
             {
                 handler.AllowAutoRedirect = false;
             }
 
-            // if the framework supports automatic decompression and GZip is enabled, set automatic decompression
+            // If the framework supports automatic decompression and GZip is enabled, set automatic decompression.
             if (handler.SupportsAutomaticDecompression && args.GZipEnabled)
             {
                 handler.AutomaticDecompression = System.Net.DecompressionMethods.GZip |
Index: Src/GoogleApis/Apis/Http/HttpConsts.cs
===================================================================
--- a/Src/GoogleApis/Apis/Http/HttpConsts.cs
+++ b/Src/GoogleApis/Apis/Http/HttpConsts.cs
@@ -21,7 +21,7 @@
 
 namespace Google.Apis.Http
 {
-    /// <summary> Http constants. </summary>
+    /// <summary>HTTP constants.</summary>
     public static class HttpConsts
     {
         public const string Get = "GET";
Index: Src/GoogleApis/Apis/Http/HttpExtenstions.cs
===================================================================
--- a/Src/GoogleApis/Apis/Http/HttpExtenstions.cs
+++ b/Src/GoogleApis/Apis/Http/HttpExtenstions.cs
@@ -19,13 +19,13 @@
 
 namespace Google.Apis.Http
 {
-    /// <summary> 
+    /// <summary>
     /// Extension methods to <see cref="System.Net.Http.HttpRequestMessage"/> and 
     /// <see cref="System.Net.Http.HttpResponseMessage"/>.
     /// </summary>
     static class HttpExtenstions
     {
-        /// <summary> Returns <c>true</c> if the response contains one of the redirect status codes. </summary>
+        /// <summary>Returns <c>true</c> if the response contains one of the redirect status codes.</summary>
         public static bool IsRedirectStatusCode(this HttpResponseMessage message)
         {
             switch (message.StatusCode)
@@ -40,7 +40,7 @@
             }
         }
 
-        /// <summary> Sets an empty Http content. </summary>
+        /// <summary>Sets an empty HTTP content.</summary>
         public static HttpContent SetEmptyContent(this HttpRequestMessage request)
         {
             request.Content = new ByteArrayContent(new byte[0]);
Index: Src/GoogleApis/Apis/Http/IConfigurableHttpClientInitializer.cs
===================================================================
--- a/Src/GoogleApis/Apis/Http/IConfigurableHttpClientInitializer.cs
+++ b/Src/GoogleApis/Apis/Http/IConfigurableHttpClientInitializer.cs
@@ -22,14 +22,14 @@
 namespace Google.Apis.Http
 {
     /// <summary> 
-    /// Http client initializer for changing the default behavior of Http client. 
+    /// HTTP client initializer for changing the default behavior of HTTP client. 
     /// Use this initializer to change default values like timeout and number of tries. 
     /// You can also set different handlers and interceptors like <see cref="IHttpUnsuccessfulResponseHandler"/>s, 
     /// <see cref="IHttpExceptionHandler"/>s and <see cref="IHttpExecuteInterceptor"/>s.
     /// </summary>
     public interface IConfigurableHttpClientInitializer
     {
-        /// <summary> Initializes an Http client after it was created. </summary>
+        /// <summary>Initializes a HTTP client after it was created.</summary>
         void Initialize(ConfigurableHttpClient httpClient);
     }
 }
Index: Src/GoogleApis/Apis/Http/IHttpClientFactory.cs
===================================================================
--- a/Src/GoogleApis/Apis/Http/IHttpClientFactory.cs
+++ b/Src/GoogleApis/Apis/Http/IHttpClientFactory.cs
@@ -14,39 +14,35 @@
 limitations under the License.
 */
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
 
 namespace Google.Apis.Http
 {
-    /// <summary> Arguments for creating an Http client. </summary>
+    /// <summary>Arguments for creating a HTTP client.</summary>
     public class CreateHttpClientArgs
     {
-        /// <summary> Gets or sets whether GZip is enabled. </summary>
+        /// <summary>Gets or sets whether GZip is enabled.</summary>
         public bool GZipEnabled { get; set; }
 
-        /// <summary> Gets or sets the application name (It's used on the User-Agent header). </summary>
+        /// <summary>Gets or sets the application name (It's used on the User-Agent header).</summary>
         public string ApplicationName { get; set; }
 
-        /// <summary> Gets a list of initializers to initialize the Http client instance. </summary>
+        /// <summary>Gets a list of initializers to initialize the HTTP client instance.</summary>
         public IList<IConfigurableHttpClientInitializer> Initializers { get; private set; }
 
-        /// <summary> Constructs a new argument instance. </summary>
+        /// <summary>Constructs a new argument instance.</summary>
         public CreateHttpClientArgs()
         {
             Initializers = new List<IConfigurableHttpClientInitializer>();
         }
     }
 
-    /// <summary> 
-    /// Http client factory creates configurable Http clients. A unique Http client should be created for each service.
+    /// <summary>
+    /// HTTP client factory creates configurable HTTP clients. A unique HTTP client should be created for each service.
     /// </summary>
     public interface IHttpClientFactory
     {
-        /// <summary> Creates a new configurable Http client by the given arguments. </summary>
+        /// <summary>Creates a new configurable HTTP client by the given arguments.</summary>
         ConfigurableHttpClient CreateHttpClient(CreateHttpClientArgs args);
     }
 }
Index: Src/GoogleApis/Apis/Http/IHttpExceptionHandler.cs
===================================================================
--- a/Src/GoogleApis/Apis/Http/IHttpExceptionHandler.cs
+++ b/Src/GoogleApis/Apis/Http/IHttpExceptionHandler.cs
@@ -15,46 +15,44 @@
 */
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net.Http;
-using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace Google.Apis.Http
 {
-    /// <summary> Argument class to <see cref="IHttpExceptionHandler.HandleException"/>.</summary>
+    /// <summary>Argument class to <see cref="IHttpExceptionHandler.HandleExceptionAsync"/>.</summary>
     public class HandleExceptionArgs
     {
-        /// <summary> Gets or sets the sent request.</summary>
+        /// <summary>Gets or sets the sent request.</summary>
         public HttpRequestMessage Request { get; set; }
 
-        /// <summary> Gets or sets the exception which occurred during sending the request.</summary>
+        /// <summary>Gets or sets the exception which occurred during sending the request.</summary>
         public Exception Exception { get; set; }
 
-        /// <summary> Gets or sets the total number of tries to send the request.</summary>
+        /// <summary>Gets or sets the total number of tries to send the request.</summary>
         public int TotalTries { get; set; }
 
-        /// <summary> Gets or sets the current failed try.</summary>
+        /// <summary>Gets or sets the current failed try.</summary>
         public int CurrentFailedTry { get; set; }
 
-        /// <summary> Gets whether there will actually be a retry if the handler returns <c>true</c>.</summary>
+        /// <summary>Gets whether there will actually be a retry if the handler returns <c>true</c>.</summary>
         public bool SupportsRetry
         {
             get { return TotalTries - CurrentFailedTry > 0; }
         }
 
-        /// <summary> Gets and sets the cancellation token which belongs to the request.</summary>
+        /// <summary>Gets and sets the cancellation token which belongs to the request.</summary>
         public CancellationToken CancellationToken { get; set; }
     }
 
-    /// <summary> 
-    /// Exception handler which is invoked when an exception is thrown during an Http request.
+    /// <summary>
+    /// Exception handler which is invoked when an exception is thrown during a HTTP request.
     /// </summary>
     public interface IHttpExceptionHandler
     {
         /// <summary>
-        /// Handles an exception thrown when sending an Http request. 
+        /// Handles an exception thrown when sending a HTTP request. 
         /// A simple rule must be followed, if you modify the request object in a way that the exception can be 
         /// resolved, you must return <c>true</c>.
         /// </summary>
@@ -62,6 +60,6 @@
         /// Handle exception argument which contains properties like the request, the exception, current failed try.
         /// </param>
         /// <returns>Whether or not this handler has made a change that will require the request to be resent</returns>
-        bool HandleException(HandleExceptionArgs args);
+        Task<bool> HandleExceptionAsync(HandleExceptionArgs args);
     }
 }
Index: Src/GoogleApis/Apis/Http/IHttpExecuteInterceptor.cs
===================================================================
--- a/Src/GoogleApis/Apis/Http/IHttpExecuteInterceptor.cs
+++ b/Src/GoogleApis/Apis/Http/IHttpExecuteInterceptor.cs
@@ -14,21 +14,23 @@
 limitations under the License.
 */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net.Http;
-using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace Google.Apis.Http
 {
     /// <summary>
-    /// Http request execute interceptor to intercept a <see cref="System.Net.Http.HttpRequestMessage"/> before it has
+    /// HTTP request execute interceptor to intercept a <see cref="System.Net.Http.HttpRequestMessage"/> before it has
     /// been sent. Sample usage is attaching "Authorization" header to a request.
     /// </summary>
     public interface IHttpExecuteInterceptor
     {
-        /// <summary> Invoked before the request is being sent. </summary>
-        void Intercept(HttpRequestMessage request);
+        /// <summary>
+        /// <summary>Invoked before the request is being sent.</summary>
+        /// </summary>
+        /// <param name="request">The HTTP request message</param>
+        /// <param name="cancellationToken">Cancellation token to cancel the operation</param>
+        Task InterceptAsync(HttpRequestMessage request, CancellationToken cancellationToken);
     }
 }
Index: Src/GoogleApis/Apis/Http/IHttpUnsuccessfulResponseHandler.cs
===================================================================
--- a/Src/GoogleApis/Apis/Http/IHttpUnsuccessfulResponseHandler.cs
+++ b/Src/GoogleApis/Apis/Http/IHttpUnsuccessfulResponseHandler.cs
@@ -14,48 +14,45 @@
 limitations under the License.
 */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net.Http;
-using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace Google.Apis.Http
 {
-    /// <summary> Argument class to <see cref="IHttpUnsuccessfulResponseHandler.HandleResponse"/>.</summary>
+    /// <summary>Argument class to <see cref="IHttpUnsuccessfulResponseHandler.HandleResponseAsync"/>.</summary>
     public class HandleUnsuccessfulResponseArgs
     {
-        /// <summary> Gets or sets the sent request.</summary>
+        /// <summary>Gets or sets the sent request.</summary>
         public HttpRequestMessage Request { get; set; }
 
-        /// <summary> Gets or sets the abnormal response.</summary>
+        /// <summary>Gets or sets the abnormal response.</summary>
         public HttpResponseMessage Response { get; set; }
 
-        /// <summary> Gets or sets the total number of tries to send the request.</summary>
+        /// <summary>Gets or sets the total number of tries to send the request.</summary>
         public int TotalTries { get; set; }
 
-        /// <summary> Gets or sets the current failed try.</summary>
+        /// <summary>Gets or sets the current failed try.</summary>
         public int CurrentFailedTry { get; set; }
 
-        /// <summary> Gets whether there will actually be a retry if the handler returns <c>true</c>.</summary>
+        /// <summary>Gets whether there will actually be a retry if the handler returns <c>true</c>.</summary>
         public bool SupportsRetry
         {
             get { return TotalTries - CurrentFailedTry > 0; }
         }
 
-        /// <summary> Gets and sets the cancellation token which belongs to the request.</summary>
+        /// <summary>Gets and sets the cancellation token which belongs to the request.</summary>
         public CancellationToken CancellationToken { get; set; }
     }
 
-    /// <summary> 
-    /// Unsuccessful response handler which is invoked when an abnormal Http response is returned when sending an Http 
+    /// <summary>
+    /// Unsuccessful response handler which is invoked when an abnormal HTTP response is returned when sending a HTTP
     /// request.
     /// </summary>
     public interface IHttpUnsuccessfulResponseHandler
     {
         /// <summary>
-        /// Handles an abnormal response when sending an Http request. 
+        /// Handles an abnormal response when sending a HTTP request. 
         /// A simple rule must be followed, if you modify the request object in a way that the abnormal response can 
         /// be resolved, you must return <c>true</c>.
         /// </summary>
@@ -63,6 +60,6 @@
         /// Handle response argument which contains properties like the request, the response, current failed try.
         /// </param>
         /// <returns>Whether or not this handler has made a change that will require the request to be resent</returns>
-        bool HandleResponse(HandleUnsuccessfulResponseArgs args);
+        Task<bool> HandleResponseAsync(HandleUnsuccessfulResponseArgs args);
     }
 }
Index: Src/GoogleApis/Apis/Requests/ClientServiceRequest.cs
===================================================================
--- a/Src/GoogleApis/Apis/Requests/ClientServiceRequest.cs
+++ b/Src/GoogleApis/Apis/Requests/ClientServiceRequest.cs
@@ -17,10 +17,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -30,6 +28,7 @@
 using Google.Apis.Services;
 using Google.Apis.Testing;
 using Google.Apis.Util;
+using Google.Apis.Requests.Parameters;
 
 namespace Google.Apis.Requests
 {
@@ -40,13 +39,13 @@
     /// <typeparam name="TResponse">The type of the response object</typeparam>
     public abstract class ClientServiceRequest<TResponse> : IClientServiceRequest<TResponse>
     {
-        /// <summary> The class logger </summary>
+        /// <summary>The class logger.</summary>
         private static readonly ILogger Logger = ApplicationContext.Logger.ForType<ClientServiceRequest<TResponse>>();
 
-        /// <summary> The service on which this request will be executed. </summary>
+        /// <summary>The service on which this request will be executed.</summary>
         private readonly IClientService service;
 
-        /// <summary> Defines whether the E-Tag will be used in a specified way or be ignored. </summary>
+        /// <summary>Defines whether the E-Tag will be used in a specified way or be ignored.</summary>
         public ETagAction ETagAction { get; set; }
 
         #region IClientServiceRequest Properties
@@ -64,7 +63,7 @@
 
         #endregion
 
-        /// <summary> Creates a new service request. </summary>
+        /// <summary>Creates a new service request.</summary>
         protected ClientServiceRequest(IClientService service)
         {
             this.service = service;
@@ -92,7 +91,7 @@
             }
             catch (AggregateException aex)
             {
-                // if an exception was thrown during the tasks, unwrap and throw it
+                // If an exception was thrown during the tasks, unwrap and throw it.
                 throw aex.InnerException;
             }
             catch (Exception ex)
@@ -106,13 +105,13 @@
             // TODO(peleyal): should we copy the stream, and dispose the response?
             try
             {
-                // sync call
+                // Sync call.
                 var response = ExecuteUnparsed(CancellationToken.None).Result;
                 return response.Content.ReadAsStreamAsync().Result;
             }
             catch (AggregateException aex)
             {
-                // if an exception was thrown during the tasks, unwrap and throw it
+                // If an exception was thrown during the tasks, unwrap and throw it.
                 throw aex.InnerException;
             }
             catch (Exception ex)
@@ -151,7 +150,7 @@
 
         #region Helpers
 
-        /// <summary> Sync executes the request without parsing the result. </summary>
+        /// <summary>Sync executes the request without parsing the result. </summary>
         private async Task<HttpResponseMessage> ExecuteUnparsed(CancellationToken cancellationToken)
         {
             using (var request = CreateRequest())
@@ -160,12 +159,11 @@
             }
         }
 
-        /// <summary> Async executes the request without parsing the result. </summary>
+        /// <summary>Async executes the request without parsing the result. </summary>
         private Task<HttpResponseMessage> ExecuteAsyncUnparsed(CancellationToken cancellationToken)
         {
             // TODO(peleyal): remove the creation of a new Task (it's not necessary).
             // It should also be removed from ResumableMediaUpload and MediaDownloader!
-
             // create a new task completion source and return its task. In additional task we actually send the request
             // using ExecuteUnparsed and setting the result or the exception on the completion source
             TaskCompletionSource<HttpResponseMessage> tcs = new TaskCompletionSource<HttpResponseMessage>();
@@ -178,14 +176,14 @@
                     }
                     catch (Exception ex)
                     {
-                        // exception was thrown - it must be set on the task completion source
+                        // Exception was thrown - it must be set on the task completion source.
                         tcs.SetException(ex);
                     }
                 }).ConfigureAwait(false);
             return tcs.Task;
         }
 
-        /// <summary> Parses the response and deserialize the content into the requested response object. </summary>
+        /// <summary>Parses the response and deserialize the content into the requested response object. </summary>
         private async Task<TResponse> ParseResponse(HttpResponseMessage response)
         {
             if (response.IsSuccessStatusCode)
@@ -204,7 +202,7 @@
         /// Creates the <seealso cref="Google.Apis.Requests.RequestBuilder"/> which is used to generate a request.
         /// </summary>
         /// <returns>
-        /// A new builder instance which contains the Http method and the right Uri with its path and query parameters.
+        /// A new builder instance which contains the HTTP method and the right Uri with its path and query parameters.
         /// </returns>
         private RequestBuilder CreateBuilder()
         {
@@ -215,19 +213,20 @@
                 Method = HttpMethod,
             };
 
-            // init parameters
+            // Init parameters.
             builder.AddParameter(RequestParameterType.Query, "key", service.ApiKey);
-            AddParameters(builder, ParameterCollection.FromDictionary(CreateParameterDictionary()));
+            var parameters = ParameterUtils.CreateParameterDictionary(this);
+            AddParameters(builder, ParameterCollection.FromDictionary(parameters));
             return builder;
         }
 
-        /// <summary>Generates the right Url for this request.</summary>
+        /// <summary>Generates the right URL for this request.</summary>
         protected string GenerateRequestUri()
         {
             return CreateBuilder().BuildUri().ToString();
         }
 
-        /// <summary>Creates an Http request message with all class parameters, developer-key, ETag, etc.</summary>
+        /// <summary>Creates a HTTP request message with all class parameters, developer-key, ETag, etc.</summary>
         [VisibleForTestOnly]
         internal HttpRequestMessage CreateRequest()
         {
@@ -250,7 +249,7 @@
 
         #region ETag
 
-        /// <summary> 
+        /// <summary>
         /// Adds the right ETag action (e.g. If-Match) header to the given HTTP request if the body contains ETag.
         /// </summary>
         private void AddETag(HttpRequestMessage request)
@@ -271,9 +270,7 @@
             }
         }
 
-        /// <summary>
-        /// Returns the default ETagAction for a specific http verb.
-        /// </summary>
+        /// <summary>Returns the default ETagAction for a specific HTTP verb.</summary>
         [VisibleForTestOnly]
         internal static ETagAction GetDefaultETagAction(string httpMethod)
         {
@@ -299,7 +296,7 @@
 
         #region Parameters
 
-        /// <summary> Adds path and query parameters to the given <c>requestBuilder</c>. </summary>
+        /// <summary>Adds path and query parameters to the given <c>requestBuilder</c>.</summary>
         private void AddParameters(RequestBuilder requestBuilder, ParameterCollection inputParameters)
         {
             foreach (var parameter in inputParameters)
@@ -343,7 +340,7 @@
                 }
             }
 
-            // check if there is a required parameter which wasn't set
+            // Check if there is a required parameter which wasn't set.
             foreach (var parameter in RequestParameters.Values)
             {
                 if (parameter.IsRequired && !inputParameters.ContainsKey(parameter.Name))
@@ -354,42 +351,6 @@
             }
         }
 
-        /// <summary>
-        /// Creates a parameter dictionary by using reflection to look at all properties marked with a KeyAttribute.
-        /// </summary>
-        [VisibleForTestOnly]
-        internal IDictionary<string, object> CreateParameterDictionary()
-        {
-            var dict = new Dictionary<string, object>();
-
-            // Use reflection to build the parameter dictionary.
-            foreach (PropertyInfo property in GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public))
-            {
-                // Retrieve the attribute.
-                RequestParameterAttribute requestParameterAttribute =
-                    property.GetCustomAttributes(typeof(RequestParameterAttribute), false).FirstOrDefault() as
-                    RequestParameterAttribute;
-                if (requestParameterAttribute == null)
-                {
-                    continue;
-                }
-
-                // Get the discovery name of this parameter by looking at the attribute, or taking a lower-case
-                // variant of the property name if no special name was set.
-                string name = requestParameterAttribute.Name ?? property.Name.ToLower();
-
-                // Set the value in the dictionary.
-                var propertyType = property.PropertyType;
-                var value = property.GetValue(this, null);
-                if (propertyType.IsValueType || value != null)
-                {
-                    dict.Add(name, value);
-                }
-            }
-
-            return dict;
-        }
-
         #endregion
     }
 }
Index: Src/GoogleApis/Apis/Requests/IClientServiceRequest.cs
===================================================================
--- a/Src/GoogleApis/Apis/Requests/IClientServiceRequest.cs
+++ b/Src/GoogleApis/Apis/Requests/IClientServiceRequest.cs
@@ -31,41 +31,41 @@
     /// </summary>
     public interface IClientServiceRequest<TResponse>
     {
-        /// <summary> Gets the service which is related to this request.</summary>
+        /// <summary>Gets the service which is related to this request.</summary>
         IClientService Service { get; }
 
-        /// <summary> Gets the name of the method to which this request belongs.</summary>
+        /// <summary>Gets the name of the method to which this request belongs.</summary>
         string MethodName { get; }
 
-        /// <summary> Gets the rest path of this request.</summary>
+        /// <summary>Gets the rest path of this request.</summary>
         string RestPath { get; }
 
-        /// <summary> Gets the Http method of this request.</summary>
+        /// <summary>Gets the HTTP method of this request.</summary>
         string HttpMethod { get; }
 
-        /// <summary> Gets the parameters information for this specific request.</summary>
+        /// <summary>Gets the parameters information for this specific request.</summary>
         IDictionary<string, IParameter> RequestParameters { get; }
 
-        /// <summary> Executes the request asynchronously and returns the result stream.</summary>
+        /// <summary>Executes the request asynchronously and returns the result stream.</summary>
         Task<Stream> ExecuteAsStreamAsync();
 
-        /// <summary> Executes the request asynchronously and returns the result stream.</summary>
-        /// <param name="cencellationToken">A cancellation token for cancelling the request in the middle of the 
+        /// <summary>Executes the request asynchronously and returns the result stream.</summary>
+        /// <param name="cencellationToken">A cancellation token for canceling the request in the middle of the 
         /// execution. operation.</param>
         Task<Stream> ExecuteAsStreamAsync(CancellationToken cencellationToken);
 
-        /// <summary> Executes the request and returns the result stream.</summary>
+        /// <summary>Executes the request and returns the result stream.</summary>
         Stream ExecuteAsStream();
 
-        /// <summary> Executes the request asynchronously and returns the result object.</summary>
+        /// <summary>Executes the request asynchronously and returns the result object.</summary>
         Task<TResponse> ExecuteAsync();
 
-        /// <summary> Executes the request asynchronously and returns the result object.</summary>
+        /// <summary>Executes the request asynchronously and returns the result object.</summary>
         /// <param name="cencellationToken">A cancellation token for cancelling the request in the middle of execution.
         /// </param>
         Task<TResponse> ExecuteAsync(CancellationToken cencellationToken);
 
-        /// <summary> Executes the request and returns the result object.</summary>
+        /// <summary>Executes the request and returns the result object.</summary>
         TResponse Execute();
     }
 }
Index: Src/GoogleApis/Apis/Requests/Parameters/ParameterCollection.cs
===================================================================
rename from Src/GoogleApis/Apis/Requests/ParameterCollection.cs
rename to Src/GoogleApis/Apis/Requests/Parameters/ParameterCollection.cs
--- a/Src/GoogleApis/Apis/Requests/ParameterCollection.cs
+++ b/Src/GoogleApis/Apis/Requests/Parameters/ParameterCollection.cs
@@ -17,9 +17,10 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+
 using Google.Apis.Util;
 
-namespace Google.Apis.Requests
+namespace Google.Apis.Requests.Parameters
 {
     /// <summary>
     /// A collection of parameters (key value pairs). May contain duplicate keys.
Index: Src/GoogleApis/Apis/Requests/Parameters/ParameterUtils.cs
===================================================================
new file mode 100644
--- /dev/null
+++ b/Src/GoogleApis/Apis/Requests/Parameters/ParameterUtils.cs
@@ -0,0 +1,129 @@
+/*
+Copyright 2013 Google Inc
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Linq;
+using System.Reflection;
+
+using Google.Apis.Util;
+
+namespace Google.Apis.Requests.Parameters
+{
+    /// <summary>
+    /// Utility class for iterating on <seealso cref="RequestParameterAttribute"/> properties in a request object.
+    /// </summary>
+    public static class ParameterUtils
+    {
+        /// <summary>
+        /// Creates a <seealso cref="System.Net.Http.FormUrlEncodedContent"/> with all the specified parameters in 
+        /// input request. It uses reflection to iterate over all properties with
+        /// <seealso cref="Google.Apis.Util.RequestParameterAttribute"/> attribute.
+        /// </summary>
+        /// <param name="request">
+        /// A request object which contains properties with 
+        /// <seealso cref="Google.Apis.Util.RequestParameterAttribute"/> attribute. Those properties will be serialized
+        /// to the returned <seealso cref="System.Net.Http.FormUrlEncodedContent"/>.
+        /// </param>
+        /// <returns>
+        /// A <seealso cref="System.Net.Http.FormUrlEncodedContent"/> which contains the all the given object required 
+        /// values
+        /// </returns>
+        public static FormUrlEncodedContent CreateFormUrlEncodedContent(object request)
+        {
+            IList<KeyValuePair<string, string>> list = new List<KeyValuePair<string, string>>();
+            IterateParameters(request, (type, name, value) =>
+                {
+                    list.Add(new KeyValuePair<string, string>(name, value.ToString()));
+                });
+            return new FormUrlEncodedContent(list);
+        }
+
+        /// <summary>
+        /// Creates a parameter dictionary by using reflection to iterate over all properties with
+        /// <seealso cref="Google.Apis.Util.RequestParameterAttribute"/> attribute.
+        /// </summary>
+        /// <param name="request">
+        /// A request object which contains properties with 
+        /// <seealso cref="Google.Apis.Util.RequestParameterAttribute"/> attribute. Those properties will be set
+        /// in the output dictionary
+        /// </param>
+        public static IDictionary<string, object> CreateParameterDictionary(object request)
+        {
+            var dict = new Dictionary<string, object>();
+            IterateParameters(request, (type, name, value) =>
+                {
+                    dict.Add(name, value);
+                });
+            return dict;
+        }
+
+        /// <summary>
+        /// Sets query parameters in the given builder with all all properties with the
+        /// <seealso cref="Google.Apis.Util.RequestParameterAttribute"/> attribute.
+        /// </summary>
+        /// <param name="builder">The request builder</param>
+        /// <param name="request">
+        /// A request object which contains properties with 
+        /// <seealso cref="Google.Apis.Util.RequestParameterAttribute"/> attribute. Those properties will be set in the 
+        /// given request builder object
+        /// </param>
+        public static void InitParameters(RequestBuilder builder, object request)
+        {
+            IterateParameters(request, (type, name, value) =>
+                {
+                    builder.AddParameter(type, name, value.ToString());
+                });
+        }
+
+        /// <summary>
+        /// Iterates over all <seealso cref="RequestParameterAttribute"/> properties in the request object and invokes
+        /// the specified action for each of them.
+        /// </summary>
+        /// <param name="request">A request object</param>
+        /// <param name="action">An action to invoke which gets the parameter type, name and its value</param>
+        private static void IterateParameters(object request, Action<RequestParameterType, string, object> action)
+        {
+            // Use reflection to build the parameter dictionary.
+            foreach (PropertyInfo property in request.GetType().GetProperties(BindingFlags.Instance |
+                BindingFlags.Public))
+            {
+                // Retrieve the RequestParameterAttribute.
+                RequestParameterAttribute attribute =
+                    property.GetCustomAttributes(typeof(RequestParameterAttribute), false).FirstOrDefault() as
+                    RequestParameterAttribute;
+                if (attribute == null)
+                {
+                    continue;
+                }
+
+                // Get the name of this parameter from the attribute, if it doesn't exist take a lower-case variant of 
+                // property name.
+                string name = attribute.Name ?? property.Name.ToLower();
+
+                var propertyType = property.PropertyType;
+                var value = property.GetValue(request, null);
+
+                // Call action with the type name and value.
+                if (propertyType.IsValueType || value != null)
+                {
+                    action(attribute.Type, name, value);
+                }
+            }
+        }
+    }
+}
Index: Src/GoogleApis/Apis/Requests/Parameters/ParameterValidator.cs
===================================================================
rename from Src/GoogleApis/Apis/Requests/ParameterValidator.cs
rename to Src/GoogleApis/Apis/Requests/Parameters/ParameterValidator.cs
--- a/Src/GoogleApis/Apis/Requests/ParameterValidator.cs
+++ b/Src/GoogleApis/Apis/Requests/Parameters/ParameterValidator.cs
@@ -22,30 +22,28 @@
 using Google.Apis.Testing;
 using Google.Apis.Util;
 
-namespace Google.Apis
+namespace Google.Apis.Requests.Parameters
 {
-    /// <summary>
-    /// Logic for validating a parameter
-    /// </summary>
+    /// <summary>Logic for validating a parameter.</summary>
     public static class ParameterValidator
     {
-        /// <summary> Validates a parameter value against the methods regex. </summary>
+        /// <summary>Validates a parameter value against the methods regex.</summary>
         [VisibleForTestOnly]
         internal static bool ValidateRegex(IParameter param, string paramValue)
         {
             return string.IsNullOrEmpty(param.Pattern) || new Regex(param.Pattern).IsMatch(paramValue);
         }
 
-        /// <summary> Validates if a parameter is valid. </summary>
+        /// <summary>Validates if a parameter is valid.</summary>
         public static bool ValidateParameter(IParameter parameter, string value)
         {
-            // If a required parameter is not present, fail
+            // Fail if a required parameter is not present.
             if (String.IsNullOrEmpty(value))
             {
                 return !parameter.IsRequired;
             }
 
-            // The parameter has value so validate the regex
+            // The parameter has value so validate the regex.
             return ValidateRegex(parameter, value);
         }
     }
Index: Src/GoogleApis/Apis/Requests/RequestBuilder.cs
===================================================================
--- a/Src/GoogleApis/Apis/Requests/RequestBuilder.cs
+++ b/Src/GoogleApis/Apis/Requests/RequestBuilder.cs
@@ -25,10 +25,11 @@
 
 namespace Google.Apis.Requests
 {
-    /// <summary> Utility class used to build a request from the various parts of a REST Method call. </summary>
-    internal class RequestBuilder
+    /// <summary>Utility class for building a URI using <see cref="BuildUri"/> or a HTTP request using 
+    /// <see cref="CreateRequest"/> from the query and path parameters of a REST call.</summary>
+    public class RequestBuilder
     {
-        /// <summary> Supported Http methods. </summary>
+        /// <summary>Supported HTTP methods.</summary> 
         private static IEnumerable<string> SupportedMethods = new List<string> 
             { 
                 HttpConsts.Get, HttpConsts.Post, HttpConsts.Put, HttpConsts.Delete, HttpConsts.Patch 
@@ -59,10 +60,10 @@
         /// </summary>
         public string Path { get; set; }
 
-        /// <summary> The Http method used for this request. </summary>
+        /// <summary>The HTTP method used for this request.</summary> 
         private string method;
 
-        /// <summary> The Http method used for this request (such as GET, PUT, POST, etc...) </summary>
+        /// <summary>The HTTP method used for this request (such as GET, PUT, POST, etc...) </summary>
         /// <remarks> Default Value is <see cref="Google.Apis.Http.HttpConsts.Get"/>. </remarks>
         public string Method
         {
@@ -75,7 +76,7 @@
             }
         }
 
-        /// <summary> Construct a new request builder. </summary>
+        /// <summary>Construct a new request builder.</summary> 
         public RequestBuilder()
         {
             this.PathParameters = new Dictionary<string, string>();
@@ -83,7 +84,7 @@
             this.Method = HttpConsts.Get;
         }
 
-        /// <summary> Constructs a Uri as defined by the parts of this request builder. </summary>
+        /// <summary>Constructs a Uri as defined by the parts of this request builder.</summary> 
         public Uri BuildUri()
         {
             var restPath = new StringBuilder(PathParameters
@@ -104,7 +105,7 @@
             return new Uri(this.BaseUri, restPath.ToString());
         }
 
-        /// <summary> Adds a parameter value. </summary>
+        /// <summary>Adds a parameter value.</summary> 
         /// <param name="type">Type of the parameter (must be Path or Query).</param>
         /// <param name="name">Parameter name.</param>
         /// <param name="value">Parameter value.</param>
@@ -131,7 +132,7 @@
             }
         }
 
-        /// <summary> Creates a new Http request message. </summary>
+        /// <summary>Creates a new HTTP request message.</summary> 
         public HttpRequestMessage CreateRequest()
         {
             return new HttpRequestMessage(new HttpMethod(Method), BuildUri());
Index: Src/GoogleApis/Apis/Services/BaseClientService.cs
===================================================================
--- a/Src/GoogleApis/Apis/Services/BaseClientService.cs
+++ b/Src/GoogleApis/Apis/Services/BaseClientService.cs
@@ -42,40 +42,28 @@
     /// <see cref="Google.Apis.Http.ConfigurableMessageHandler"/> execute interceptor list, which uses the given 
     /// Authenticator. It calls to its applying authentication method, and injects the "Authorization" header in the 
     /// request.
-    /// If the given Authenticator implements <see cref="Google.Apis.Http.IUnsuccessfulReponseHandler"/>, this class
-    /// adds the Authenticator to the <see cref="Google.Apis.Http.ConfigurableMessageHandler"/>'s unsuccessful response
-    /// handler list.
+    /// If the given Authenticator implements <see cref="Google.Apis.Http.IHttpUnsuccessfulResponseHandler"/>, this 
+    /// class adds the Authenticator to the <see cref="Google.Apis.Http.ConfigurableMessageHandler"/>'s unsuccessful 
+    /// response handler list.
     /// </summary>
     public abstract class BaseClientService : IClientService
     {
-        /// <summary> The class logger. </summary>
+        /// <summary>The class logger.</summary>
         private static readonly ILogger Logger = ApplicationContext.Logger.ForType<BaseClientService>();
 
         #region Initializer
 
-        /// <summary> 
-        /// Indicates if exponential back-off is used automatically on exception in a service request and\or when 503 
-        /// response is returned form the server.
-        /// </summary>
-        [Flags]
-        public enum ExponentialBackOffPolicy
-        {
-            None = 0,
-            Exception = 1,
-            UnsuccessfulResponse503 = 2
-        }
-
-        /// <summary> An initializer class for the client service. </summary>
+        /// <summary>An initializer class for the client service.</summary>
         public class Initializer
         {
-            /// <summary> 
+            /// <summary>
             /// Gets or sets the factory for creating <see cref="System.Net.Http.HttpClient"/> instance. If this 
             /// property is not set the service uses a new <see cref="Google.Apis.Http.HttpClientFactory"/> instance.
             /// </summary>
             public IHttpClientFactory HttpClientFactory { get; set; }
 
             /// <summary>
-            /// Gets or sets an Http client initializer which is able to customize properties on 
+            /// Gets or sets a HTTP client initializer which is able to customize properties on 
             /// <see cref="Google.Apis.Http.ConfigurableHttpClient"/> and 
             /// <see cref="Google.Apis.Http.ConfigurableMessageHandler"/>.
             /// </summary>
@@ -88,33 +76,33 @@
             /// If the value is set to <c>None</c>, no exponential back-off policy is used, and it's up to user to
             /// configure the <seealso cref="Google.Apis.Http.ConfigurableMessageHandler"/> in an
             /// <seealso cref="Google.Apis.Http.IConfigurableHttpClientInitializer"/> to set a specific back-off
-            /// implementation (using <seealso cref="Google.Api.Http.BackOffHandler"/>).
+            /// implementation (using <seealso cref="Google.Apis.Http.BackOffHandler"/>).
             /// </summary>
             public ExponentialBackOffPolicy DefaultExponentialBackOffPolicy { get; set; }
 
-            /// <summary> Gets or sets whether this service supports GZip. Default value is <c>true</c>. </summary>
+            /// <summary>Gets or sets whether this service supports GZip. Default value is <c>true</c>.</summary>
             public bool GZipEnabled { get; set; }
 
             /// <summary>
-            /// Gets and Sets the Serializer. Default value is <see cref="Google.Apis.Json.NewtonsoftJsonSerializer"/>.
+            /// Gets and Sets the serializer. Default value is <see cref="Google.Apis.Json.NewtonsoftJsonSerializer"/>.
             /// </summary>
             public ISerializer Serializer { get; set; }
 
-            /// <summary> Gets or sets the API Key. Default value is <c>null</c>. </summary>
+            /// <summary>Gets or sets the API Key. Default value is <c>null</c>.</summary>
             public string ApiKey { get; set; }
 
-            /// <summary> 
+            /// <summary>
             /// Gets or sets the Authenticator. Default value is 
             /// <see cref="Google.Apis.Authentication.NullAuthenticator.Instance"/>.
             /// </summary>
             public IAuthenticator Authenticator { get; set; }
 
-            /// <summary> 
+            /// <summary>
             /// Gets or sets Application name to be used in the User-Agent header. Default value is <c>null</c>. 
             /// </summary>
             public string ApplicationName { get; set; }
 
-            /// <summary> Constructs a new initializer with default values. </summary>
+            /// <summary>Constructs a new initializer with default values.</summary>
             public Initializer()
             {
                 GZipEnabled = true;
@@ -124,48 +112,12 @@
             }
         }
 
-        /// <summary>
-        /// An initializer which adds exponential back-off as exception handler and\or unsuccessful response handler by
-        /// the given <seealso cref="BaseClientService.ExponentialBackOffPolicy"/>.
-        /// </summary>
-        private class ExponentialBackOffInitializer : IConfigurableHttpClientInitializer
-        {
-            private ExponentialBackOffPolicy Policy { get; set; }
-            private Func<BackOffHandler> CreateBackOff { get; set; }
-
-            /// <summary>
-            /// Constructs a new back-off initializer with the given policy and back-off handler create function.
-            /// </summary>
-            public ExponentialBackOffInitializer(ExponentialBackOffPolicy policy, Func<BackOffHandler> createBackOff)
-            {
-                Policy = policy;
-                CreateBackOff = createBackOff;
-            }
-
-            public void Initialize(ConfigurableHttpClient httpClient)
-            {
-                var backOff = CreateBackOff();
-
-                // add exception handler and\or unsuccessful response handler
-                if ((Policy & ExponentialBackOffPolicy.Exception) == ExponentialBackOffPolicy.Exception)
-                {
-                    httpClient.MessageHandler.ExceptionHandlers.Add(backOff);
-                }
-
-                if ((Policy & ExponentialBackOffPolicy.UnsuccessfulResponse503) ==
-                    ExponentialBackOffPolicy.UnsuccessfulResponse503)
-                {
-                    httpClient.MessageHandler.UnsuccessfulResponseHandlers.Add(backOff);
-                }
-            }
-        }
-
         #endregion
 
-        /// <summary> Constructs a new base client with the specified initializer. </summary>
+        /// <summary>Constructs a new base client with the specified initializer.</summary>
         protected BaseClientService(Initializer initializer)
         {
-            // sets the right properties by the initializer's properties
+            // Set the right properties by the initializer's properties.
             GZipEnabled = initializer.GZipEnabled;
             Serializer = initializer.Serializer;
             ApiKey = initializer.ApiKey;
@@ -177,11 +129,11 @@
             }
             HttpClientInitializer = initializer.HttpClientInitializer;
 
-            // create an Http client for this service
+            // Create a HTTP client for this service.
             HttpClient = CreateHttpClient(initializer);
         }
 
-        /// <summary> Return <c>true</c> if this service contains the specified feature. </summary>
+        /// <summary>Returns <c>true</c> if this service contains the specified feature.</summary>
         private bool HasFeature(Features feature)
         {
             return Features.Contains(feature.GetStringValue());
@@ -189,7 +141,7 @@
 
         private ConfigurableHttpClient CreateHttpClient(Initializer initializer)
         {
-            // if factory wasn't set use the default Http client factory
+            // If factory wasn't set use the default HTTP client factory.
             var factory = initializer.HttpClientFactory ?? new HttpClientFactory();
             var args = new CreateHttpClientArgs
                 {
@@ -197,20 +149,20 @@
                     ApplicationName = ApplicationName,
                 };
 
-            // add the user's input initializer
+            // Add the user's input initializer.
             if (HttpClientInitializer != null)
             {
                 args.Initializers.Add(HttpClientInitializer);
             }
 
-            // add exponential back-off initializer if necessary
+            // Add exponential back-off initializer if necessary.
             if (initializer.DefaultExponentialBackOffPolicy != ExponentialBackOffPolicy.None)
             {
                 args.Initializers.Add(new ExponentialBackOffInitializer(initializer.DefaultExponentialBackOffPolicy,
                     CreateBackOffHandler));
             }
 
-            // add authenticator initializer to intercept a request and add the "Authorization" header and also handle
+            // Add authenticator initializer to intercept a request and add the "Authorization" header and also handle
             // abnormal 401 responses in case the authenticator is an instance of unsuccessful response handler.
             args.Initializers.Add(new AuthenticatorMessageHandlerInitializer(Authenticator));
 
@@ -284,8 +236,6 @@
                 var request = new StandardResponse<object> { Data = obj };
                 return Serializer.Serialize(request);
             }
-
-            // New v1.0 path
             return Serializer.Serialize(obj);
         }
 
@@ -374,7 +324,7 @@
 
         #endregion
 
-        #region Abstract Memebrs
+        #region Abstract Members
 
         public abstract string Name { get; }
         public abstract string BaseUri { get; }
@@ -386,7 +336,7 @@
 
         #endregion
 
-        /// <summary> Creates a GZip stream by the given serialized object. </summary>
+        /// <summary>Creates a GZip stream by the given serialized object.</summary>
         private static Stream CreateGZipStream(string serializedObject)
         {
             byte[] bytes = System.Text.Encoding.UTF8.GetBytes(serializedObject);
Index: Src/GoogleApis/Apis/Services/IClientService.cs
===================================================================
--- a/Src/GoogleApis/Apis/Services/IClientService.cs
+++ b/Src/GoogleApis/Apis/Services/IClientService.cs
@@ -28,45 +28,45 @@
 {
     /// <summary>
     /// Client service contains all the necessary information a Google service requires. 
-    /// Each concrete <see cref="Google.Api.Request.IClientServiceRequest"/> has a reference to a service for 
+    /// Each concrete <seealso cref="Google.Apis.Requests.IClientServiceRequest"/> has a reference to a service for 
     /// important properties like API key, application name, base Uri, etc.
     /// This service interface also contains serialization methods to serialize an object to stream and deserialize a 
     /// stream into an object.
     /// </summary>
     public interface IClientService : IDisposable
     {
-        /// <summary> Gets the Http client which is used to create requests. </summary>
+        /// <summary>Gets the HTTP client which is used to create requests.</summary>
         ConfigurableHttpClient HttpClient { get; }
 
-        /// <summary> 
-        /// Gets an Http client initializer which is able to custom properties on 
+        /// <summary>
+        /// Gets a HTTP client initializer which is able to custom properties on 
         /// <see cref="Google.Apis.Http.ConfigurableHttpClient"/> and 
         /// <see cref="Google.Apis.Http.ConfigurableMessageHandler"/>.
         /// </summary>
         IConfigurableHttpClientInitializer HttpClientInitializer { get; }
 
-        /// <summary> Gets the service name. </summary>
+        /// <summary>Gets the service name.</summary>
         string Name { get; }
 
-        /// <summary> Gets the BaseUri of the service. All request paths should be relative to this URI. </summary>
+        /// <summary>Gets the BaseUri of the service. All request paths should be relative to this URI.</summary>
         string BaseUri { get; }
 
-        /// <summary> Gets the BasePath of the service. </summary>
+        /// <summary>Gets the BasePath of the service.</summary>
         string BasePath { get; }
 
-        /// <summary> Gets the Authenticator for this service. </summary>
+        /// <summary>Gets the Authenticator for this service.</summary>
         IAuthenticator Authenticator { get; }
 
-        /// <summary> Gets the supported features by this service. </summary>
+        /// <summary>Gets the supported features by this service.</summary>
         IList<string> Features { get; }
 
-        /// <summary> Gets or sets whether this service supports GZip. </summary>
+        /// <summary>Gets or sets whether this service supports GZip.</summary>
         bool GZipEnabled { get; }
 
-        /// <summary> Gets the API-Key (DeveloperKey) which this service uses for all requests. </summary>
+        /// <summary>Gets the API-Key (DeveloperKey) which this service uses for all requests.</summary>
         string ApiKey { get; }
 
-        /// <summary> Gets the application name to be used in the User-Agent header. </summary>
+        /// <summary>Gets the application name to be used in the User-Agent header.</summary>
         string ApplicationName { get; }
 
         /// <summary>
@@ -78,16 +78,16 @@
 
         #region Serialization Methods
 
-        /// <summary> Gets the Serializer used by this service. </summary>
+        /// <summary>Gets the Serializer used by this service.</summary>
         ISerializer Serializer { get; }
 
-        /// <summary> Serializes an object into a string representation. </summary>
+        /// <summary>Serializes an object into a string representation.</summary>
         string SerializeObject(object data);
 
-        /// <summary> Deserializes a response into the specified object. </summary>
+        /// <summary>Deserializes a response into the specified object.</summary>
         Task<T> DeserializeResponse<T>(HttpResponseMessage response);
 
-        /// <summary> Deserializes an error response into a <see cref="RequestError"/> object. </summary>
+        /// <summary>Deserializes an error response into a <see cref="RequestError"/> object.</summary>
         /// <exception cref="GoogleApiException">If no error is found in the response.</exception>
         Task<RequestError> DeserializeError(HttpResponseMessage response);
 
Index: Src/GoogleApis/Apis/Util/IClock.cs
===================================================================
new file mode 100644
--- /dev/null
+++ b/Src/GoogleApis/Apis/Util/IClock.cs
@@ -0,0 +1,45 @@
+/*
+Copyright 2013 Google Inc
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+using System;
+
+namespace Google.Apis.Util
+{
+    /// <summary>Clock wrapper for getting the current time.</summary>
+    public interface IClock
+    {
+        /// <summary>
+        /// Gets a <seealso cref="DateTime"/> object that is set to the current date and time on this computer, 
+        /// expressed as the local time.
+        /// </summary>
+        DateTime Now { get; }
+    }
+
+    /// <summary>A default clock implementation that wraps the <seealso cref="DateTime.Now"/> property.</summary>
+    public class SystemClock : IClock
+    {
+        /// <summary>Constructs a new system clock.</summary>
+        protected SystemClock() { }
+
+        /// <summary>The default instance.</summary>
+        public static readonly IClock Default = new SystemClock();
+
+        public DateTime Now
+        {
+            get { return DateTime.Now; }
+        }
+    }
+}
Index: Src/GoogleApis/Apis/Util/RequestParameterAttribute.cs
===================================================================
--- a/Src/GoogleApis/Apis/Util/RequestParameterAttribute.cs
+++ b/Src/GoogleApis/Apis/Util/RequestParameterAttribute.cs
@@ -29,21 +29,32 @@
         private readonly string name;
         private readonly RequestParameterType type;
 
-        /// <summary>
-        /// Name/key of this attribute
-        /// </summary>
-        public string Name { get { return name; }}
+        /// <summary>Gets the name of the parameter.</summary>
+        public string Name { get { return name; } }
 
+        /// <summary>Gets the type of the parameter, Path or Query.</summary>
         public RequestParameterType Type { get { return type; } }
 
         /// <summary>
-        /// Attribute a property to be a part of a REST URI.
+        /// Constructs a new property attribute to be a part of a REST URI. 
+        /// This constructor uses <seealso cref="RequestParameterType.Query"/> as the parameter's type.
         /// </summary>
         /// <param name="name">
-        /// The name of the parameter. If the parameter is a path parameter this name
-        /// will be used to substitute the string value into the path, replacing {name}.
-        /// If the parameter is a query parameter, this parameter will be added to the
-        /// query string, in the format "name=value".
+        /// The name of the parameter. If the parameter is a path parameter this name will be used to substitute the 
+        /// string value into the path, replacing {name}. If the parameter is a query parameter, this parameter will be
+        /// added to the query string, in the format "name=value".
+        /// </param>
+        public RequestParameterAttribute(string name)
+            : this(name, RequestParameterType.Query)
+        {
+
+        }
+
+        /// <summary>Constructs a new property attribute to be a part of a REST URI.</summary>
+        /// <param name="name">
+        /// The name of the parameter. If the parameter is a path parameter this name will be used to substitute the 
+        /// string value into the path, replacing {name}. If the parameter is a query parameter, this parameter will be
+        /// added to the query string, in the format "name=value".
         /// </param>
         /// <param name="type">The type of the parameter, either Path or Query.</param>
         public RequestParameterAttribute(string name, RequestParameterType type)
@@ -52,22 +63,14 @@
             this.type = type;
         }
     }
-    
-    /// <summary>
-    /// Describe the type of this parameter (Path or Query).
-    /// </summary>
+
+    /// <summary>Describe the type of this parameter (Path or Query).</summary>
     public enum RequestParameterType
     {
-        /// <summary>
-        /// The parameter is a path parameter and will be inserted into the path portion of the
-        /// request URI.
-        /// </summary>
+        /// <summary>A path parameter which is inserted into the path portion of the request URI.</summary>
         Path,
 
-        /// <summary>
-        /// The parameter is a query parameter and will be inserted into the query portion of the
-        /// request URI.
-        /// </summary>
+        /// <summary>A query parameter which is inserted into the query portion of the request URI.</summary>
         Query
     }
 }
Index: Src/GoogleApis/Apis/Util/Store/IDataStore.cs
===================================================================
new file mode 100644
--- /dev/null
+++ b/Src/GoogleApis/Apis/Util/Store/IDataStore.cs
@@ -0,0 +1,53 @@
+/*
+Copyright 2013 Google Inc
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+using System;
+using System.Threading.Tasks;
+
+namespace Google.Apis.Util.Store
+{
+    /// <summary>
+    /// Stores and manages data objects, where the key is a string and the value is an object.
+    /// <para>
+    /// <c>null</c> keys are not allowed.
+    /// </para>
+    /// </summary>
+    public interface IDataStore
+    {
+        /// <summary>Stores the given value for the given key (replacing any existing value).</summary>
+        /// <typeparam name="T">The type to store in the data store</typeparam>
+        /// <param name="key">The key</param>
+        /// <param name="value">The value to store in the data store</param>
+        Task Store<T>(string key, T value);
+
+        /// <summary>
+        /// Deletes the given key. The type is provided here as well because the "real" saved key should contain 
+        /// type information as well, so the data store will be able to store the same key for different types.
+        /// </summary>
+        /// <param name="key">The key to delete from the data store</param>
+        /// <param name="t">The type of the stored value</param>
+        Task Delete(string key, Type t);
+
+        /// <summary>Returns the stored value for the given key or <c>null</c> if not found.</summary>
+        /// <typeparam name="T">The type to retrieve</typeparam>
+        /// <param name="key">The key to retrieve from the data store</param>
+        /// <returns>The stored object</returns>
+        Task<T> Get<T>(string key);
+
+        /// <summary>Clears all values in the data store.</summary>
+        Task Clear();
+    }
+}
\ No newline at end of file
Index: Src/GoogleApis/Apis/[Media]/Upload/ResumableUpload.cs
===================================================================
--- a/Src/GoogleApis/Apis/[Media]/Upload/ResumableUpload.cs
+++ b/Src/GoogleApis/Apis/[Media]/Upload/ResumableUpload.cs
@@ -45,16 +45,16 @@
     {
         #region Constants
 
-        /// <summary> The class logger. </summary>
+        /// <summary>The class logger.</summary>
         private static readonly ILogger logger = ApplicationContext.Logger.ForType<ResumableUpload<TRequest>>();
 
         private const int KB = 0x400;
         private const int MB = 0x100000;
 
-        /// <summary> Minimum chunk size (except the last one). Default value is 256*KB. </summary>
+        /// <summary>Minimum chunk size (except the last one). Default value is 256*KB.</summary>
         public const int MinimumChunkSize = 256 * KB;
 
-        /// <summary> Default chunk size. Default value is 10*MB. </summary>
+        /// <summary>Default chunk size. Default value is 10*MB.</summary>
         public const int DefaultChunkSize = 10 * MB;
 
         /// <summary>
@@ -63,25 +63,25 @@
         /// </summary>
         internal int BufferSize = 4 * KB;
 
-        /// <summary> Indicates the stream's size is unknown. </summary>
+        /// <summary>Indicates the stream's size is unknown.</summary>
         private const int UnknownSize = -1;
 
-        /// <summary> The mime type for the encoded JSON body. </summary>
+        /// <summary>The mime type for the encoded JSON body.</summary>
         private const string JsonMimeType = "application/json; charset=UTF-8";
 
-        /// <summary> Payload description headers, describing the content itself. </summary>
+        /// <summary>Payload description headers, describing the content itself.</summary>
         private const string PayloadContentTypeHeader = "X-Upload-Content-Type";
 
-        /// <summary> Payload description headers, describing the content itself. </summary>
+        /// <summary>Payload description headers, describing the content itself.</summary>
         private const string PayloadContentLengthHeader = "X-Upload-Content-Length";
 
-        /// <summary> Specify the type of this upload (this class supports resumable only). </summary>
+        /// <summary>Specify the type of this upload (this class supports resumable only).</summary>
         private const string UploadType = "uploadType";
 
-        /// <summary> The uploadType parameter value for resumable uploads. </summary>
+        /// <summary>The uploadType parameter value for resumable uploads.</summary>
         private const string Resumable = "resumable";
 
-        /// <summary> Content-Range header value for the body upload of zero length files. </summary>
+        /// <summary>Content-Range header value for the body upload of zero length files.</summary>
         private const string ZeroByteContentRangeHeader = "bytes */0";
 
         #endregion // Constants
@@ -93,7 +93,7 @@
         /// </summary>
         /// <param name="service">The client service.</param>
         /// <param name="path">The path for this media upload method.</param>
-        /// <param name="httpMethod">The Http method to start this upload.</param>
+        /// <param name="httpMethod">The HTTP method to start this upload.</param>
         /// <param name="contentStream">The stream containing the content to upload.</param>
         /// <param name="contentType">Content type of the content to be uploaded.</param>
         /// <remarks>
@@ -121,22 +121,22 @@
 
         #region Properties
 
-        /// <summary> Gets or sets the service. </summary>
+        /// <summary>Gets or sets the service.</summary>
         public IClientService Service { get; private set; }
 
-        /// <summary> 
+        /// <summary>
         /// Gets or sets the path of the method (combined with <see cref="IClientService.BaseUri"/>) to produce 
         /// absolute Uri. 
         /// </summary>
         public string Path { get; private set; }
 
-        /// <summary> Gets or sets the Http method of this upload (used to initialize the upload). </summary>
+        /// <summary>Gets or sets the HTTP method of this upload (used to initialize the upload).</summary>
         public string HttpMethod { get; private set; }
 
-        /// <summary> Gets or sets the stream to upload. </summary>
+        /// <summary>Gets or sets the stream to upload.</summary>
         public Stream ContentStream { get; private set; }
 
-        /// <summary> Gets or sets the stream's Content-Type. </summary>
+        /// <summary>Gets or sets the stream's Content-Type.</summary>
         public string ContentType { get; private set; }
 
         /// <summary>
@@ -151,31 +151,31 @@
         /// </summary>
         private byte[] LastMediaRequest { get; set; }
 
-        /// <summary> Gets or sets cached byte which indicates if end of stream has been reached. </summary>
+        /// <summary>Gets or sets cached byte which indicates if end of stream has been reached.</summary>
         private byte[] CachedByte { get; set; }
 
-        /// <summary> Gets or sets the last request length. </summary>
+        /// <summary>Gets or sets the last request length.</summary>
         private int LastMediaLength { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// Gets or sets the resumable session Uri. 
         /// See https://developers.google.com/drive/manage-uploads#save-session-uri" for more details.
         /// </summary>
         private Uri UploadUri { get; set; }
 
-        /// <summary> Gets or sets the amount of bytes the server had received so far. </summary>
+        /// <summary>Gets or sets the amount of bytes the server had received so far.</summary>
         private long BytesServerReceived { get; set; }
 
-        /// <summary> Gets or sets the amount of bytes the client had sent so far. </summary>
+        /// <summary>Gets or sets the amount of bytes the client had sent so far.</summary>
         private long BytesClientSent { get; set; }
 
-        /// <summary> Gets or sets the body of this request. </summary>
+        /// <summary>Gets or sets the body of this request.</summary>
         public TRequest Body { get; set; }
 
         [VisibleForTestOnly]
         internal int chunkSize = DefaultChunkSize;
 
-        /// <summary> 
+        /// <summary>
         /// Gets or sets the size of each chunk sent to the server.
         /// Chunks (except the last chunk) must be a multiple of <see cref="MinimumChunkSize"/> to be compatible with 
         /// Google upload servers.
@@ -197,12 +197,12 @@
 
         #region Events
 
-        /// <summary> Event called whenever the progress of the upload changes. </summary>
+        /// <summary>Event called whenever the progress of the upload changes.</summary>
         public event Action<IUploadProgress> ProgressChanged;
 
         #endregion //Events
 
-        #region Error handling (Expcetion and 5xx)
+        #region Error handling (Exception and 5xx)
 
         /// <summary>
         /// Callback class that is invoked on abnormal response or an exception.
@@ -214,7 +214,7 @@
         {
             private ResumableUpload<TRequest> Owner { get; set; }
 
-            /// <summary> 
+            /// <summary>
             /// Constructs a new callback and register it as unsuccessful response handler and exception handler on the 
             /// configurable message handler.
             /// </summary>
@@ -225,8 +225,9 @@
                 Owner.Service.HttpClient.MessageHandler.ExceptionHandlers.Add(this);
             }
 
-            public bool HandleResponse(HandleUnsuccessfulResponseArgs args)
+            public Task<bool> HandleResponseAsync(HandleUnsuccessfulResponseArgs args)
             {
+                var result = false;
                 var statusCode = (int)args.Response.StatusCode;
                 // handle the error if and only if all the following conditions occur:
                 // - there is going to be an actual retry
@@ -236,18 +237,25 @@
                 // - we got a 5xx server error.
                 if (args.SupportsRetry && args.Request.RequestUri.Equals(Owner.UploadUri) && statusCode / 100 == 5)
                 {
-                    return OnServerError(args.Request);
+                    result = OnServerError(args.Request);
                 }
-                return false;
+
+                TaskCompletionSource<bool> tcs = new TaskCompletionSource<bool>();
+                tcs.SetResult(result);
+                return tcs.Task;
             }
 
-            public bool HandleException(HandleExceptionArgs args)
+            public Task<bool> HandleExceptionAsync(HandleExceptionArgs args)
             {
-                return args.SupportsRetry && !args.CancellationToken.IsCancellationRequested &&
+                var result = args.SupportsRetry && !args.CancellationToken.IsCancellationRequested &&
                     args.Request.RequestUri.Equals(Owner.UploadUri) ? OnServerError(args.Request) : false;
+
+                TaskCompletionSource<bool> tcs = new TaskCompletionSource<bool>();
+                tcs.SetResult(result);
+                return tcs.Task;
             }
 
-            /// <summary> Changes the request in order to resume the interrupted upload. </summary>
+            /// <summary>Changes the request in order to resume the interrupted upload.</summary>
             private bool OnServerError(HttpRequestMessage request)
             {
                 // clear all headers and set Content-Range and Content-Length headers
@@ -269,7 +277,7 @@
 
         #region Progress Monitoring
 
-        /// <summary> Class that communicates the progress of resumable uploads to a container. </summary>
+        /// <summary>Class that communicates the progress of resumable uploads to a container.</summary>
         private class ResumableUploadProgress : IUploadProgress
         {
             /// <summary>
@@ -375,7 +383,7 @@
             return Progress;
         }
 
-        /// <summary> Uploads the content asynchronously to the server.</summary>
+        /// <summary>Uploads the content asynchronously to the server.</summary>
         /// <remarks>
         /// In case the upload fails the task will not be completed. In that case the task's 
         /// <seealso cref="System.Threading.Tasks.Task.Exception"/> property will bet set, or its 
@@ -386,7 +394,7 @@
             return UploadAsync(CancellationToken.None);
         }
 
-        /// <summary> Uploads the content asynchronously to the server.</summary>
+        /// <summary>Uploads the content asynchronously to the server.</summary>
         /// <param name="cancellationToken">The cancellation token to cancel a request in the middle.</param>
         public Task<IUploadProgress> UploadAsync(CancellationToken cancellationToken)
         {
@@ -436,7 +444,7 @@
         {
         }
 
-        /// <summary> 
+        /// <summary>
         /// Uploads the next chunk of data to the server.
         /// </summary>
         /// <returns> 
@@ -485,7 +493,7 @@
             throw new GoogleApiException(Service.Name, error.ToString());
         }
 
-        /// <summary> A callback when the media was uploaded successfully. </summary>
+        /// <summary>A callback when the media was uploaded successfully.</summary>
         private void MediaCompleted(HttpResponseMessage response)
         {
             logger.Debug("MediaUpload[{0}] - media was uploaded successfully", UploadUri);
@@ -496,7 +504,7 @@
             LastMediaRequest = null;
         }
 
-        /// <summary> Prepares the given request with the next chunk in case the steam length is unknown. </summary>
+        /// <summary>Prepares the given request with the next chunk in case the steam length is unknown.</summary>
         private void PrepareNextChunkUnknownSize(HttpRequestMessage request, Stream stream,
             CancellationToken cancellationToken)
         {
@@ -564,7 +572,7 @@
             request.Content = byteArrayContent;
         }
 
-        /// <summary> Prepares the given request with the next chunk in case the steam length is known. </summary>
+        /// <summary>Prepares the given request with the next chunk in case the steam length is known.</summary>
         private void PrepareNextChunkKnownSize(HttpRequestMessage request, Stream stream,
             CancellationToken cancellationToken)
         {
@@ -603,7 +611,7 @@
             LastMediaLength = chunkSize;
         }
 
-        /// <summary> Returns the next byte index need to be sent. </summary>
+        /// <summary>Returns the next byte index need to be sent.</summary>
         private long GetNextByte(string range)
         {
             return long.Parse(range.Substring(range.IndexOf('-') + 1)) + 1;
@@ -642,7 +650,7 @@
             }
         }
 
-        /// <summary> Creates a request to initialize a request. </summary>
+        /// <summary>Creates a request to initialize a request.</summary>
         private HttpRequestMessage CreateInitializeRequest()
         {
             var builder = new RequestBuilder()
@@ -722,7 +730,7 @@
         /// </summary>
         /// <param name="service">The client service.</param>
         /// <param name="path">The path for this media upload method.</param>
-        /// <param name="httpMethod">The Http method to start this upload.</param>
+        /// <param name="httpMethod">The HTTP method to start this upload.</param>
         /// <param name="contentStream">The stream containing the content to upload.</param>
         /// <param name="contentType">Content type of the content to be uploaded.</param>
         /// <remarks>
@@ -752,14 +760,14 @@
 
         #region Events
 
-        /// <summary> Event which is called when the response metadata is processed. </summary>
+        /// <summary>Event which is called when the response metadata is processed.</summary>
         public event Action<TResponse> ResponseReceived;
 
         #endregion // Events
 
         #region Overrides
 
-        /// <summary> Process the response body </summary>
+        /// <summary>Process the response body </summary>
         protected override void ProcessResponse(HttpResponseMessage response)
         {
             base.ProcessResponse(response);
Index: Src/GoogleApis/GoogleApiException.cs
===================================================================
--- a/Src/GoogleApis/GoogleApiException.cs
+++ b/Src/GoogleApis/GoogleApiException.cs
@@ -22,24 +22,18 @@
 
 namespace Google
 {
-    /// <summary>
-    /// Represents an exception thrown by an API Service.
-    /// </summary>
+    /// <summary>Represents an exception thrown by an API Service.</summary>
     public class GoogleApiException : Exception
     {
         private readonly string serviceName;
 
-        /// <summary>
-        /// Gets the service name which related to this exception.
-        /// </summary>
+        /// <summary>Gets the service name which related to this exception.</summary>
         public string ServiceName
         {
             get { return serviceName; }
         }
 
-        /// <summary>
-        /// Creates an API Service exception.
-        /// </summary>
+        /// <summary>Creates an API Service exception.</summary>
         public GoogleApiException(string serviceName, string message, Exception inner)
             : base(message, inner)
         {
@@ -47,15 +41,10 @@
             this.serviceName = serviceName;
         }
 
-        /// <summary>
-        /// Creates an API Service exception
-        /// </summary>
+        /// <summary>Creates an API Service exception.</summary>
         public GoogleApiException(string serviceName, string message) : this(serviceName, message, null) { }
 
-        /// <summary>
-        /// The http status code which was returned along with this error,
-        /// or 0 if unavailable.
-        /// </summary>
+        /// <summary>The HTTP status code which was returned along with this error, or 0 if unavailable.</summary>
         public HttpStatusCode HttpStatusCode { get; set; }
 
         public override string ToString()
Index: Src/GoogleApis/GoogleApis.csproj
===================================================================
--- a/Src/GoogleApis/GoogleApis.csproj
+++ b/Src/GoogleApis/GoogleApis.csproj
@@ -41,6 +41,7 @@
     <!-- A reference to the entire .NET Framework is automatically included -->
     <None Include="Apis\Http\ClassDiagram.cd" />
     <None Include="Apis\ServiceRequests.cd" />
+    <None Include="Apis\[Media]\ClassDiagram.cd" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -55,6 +56,7 @@
     <Compile Include="Apis\Http\ConfigurableHttpClient.cs" />
     <Compile Include="Apis\Http\ConfigurableMessageHandler.cs" />
     <Compile Include="Apis\Http\BackOffHandler.cs" />
+    <Compile Include="Apis\Http\ExponentialBackOffInitializer.cs" />
     <Compile Include="Apis\Http\HttpClientFactory.cs" />
     <Compile Include="Apis\Http\HttpConsts.cs" />
     <Compile Include="Apis\Http\HttpExtenstions.cs" />
@@ -76,13 +78,16 @@
     <Compile Include="Apis\Requests\ETagAction.cs" />
     <Compile Include="Apis\Requests\IClientServiceRequest.cs" />
     <Compile Include="Apis\Requests\IDirectResponseSchema.cs" />
-    <Compile Include="Apis\Requests\ParameterCollection.cs" />
-    <Compile Include="Apis\Requests\ParameterValidator.cs" />
+    <Compile Include="Apis\Requests\Parameters\ParameterCollection.cs" />
+    <Compile Include="Apis\Requests\Parameters\ParameterUtils.cs" />
+    <Compile Include="Apis\Requests\Parameters\ParameterValidator.cs" />
     <Compile Include="Apis\Requests\RequestBuilder.cs" />
     <Compile Include="Apis\Requests\RequestError.cs" />
     <Compile Include="Apis\Requests\SingleError.cs" />
     <Compile Include="Apis\Services\BaseClientService.cs" />
     <Compile Include="Apis\Services\IClientService.cs" />
+    <Compile Include="Apis\Util\IClock.cs" />
+    <Compile Include="Apis\Util\Store\IDataStore.cs" />
     <Compile Include="Apis\Testing\VisibleForTestOnly.cs" />
     <Compile Include="Apis\[Media]\Download\IDownloadProgress.cs" />
     <Compile Include="Apis\[Media]\Download\IMediaDownloader.cs" />
@@ -130,9 +135,14 @@
       <HintPath>..\..\packages\Zlib.Portable.1.9.2\lib\portable-net4+sl4+wp71+win8\Zlib.Portable.dll</HintPath>
     </Reference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.8\tools\Microsoft.Bcl.Build.targets" />
+  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
Index: Src/GoogleApis/Properties/AssemblyInfo.cs
===================================================================
--- a/Src/GoogleApis/Properties/AssemblyInfo.cs
+++ b/Src/GoogleApis/Properties/AssemblyInfo.cs
@@ -20,7 +20,7 @@
 // Information about this assembly is defined by the following attributes. 
 // Change them to the values specific to your project.
 
-[assembly: AssemblyTitle("GoogleApis")]
+[assembly: AssemblyTitle("Google.Apis")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Google Inc")]
Index: Src/GoogleApis/packages.config
===================================================================
--- a/Src/GoogleApis/packages.config
+++ b/Src/GoogleApis/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Microsoft.Bcl" version="1.0.19" targetFramework="portable-win+net40+sl40+wp71" />
   <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="portable-win+net40+sl40+wp71" />
-  <package id="Microsoft.Bcl.Build" version="1.0.8" targetFramework="portable-win+net40+sl40+wp71" />
+  <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="portable-win+net40+sl40+wp71" />
   <package id="Microsoft.Net.Http" version="2.1.10" targetFramework="portable-win+net40+sl40+wp71" />
   <package id="Newtonsoft.Json" version="5.0.5" targetFramework="portable-win+net40+sl40+wp71" />
   <package id="Zlib.Portable" version="1.9.2" targetFramework="portable-win+net40+sl40+wp71" />
Index: packages/Microsoft.Bcl.Build.1.0.8/tools/Microsoft.Bcl.Build.targets
===================================================================
deleted file mode 100644
--- a/packages/Microsoft.Bcl.Build.1.0.8/tools/Microsoft.Bcl.Build.targets
+++ /dev/null
@@ -1,227 +0,0 @@
-<!--
-***********************************************************************************************
-Microsoft.Bcl.targets
-
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
-          created a backup copy.  Incorrect changes to this file will make it
-          impossible to load or build your projects from the command-line or the IDE.
-
-Copyright (C) Microsoft Corporation. All rights reserved.
-***********************************************************************************************
--->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' != 'Silverlight'">
-    <!-- 
-      Workaround MSBuild issue that prevents System.Runtime 2.5 and System.Threading.Tasks 2.5 from
-      satisfying indirect dependencies on System.Runtime 1.5 and System.Threading.Tasks 1.5 respectively.  
-    -->
-    <AutoUnifyAssemblyReferences>false</AutoUnifyAssemblyReferences>
-
-    <!-- MSBuild by default doesn't pass the Web.Config ResolveAssemblyReference, in which case, set it so that it sees binding redirects -->
-    <AppConfig Condition="'$(AppConfig)' == '' And '$(WebProjectOutputDir)' != '' And Exists('$(ProjectConfigFileName)')">$(ProjectConfigFileName)</AppConfig>
-  </PropertyGroup>
-
-  <!-- Workaround issue that incorrectly unifies references not in the current profile to the version in the superset of all profiles. -->
-  <Target Name="_BclBuildSetFullFrameworkFolderToProfile" AfterTargets="GetReferenceAssemblyPaths" Condition="'$(TargetFrameworkIdentifier)' == '.NETPortable'">
-    <PropertyGroup>
-      <_FullFrameworkReferenceAssemblyPaths>$(TargetFrameworkDirectory)</_FullFrameworkReferenceAssemblyPaths>
-    </PropertyGroup>
-  </Target>
-
-  <!--
-    *******************************************************************************************************************
-    *******************************************************************************************************************
-                                                                                         EnsureBindingRedirects Section
-    *******************************************************************************************************************
-    *******************************************************************************************************************
-    -->
-  <PropertyGroup>
-    <__IntermediateAppConfig>$(IntermediateOutputPath)$(MSBuildProjectFile).App.config</__IntermediateAppConfig>
-  </PropertyGroup>
-
-  <UsingTask TaskName="EnsureBindingRedirects" AssemblyFile="$(MSBuildThisFileDirectory)Microsoft.Bcl.Build.Tasks.dll" />
-
-  <!-- 
-    ===================================================================================================================
-                                                                                  BclBuildDetermineReferencesToRedirect
-                              
-    Determine which references are opted in for binding redirects
-    ===================================================================================================================
-    -->
-  <Target Name="BclBuildDetermineReferencesToRedirect" BeforeTargets="BclBuildEnsureBindingRedirects">
-    <!-- Convention is a file next to the reference with name "ensureRedirect.xml" -->
-    <ItemGroup>
-      <_EnsureBindingRedirectReference Include="@(Reference)"
-                                       Condition="'%(Reference.HintPath)' != '' and Exists('$([System.IO.Path]::GetDirectoryName(&quot;%(Reference.HintPath)&quot;))\\ensureRedirect.xml')" />
-    </ItemGroup>
-  </Target>
-
-  <!-- 
-    ===================================================================================================================
-                                                                                         BclBuildEnsureBindingRedirects
-                              
-    Generate a new app.config with merged binding redirects if we have binding redirects to ensure and it's out of date
-    ===================================================================================================================
-    -->
-  <Target Name="BclBuildEnsureBindingRedirects"
-          DependsOnTargets="BclBuildDetermineReferencesToRedirect"
-          BeforeTargets="ResolveAssemblyReferences"
-          Condition="'@(_EnsureBindingRedirectReference)' != ''"
-          Inputs="$(MSBuildAllProjects);$(AppConfig);@(_EnsureBindingRedirectReference->'%(HintPath)')"
-          Outputs="$(__IntermediateAppConfig)">
-
-    <EnsureBindingRedirects References="@(_EnsureBindingRedirectReference->'%(HintPath)')"
-                            SourceAppConfigPath="$(AppConfig)"
-                            DestinationAppConfigPath="$(__IntermediateAppConfig)">
-      <Output TaskParameter="DestinationAppConfigPath" ItemName="FileWrites"/>
-    </EnsureBindingRedirects>
-  </Target>
-
-  <!-- 
-    ===================================================================================================================
-                                                                                  BclBuildUpdateAppConfigWithTargetPath
-                              
-    Update project properties to point to the generated app.config
-    ===================================================================================================================
-    -->
-  <Target Name="BclBuildUpdateAppConfigWithTargetPath"
-          DependsOnTargets="BclBuildDetermineReferencesToRedirect;BclBuildEnsureBindingRedirects"
-          BeforeTargets="ResolveAssemblyReferences"
-          Condition="'@(_EnsureBindingRedirectReference)' != ''">
-    <PropertyGroup>
-      <AppConfig>$(__IntermediateAppConfig)</AppConfig>
-    </PropertyGroup>
-    <ItemGroup>
-      <AppConfigWithTargetPath Remove="@(AppConfigWithTargetPath)" />
-      <AppConfigWithTargetPath Include="$(AppConfig)">
-        <TargetPath>$(TargetFileName).config</TargetPath>
-      </AppConfigWithTargetPath>
-    </ItemGroup>
-  </Target>
-
-
-  <!--
-    *******************************************************************************************************************
-    *******************************************************************************************************************
-                                                                                      ValidatePackageReferences Section
-    
-    This group of targets enables validation of nuget package references when building inside VisualStudio.
-    *******************************************************************************************************************
-    *******************************************************************************************************************
-    -->
-
-  <!-- 
-    ===================================================================================================================
-                                                                                  BclBuildAddProjectReferenceProperties
-                              
-    Adds properties to be set when resolving project references.  The properties ensure that the references get built
-    in the context of the referencer (by changing the set of properties used to build the project) and pass down the
-    context needed to validate the referencing project.
-    ===================================================================================================================
-    -->
-  <Target Name="BclBuildAddProjectReferenceProperties"
-          BeforeTargets="AssignProjectConfiguration"
-          Condition="'$(BuildingInsideVisualStudio)' == 'true'">
-    <PropertyGroup>
-      <_BclBuildProjectReferenceProperties>BclBuildReferencingProject=$(MSBuildProjectFullPath);BclBuildReferencingProjectConfig=$(MSBuildProjectDirectory)\packages.config</_BclBuildProjectReferenceProperties>
-      <_BclBuildProjectReferenceProperties Condition="'$(SkipValidatePackageReferences)' != ''">$(_BclBuildProjectReferenceProperties);SkipValidatePackageReferences=$(SkipValidatePackageReferences)</_BclBuildProjectReferenceProperties>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference>
-        <AdditionalProperties>$(_BclBuildProjectReferenceProperties);%(ProjectReference.AdditionalProperties)</AdditionalProperties>
-      </ProjectReference>
-    </ItemGroup>
-  </Target>
-
-  <!-- 
-    ===================================================================================================================
-                                                                                            BclBuildSetRunningFullBuild
-                              
-    Determines when a full build is running as opposed to a single target.
-    ===================================================================================================================
-    -->
-  <Target Name="BclBuildSetRunningFullBuild"
-          BeforeTargets="BuildOnlySettings">
-    <PropertyGroup>
-      <BclBuildRunningFullBuild>true</BclBuildRunningFullBuild>
-    </PropertyGroup>
-  </Target>
-
-  <!-- 
-    ===================================================================================================================
-                                                                                    GetTargetPath/BclBuildGetTargetPath
-                              
-    MSBuild will only build a target once for a given set of properties.
-    
-    We need that single build of GetTargetPath to run during project reference resolution, so that we can detect a 
-    referencing project that doesn't have Bcl.Build.
-    
-    To accomplish this we replace GetTargetPath with BclBuildGetTargetPath when running a full build.
-    ===================================================================================================================
-    -->
-  <Target
-      Name="GetTargetPath"
-      Condition="'$(BclBuildRunningFullBuild)' != 'true'"
-      DependsOnTargets="$(GetTargetPathDependsOn)"
-      Returns="$(TargetPath)"/>
-
-  <Target
-      Name="BclBuildGetTargetPath"
-      Condition="'$(BclBuildRunningFullBuild)' == 'true'"
-      AfterTargets="GetTargetPath"
-      Returns="$(TargetPath)">
-    <PropertyGroup>
-      <!-- Reset BclBuildRunningFullBuild, it will be set again when doing a full build. -->
-      <BclBuildRunningFullBuild>false</BclBuildRunningFullBuild>
-    </PropertyGroup>
-  </Target>
-
-  <!-- 
-    ===================================================================================================================
-                                                                                 BclBuildValidateNugetPackageReferences
-                              
-    This target validates that any Nuget packages installed in the current project are also installed in projects 
-    referencing the current project.
-    
-    This is necessary because Nuget packages contain more than just simple references.  Installing the package ensures
-        1. The right set of references for the target framework are added
-        2. Config file transforms are applied
-        3. Project installation scripts are run
-       
-    For all packages listed as installed for the current project in packages config, if the package ID matches one
-    specified in @(ValidatePackages), ensure that the same package is installed in the referencing project. 
-    
-    This target can be disabled for a project reference by setting SkipValidatePackageReferences=true for the reference:
-    <ProjectReference Include="..\pcl\pcl.csproj">
-      <Project>{664a9e98-fac7-4567-a046-0dde95fddb48}</Project>
-      <Name>pcl</Name>
-      <Properties>SkipValidatePackageReferences=true</Properties>
-    </ProjectReference>
-    
-    This target can be disabled for all references to a project by adding the following:
-    <PropertyGroup>
-      <SkipValidatePackageReferences>true</SkipValidatePackageReferences>
-    </PropertyGroup>
-    ===================================================================================================================
-    -->
-  <UsingTask TaskName="ValidatePackageReferences" AssemblyFile="$(MSBuildThisFileDirectory)Microsoft.Bcl.Build.Tasks.dll" />
-  <Target Name="BclBuildValidateNugetPackageReferences"
-          Condition="'$(BclBuildRunningFullBuild)' != 'true' AND '$(SkipValidatePackageReferences)' != 'true' AND '$(BuildingInsideVisualStudio)' == 'true'"
-          BeforeTargets="GetTargetPath">
-    <ItemGroup>
-      <ValidatePackages Include="Microsoft.Bcl"/>
-      <ValidatePackages Include="Microsoft.Bcl.Async"/>
-      <ValidatePackages Include="Microsoft.Bcl.Compression"/>
-      <ValidatePackages Include="Microsoft.Net.Http"/>
-    </ItemGroup>
-
-    <ValidatePackageReferences Packages="@(ValidatePackages)"
-                               ReferencingProject="$(BclBuildReferencingProject)"
-                               ReferencingProjectPackagesConfig="$(BclBuildReferencingProjectConfig)"
-                               ReferencedProject="$(MSBuildProjectFullPath)"
-                               ReferencedProjectPackagesConfig="$(MSBuildProjectDirectory)\packages.config"
-                               TreatWarningsAsErrors="$(TreatWarningsAsErrors)" />
-  </Target>
-</Project>
\ No newline at end of file