diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index b5ffa0a..42b21ad 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,3 +1,19 @@
+### New in 1.0.0 (Release 2015/07/03)
+* New: `EndpointVerificationStrategy.ClusterMembers` - Similar verification as `EndpointVerificationStrategy.Any` but also adds verified cluster members to the `EndpointPool`.
+* New: `IEtcdClient.Statistics`
+	* `GetLeaderStatistics` - Retrieve the statistical information for leader of the etcd cluster
+	* `GetServerStatistics` - Retrieve the statistical information for the server (Which server depends on how the `EndpointPool` was built)
+	* `GetStoreStatistics` - Retrieve the etcd backing store statistics (For which server depends on how the `EndpointPool` was built)
+* Breaking Change: `IEtcdClient.Enqueue` has been moved to `IEtcdClient.Atomic.Enqueue`
+* Breaking Change: `IKeyDataValueConverter` overhaul
+	* `object ReadString(string value)` has been refactored into `T Read<T>(string value)`
+	* `string WriteString(object value)` has been refactored into `string Write<T>(T value)`
+* Change: The following have been annotated with `[Serializable]`
+	* `Endpoint`
+	* `EndpointPool`
+	* `EndpointRoutingStrategy`
+	* `EndpointVerificationStrategy`
+
 ### New in 0.2.1 (Released 2015/05/07)
 * Fixed: `NullReferenceException` thrown when a `WebException` occurs due to a client connection problem.
 
diff --git a/meta/Draft.nuspec b/meta/Draft.nuspec
index fad1d50..c9dcefc 100644
--- a/meta/Draft.nuspec
+++ b/meta/Draft.nuspec
@@ -14,8 +14,8 @@
         <copyright>Copyright 2015 Jordan S. Jones</copyright>
         <dependencies>
             <group targetFramework="net45">
-                <dependency id="Flurl" version="1.0.6" />
-                <dependency id="Flurl.Http" version="0.5.0" />
+                <dependency id="Flurl" version="1.0.8" />
+                <dependency id="Flurl.Http" version="0.6.2" />
                 <dependency id="Newtonsoft.Json" version="6.0.8" />
                 <dependency id="Rx-Core" version="2.2.5" />
                 <dependency id="Rx-Interfaces" version="2.2.5" />
diff --git a/source/Draft/Constants.Etcd.cs b/source/Draft/Constants.Etcd.cs
index 77bd42d..1d85987 100644
--- a/source/Draft/Constants.Etcd.cs
+++ b/source/Draft/Constants.Etcd.cs
@@ -60,6 +60,12 @@ internal static partial class Etcd
 
             public const string Path_Stats = "/v2/stats";
 
+            public const string Path_Stats_Leader = Path_Stats + "/leader";
+
+            public const string Path_Stats_Self = Path_Stats + "/self";
+
+            public const string Path_Stats_Store = Path_Stats + "/store";
+
             public const string Path_Version = "/version";
 
         }
diff --git a/source/Draft/Converters.cs b/source/Draft/Converters.cs
index c8a9043..7ea0e21 100644
--- a/source/Draft/Converters.cs
+++ b/source/Draft/Converters.cs
@@ -12,24 +12,25 @@ namespace Draft
     public static class Converters
     {
 
+        private static IKeyDataValueConverter _default;
+
         internal static readonly JsonValueConverter JsonConverter = new JsonValueConverter();
 
         internal static readonly StringValueConverter StringConverter = new StringValueConverter();
 
-        static Converters()
-        {
-            Default = Json;
-        }
-
         /// <summary>
         ///     The default converter.
         /// </summary>
-        public static IKeyDataValueConverter Default { get; internal set; }
+        public static IKeyDataValueConverter Default
+        {
+            get { return _default ?? Json; }
+            internal set { _default = value; }
+        }
 
         /// <summary>
         ///     Json based converter.
         /// </summary>
-        public static IJsonKeyDataValueConverter Json
+        public static IKeyDataValueConverter Json
         {
             get { return JsonConverter; }
         }
diff --git a/source/Draft/Draft-Net45.csproj b/source/Draft/Draft-Net45.csproj
index f0e4b6f..400290d 100644
--- a/source/Draft/Draft-Net45.csproj
+++ b/source/Draft/Draft-Net45.csproj
@@ -34,17 +34,17 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Flurl, Version=1.0.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Flurl.1.0.7\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll</HintPath>
+    <Reference Include="Flurl, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Flurl.1.0.8\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Flurl.Http, Version=0.6.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Flurl.Http.0.6.0\lib\net45\Flurl.Http.dll</HintPath>
+    <Reference Include="Flurl.Http, Version=0.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Flurl.Http.0.6.2\lib\net45\Flurl.Http.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -78,6 +78,8 @@
     <Compile Include="Endpoints\VerificationStrategy.None.cs" />
     <Compile Include="Endpoints\VerificationStrategy.All.cs" />
     <Compile Include="Endpoints\VerificationStrategy.Any.cs" />
+    <Compile Include="Endpoints\VerificationStrategy.ClusterMembers.cs" />
+    <Compile Include="Exceptions\BadRequestException.cs" />
     <Compile Include="Exceptions\ClientInternalException.cs" />
     <Compile Include="Exceptions\DirectoryNotEmptyException.cs" />
     <Compile Include="Exceptions\EtcdException.cs" />
@@ -106,6 +108,7 @@
     <Compile Include="Exceptions\PreviousValueRequiredException.cs" />
     <Compile Include="Exceptions\RaftInternalException.cs" />
     <Compile Include="Exceptions\RootIsReadOnlyException.cs" />
+    <Compile Include="Exceptions\ServiceUnavailableException.cs" />
     <Compile Include="Exceptions\StandbyInternalException.cs" />
     <Compile Include="Exceptions\TestFailedException.cs" />
     <Compile Include="Exceptions\TimeoutNotANumberException.cs" />
@@ -121,6 +124,7 @@
     <Compile Include="Helpers\FormBodyBuilder.cs" />
     <Compile Include="Helpers\IRandom.cs" />
     <Compile Include="Helpers\StaticRandom.cs" />
+    <Compile Include="Helpers\NormalizedPathSegment.cs" />
     <Compile Include="Json\EtcdErrorCodeConverter.cs" />
     <Compile Include="Requests\Cluster\CreateMemberRequest.cs" />
     <Compile Include="Requests\Cluster\DeleteMemberRequest.cs" />
@@ -134,6 +138,12 @@
     <Compile Include="Requests\Cluster\UpdateMemberPeerUrlsRequest.cs" />
     <Compile Include="Requests\GetVersionRequest.cs" />
     <Compile Include="Requests\IGetVersionRequest.cs" />
+    <Compile Include="Requests\Statistics\GetLeaderStatisticsRequest.cs" />
+    <Compile Include="Requests\Statistics\GetSelfStatisticsRequest.cs" />
+    <Compile Include="Requests\Statistics\GetStoreStatisticsRequest.cs" />
+    <Compile Include="Requests\Statistics\IGetLeaderStatisticsRequest.cs" />
+    <Compile Include="Requests\Statistics\IGetServerStatisticsRequest.cs" />
+    <Compile Include="Requests\Statistics\IGetStoreStatisticsRequest.cs" />
     <Compile Include="Responses\Cluster\ClusterMember.cs" />
     <Compile Include="Responses\Cluster\ClusterMemberCollection.cs" />
     <Compile Include="Responses\Cluster\IClusterMember.cs" />
@@ -143,6 +153,13 @@
     <Compile Include="Responses\IEtcdVersion.cs" />
     <Compile Include="Responses\IHaveAValueConverter.cs" />
     <Compile Include="Responses\IHaveResponseHeaders.cs" />
+    <Compile Include="Responses\Statistics\IFollowerCounts.cs" />
+    <Compile Include="Responses\Statistics\IFollowerLatency.cs" />
+    <Compile Include="Responses\Statistics\IFollowerStatistics.cs" />
+    <Compile Include="Responses\Statistics\ILeaderInfo.cs" />
+    <Compile Include="Responses\Statistics\ILeaderStatistics.cs" />
+    <Compile Include="Responses\Statistics\IServerStatistics.cs" />
+    <Compile Include="Responses\Statistics\IStoreStatistics.cs" />
     <Compile Include="ValueConverters\JsonValueConverter.cs" />
     <Compile Include="ValueConverters\StringValueConverter.cs" />
     <Compile Include="Etcd.cs" />
@@ -197,9 +214,7 @@
     <Compile Include="Constants.ErrorCode.cs" />
     <None Include="packages.Draft-Net45.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Requests\Statistics\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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.
diff --git a/source/Draft/Endpoints/Endpoint.cs b/source/Draft/Endpoints/Endpoint.cs
index 109e6f6..0a8ea47 100644
--- a/source/Draft/Endpoints/Endpoint.cs
+++ b/source/Draft/Endpoints/Endpoint.cs
@@ -1,14 +1,23 @@
 using System;
 using System.Linq;
+using System.Runtime.Serialization;
 
 namespace Draft.Endpoints
 {
     /// <summary>
     ///     Represents a verified etcd endpoint.
     /// </summary>
+    [Serializable, DataContract]
     public sealed class Endpoint : IEquatable<Endpoint>
     {
 
+        /// <summary>
+        ///     Initializes a new <see cref="Endpoint" /> class with default values for <see cref="Availability" /> and
+        ///     <see cref="Uri" />.
+        /// </summary>
+        public Endpoint()
+            : this(default(Uri), default(EndpointAvailability)) {}
+
         /// <summary>
         ///     Initializes a new <see cref="Endpoint" /> class with the specified <paramref name="availability" /> and
         ///     <paramref name="uri" />.
@@ -24,11 +33,13 @@ public Endpoint(Uri uri, EndpointAvailability availability)
         /// <summary>
         ///     <see cref="EndpointAvailability" /> value of this etcd endpoint.
         /// </summary>
+        [DataMember(Order = 1)]
         public EndpointAvailability Availability { get; private set; }
 
         /// <summary>
         ///     Is <c>true</c> when <see cref="Availability" /><c> == </c><see cref="EndpointAvailability.Online" />.
         /// </summary>
+        [IgnoreDataMember]
         public bool IsOnline
         {
             get { return Availability == EndpointAvailability.Online; }
@@ -37,8 +48,29 @@ public bool IsOnline
         /// <summary>
         ///     <see cref="Uri" /> value of this etcd endpoint.
         /// </summary>
+        [DataMember(Order = 2)]
         public Uri Uri { get; private set; }
 
+        /// <summary>
+        ///     Creates a new <see cref="Endpoint" /> instance with the specified <paramref name="availability" /> value.
+        /// </summary>
+        /// <returns>A new <see cref="Endpoint" /> instance with the specified <paramref name="availability" /> value.</returns>
+        public Endpoint WithEndpointAvailability(EndpointAvailability availability)
+        {
+            return new Endpoint(Uri, availability);
+        }
+
+        /// <summary>
+        ///     Creates a new <see cref="Endpoint" /> instance with the specified <paramref name="uri" /> value.
+        /// </summary>
+        /// <returns>A new <see cref="Endpoint" /> instance with the specified <paramref name="uri" /> value.</returns>
+        public Endpoint WithUri(Uri uri)
+        {
+            return new Endpoint(uri, Availability);
+        }
+
+        #region Equality
+
         /// <summary>
         ///     Determines whether the specified <see cref="Endpoint" /> is equal to the current <see cref="Endpoint" />.
         /// </summary>
@@ -46,7 +78,7 @@ public bool Equals(Endpoint other)
         {
             if (ReferenceEquals(null, other)) { return false; }
             if (ReferenceEquals(this, other)) { return true; }
-            return Availability == other.Availability && Equals(Uri, other.Uri);
+            return Equals(Uri, other.Uri);
         }
 
         /// <summary>
@@ -64,7 +96,7 @@ public override bool Equals(object obj)
         /// </summary>
         public override int GetHashCode()
         {
-            unchecked { return ((int) Availability * 397) ^ (Uri != null ? Uri.GetHashCode() : 0); }
+            unchecked { return (Uri != null ? Uri.GetHashCode() : 0); }
         }
 
         /// <summary>
@@ -83,5 +115,6 @@ public override int GetHashCode()
             return !Equals(left, right);
         }
 
+        #endregion
     }
 }
diff --git a/source/Draft/Endpoints/EndpointPool.cs b/source/Draft/Endpoints/EndpointPool.cs
index 3d88173..99fd4b5 100644
--- a/source/Draft/Endpoints/EndpointPool.cs
+++ b/source/Draft/Endpoints/EndpointPool.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 
 using Flurl;
 
@@ -9,6 +10,7 @@ namespace Draft.Endpoints
     /// <summary>
     ///     Pool of Etcd Endpoints
     /// </summary>
+    [Serializable, DataContract]
     public sealed partial class EndpointPool
     {
 
@@ -18,23 +20,22 @@ internal EndpointPool(IEnumerable<Endpoint> endpoints, EndpointRoutingStrategy r
             RoutingStrategy = routingStrategy;
         }
 
+        [DataMember(Order = 1)]
         internal List<Endpoint> AllEndpoints { get; private set; }
 
+        [IgnoreDataMember]
         internal Endpoint[] OnlineEndpoints
         {
             get { return AllEndpoints.Where(x => x.IsOnline).ToArray(); }
         }
 
+        [DataMember(Order = 2)]
         internal EndpointRoutingStrategy RoutingStrategy { get; private set; }
 
         internal Url GetEndpointUrl(params string[] pathParts)
         {
-            pathParts = pathParts ?? new string[0];
-
-            var keyPath = string.Join("/", pathParts.Select(x => x.TrimStart('/').TrimEnd('/')));
-
-            return RoutingStrategy.Select(keyPath, OnlineEndpoints).Uri.ToUrl()
-                                  .AppendPathSegment(keyPath);
+            var pathSegment = new NormalizedPathSegment(pathParts);
+            return pathSegment.ToUrl(RoutingStrategy.Select(pathSegment.Value, OnlineEndpoints).Uri);
         }
 
     }
diff --git a/source/Draft/Endpoints/EndpointRoutingStrategy.cs b/source/Draft/Endpoints/EndpointRoutingStrategy.cs
index bee018a..63e8dbc 100644
--- a/source/Draft/Endpoints/EndpointRoutingStrategy.cs
+++ b/source/Draft/Endpoints/EndpointRoutingStrategy.cs
@@ -1,14 +1,17 @@
 using System;
 using System.Linq;
+using System.Runtime.Serialization;
 
 namespace Draft.Endpoints
 {
     /// <summary>
     ///     Represents a strategy for selecting which etcd endpoint to use for http calls.
     /// </summary>
+    [Serializable, DataContract]
     public abstract class EndpointRoutingStrategy
     {
 
+        [IgnoreDataMember]
         internal static EndpointRoutingStrategy Default
         {
             get { return First; }
@@ -24,15 +27,19 @@ internal static EndpointRoutingStrategy Default
 
         #region Built-in strategies
 
+        [IgnoreDataMember]
         private static readonly Lazy<EndpointRoutingStrategy> LazyFirst = new Lazy<EndpointRoutingStrategy>(() => new RoutingStrategyFirst());
 
+        [IgnoreDataMember]
         private static readonly Lazy<EndpointRoutingStrategy> LazyRandom = new Lazy<EndpointRoutingStrategy>(() => new RoutingStrategyRandom());
 
+        [IgnoreDataMember]
         private static readonly Lazy<EndpointRoutingStrategy> LazyRoundRobin = new Lazy<EndpointRoutingStrategy>(() => new RoutingStrategyRoundRobin());
 
         /// <summary>
         ///     Uses the first <see cref="Endpoint" />.
         /// </summary>
+        [IgnoreDataMember]
         public static EndpointRoutingStrategy First
         {
             get { return LazyFirst.Value; }
@@ -41,6 +48,7 @@ public static EndpointRoutingStrategy First
         /// <summary>
         ///     Uses a randomly selected <see cref="Endpoint" />.
         /// </summary>
+        [IgnoreDataMember]
         public static EndpointRoutingStrategy Random
         {
             get { return LazyRandom.Value; }
@@ -49,6 +57,7 @@ public static EndpointRoutingStrategy Random
         /// <summary>
         ///     Uses a round-robin patter for selecting the <see cref="Endpoint" />.
         /// </summary>
+        [IgnoreDataMember]
         public static EndpointRoutingStrategy RoundRobin
         {
             get { return LazyRoundRobin.Value; }
diff --git a/source/Draft/Endpoints/EndpointVerificationStrategy.cs b/source/Draft/Endpoints/EndpointVerificationStrategy.cs
index 5067135..2d47db1 100644
--- a/source/Draft/Endpoints/EndpointVerificationStrategy.cs
+++ b/source/Draft/Endpoints/EndpointVerificationStrategy.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Threading.Tasks;
 
 using Draft.Exceptions;
@@ -10,9 +11,11 @@ namespace Draft.Endpoints
     /// <summary>
     ///     Represents a strategy for verifying etcd enpoint availability.
     /// </summary>
+    [Serializable, DataContract]
     public abstract class EndpointVerificationStrategy
     {
 
+        [IgnoreDataMember]
         internal static EndpointVerificationStrategy Default
         {
             get { return None; }
@@ -27,15 +30,22 @@ internal static EndpointVerificationStrategy Default
 
         #region Built-in strategies
 
+        [IgnoreDataMember]
         private static readonly Lazy<EndpointVerificationStrategy> LazyAll = new Lazy<EndpointVerificationStrategy>(() => new VerificationStrategyAll());
 
+        [IgnoreDataMember]
         private static readonly Lazy<EndpointVerificationStrategy> LazyAny = new Lazy<EndpointVerificationStrategy>(() => new VerificationStrategyAny());
 
+        [IgnoreDataMember]
+        private static readonly Lazy<EndpointVerificationStrategy> LazyClusterMembers = new Lazy<EndpointVerificationStrategy>(() => new VerificationStrategyClusterMembers());
+
+        [IgnoreDataMember]
         private static readonly Lazy<EndpointVerificationStrategy> LazyNone = new Lazy<EndpointVerificationStrategy>(() => new VerificationStrategyNone());
 
         /// <summary>
         ///     Verify all supplied endpoints are responding.
         /// </summary>
+        [IgnoreDataMember]
         public static EndpointVerificationStrategy All
         {
             get { return LazyAll.Value; }
@@ -44,14 +54,25 @@ public static EndpointVerificationStrategy All
         /// <summary>
         ///     Verify any supplied endpoints are responding.
         /// </summary>
+        [IgnoreDataMember]
         public static EndpointVerificationStrategy Any
         {
             get { return LazyAny.Value; }
         }
 
+        /// <summary>
+        ///     Similar verification as <see cref="Any" /> but also adds verified cluster members to the <see cref="EndpointPool" />.
+        /// </summary>
+        [IgnoreDataMember]
+        public static EndpointVerificationStrategy ClusterMembers
+        {
+            get { return LazyClusterMembers.Value; }
+        }
+
         /// <summary>
         ///     Doesn't do any endpoint verification.
         /// </summary>
+        [IgnoreDataMember]
         public static EndpointVerificationStrategy None
         {
             get { return LazyNone.Value; }
diff --git a/source/Draft/Endpoints/RoutingStrategy.First.cs b/source/Draft/Endpoints/RoutingStrategy.First.cs
index 9d71545..dce91ba 100644
--- a/source/Draft/Endpoints/RoutingStrategy.First.cs
+++ b/source/Draft/Endpoints/RoutingStrategy.First.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Linq;
+using System.Runtime.Serialization;
 
 namespace Draft.Endpoints
 {
+    [Serializable, DataContract]
     internal sealed class RoutingStrategyFirst : EndpointRoutingStrategy
     {
 
diff --git a/source/Draft/Endpoints/RoutingStrategy.Random.cs b/source/Draft/Endpoints/RoutingStrategy.Random.cs
index d413c21..0ec5234 100644
--- a/source/Draft/Endpoints/RoutingStrategy.Random.cs
+++ b/source/Draft/Endpoints/RoutingStrategy.Random.cs
@@ -1,12 +1,15 @@
 using System;
 using System.Linq;
+using System.Runtime.Serialization;
 
 namespace Draft.Endpoints
 {
+    [Serializable, DataContract]
     internal sealed class RoutingStrategyRandom : EndpointRoutingStrategy
     {
 
-        private readonly IRandom _random;
+        [NonSerialized, IgnoreDataMember]
+        private IRandom _random;
 
         public RoutingStrategyRandom() : this(StaticRandom.Instance) {}
 
@@ -15,6 +18,12 @@ public RoutingStrategyRandom(IRandom random)
             _random = random ?? StaticRandom.Instance;
         }
 
+        [OnDeserialized]
+        private void OnDeserialized(StreamingContext ignored)
+        {
+            _random = _random ?? StaticRandom.Instance;
+        }
+
         public override Endpoint Select(string key, Endpoint[] endpoints)
         {
             var ecount = endpoints.Length;
diff --git a/source/Draft/Endpoints/RoutingStrategy.RoundRobin.cs b/source/Draft/Endpoints/RoutingStrategy.RoundRobin.cs
index 02a4e5b..be59971 100644
--- a/source/Draft/Endpoints/RoutingStrategy.RoundRobin.cs
+++ b/source/Draft/Endpoints/RoutingStrategy.RoundRobin.cs
@@ -1,12 +1,15 @@
 using System;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Threading;
 
 namespace Draft.Endpoints
 {
+    [Serializable, DataContract]
     internal sealed class RoutingStrategyRoundRobin : EndpointRoutingStrategy
     {
 
+        [DataMember(Order = 1)]
         private int _next = -1;
 
         public override Endpoint Select(string key, Endpoint[] endpoints)
diff --git a/source/Draft/Endpoints/VerificationStrategy.All.cs b/source/Draft/Endpoints/VerificationStrategy.All.cs
index 09514d7..4204500 100644
--- a/source/Draft/Endpoints/VerificationStrategy.All.cs
+++ b/source/Draft/Endpoints/VerificationStrategy.All.cs
@@ -1,12 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Threading.Tasks;
 
 using Draft.Exceptions;
 
 namespace Draft.Endpoints
 {
+    [Serializable, DataContract]
     internal sealed class VerificationStrategyAll : EndpointVerificationStrategy
     {
 
diff --git a/source/Draft/Endpoints/VerificationStrategy.Any.cs b/source/Draft/Endpoints/VerificationStrategy.Any.cs
index 8defafc..536cdcc 100644
--- a/source/Draft/Endpoints/VerificationStrategy.Any.cs
+++ b/source/Draft/Endpoints/VerificationStrategy.Any.cs
@@ -1,12 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Threading.Tasks;
 
 using Draft.Exceptions;
 
 namespace Draft.Endpoints
 {
+    [Serializable, DataContract]
     internal sealed class VerificationStrategyAny : EndpointVerificationStrategy
     {
 
diff --git a/source/Draft/Endpoints/VerificationStrategy.ClusterMembers.cs b/source/Draft/Endpoints/VerificationStrategy.ClusterMembers.cs
new file mode 100644
index 0000000..05772ed
--- /dev/null
+++ b/source/Draft/Endpoints/VerificationStrategy.ClusterMembers.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Threading.Tasks;
+
+using Draft.Exceptions;
+
+namespace Draft.Endpoints
+{
+    [Serializable, DataContract]
+    internal sealed class VerificationStrategyClusterMembers : EndpointVerificationStrategy
+    {
+
+        private async Task<List<Endpoint>> DoVerify(IEnumerable<Uri> uris)
+        {
+            return (await uris.ParallelValidateEndpoints()).ToList();
+        }
+
+        public override async Task<IEnumerable<Endpoint>> Verify(IEnumerable<Uri> endpointUris)
+        {
+            var uris = (endpointUris ?? Enumerable.Empty<Uri>()).ToList();
+            var endpoints = await DoVerify(uris);
+
+            var distinctEndpoints = new HashSet<Endpoint>(endpoints.Where(x => x.IsOnline));
+
+            if (!distinctEndpoints.Any())
+            {
+                throw new InvalidHostException(
+                    string.Format(
+                        "The following endpoints are not responding: {0}",
+                        string.Join(", ", uris.Select(x => x.ToString()))
+                        ));
+            }
+
+            var memberUris = (await distinctEndpoints.Select(x => x.Uri).ParallelLoadClusterMembers()).ToList();
+            var verifiedMemberEndpoints = await DoVerify(memberUris);
+
+            verifiedMemberEndpoints
+                .ForEach(x => distinctEndpoints.Add(x));
+
+            return distinctEndpoints;
+        }
+
+    }
+}
diff --git a/source/Draft/Endpoints/VerificationStrategy.None.cs b/source/Draft/Endpoints/VerificationStrategy.None.cs
index 32e7556..42b167e 100644
--- a/source/Draft/Endpoints/VerificationStrategy.None.cs
+++ b/source/Draft/Endpoints/VerificationStrategy.None.cs
@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Threading.Tasks;
 
 namespace Draft.Endpoints
 {
+    [Serializable, DataContract]
     internal sealed class VerificationStrategyNone : EndpointVerificationStrategy
     {
 
diff --git a/source/Draft/Etcd.cs b/source/Draft/Etcd.cs
index a9ac3a5..55af870 100644
--- a/source/Draft/Etcd.cs
+++ b/source/Draft/Etcd.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Net.Http.Headers;
@@ -11,6 +12,7 @@
 using Flurl.Http;
 
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace Draft
 {
@@ -25,8 +27,17 @@ public static class Etcd
 
         internal static readonly Lazy<ClientConfig> ClientConfig = new Lazy<ClientConfig>(() => new ClientConfig());
 
+        internal static readonly JsonSerializerSettings JsonSettings;
+
         static Etcd()
         {
+
+            JsonSettings = new JsonSerializerSettings();
+            JsonSettings.Converters = JsonSettings.Converters ?? new List<JsonConverter>();
+            JsonSettings.Converters.Add(new EtcdErrorCodeConverter());
+            JsonSettings.Converters.Add(new StringEnumConverter { AllowIntegerValues = true });
+
+
             FlurlHttp.Configure(
                 c =>
                 {
@@ -34,19 +45,14 @@ static Etcd()
                     {
                         if (http.Request.IsJsonContentType())
                         {
-                            // This is going to be replaced because etcd complains if the
+                            // This needs to be explicitly set because etcd complains if the
                             // content-type has a charset value appended
                             http.Request.Content.Headers.ContentType = new MediaTypeWithQualityHeaderValue(Constants.Http.ContentType_ApplicationJson);
                         }
                     };
                 });
 
-            JsonConvert.DefaultSettings = () =>
-            {
-                var settings = new JsonSerializerSettings();
-                settings.Converters.Add(new EtcdErrorCodeConverter());
-                return settings;
-            };
+            JsonConvert.DefaultSettings = () => JsonSettings;
         }
 
         /// <summary>
diff --git a/source/Draft/EtcdClient.cs b/source/Draft/EtcdClient.cs
index 6386dfb..11a77ee 100644
--- a/source/Draft/EtcdClient.cs
+++ b/source/Draft/EtcdClient.cs
@@ -6,10 +6,11 @@
 using Draft.Endpoints;
 using Draft.Requests;
 using Draft.Requests.Cluster;
+using Draft.Requests.Statistics;
 
 namespace Draft
 {
-    internal class EtcdClient : IEtcdClient, IAtomicEtcdClient, IClusterEtcdClient
+    internal class EtcdClient : IEtcdClient, IAtomicEtcdClient, IClusterEtcdClient, IStatisticsEtcdClient
     {
 
         private readonly object _gate = new object();
@@ -27,13 +28,13 @@ public IMutableEtcdClientConfig Config
             get { return _clientConfig; }
         }
 
-        public EndpointPool EndpointPool { get; private set; }
-
         IEtcdClientConfig IEtcdClient.Config
         {
             get { return Config; }
         }
 
+        public EndpointPool EndpointPool { get; private set; }
+
         #region Client Config
 
         public void Configure(Action<IMutableEtcdClientConfig> configAction)
@@ -68,11 +69,6 @@ public IDeleteKeyRequest DeleteKey(string key)
             return new DeleteRequest(this, EndpointPool, false, Constants.Etcd.Path_Keys, key);
         }
 
-        IQueueRequest IEtcdClient.Enqueue(string key)
-        {
-            return Enqueue(key);
-        }
-
         public IGetRequest GetKey(string key)
         {
             return new GetRequest(this, EndpointPool, Constants.Etcd.Path_Keys, key);
@@ -172,5 +168,29 @@ public IUpdateMemberPeerUrlsRequest UpdateMemberPeerUrls()
         }
 
         #endregion
+
+        #region IStatisticsEtcd Client
+
+        public IStatisticsEtcdClient Statistics
+        {
+            get { return this; }
+        }
+
+        public IGetLeaderStatisticsRequest GetLeaderStatistics()
+        {
+            return new GetLeaderStatisticsRequest(this, EndpointPool, Constants.Etcd.Path_Stats_Leader);
+        }
+
+        public IGetServerStatisticsRequest GetServerStatistics()
+        {
+            return new GetSelfStatisticsRequest(this, EndpointPool, Constants.Etcd.Path_Stats_Self);
+        }
+
+        public IGetStoreStatisticsRequest GetStoreStatistics()
+        {
+            return new GetStoreStatisticsRequest(this, EndpointPool, Constants.Etcd.Path_Stats_Store);
+        }
+
+        #endregion
     }
 }
diff --git a/source/Draft/Exceptions/BadRequestException.cs b/source/Draft/Exceptions/BadRequestException.cs
new file mode 100644
index 0000000..b835d06
--- /dev/null
+++ b/source/Draft/Exceptions/BadRequestException.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Linq;
+
+namespace Draft.Exceptions
+{
+    /// <summary>
+    ///     Represents a general problem with the requst to etcd.
+    /// </summary>
+    public class BadRequestException : EtcdException
+    {
+
+        /// <summary>
+        ///     Initializes a new <see cref="BadRequestException" /> instance.
+        /// </summary>
+        public BadRequestException() {}
+
+        /// <summary>
+        ///     Initializes a new <see cref="BadRequestException" /> instance with a specified error message.
+        /// </summary>
+        public BadRequestException(string message) : base(message) {}
+
+        /// <summary>
+        ///     Indicates that this exception is due to a general problem with the request to etcd.
+        /// </summary>
+        public override bool IsBadRequest
+        {
+            get { return true; }
+        }
+
+    }
+}
diff --git a/source/Draft/Exceptions/EtcdException.cs b/source/Draft/Exceptions/EtcdException.cs
index ba4300a..b0f1ece 100644
--- a/source/Draft/Exceptions/EtcdException.cs
+++ b/source/Draft/Exceptions/EtcdException.cs
@@ -35,6 +35,14 @@ protected EtcdException(string message) : base(message) {}
         /// </summary>
         public HttpStatusCode? HttpStatusCode { get; internal set; }
 
+        /// <summary>
+        ///     Indicates that this exception is due to a general problem with the request to etcd.
+        /// </summary>
+        public virtual bool IsBadRequest
+        {
+            get { return false; }
+        }
+
         /// <summary>
         ///     Indicates that this exception is due to an internal client error
         /// </summary>
@@ -236,6 +244,14 @@ public virtual bool IsRootReadOnly
             get { return false; }
         }
 
+        /// <summary>
+        ///     Indicates that this exception is due to an "Service unavailable error".
+        /// </summary>
+        public virtual bool IsServiceUnavailable
+        {
+            get { return false; }
+        }
+
         /// <summary>
         ///     Indicates that this exception is due to an "Internal standby error".
         /// </summary>
diff --git a/source/Draft/Exceptions/ExceptionHandling.cs b/source/Draft/Exceptions/ExceptionHandling.cs
index 759c0bb..a87142d 100644
--- a/source/Draft/Exceptions/ExceptionHandling.cs
+++ b/source/Draft/Exceptions/ExceptionHandling.cs
@@ -39,6 +39,8 @@ public static EtcdException ProcessException(this Exception This)
             if (fhe.IsTimeoutException()) { return fhe.AsTimeoutException(); }
             if (fhe.IsInvalidHostException()) { return fhe.AsInvalidHostException(); }
             if (fhe.IsInvalidRequestException()) { return fhe.AsInvalidRequestException(); }
+            if (fhe.IsBadRequestException()) { return fhe.AsBadRequestException(); }
+            if (fhe.IsServiceUnavailableException()) { return fhe.AsServiceUnavailableException(); }
             if (fhe.IsHttpConnectionException()) { return fhe.AsHttpConnectionException(); }
 
             var etcdError = fhe.GetResponseJson<EtcdError>();
@@ -155,6 +157,22 @@ public static EtcdException ProcessException(this Exception This)
             return exception;
         }
 
+        #region Bad Request Exception
+
+        private static EtcdException AsBadRequestException(this FlurlHttpException This)
+        {
+            return new BadRequestException(This.Message);
+        }
+
+        private static bool IsBadRequestException(this FlurlHttpException This)
+        {
+            return This.Call.HttpStatus.HasValue
+                   && This.Call.HttpStatus.Value == HttpStatusCode.BadRequest
+                   && !This.Call.Response.IsJsonContentType();
+        }
+
+        #endregion
+
         #region Connection Closed Exception
 
         private static EtcdException AsHttpConnectionException(this FlurlHttpException This)
@@ -189,7 +207,7 @@ private static bool IsHttpConnectionException(this FlurlHttpException This)
 
         private static EtcdException AsInvalidHostException(this FlurlHttpException This)
         {
-            return new InvalidHostException();
+            return new InvalidHostException(This.Message);
         }
 
         private static bool IsInvalidHostException(this FlurlHttpException This)
@@ -220,6 +238,22 @@ private static bool IsInvalidRequestException(this FlurlHttpException This)
 
         #endregion
 
+        #region Service Unavailable Exception
+
+        private static EtcdException AsServiceUnavailableException(this FlurlHttpException This)
+        {
+            return new ServiceUnavailableException(This.Message);
+        }
+
+        private static bool IsServiceUnavailableException(this FlurlHttpException This)
+        {
+            return This.Call.HttpStatus.HasValue
+                   && This.Call.HttpStatus.Value == HttpStatusCode.ServiceUnavailable;
+        }
+
+        #endregion
+
+
         #region Timeout Exception
 
         private static EtcdException AsTimeoutException(this FlurlHttpException This)
diff --git a/source/Draft/Exceptions/ServiceUnavailableException.cs b/source/Draft/Exceptions/ServiceUnavailableException.cs
new file mode 100644
index 0000000..6e4546a
--- /dev/null
+++ b/source/Draft/Exceptions/ServiceUnavailableException.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Linq;
+
+namespace Draft.Exceptions
+{
+    /// <summary>
+    ///     Represents a "Service unavailable error".
+    /// </summary>
+    public class ServiceUnavailableException : EtcdException
+    {
+
+        /// <summary>
+        ///     Initializes a new <see cref="ServiceUnavailableException" /> instance.
+        /// </summary>
+        public ServiceUnavailableException() {}
+
+        /// <summary>
+        ///     Initializes a new <see cref="ServiceUnavailableException" /> instance with a specified error message.
+        /// </summary>
+        public ServiceUnavailableException(string message) : base(message) {}
+
+        /// <summary>
+        ///     Indicates that this exception is due to a general problem with the request to etcd.
+        /// </summary>
+        public override bool IsServiceUnavailable
+        {
+            get { return true; }
+        }
+
+    }
+}
diff --git a/source/Draft/Extensions/ValueConverter.RequestExtensions.cs b/source/Draft/Extensions/ValueConverter.RequestExtensions.cs
index 21beea6..ae880d3 100644
--- a/source/Draft/Extensions/ValueConverter.RequestExtensions.cs
+++ b/source/Draft/Extensions/ValueConverter.RequestExtensions.cs
@@ -15,7 +15,7 @@ public static class ValueConversionForRequestExtensions
         private static string Convert<T>(IEtcdClientConfig config, T value, IKeyDataValueConverter valueConverter = null)
         {
             valueConverter = valueConverter ?? (config.ValueConverter ?? Etcd.Configuration.ValueConverter);
-            return valueConverter.WriteString(value);
+            return valueConverter.Write(value);
         }
 
         /// <summary>
diff --git a/source/Draft/Extensions/ValueConverter.ResponseExtensions.cs b/source/Draft/Extensions/ValueConverter.ResponseExtensions.cs
index d65899b..0ec792a 100644
--- a/source/Draft/Extensions/ValueConverter.ResponseExtensions.cs
+++ b/source/Draft/Extensions/ValueConverter.ResponseExtensions.cs
@@ -28,13 +28,7 @@ public static T GetValue<T>(this IKeyData This, IKeyDataValueConverter valueConv
             valueConverter = valueConverter == null && keyData != null ? keyData.ValueConverter() : valueConverter;
 
             valueConverter = valueConverter ?? Etcd.Configuration.ValueConverter;
-            var jsonConverter = valueConverter as IJsonKeyDataValueConverter;
-            if (jsonConverter != null)
-            {
-                return jsonConverter.ReadString<T>(value);
-            }
-
-            return (T) valueConverter.ReadString(value);
+            return valueConverter.Read<T>(value);
         }
 
     }
diff --git a/source/Draft/Extensions/VerificationStrategyExtensions.cs b/source/Draft/Extensions/VerificationStrategyExtensions.cs
index 3eabcf8..fe25ad7 100644
--- a/source/Draft/Extensions/VerificationStrategyExtensions.cs
+++ b/source/Draft/Extensions/VerificationStrategyExtensions.cs
@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 
 using Draft.Endpoints;
+using Draft.Responses.Cluster;
 
 using Flurl.Http;
 
@@ -45,5 +46,30 @@ private static async Task<Endpoint> ValidateEndpoint(Uri endpoint)
             return new Endpoint(endpoint, availablility);
         }
 
+        public static async Task<IEnumerable<Uri>> ParallelLoadClusterMembers(this IEnumerable<Uri> This)
+        {
+            var loadTasks = This.Select(LoadClusterMembers).ToArray();
+
+            await Task.WhenAll(loadTasks);
+
+            return loadTasks.SelectMany(x => x.Result);
+        }
+
+        private static async Task<IEnumerable<Uri>> LoadClusterMembers(Uri endpoint)
+        {
+            try
+            {
+                var collection = await new NormalizedPathSegment(Constants.Etcd.Path_Members)
+                    .ToUrl(endpoint)
+                    .GetAsync()
+                    .ReceiveJson<ClusterMemberCollection>();
+                return collection.Members.SelectMany(x => x.ClientUrls);
+            }
+            catch (FlurlHttpException e)
+            {
+                throw e.ProcessException();
+            }
+        }
+
     }
 }
diff --git a/source/Draft/Helpers/NormalizedPathSegment.cs b/source/Draft/Helpers/NormalizedPathSegment.cs
new file mode 100644
index 0000000..ebaf5fd
--- /dev/null
+++ b/source/Draft/Helpers/NormalizedPathSegment.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Linq;
+
+using Flurl;
+
+namespace Draft
+{
+    internal sealed class NormalizedPathSegment
+    {
+
+        public NormalizedPathSegment(params string[] pathParts)
+        {
+            pathParts = pathParts ?? new string[0];
+
+            Value = string.Join("/", pathParts.Select(x => x.TrimStart('/').TrimEnd('/')));
+        }
+
+        public string Value { get; private set; }
+
+
+        public Url ToUrl(Uri uri)
+        {
+            return uri.ToUrl().AppendPathSegment(Value);
+        }
+    }
+}
diff --git a/source/Draft/IEtcdClient.cs b/source/Draft/IEtcdClient.cs
index 4417f9c..5b66b53 100644
--- a/source/Draft/IEtcdClient.cs
+++ b/source/Draft/IEtcdClient.cs
@@ -2,8 +2,10 @@
 using System.Linq;
 
 using Draft.Configuration;
+using Draft.Endpoints;
 using Draft.Requests;
 using Draft.Requests.Cluster;
+using Draft.Requests.Statistics;
 
 namespace Draft
 {
@@ -19,7 +21,7 @@ public interface IEtcdClient
         IAtomicEtcdClient Atomic { get; }
 
         /// <summary>
-        ///     Returns an etcd cluent for cluster related operations.
+        ///     Returns an etcd client for cluster related operations.
         /// </summary>
         IClusterEtcdClient Cluster { get; }
 
@@ -28,6 +30,11 @@ public interface IEtcdClient
         /// </summary>
         IEtcdClientConfig Config { get; }
 
+        /// <summary>
+        ///     Returns an etcd client for statistics related operations.
+        /// </summary>
+        IStatisticsEtcdClient Statistics { get; }
+
         /// <summary>
         ///     Provides thread-safe access to this instance's configuration options.
         /// </summary>
@@ -48,15 +55,6 @@ public interface IEtcdClient
         /// </summary>
         IDeleteKeyRequest DeleteKey(string key);
 
-        /// <summary>
-        ///     Begins an enqueue key request.
-        /// </summary>
-        /// <remarks>
-        /// <para>This is being moved to live as a member of <see cref="IEtcdClient.Atomic" /> (<see cref="IAtomicEtcdClient.Enqueue" />).</para>
-        /// </remarks>
-        [Obsolete("This is being moved to live under the 'Atomic' member. Soon(TM) this will result in a compile time error.")]
-        IQueueRequest Enqueue(string key);
-
         /// <summary>
         ///     Begins a key retrieval request.
         /// </summary>
@@ -153,4 +151,29 @@ public interface IClusterEtcdClient
         IUpdateMemberPeerUrlsRequest UpdateMemberPeerUrls();
 
     }
+
+    /// <summary>
+    ///     Etcd client for statistics related operations.
+    /// </summary>
+    public interface IStatisticsEtcdClient
+    {
+
+        /// <summary>
+        ///     Begins a request to retrieve the statistical information for the leader in an etcd cluster.
+        /// </summary>
+        IGetLeaderStatisticsRequest GetLeaderStatistics();
+
+        /// <summary>
+        ///     Begins a request to retrieve the statistical information for the server.
+        /// </summary>
+        /// <remarks>Which server depends on how the <see cref="EndpointPool" /> was built.</remarks>
+        IGetServerStatisticsRequest GetServerStatistics();
+
+        /// <summary>
+        ///     Begins a request to retrieve the etcd backing store statistics.
+        /// </summary>
+        /// <remarks>For which server depends on how the <see cref="EndpointPool" /> was built.</remarks>
+        IGetStoreStatisticsRequest GetStoreStatistics();
+
+    }
 }
diff --git a/source/Draft/IKeyDataValueConverter.cs b/source/Draft/IKeyDataValueConverter.cs
index 415d47f..8d170e9 100644
--- a/source/Draft/IKeyDataValueConverter.cs
+++ b/source/Draft/IKeyDataValueConverter.cs
@@ -5,6 +5,7 @@
 
 namespace Draft
 {
+
     /// <summary>
     ///     Converts an <see cref="IKeyData" />'s <code>Value</code> to and from a string.
     /// </summary>
@@ -12,37 +13,20 @@ public interface IKeyDataValueConverter
     {
 
         /// <summary>
-        ///     Converts from the string representation of the object.
+        ///     Converts from the string representation of the <paramref name="value" />.
         /// </summary>
         /// <param name="value">
         ///     <see cref="IKeyData.RawValue" />
         /// </param>
         /// <returns>The converted result of <paramref name="value" />.</returns>
-        object ReadString(string value);
+        T Read<T>(string value);
 
         /// <summary>
-        ///     Converts to the string representation of the object.
+        ///     Converts to the string representation of the <paramref name="value" />.
         /// </summary>
         /// <param name="value">The object to convert.</param>
         /// <returns>The converted result of <paramref name="value" />.</returns>
-        string WriteString(object value);
-
-    }
-
-    /// <summary>
-    ///     Converts an <see cref="IKeyData" />'s <code>Value</code> to and from a json encoded string.
-    /// </summary>
-    public interface IJsonKeyDataValueConverter : IKeyDataValueConverter
-    {
-
-        /// <summary>
-        ///     Converts from the string representation of the object.
-        /// </summary>
-        /// <param name="value">
-        ///     <see cref="IKeyData.RawValue" />
-        /// </param>
-        /// <returns>The <typeparamref name="T" /> converted result of <paramref name="value" /></returns>
-        T ReadString<T>(string value);
+        string Write<T>(T value);
 
     }
 }
diff --git a/source/Draft/Requests/Cluster/CreateMemberRequest.cs b/source/Draft/Requests/Cluster/CreateMemberRequest.cs
index 606ce64..3cfec45 100644
--- a/source/Draft/Requests/Cluster/CreateMemberRequest.cs
+++ b/source/Draft/Requests/Cluster/CreateMemberRequest.cs
@@ -10,8 +10,6 @@
 using Draft.Endpoints;
 using Draft.Responses.Cluster;
 
-using Flurl;
-
 namespace Draft.Requests.Cluster
 {
     internal class CreateMemberRequest : BaseRequest, ICreateMemberRequest
diff --git a/source/Draft/Requests/Cluster/DeleteMemberRequest.cs b/source/Draft/Requests/Cluster/DeleteMemberRequest.cs
index 2f58874..60b7cb2 100644
--- a/source/Draft/Requests/Cluster/DeleteMemberRequest.cs
+++ b/source/Draft/Requests/Cluster/DeleteMemberRequest.cs
@@ -8,8 +8,6 @@
 
 using Draft.Endpoints;
 
-using Flurl;
-
 namespace Draft.Requests.Cluster
 {
     internal class DeleteMemberRequest : BaseRequest, IDeleteMemberRequest
diff --git a/source/Draft/Requests/Cluster/GetLeaderRequest.cs b/source/Draft/Requests/Cluster/GetLeaderRequest.cs
index fc3419a..ba9fcd1 100644
--- a/source/Draft/Requests/Cluster/GetLeaderRequest.cs
+++ b/source/Draft/Requests/Cluster/GetLeaderRequest.cs
@@ -9,14 +9,12 @@
 using Draft.Endpoints;
 using Draft.Responses.Cluster;
 
-using Flurl;
-
 namespace Draft.Requests.Cluster
 {
     internal class GetLeaderRequest : BaseRequest, IGetLeaderRequest
     {
 
-        public GetLeaderRequest(IEtcdClient etcdClient, EndpointPool endpointPool, params string[] pathParts) 
+        public GetLeaderRequest(IEtcdClient etcdClient, EndpointPool endpointPool, params string[] pathParts)
             : base(etcdClient, endpointPool, pathParts) {}
 
         public async Task<IClusterMember> Execute()
diff --git a/source/Draft/Requests/Cluster/GetMembersRequest.cs b/source/Draft/Requests/Cluster/GetMembersRequest.cs
index 0de8d91..3249eb7 100644
--- a/source/Draft/Requests/Cluster/GetMembersRequest.cs
+++ b/source/Draft/Requests/Cluster/GetMembersRequest.cs
@@ -1,4 +1,7 @@
 using System;
+
+using Flurl.Http;
+
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
@@ -6,15 +9,12 @@
 using Draft.Endpoints;
 using Draft.Responses.Cluster;
 
-using Flurl;
-using Flurl.Http;
-
 namespace Draft.Requests.Cluster
 {
     internal class GetMembersRequest : BaseRequest, IGetMembersRequest
     {
 
-        public GetMembersRequest(IEtcdClient etcdClient, EndpointPool endpointPool, params string[] pathParts) 
+        public GetMembersRequest(IEtcdClient etcdClient, EndpointPool endpointPool, params string[] pathParts)
             : base(etcdClient, endpointPool, pathParts) {}
 
         public async Task<IClusterMember[]> Execute()
diff --git a/source/Draft/Requests/Cluster/UpdateMemberPeerUrlsRequest.cs b/source/Draft/Requests/Cluster/UpdateMemberPeerUrlsRequest.cs
index a6d7048..f86a84f 100644
--- a/source/Draft/Requests/Cluster/UpdateMemberPeerUrlsRequest.cs
+++ b/source/Draft/Requests/Cluster/UpdateMemberPeerUrlsRequest.cs
@@ -35,7 +35,7 @@ public async Task<IClusterMember> Execute()
             {
                 return await TargetUrl
                     .AppendPathSegment(MemberId)
-                    .PostJsonAsync(values)
+                    .PutJsonAsync(values)
                     .ReceiveJson<ClusterMember>();
             }
             catch (FlurlHttpException e)
diff --git a/source/Draft/Requests/Statistics/GetLeaderStatisticsRequest.cs b/source/Draft/Requests/Statistics/GetLeaderStatisticsRequest.cs
new file mode 100644
index 0000000..dd70a84
--- /dev/null
+++ b/source/Draft/Requests/Statistics/GetLeaderStatisticsRequest.cs
@@ -0,0 +1,39 @@
+using System;
+
+using Flurl.Http;
+
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+
+using Draft.Endpoints;
+using Draft.Responses.Statistics;
+
+namespace Draft.Requests.Statistics
+{
+    internal class GetLeaderStatisticsRequest : BaseRequest, IGetLeaderStatisticsRequest
+    {
+
+        public GetLeaderStatisticsRequest(IEtcdClient etcdClient, EndpointPool endpointPool, params string[] pathParts) : base(etcdClient, endpointPool, pathParts) {}
+
+        public async Task<ILeaderStatistics> Execute()
+        {
+            try
+            {
+                return await TargetUrl
+                    .GetAsync()
+                    .ReceiveJson<LeaderStatistics>();
+            }
+            catch (FlurlHttpException e)
+            {
+                throw e.ProcessException();
+            }
+        }
+
+        public TaskAwaiter<ILeaderStatistics> GetAwaiter()
+        {
+            return Execute().GetAwaiter();
+        }
+
+    }
+}
diff --git a/source/Draft/Requests/Statistics/GetSelfStatisticsRequest.cs b/source/Draft/Requests/Statistics/GetSelfStatisticsRequest.cs
new file mode 100644
index 0000000..f3deff9
--- /dev/null
+++ b/source/Draft/Requests/Statistics/GetSelfStatisticsRequest.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+
+using Draft.Endpoints;
+using Draft.Responses.Statistics;
+
+using Flurl.Http;
+
+namespace Draft.Requests.Statistics
+{
+    internal class GetSelfStatisticsRequest : BaseRequest, IGetServerStatisticsRequest
+    {
+
+        public GetSelfStatisticsRequest(IEtcdClient etcdClient, EndpointPool endpointPool, params string[] pathParts) : base(etcdClient, endpointPool, pathParts) {}
+
+        public async Task<IServerStatistics> Execute()
+        {
+            try
+            {
+                return await TargetUrl
+                    .GetAsync()
+                    .ReceiveJson<ServerStatistics>();
+            }
+            catch (FlurlHttpException e)
+            {
+                throw e.ProcessException();
+            }
+        }
+
+        public TaskAwaiter<IServerStatistics> GetAwaiter()
+        {
+            return Execute().GetAwaiter();
+        }
+
+    }
+}
diff --git a/source/Draft/Requests/Statistics/GetStoreStatisticsRequest.cs b/source/Draft/Requests/Statistics/GetStoreStatisticsRequest.cs
new file mode 100644
index 0000000..281d167
--- /dev/null
+++ b/source/Draft/Requests/Statistics/GetStoreStatisticsRequest.cs
@@ -0,0 +1,39 @@
+using System;
+
+using Flurl.Http;
+
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+
+using Draft.Endpoints;
+using Draft.Responses.Statistics;
+
+namespace Draft.Requests.Statistics
+{
+    internal class GetStoreStatisticsRequest : BaseRequest, IGetStoreStatisticsRequest
+    {
+
+        public GetStoreStatisticsRequest(IEtcdClient etcdClient, EndpointPool endpointPool, params string[] pathParts) : base(etcdClient, endpointPool, pathParts) {}
+
+        public async Task<IStoreStatistics> Execute()
+        {
+            try
+            {
+                return await TargetUrl
+                    .GetAsync()
+                    .ReceiveJson<StoreStatistics>();
+            }
+            catch (FlurlHttpException e)
+            {
+                throw e.ProcessException();
+            }
+        }
+
+        public TaskAwaiter<IStoreStatistics> GetAwaiter()
+        {
+            return Execute().GetAwaiter();
+        }
+
+    }
+}
diff --git a/source/Draft/Requests/Statistics/IGetLeaderStatisticsRequest.cs b/source/Draft/Requests/Statistics/IGetLeaderStatisticsRequest.cs
new file mode 100644
index 0000000..49410be
--- /dev/null
+++ b/source/Draft/Requests/Statistics/IGetLeaderStatisticsRequest.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+
+using Draft.Responses.Statistics;
+
+namespace Draft.Requests.Statistics
+{
+    /// <summary>
+    ///     A request to retrieve the statistical information for the leader in an etcd cluster.
+    /// </summary>
+    public interface IGetLeaderStatisticsRequest
+    {
+
+        /// <summary>
+        ///     The underlying <see cref="IEtcdClient" /> for this request.
+        /// </summary>
+        IEtcdClient EtcdClient { get; }
+
+        /// <summary>
+        ///     Execute this request.
+        /// </summary>
+        Task<ILeaderStatistics> Execute();
+
+        /// <summary>
+        ///     Allows use of the <c>await</c> keyword for this request.
+        /// </summary>
+        TaskAwaiter<ILeaderStatistics> GetAwaiter();
+
+    }
+}
diff --git a/source/Draft/Requests/Statistics/IGetServerStatisticsRequest.cs b/source/Draft/Requests/Statistics/IGetServerStatisticsRequest.cs
new file mode 100644
index 0000000..4918120
--- /dev/null
+++ b/source/Draft/Requests/Statistics/IGetServerStatisticsRequest.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+
+using Draft.Endpoints;
+using Draft.Responses.Statistics;
+
+namespace Draft.Requests.Statistics
+{
+    /// <summary>
+    ///     A request to retrieve the statistical information for the server.
+    /// </summary>
+    /// <remarks>Which server depends on how the <see cref="EndpointPool" /> was built.</remarks>
+    public interface IGetServerStatisticsRequest
+    {
+
+        /// <summary>
+        ///     The underlying <see cref="IEtcdClient" /> for this request.
+        /// </summary>
+        IEtcdClient EtcdClient { get; }
+
+        /// <summary>
+        ///     Execute this request.
+        /// </summary>
+        Task<IServerStatistics> Execute();
+
+        /// <summary>
+        ///     Allows use of the <c>await</c> keyword for this request.
+        /// </summary>
+        TaskAwaiter<IServerStatistics> GetAwaiter();
+
+    }
+}
diff --git a/source/Draft/Requests/Statistics/IGetStoreStatisticsRequest.cs b/source/Draft/Requests/Statistics/IGetStoreStatisticsRequest.cs
new file mode 100644
index 0000000..0f58684
--- /dev/null
+++ b/source/Draft/Requests/Statistics/IGetStoreStatisticsRequest.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+
+using Draft.Endpoints;
+using Draft.Responses.Statistics;
+
+namespace Draft.Requests.Statistics
+{
+    /// <summary>
+    ///     A request to retrieve the etcd backing store statistics.
+    /// </summary>
+    /// <remarks>For which server depends on how the <see cref="EndpointPool" /> was built.</remarks>
+    public interface IGetStoreStatisticsRequest
+    {
+
+        /// <summary>
+        ///     The underlying <see cref="IEtcdClient" /> for this request.
+        /// </summary>
+        IEtcdClient EtcdClient { get; }
+
+        /// <summary>
+        ///     Execute this request.
+        /// </summary>
+        Task<IStoreStatistics> Execute();
+
+        /// <summary>
+        ///     Allows use of the <c>await</c> keyword for this request.
+        /// </summary>
+        TaskAwaiter<IStoreStatistics> GetAwaiter();
+
+    }
+}
diff --git a/source/Draft/Responses/Statistics/FollowerCounts.cs b/source/Draft/Responses/Statistics/FollowerCounts.cs
index a67c2b3..96f67fc 100644
--- a/source/Draft/Responses/Statistics/FollowerCounts.cs
+++ b/source/Draft/Responses/Statistics/FollowerCounts.cs
@@ -8,20 +8,20 @@ namespace Draft.Responses.Statistics
     ///     Follower send counts
     /// </summary>
     [DataContract]
-    internal class FollowerCounts
+    internal class FollowerCounts : IFollowerCounts
     {
 
         /// <summary>
         ///     Count of unsuccessful sends
         /// </summary>
         [DataMember(Name = "fail")]
-        public long Fail { get; private set; }
+        public long Fail { get; set; }
 
         /// <summary>
         ///     Count of successful sends
         /// </summary>
         [DataMember(Name = "success")]
-        public long Success { get; private set; }
+        public long Success { get; set; }
 
     }
 }
diff --git a/source/Draft/Responses/Statistics/FollowerLatency.cs b/source/Draft/Responses/Statistics/FollowerLatency.cs
index eecbb18..cc360db 100644
--- a/source/Draft/Responses/Statistics/FollowerLatency.cs
+++ b/source/Draft/Responses/Statistics/FollowerLatency.cs
@@ -8,38 +8,38 @@ namespace Draft.Responses.Statistics
     ///     Follower latency statistics
     /// </summary>
     [DataContract]
-    internal class FollowerLatency
+    internal class FollowerLatency : IFollowerLatency
     {
 
         /// <summary>
         ///     Follower's average latency
         /// </summary>
         [DataMember(Name = "average")]
-        public double Average { get; private set; }
+        public double Average { get; set; }
 
         /// <summary>
         ///     Follower's current latency
         /// </summary>
         [DataMember(Name = "current")]
-        public double Current { get; private set; }
+        public double Current { get; set; }
 
         /// <summary>
         ///     Follower's maximum latency
         /// </summary>
         [DataMember(Name = "maximum")]
-        public double Maximum { get; private set; }
+        public double Maximum { get; set; }
 
         /// <summary>
         ///     Follower's minimum latency
         /// </summary>
         [DataMember(Name = "minimum")]
-        public double Minimum { get; private set; }
+        public double Minimum { get; set; }
 
         /// <summary>
         ///     Standard Deviation
         /// </summary>
         [DataMember(Name = "standardDeviation")]
-        public double StandardDeviation { get; private set; }
+        public double StandardDeviation { get; set; }
 
     }
 }
diff --git a/source/Draft/Responses/Statistics/FollowerStatistics.cs b/source/Draft/Responses/Statistics/FollowerStatistics.cs
index 8770e67..69eb401 100644
--- a/source/Draft/Responses/Statistics/FollowerStatistics.cs
+++ b/source/Draft/Responses/Statistics/FollowerStatistics.cs
@@ -8,20 +8,31 @@ namespace Draft.Responses.Statistics
     ///     Various statistics about a follower in an etcd cluster
     /// </summary>
     [DataContract]
-    internal class FollowerStatistics
+    internal class FollowerStatistics : IFollowerStatistics
     {
 
+        IFollowerCounts IFollowerStatistics.Counts
+        {
+            get { return Counts; }
+        }
+
         /// <summary>
         ///     Follower send counts
         /// </summary>
         [DataMember(Name = "counts")]
-        public FollowerCounts Counts { get; private set; }
+        public FollowerCounts Counts { get; set; }
+
+        IFollowerLatency IFollowerStatistics.Latency
+        {
+            get { return Latency; }
+        }
 
         /// <summary>
         ///     Follower latency statistics
         /// </summary>
         [DataMember(Name = "latency")]
-        public FollowerLatency Latency { get; private set; }
+        public FollowerLatency Latency { get; set; }
 
     }
+
 }
diff --git a/source/Draft/Responses/Statistics/IFollowerCounts.cs b/source/Draft/Responses/Statistics/IFollowerCounts.cs
new file mode 100644
index 0000000..883755a
--- /dev/null
+++ b/source/Draft/Responses/Statistics/IFollowerCounts.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Linq;
+
+namespace Draft.Responses.Statistics
+{
+    /// <summary>
+    ///     Follower send counts
+    /// </summary>
+    public interface IFollowerCounts
+    {
+
+        /// <summary>
+        ///     Count of unsuccessful sends
+        /// </summary>
+        long Fail { get; }
+
+        /// <summary>
+        ///     Count of successful sends
+        /// </summary>
+        long Success { get; }
+
+    }
+}
diff --git a/source/Draft/Responses/Statistics/IFollowerLatency.cs b/source/Draft/Responses/Statistics/IFollowerLatency.cs
new file mode 100644
index 0000000..4eb2040
--- /dev/null
+++ b/source/Draft/Responses/Statistics/IFollowerLatency.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Linq;
+
+namespace Draft.Responses.Statistics
+{
+    /// <summary>
+    ///     Follower latency statistics
+    /// </summary>
+    public interface IFollowerLatency
+    {
+
+        /// <summary>
+        ///     Follower's average latency
+        /// </summary>
+        double Average { get; }
+
+        /// <summary>
+        ///     Follower's current latency
+        /// </summary>
+        double Current { get; }
+
+        /// <summary>
+        ///     Follower's maximum latency
+        /// </summary>
+        double Maximum { get; }
+
+        /// <summary>
+        ///     Follower's minimum latency
+        /// </summary>
+        double Minimum { get; }
+
+        /// <summary>
+        ///     Standard Deviation
+        /// </summary>
+        double StandardDeviation { get; }
+
+    }
+}
diff --git a/source/Draft/Responses/Statistics/IFollowerStatistics.cs b/source/Draft/Responses/Statistics/IFollowerStatistics.cs
new file mode 100644
index 0000000..4f53300
--- /dev/null
+++ b/source/Draft/Responses/Statistics/IFollowerStatistics.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Linq;
+
+namespace Draft.Responses.Statistics
+{
+    /// <summary>
+    ///     Various statistics about a follower in an etcd cluster
+    /// </summary>
+    public interface IFollowerStatistics
+    {
+
+        /// <summary>
+        ///     Follower send counts
+        /// </summary>
+        IFollowerCounts Counts { get; }
+
+        /// <summary>
+        ///     Follower latency statistics
+        /// </summary>
+        IFollowerLatency Latency { get; }
+
+    }
+}
diff --git a/source/Draft/Responses/Statistics/ILeaderInfo.cs b/source/Draft/Responses/Statistics/ILeaderInfo.cs
new file mode 100644
index 0000000..e9f86b0
--- /dev/null
+++ b/source/Draft/Responses/Statistics/ILeaderInfo.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Linq;
+
+namespace Draft.Responses.Statistics
+{
+    /// <summary>
+    ///     Statistical information for a member server's leader
+    /// </summary>
+    public interface ILeaderInfo
+    {
+
+        /// <summary>
+        ///     Id of the current leader
+        /// </summary>
+        string Leader { get; }
+
+        /// <summary>
+        ///     Time when the leader was started (if available)
+        /// </summary>
+        DateTime? StartTime { get; }
+
+        /// <summary>
+        ///     String representation of the amount of time the leader has been leader
+        /// </summary>
+        string Uptime { get; }
+
+    }
+}
diff --git a/source/Draft/Responses/Statistics/ILeaderStatistics.cs b/source/Draft/Responses/Statistics/ILeaderStatistics.cs
new file mode 100644
index 0000000..bda0e5d
--- /dev/null
+++ b/source/Draft/Responses/Statistics/ILeaderStatistics.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Draft.Responses.Statistics
+{
+    /// <summary>
+    ///     Statistics about communication with cluster members
+    /// </summary>
+    public interface ILeaderStatistics
+    {
+
+        /// <summary>
+        ///     Map of cluster member id's to cluster member statistics
+        /// </summary>
+        IReadOnlyDictionary<string, IFollowerStatistics> Followers { get; }
+
+        /// <summary>
+        ///     Id for the currently elected cluster leader
+        /// </summary>
+        string Leader { get; }
+
+    }
+}
diff --git a/source/Draft/Responses/Statistics/IServerStatistics.cs b/source/Draft/Responses/Statistics/IServerStatistics.cs
new file mode 100644
index 0000000..d5b46a6
--- /dev/null
+++ b/source/Draft/Responses/Statistics/IServerStatistics.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Linq;
+
+namespace Draft.Responses.Statistics
+{
+    /// <summary>
+    ///     Statistical information on an etcd server member
+    /// </summary>
+    public interface IServerStatistics
+    {
+
+        /// <summary>
+        ///     The unique identifier for this server member
+        /// </summary>
+        string Id { get; }
+
+        /// <summary>
+        ///     Statistical information for this server member's leader
+        /// </summary>
+        ILeaderInfo LeaderInfo { get; }
+
+        /// <summary>
+        ///     The name for this server member
+        /// </summary>
+        string Name { get; }
+
+        /// <summary>
+        ///     Number of append requests this server member has processed
+        /// </summary>
+        long ReceivedAppendRequestCount { get; }
+
+        /// <summary>
+        ///     Number of bytes per second this server member is receiving (follower state only)
+        /// </summary>
+        double? ReceivedBandwidthRate { get; }
+
+        /// <summary>
+        ///     Number of requests per second this server member is receiving (follower state only)
+        /// </summary>
+        double? ReceivedPackageRate { get; }
+
+        /// <summary>
+        ///     Numer of requests this server member has sent
+        /// </summary>
+        long SendAppendRequestCount { get; }
+
+        /// <summary>
+        ///     Number of bytes per second this server member is sending (leader state only)
+        /// </summary>
+        /// <remarks>
+        ///     This value is null on single member clusters
+        /// </remarks>
+        double? SendBandwidthRate { get; }
+
+        /// <summary>
+        ///     Number of requests per second this server member is sending (leader state only)
+        /// </summary>
+        /// <remarks>
+        ///     This value is null on single member clusters
+        /// </remarks>
+        double? SendPackageRate { get; }
+
+        /// <summary>
+        ///     The time when this server member was started
+        /// </summary>
+        DateTime StartTime { get; }
+
+        /// <summary>
+        ///     The cluster state for this server member
+        /// </summary>
+        StateType State { get; }
+
+    }
+}
diff --git a/source/Draft/Responses/Statistics/IStoreStatistics.cs b/source/Draft/Responses/Statistics/IStoreStatistics.cs
new file mode 100644
index 0000000..617b331
--- /dev/null
+++ b/source/Draft/Responses/Statistics/IStoreStatistics.cs
@@ -0,0 +1,93 @@
+using System;
+using System.Linq;
+
+namespace Draft.Responses.Statistics
+{
+    /// <summary>
+    ///     Etcd backing store statistics
+    /// </summary>
+    public interface IStoreStatistics
+    {
+
+        /// <summary>
+        ///     Number of failed Compare and Delete requests
+        /// </summary>
+        long CompareAndDeleteFail { get; }
+
+        /// <summary>
+        ///     Number of successful Compare and Delete requests
+        /// </summary>
+        long CompareAndDeleteSuccess { get; }
+
+        /// <summary>
+        ///     Number of failed Compare and Swap requests
+        /// </summary>
+        long CompareAndSwapFail { get; }
+
+        /// <summary>
+        ///     Number of successful Compare and Swap requests
+        /// </summary>
+        long CompareAndSwapSuccess { get; }
+
+        /// <summary>
+        ///     Number of failed Create requests
+        /// </summary>
+        long CreateFail { get; }
+
+        /// <summary>
+        ///     Number of successful Create requests
+        /// </summary>
+        long CreateSuccess { get; }
+
+        /// <summary>
+        ///     Number of failed Delete requests
+        /// </summary>
+        long DeleteFail { get; }
+
+        /// <summary>
+        ///     Number of successful Delete requests
+        /// </summary>
+        long DeleteSuccess { get; }
+
+        /// <summary>
+        ///     Number of key expirations
+        /// </summary>
+        long ExpireCount { get; }
+
+        /// <summary>
+        ///     Number of failed Get requests
+        /// </summary>
+        long GetsFail { get; }
+
+        /// <summary>
+        ///     Number of successful Get requests
+        /// </summary>
+        long GetsSuccess { get; }
+
+        /// <summary>
+        ///     Number of failed Set requests
+        /// </summary>
+        long SetsFail { get; }
+
+        /// <summary>
+        ///     Number of successful Set requests
+        /// </summary>
+        long SetsSuccess { get; }
+
+        /// <summary>
+        ///     Number of failed Update requests
+        /// </summary>
+        long UpdateFail { get; }
+
+        /// <summary>
+        ///     Number of successful Update requests
+        /// </summary>
+        long UpdateSuccess { get; }
+
+        /// <summary>
+        ///     Number of active watchers
+        /// </summary>
+        long Watchers { get; }
+
+    }
+}
diff --git a/source/Draft/Responses/Statistics/LeaderInfo.cs b/source/Draft/Responses/Statistics/LeaderInfo.cs
index f792c7c..d06269e 100644
--- a/source/Draft/Responses/Statistics/LeaderInfo.cs
+++ b/source/Draft/Responses/Statistics/LeaderInfo.cs
@@ -8,26 +8,27 @@ namespace Draft.Responses.Statistics
     ///     Statistical information for a member server's leader
     /// </summary>
     [DataContract]
-    internal class LeaderInfo
+    internal class LeaderInfo : ILeaderInfo
     {
 
         /// <summary>
         ///     Id of the current leader
         /// </summary>
         [DataMember(Name = "leader")]
-        public string Leader { get; private set; }
+        public string Leader { get; set; }
 
         /// <summary>
         ///     Time when the leader was started (if available)
         /// </summary>
         [DataMember(Name = "startTime")]
-        public DateTime? StartTime { get; private set; }
+        public DateTime? StartTime { get; set; }
 
         /// <summary>
         ///     String representation of the amount of time the leader has been leader
         /// </summary>
         [DataMember(Name = "uptime")]
-        public string Uptime { get; private set; }
+        public string Uptime { get; set; }
 
     }
+
 }
diff --git a/source/Draft/Responses/Statistics/LeaderStatistics.cs b/source/Draft/Responses/Statistics/LeaderStatistics.cs
index 08534a9..07210aa 100644
--- a/source/Draft/Responses/Statistics/LeaderStatistics.cs
+++ b/source/Draft/Responses/Statistics/LeaderStatistics.cs
@@ -6,21 +6,36 @@
 namespace Draft.Responses.Statistics
 {
     /// <summary>
-    /// Statistics about communication with cluster members
+    ///     Statistics about communication with cluster members
     /// </summary>
     [DataContract]
-    internal class LeaderStatistics
+    internal class LeaderStatistics : ILeaderStatistics
     {
+
+        [DataMember(Name = "followers")]
+        private Dictionary<string, FollowerStatistics> _followers;
+
         /// <summary>
-        /// Id for the currently elected cluster leader
+        ///     Map of cluster member id's to cluster member statistics
         /// </summary>
-        [DataMember(Name = "leader")]
-        public string Leader { get; private set; }
-        
+        [IgnoreDataMember]
+        public Dictionary<string, FollowerStatistics> Followers
+        {
+            get { return _followers ?? (_followers = new Dictionary<string, FollowerStatistics>()); }
+        }
+
+        [IgnoreDataMember]
+        IReadOnlyDictionary<string, IFollowerStatistics> ILeaderStatistics.Followers
+        {
+            get { return Followers.ToDictionary(x => x.Key, x => x.Value as IFollowerStatistics); }
+        }
+
         /// <summary>
-        /// Map of cluster member id's to cluster member statistics
+        ///     Id for the currently elected cluster leader
         /// </summary>
-        [DataMember(Name = "followers")]
-        public IReadOnlyDictionary<string, FollowerStatistics> Followers { get; private set; }
+        [DataMember(Name = "leader")]
+        public string Leader { get; set; }
+
     }
-}
\ No newline at end of file
+
+}
diff --git a/source/Draft/Responses/Statistics/ServerStatistics.cs b/source/Draft/Responses/Statistics/ServerStatistics.cs
index 316092c..d997e72 100644
--- a/source/Draft/Responses/Statistics/ServerStatistics.cs
+++ b/source/Draft/Responses/Statistics/ServerStatistics.cs
@@ -8,50 +8,56 @@ namespace Draft.Responses.Statistics
     ///     Statistical information on an etcd server member
     /// </summary>
     [DataContract]
-    internal class ServerStatistics
+    internal class ServerStatistics : IServerStatistics
     {
 
         /// <summary>
         ///     The unique identifier for this server member
         /// </summary>
         [DataMember(Name = "id")]
-        public string Id { get; private set; }
+        public string Id { get; set; }
 
         /// <summary>
         ///     Statistical information for this server member's leader
         /// </summary>
         [DataMember(Name = "leaderInfo")]
-        public LeaderInfo LeaderInfo { get; private set; }
+        public LeaderInfo LeaderInfo { get; set; }
+
+        [IgnoreDataMember]
+        ILeaderInfo IServerStatistics.LeaderInfo
+        {
+            get { return LeaderInfo; }
+        }
 
         /// <summary>
         ///     The name for this server member
         /// </summary>
         [DataMember(Name = "name")]
-        public string Name { get; private set; }
+        public string Name { get; set; }
 
         /// <summary>
         ///     Number of append requests this server member has processed
         /// </summary>
         [DataMember(Name = "recvAppendRequestCnt")]
-        public long ReceivedAppendRequestCount { get; private set; }
+        public long ReceivedAppendRequestCount { get; set; }
 
         /// <summary>
         ///     Number of bytes per second this server member is receiving (follower state only)
         /// </summary>
         [DataMember(Name = "recvBandwidthRate")]
-        public double? ReceivedBandwidthRate { get; private set; }
+        public double? ReceivedBandwidthRate { get; set; }
 
         /// <summary>
         ///     Number of requests per second this server member is receiving (follower state only)
         /// </summary>
         [DataMember(Name = "recvPkgRate")]
-        public double? ReceivedPackageRate { get; private set; }
+        public double? ReceivedPackageRate { get; set; }
 
         /// <summary>
         ///     Numer of requests this server member has sent
         /// </summary>
         [DataMember(Name = "sendAppendRequestCnt")]
-        public long SendAppendRequestCount { get; private set; }
+        public long SendAppendRequestCount { get; set; }
 
         /// <summary>
         ///     Number of bytes per second this server member is sending (leader state only)
@@ -60,7 +66,7 @@ internal class ServerStatistics
         ///     This value is null on single member clusters
         /// </remarks>
         [DataMember(Name = "sendBandwidthRate")]
-        public double? SendBandwidthRate { get; private set; }
+        public double? SendBandwidthRate { get; set; }
 
         /// <summary>
         ///     Number of requests per second this server member is sending (leader state only)
@@ -69,19 +75,19 @@ internal class ServerStatistics
         ///     This value is null on single member clusters
         /// </remarks>
         [DataMember(Name = "sendPkgRate")]
-        public double? SendPackageRate { get; private set; }
+        public double? SendPackageRate { get; set; }
 
         /// <summary>
         ///     The time when this server member was started
         /// </summary>
         [DataMember(Name = "startTime")]
-        public DateTime StartTime { get; private set; }
+        public DateTime StartTime { get; set; }
 
         /// <summary>
         ///     The cluster state for this server member
         /// </summary>
         [DataMember(Name = "state")]
-        public StateType State { get; private set; }
+        public StateType State { get; set; }
 
     }
 }
diff --git a/source/Draft/Responses/Statistics/StateType.cs b/source/Draft/Responses/Statistics/StateType.cs
index 2378fe3..29c7590 100644
--- a/source/Draft/Responses/Statistics/StateType.cs
+++ b/source/Draft/Responses/Statistics/StateType.cs
@@ -1,33 +1,38 @@
 using System;
 using System.Linq;
+using System.Runtime.Serialization;
 
 namespace Draft.Responses.Statistics
 {
     /// <summary>
-    /// Represents the leadership type of a member of a cluster
+    ///     Represents the leadership type of a member of a cluster
     /// </summary>
-    internal enum StateType
+    [DataContract]
+    public enum StateType
     {
 
         /// <summary>
-        /// Unable to parse
+        ///     Unable to parse
         /// </summary>
         Unknown,
 
         /// <summary>
-        /// StateFollower
+        ///     StateFollower
         /// </summary>
-        Follower,
+        [EnumMember(Value = "StateFollower")]
+        StateFollower,
 
         /// <summary>
-        /// StateCandidate
+        ///     StateCandidate
         /// </summary>
-        Candidate,
+        [EnumMember(Value = "StateCandidate")]
+        StateCandidate,
 
         /// <summary>
-        /// StateLeader
+        ///     StateLeader
         /// </summary>
-        Leader
+        [EnumMember(Value = "StateLeader")]
+        StateLeader
 
     }
 }
diff --git a/source/Draft/Responses/Statistics/StoreStatistics.cs b/source/Draft/Responses/Statistics/StoreStatistics.cs
index 15a5109..220ac94 100644
--- a/source/Draft/Responses/Statistics/StoreStatistics.cs
+++ b/source/Draft/Responses/Statistics/StoreStatistics.cs
@@ -8,9 +8,21 @@ namespace Draft.Responses.Statistics
     ///     Etcd backing store statistics
     /// </summary>
     [DataContract]
-    internal class StoreStatistics
+    internal class StoreStatistics : IStoreStatistics
     {
 
+        /// <summary>
+        ///     Number of failed Compare and Delete requests
+        /// </summary>
+        [DataMember(Name = "compareAndDeleteFail")]
+        public long CompareAndDeleteFail { get; private set; }
+
+        /// <summary>
+        ///     Number of successful Compare and Delete requests
+        /// </summary>
+        [DataMember(Name = "compareAndDeleteSuccess")]
+        public long CompareAndDeleteSuccess { get; private set; }
+
         /// <summary>
         ///     Number of failed Compare and Swap requests
         /// </summary>
diff --git a/source/Draft/ValueConverters/JsonValueConverter.cs b/source/Draft/ValueConverters/JsonValueConverter.cs
index f4b9bbe..4724140 100644
--- a/source/Draft/ValueConverters/JsonValueConverter.cs
+++ b/source/Draft/ValueConverters/JsonValueConverter.cs
@@ -1,26 +1,23 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace Draft.ValueConverters
 {
-    internal class JsonValueConverter : IJsonKeyDataValueConverter
+    internal class JsonValueConverter : IKeyDataValueConverter
     {
 
-        public T ReadString<T>(string value)
+        public T Read<T>(string value)
         {
-            return JsonConvert.DeserializeObject<T>(value);
+            return JsonConvert.DeserializeObject<T>(value, Etcd.JsonSettings);
         }
 
-        public object ReadString(string value)
+        public string Write<T>(T value)
         {
-            return ReadString<object>(value);
-        }
-
-        public string WriteString(object value)
-        {
-            return JsonConvert.SerializeObject(value);
+            return JsonConvert.SerializeObject(value, Etcd.JsonSettings);
         }
 
     }
diff --git a/source/Draft/ValueConverters/StringValueConverter.cs b/source/Draft/ValueConverters/StringValueConverter.cs
index f65ab93..dadae1a 100644
--- a/source/Draft/ValueConverters/StringValueConverter.cs
+++ b/source/Draft/ValueConverters/StringValueConverter.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Linq;
 
 namespace Draft.ValueConverters
@@ -6,10 +7,65 @@ namespace Draft.ValueConverters
     internal class StringValueConverter : IKeyDataValueConverter
     {
 
+        private static readonly Type StringType = typeof (string);
+
+        public T Read<T>(string value)
+        {
+            if (string.IsNullOrWhiteSpace(value))
+            {
+                return default(T);
+            }
+
+            var tType = typeof (T);
+
+            if (tType.IsEnum)
+            {
+                return (T) Enum.Parse(tType, value, true);
+            }
+
+            var converter = TypeDescriptor.GetConverter(StringType);
+            if (converter.CanConvertTo(tType))
+            {
+                return (T) converter.ConvertTo(value, tType);
+            }
+
+            converter = TypeDescriptor.GetConverter(tType);
+            if (converter.CanConvertFrom(StringType))
+            {
+                return (T) converter.ConvertFromString(value);
+            }
+
+            return (T) Convert.ChangeType(value, tType);
+        }
+
+        public string Write<T>(T value)
+        {
+            if (value == null) { return string.Empty; }
+
+            if (value is Enum)
+            {
+                return Enum.GetName(value.GetType(), value);
+            }
+
+            var tType = typeof (T);
+            var converter = TypeDescriptor.GetConverter(tType);
+            if (converter.CanConvertTo(StringType))
+            {
+                return converter.ConvertToString(value);
+            }
+
+            converter = TypeDescriptor.GetConverter(StringType);
+            if (converter.CanConvertFrom(tType))
+            {
+                return converter.ConvertToString(value);
+            }
+
+            return (string) Convert.ChangeType(value, StringType);
+        }
 
         public object ReadString(string value)
         {
-            return value;
+            return Read<object>(value);
         }
 
         public string WriteString(object value)
@@ -18,7 +74,7 @@ public string WriteString(object value)
             if (strValue != null) { return strValue; }
 
 
-            return Convert.ToString(value);
+            return Write(value);
         }
 
     }
diff --git a/source/Draft/packages.Draft-Net45.config b/source/Draft/packages.Draft-Net45.config
index bd7133e..26f1d43 100644
--- a/source/Draft/packages.Draft-Net45.config
+++ b/source/Draft/packages.Draft-Net45.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Flurl" version="1.0.7" targetFramework="net45" />
-  <package id="Flurl.Http" version="0.6.0" targetFramework="net45" />
+  <package id="Flurl" version="1.0.8" targetFramework="net45" />
+  <package id="Flurl.Http" version="0.6.2" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
diff --git a/tests/Draft.Tests/Draft-Net45.Tests.csproj b/tests/Draft.Tests/Draft-Net45.Tests.csproj
index b6096e1..4302d86 100644
--- a/tests/Draft.Tests/Draft-Net45.Tests.csproj
+++ b/tests/Draft.Tests/Draft-Net45.Tests.csproj
@@ -37,26 +37,28 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FluentAssertions">
-      <HintPath>..\..\packages\FluentAssertions.3.3.0\lib\net45\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=3.4.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\FluentAssertions.3.4.1\lib\net45\FluentAssertions.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions.Core">
-      <HintPath>..\..\packages\FluentAssertions.3.3.0\lib\net45\FluentAssertions.Core.dll</HintPath>
+    <Reference Include="FluentAssertions.Core, Version=3.4.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\FluentAssertions.3.4.1\lib\net45\FluentAssertions.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Flurl, Version=1.0.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Flurl.1.0.7\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll</HintPath>
+    <Reference Include="Flurl, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Flurl.1.0.8\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Flurl.Http, Version=0.6.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Flurl.Http.0.6.0\lib\net45\Flurl.Http.dll</HintPath>
+    <Reference Include="Flurl.Http, Version=0.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Flurl.Http.0.6.2\lib\net45\Flurl.Http.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Ploeh.AutoFixture, Version=3.30.3.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AutoFixture.3.30.3\lib\net40\Ploeh.AutoFixture.dll</HintPath>
+    <Reference Include="Ploeh.AutoFixture, Version=3.30.8.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\AutoFixture.3.30.8\lib\net40\Ploeh.AutoFixture.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -97,11 +99,16 @@
     <Compile Include="Extensions\HttpTestExtensions.cs" />
     <Compile Include="Fixtures\Dtos\SimpleDataContractDto.cs" />
     <Compile Include="Fixtures\Fixtures.Cluster.cs" />
+    <Compile Include="Fixtures\Fixtures.Statistics.cs" />
     <Compile Include="Fixtures\TestingHttpClientFactory.cs" />
     <Compile Include="Helpers\XmlValueConverter.cs" />
     <Compile Include="Tests\Atomics\CompareAndDeleteTests.cs" />
     <Compile Include="Tests\Atomics\CompareAndSwapTests.cs" />
     <Compile Include="Tests\Cluster\CreateMemberTests.cs" />
+    <Compile Include="Tests\Cluster\DeleteMemberTests.cs" />
+    <Compile Include="Tests\Cluster\GetLeaderTests.cs" />
+    <Compile Include="Tests\Cluster\GetMembersTests.cs" />
+    <Compile Include="Tests\Cluster\UpdateMemberPeerUrlsTests.cs" />
     <Compile Include="Tests\ConfigureTests.cs" />
     <Compile Include="Tests\Exceptions\CoreExceptionTests.cs" />
     <Compile Include="Tests\Keys\DirectoryRequestTests.cs" />
@@ -125,6 +132,9 @@
     <Compile Include="Tests\RoutingStrategies\RoutingStrategyFirstTests.cs" />
     <Compile Include="Tests\RoutingStrategies\RoutingStrategyRandomTests.cs" />
     <Compile Include="Tests\RoutingStrategies\RoutingStrategyRoundRobinTests.cs" />
+    <Compile Include="Tests\Statistics\GetLeaderTests.cs" />
+    <Compile Include="Tests\Statistics\GetSelfTests.cs" />
+    <Compile Include="Tests\Statistics\GetStoreTests.cs" />
     <Compile Include="Tests\ValueConverterTests.cs" />
     <Compile Include="Tests\VerificationStrategies\BaseVerificationStrategyTests.cs" />
     <Compile Include="Tests\VerificationStrategies\VerificationStrategyAllTests.cs" />
diff --git a/tests/Draft.Tests/Fixtures/Fixtures.Cluster.cs b/tests/Draft.Tests/Fixtures/Fixtures.Cluster.cs
index 79765ac..21cc098 100644
--- a/tests/Draft.Tests/Fixtures/Fixtures.Cluster.cs
+++ b/tests/Draft.Tests/Fixtures/Fixtures.Cluster.cs
@@ -18,6 +18,25 @@ public static object CreateResponse(params Uri[] peerUris)
                 };
             }
 
+            public static object ClusterMemberResponse(Uri[] clientUris = null, Uri[] peerUris = null)
+            {
+                return new
+                {
+                    id = Guid.NewGuid().ToString(),
+                    name = Guid.NewGuid().ToString(),
+                    clientURLs = (clientUris ?? new Uri[0]).Select(x => x.ToString()).ToArray(),
+                    peerURLs = (peerUris ?? new Uri[0]).Select(x => x.ToString()).ToArray()
+                };
+            }
+
+            public static object ClusterMembersResponse(params object[] members)
+            {
+                return new
+                {
+                    members = members
+                };
+            }
+
         }
 
     }
diff --git a/tests/Draft.Tests/Fixtures/Fixtures.Statistics.cs b/tests/Draft.Tests/Fixtures/Fixtures.Statistics.cs
new file mode 100644
index 0000000..7542b8c
--- /dev/null
+++ b/tests/Draft.Tests/Fixtures/Fixtures.Statistics.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Linq;
+
+namespace Draft.Tests
+{
+    internal static partial class Fixtures
+    {
+
+        public static class Statistics
+        {
+
+            public static readonly string LeaderResponse = @"{
+    ""followers"": {
+        ""6e3bd23ae5f1eae0"": {
+            ""counts"": {
+                ""fail"": 0,
+                ""success"": 745
+            },
+            ""latency"": {
+                ""average"": 0.017039507382550306,
+                ""current"": 0.000138,
+                ""maximum"": 1.007649,
+                ""minimum"": 0,
+                ""standardDeviation"": 0.05289178277920594
+            }
+        },
+        ""a8266ecf031671f3"": {
+            ""counts"": {
+                ""fail"": 0,
+                ""success"": 735
+            },
+            ""latency"": {
+                ""average"": 0.012124141496598642,
+                ""current"": 0.000559,
+                ""maximum"": 0.791547,
+                ""minimum"": 0,
+                ""standardDeviation"": 0.04187900156583733
+            }
+        }
+    },
+    ""leader"": ""924e2e83e93f2560""
+}";
+
+            public static readonly string SelfResponse = @"{
+    ""id"": ""eca0338f4ea31566"",
+    ""leaderInfo"": {
+        ""leader"": ""8a69d5f6b7814500"",
+        ""startTime"": ""2014-10-24T13:15:51.186620747-07:00"",
+        ""uptime"": ""10m59.322358947s""
+    },
+    ""name"": ""node3"",
+    ""recvAppendRequestCnt"": 5944,
+    ""recvBandwidthRate"": 570.6254930219969,
+    ""recvPkgRate"": 9.00892789741075,
+    ""sendAppendRequestCnt"": 0,
+    ""startTime"": ""2014-10-24T13:15:50.072007085-07:00"",
+    ""state"": ""StateFollower""
+}";
+
+            public static readonly string StoreResponse = @"{
+    ""compareAndSwapFail"": 0,
+    ""compareAndSwapSuccess"": 0,
+    ""createFail"": 0,
+    ""createSuccess"": 2,
+    ""deleteFail"": 0,
+    ""deleteSuccess"": 0,
+    ""expireCount"": 0,
+    ""getsFail"": 4,
+    ""getsSuccess"": 75,
+    ""setsFail"": 2,
+    ""setsSuccess"": 4,
+    ""updateFail"": 0,
+    ""updateSuccess"": 0,
+    ""watchers"": 0
+}";
+
+        }
+
+    }
+}
diff --git a/tests/Draft.Tests/Helpers/XmlValueConverter.cs b/tests/Draft.Tests/Helpers/XmlValueConverter.cs
index 44b8ff9..1e90626 100644
--- a/tests/Draft.Tests/Helpers/XmlValueConverter.cs
+++ b/tests/Draft.Tests/Helpers/XmlValueConverter.cs
@@ -1,38 +1,31 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 namespace Draft.Tests
 {
-    public class XmlValueConverter<T> : IKeyDataValueConverter
+    public class XmlValueConverter : IKeyDataValueConverter
     {
 
-        public XmlValueConverter()
-        {
-            XmlSerializer = new XmlSerializer(typeof (T));
-        }
-
-        public XmlSerializer XmlSerializer { get; private set; }
-
-        public object ReadString(string value)
+        public T Read<T>(string value)
         {
             using (var sr = new StringReader(value))
             {
-                return XmlSerializer.Deserialize(sr);
+                var serializer = new XmlSerializer(typeof (T));
+                return (T) serializer.Deserialize(sr);
             }
         }
 
-        public string WriteString(object value)
+        public string Write<T>(T value)
         {
-            var sb = new StringBuilder();
-            using (var sw = new StringWriter(sb))
+            using (var sw = new StringWriter())
             {
-                XmlSerializer.Serialize(sw, value);
+                var serializer = new XmlSerializer(typeof (T));
+                serializer.Serialize(sw, value);
+                sw.Flush();
+                return sw.ToString();
             }
-
-            return sb.ToString();
         }
 
     }
diff --git a/tests/Draft.Tests/Tests/Cluster/CreateMemberTests.cs b/tests/Draft.Tests/Tests/Cluster/CreateMemberTests.cs
index be0dc21..39619e8 100644
--- a/tests/Draft.Tests/Tests/Cluster/CreateMemberTests.cs
+++ b/tests/Draft.Tests/Tests/Cluster/CreateMemberTests.cs
@@ -28,14 +28,14 @@ public async Task ShouldCallTheCorrectUrlByAwaitingImmediately()
                 http.RespondWithJson(Fixtures.Cluster.CreateResponse(Fixtures.EtcdUrl.ToUri()));
 
                 var member = await Etcd.ClientFor(Fixtures.EtcdUrl.ToUri())
-                    .Cluster
-                    .CreateMember()
-                    .WithPeerUri(Fixtures.EtcdUrl.ToUri());
+                                       .Cluster
+                                       .CreateMember()
+                                       .WithPeerUri(Fixtures.EtcdUrl.ToUri());
 
                 http.Should()
                     .HaveCalled(
                         Fixtures.EtcdUrl
-                        .AppendPathSegment(Constants.Etcd.Path_Members)
+                                .AppendPathSegment(Constants.Etcd.Path_Members)
                     )
                     .WithVerb(HttpMethod.Post)
                     .WithContentType(Constants.Http.ContentType_ApplicationJson)
@@ -44,9 +44,9 @@ public async Task ShouldCallTheCorrectUrlByAwaitingImmediately()
                 member.Should().NotBeNull();
 
                 member.PeerUrls.Should()
-                    .NotBeEmpty()
-                    .And
-                    .ContainSingle(x => Fixtures.EtcdUrl.ToUri().Equals(x));
+                      .NotBeEmpty()
+                      .And
+                      .ContainSingle(x => Fixtures.EtcdUrl.ToUri().Equals(x));
             }
         }
 
@@ -60,14 +60,14 @@ public void ShouldThrowExistingPeerAddressExceptionOnDuplicatePeerAddress()
                 Func<Task> action = async () =>
                 {
                     await Etcd.ClientFor(Fixtures.EtcdUrl.ToUri())
-                        .Cluster
-                        .CreateMember()
-                        .WithPeerUri(Fixtures.EtcdUrl.ToUri());
+                              .Cluster
+                              .CreateMember()
+                              .WithPeerUri(Fixtures.EtcdUrl.ToUri());
                 };
 
                 action.ShouldThrowExactly<ExistingPeerAddressException>()
-                    .And
-                    .IsExistingPeerAddress.Should().BeTrue();
+                      .And
+                      .IsExistingPeerAddress.Should().BeTrue();
             }
         }
 
diff --git a/tests/Draft.Tests/Tests/Cluster/DeleteMemberTests.cs b/tests/Draft.Tests/Tests/Cluster/DeleteMemberTests.cs
new file mode 100644
index 0000000..a09e077
--- /dev/null
+++ b/tests/Draft.Tests/Tests/Cluster/DeleteMemberTests.cs
@@ -0,0 +1,89 @@
+using System;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+using Draft.Exceptions;
+
+using FluentAssertions;
+
+using Flurl;
+using Flurl.Http.Testing;
+
+using Xunit;
+
+namespace Draft.Tests.Cluster
+{
+    public class DeleteMemberTests
+    {
+
+        [Fact]
+        public async Task ShouldCallTheCorrectUrlByAwaitingImmediately()
+        {
+            using (var http = new HttpTest())
+            {
+                http.RespondWithJson(Fixtures.Cluster.CreateResponse(Fixtures.EtcdUrl.ToUri()));
+
+                var memberId = StaticRandom.Instance.Next();
+
+                await Etcd.ClientFor(Fixtures.EtcdUrl.ToUri())
+                          .Cluster
+                          .DeleteMember()
+                          .WithMemberId(memberId.ToString());
+
+                http.Should()
+                    .HaveCalled(
+                        Fixtures.EtcdUrl
+                                .AppendPathSegment(Constants.Etcd.Path_Members)
+                                .AppendPathSegment(memberId.ToString())
+                    )
+                    .WithVerb(HttpMethod.Delete)
+                    .Times(1);
+            }
+        }
+
+        [Fact]
+        public void ShouldThrowBadRequestExceptionOn400ResponseCode()
+        {
+            using (var http = new HttpTest())
+            {
+                http.RespondWith(HttpStatusCode.BadRequest, string.Empty);
+
+                Func<Task> action = async () =>
+                {
+                    await Etcd.ClientFor(Fixtures.EtcdUrl.ToUri())
+                              .Cluster
+                              .DeleteMember()
+                              .WithMemberId(StaticRandom.Instance.Next().ToString());
+                };
+
+                action.ShouldThrowExactly<BadRequestException>()
+                      .And
+                      .IsBadRequest.Should().BeTrue();
+            }
+        }
+
+        [Fact]
+        public void ShouldThrowInvalidRequestExceptionOn404ResponseCode()
+        {
+            using (var http = new HttpTest())
+            {
+                http.RespondWith(HttpStatusCode.NotFound, string.Empty);
+
+                Func<Task> action = async () =>
+                {
+                    await Etcd.ClientFor(Fixtures.EtcdUrl.ToUri())
+                              .Cluster
+                              .DeleteMember()
+                              .WithMemberId(StaticRandom.Instance.Next().ToString());
+                };
+
+                action.ShouldThrowExactly<InvalidRequestException>()
+                      .And
+                      .IsInvalidRequest.Should().BeTrue();
+            }
+        }
+
+    }
+}
diff --git a/tests/Draft.Tests/Tests/Cluster/GetLeaderTests.cs b/tests/Draft.Tests/Tests/Cluster/GetLeaderTests.cs
new file mode 100644
index 0000000..d552593
--- /dev/null
+++ b/tests/Draft.Tests/Tests/Cluster/GetLeaderTests.cs
@@ -0,0 +1,77 @@
+using System;
+
+using FluentAssertions;
+
+using Flurl;
+
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+using Draft.Exceptions;
+
+using Flurl.Http.Testing;
+
+using Xunit;
+
+namespace Draft.Tests.Cluster
+{
+    public class GetLeaderTests
+    {
+
+        [Fact]
+        public async Task ShouldCallTheCorrectUrlByAwaitingImmediately()
+        {
+            using (var http = new HttpTest())
+            {
+                http.RespondWithJson(Fixtures.Cluster.ClusterMemberResponse(new[] {Fixtures.EtcdUrl.ToUri()}, new[] {Fixtures.EtcdUrl.ToUri()}));
+
+                var leader = await Etcd.ClientFor(Fixtures.EtcdUrl.ToUri())
+                                       .Cluster
+                                       .GetLeader();
+
+                http.Should()
+                    .HaveCalled(
+                        Fixtures.EtcdUrl
+                                .AppendPathSegment(Constants.Etcd.Path_Members_Leader)
+                    )
+                    .WithVerb(HttpMethod.Get)
+                    .Times(1);
+
+                leader.Should().NotBeNull();
+
+                leader.PeerUrls.Should()
+                      .NotBeEmpty()
+                      .And
+                      .ContainSingle(x => Fixtures.EtcdUrl.ToUri().Equals(x));
+
+                leader.ClientUrls.Should()
+                      .NotBeEmpty()
+                      .And
+                      .ContainSingle(x => Fixtures.EtcdUrl.ToUri().Equals(x));
+            }
+        }
+
+        [Fact]
+        public void ShouldThrowServiceUnavailableExceptionOn503ResponseCode()
+        {
+            using (var http = new HttpTest())
+            {
+                http.RespondWith(HttpStatusCode.ServiceUnavailable, string.Empty);
+
+                Func<Task> action = async () =>
+                {
+                    await Etcd.ClientFor(Fixtures.EtcdUrl.ToUri())
+                              .Cluster
+                              .GetLeader();
+                };
+
+                action.ShouldThrowExactly<ServiceUnavailableException>()
+                      .And
+                      .IsServiceUnavailable.Should().BeTrue();
+            }
+        }
+
+    }
+}
diff --git a/tests/Draft.Tests/Tests/Cluster/GetMembersTests.cs b/tests/Draft.Tests/Tests/Cluster/GetMembersTests.cs
new file mode 100644
index 0000000..6860812
--- /dev/null
+++ b/tests/Draft.Tests/Tests/Cluster/GetMembersTests.cs
@@ -0,0 +1,53 @@
+using System;
+
+using Flurl;
+
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+using FluentAssertions;
+
+using Flurl.Http.Testing;
+
+using Xunit;
+
+namespace Draft.Tests.Cluster
+{
+    public class GetMembersTests
+    {
+
+        [Fact]
+        public async Task ShouldCallTheCorrectUrlByAwaitingImmediately()
+        {
+            using (var http = new HttpTest())
+            {
+                http.RespondWithJson(
+                    Fixtures.Cluster.ClusterMembersResponse(
+                        Fixtures.Cluster.ClusterMemberResponse(),
+                        Fixtures.Cluster.ClusterMemberResponse(),
+                        Fixtures.Cluster.ClusterMemberResponse(),
+                        Fixtures.Cluster.ClusterMemberResponse(),
+                        Fixtures.Cluster.ClusterMemberResponse()
+                        ));
+
+                var members = await Etcd.ClientFor(Fixtures.EtcdUrl.ToUri())
+                                        .Cluster
+                                        .GetMembers();
+
+                http.Should()
+                    .HaveCalled(
+                        Fixtures.EtcdUrl
+                                .AppendPathSegment(Constants.Etcd.Path_Members)
+                    )
+                    .WithVerb(HttpMethod.Get)
+                    .Times(1);
+
+                members.Should().NotBeNull()
+                       .And
+                       .HaveCount(5);
+            }
+        }
+
+    }
+}
diff --git a/tests/Draft.Tests/Tests/Cluster/UpdateMemberPeerUrlsTests.cs b/tests/Draft.Tests/Tests/Cluster/UpdateMemberPeerUrlsTests.cs
new file mode 100644
index 0000000..58060d9
--- /dev/null
+++ b/tests/Draft.Tests/Tests/Cluster/UpdateMemberPeerUrlsTests.cs
@@ -0,0 +1,64 @@
+using System;
+
+using Flurl;
+
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+using FluentAssertions;
+
+using Flurl.Http.Testing;
+
+using Xunit;
+
+namespace Draft.Tests.Cluster
+{
+    public class UpdateMemberPeerUrlsTests
+    {
+
+        [Fact]
+        public async Task ShouldCallTheCorrectUrlByAwaitingImmediately()
+        {
+            using (var http = new HttpTest())
+            {
+                http.RespondWithJson(
+                    Fixtures.Cluster.ClusterMemberResponse(
+                        peerUris : new[]
+                        {
+                            Fixtures.EtcdUrl.ToUri(),
+                            Fixtures.EtcdUrl.ToUri()
+                        }));
+
+                var memberId = StaticRandom.Instance.Next().ToString();
+
+                var member = await Etcd.ClientFor(Fixtures.EtcdUrl.ToUri())
+                                       .Cluster
+                                       .UpdateMemberPeerUrls()
+                                       .WithMemberId(memberId)
+                                       .WithPeerUri(Fixtures.EtcdUrl.ToUri(), Fixtures.EtcdUrl.ToUri());
+
+                http.Should()
+                    .HaveCalled(
+                        Fixtures.EtcdUrl
+                                .AppendPathSegment(Constants.Etcd.Path_Members)
+                                .AppendPathSegment(memberId)
+                    )
+                    .WithVerb(HttpMethod.Put)
+                    .WithContentType(Constants.Http.ContentType_ApplicationJson)
+                    .Times(1);
+
+                member.Should().NotBeNull();
+                member.PeerUrls
+                      .Should()
+                      .HaveCount(2)
+                      .And
+                      .ContainInOrder(
+                          Fixtures.EtcdUrl.ToUri(),
+                          Fixtures.EtcdUrl.ToUri()
+                    );
+            }
+        }
+
+    }
+}
diff --git a/tests/Draft.Tests/Tests/Statistics/GetLeaderTests.cs b/tests/Draft.Tests/Tests/Statistics/GetLeaderTests.cs
new file mode 100644
index 0000000..514ef03
--- /dev/null
+++ b/tests/Draft.Tests/Tests/Statistics/GetLeaderTests.cs
@@ -0,0 +1,48 @@
+using System;
+
+using FluentAssertions;
+
+using Flurl;
+
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+using Flurl.Http.Testing;
+
+using Xunit;
+
+namespace Draft.Tests.Statistics
+{
+    public class GetLeaderTests
+    {
+
+        [Fact]
+        public async Task ShouldCallTheCorrectUrlByAwaitingImmediately()
+        {
+            using (var http = new HttpTest())
+            {
+                http.RespondWith(Fixtures.Statistics.LeaderResponse);
+
+                var response = await Etcd.ClientFor(Fixtures.EtcdUrl.ToUri())
+                    .Statistics
+                    .GetLeaderStatistics();
+
+                http.Should()
+                    .HaveCalled(Fixtures.EtcdUrl.AppendPathSegment(Constants.Etcd.Path_Stats_Leader))
+                    .WithVerb(HttpMethod.Get)
+                    .Times(1);
+
+                response.Should().NotBeNull();
+
+                response.Leader.Should().NotBeNullOrWhiteSpace();
+                response.Followers.Should().NotBeNull()
+                    .And.HaveCount(2);
+                response.Followers.Keys.OrderBy(x => x).Should()
+                    .HaveCount(2)
+                    .And.ContainInOrder("6e3bd23ae5f1eae0", "a8266ecf031671f3");
+            }
+        }
+
+    }
+}
diff --git a/tests/Draft.Tests/Tests/Statistics/GetSelfTests.cs b/tests/Draft.Tests/Tests/Statistics/GetSelfTests.cs
new file mode 100644
index 0000000..f3989c5
--- /dev/null
+++ b/tests/Draft.Tests/Tests/Statistics/GetSelfTests.cs
@@ -0,0 +1,52 @@
+using System;
+
+using FluentAssertions;
+
+using Flurl;
+
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+using Draft.Responses.Statistics;
+
+using Flurl.Http.Testing;
+
+using Xunit;
+
+namespace Draft.Tests.Statistics
+{
+    public class GetSelfTests
+    {
+
+        [Fact]
+        public async Task ShouldCallTheCorrectUrlByAwaitingImmediately()
+        {
+            using (var http = new HttpTest())
+            {
+                http.RespondWith(Fixtures.Statistics.SelfResponse);
+
+                var response = await Etcd.ClientFor(Fixtures.EtcdUrl.ToUri())
+                    .Statistics
+                    .GetServerStatistics();
+
+                http.Should()
+                    .HaveCalled(Fixtures.EtcdUrl.AppendPathSegment(Constants.Etcd.Path_Stats_Self))
+                    .WithVerb(HttpMethod.Get)
+                    .Times(1);
+
+                response.Should().NotBeNull();
+                response.Id.Should().NotBeNullOrWhiteSpace();
+                response.Name.Should().NotBeNullOrWhiteSpace();
+
+                response.LeaderInfo.Should().NotBeNull();
+                response.LeaderInfo.Leader.Should().Be("8a69d5f6b7814500");
+                response.LeaderInfo.StartTime.Should().HaveValue().And.NotBe(default(DateTime));
+                response.LeaderInfo.Uptime.Should().NotBeNullOrWhiteSpace();
+
+                response.State.Should().Be(StateType.StateFollower);
+            }
+        }
+
+    }
+}
diff --git a/tests/Draft.Tests/Tests/Statistics/GetStoreTests.cs b/tests/Draft.Tests/Tests/Statistics/GetStoreTests.cs
new file mode 100644
index 0000000..4c38705
--- /dev/null
+++ b/tests/Draft.Tests/Tests/Statistics/GetStoreTests.cs
@@ -0,0 +1,54 @@
+using System;
+
+using FluentAssertions;
+
+using Flurl;
+
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+using Flurl.Http.Testing;
+
+using Xunit;
+
+namespace Draft.Tests.Statistics
+{
+    public class GetStoreTests
+    {
+
+        [Fact]
+        public async Task ShouldCallTheCorrectUrlByAwaitingImmediately()
+        {
+            using (var http = new HttpTest())
+            {
+                http.RespondWith(Fixtures.Statistics.StoreResponse);
+
+                var response = await Etcd.ClientFor(Fixtures.EtcdUrl.ToUri())
+                    .Statistics
+                    .GetStoreStatistics();
+
+                http.Should()
+                    .HaveCalled(Fixtures.EtcdUrl.AppendPathSegment(Constants.Etcd.Path_Stats_Store))
+                    .WithVerb(HttpMethod.Get)
+                    .Times(1);
+
+                response.Should().NotBeNull();
+                response.CreateSuccess.Should().Be(2);
+                response.GetsFail.Should().Be(4);
+                response.GetsSuccess.Should().Be(75);
+                response.SetsFail.Should().Be(2);
+                response.SetsSuccess.Should().Be(4);
+                response.CompareAndDeleteFail.Should().Be(0);
+                response.CompareAndDeleteSuccess.Should().Be(0);
+                response.CompareAndSwapFail.Should().Be(0);
+                response.CompareAndSwapSuccess.Should().Be(0);
+                response.DeleteSuccess.Should().Be(0);
+                response.DeleteFail.Should().Be(0);
+                response.ExpireCount.Should().Be(0);
+                response.Watchers.Should().Be(0);
+            }
+        }
+
+    }
+}
diff --git a/tests/Draft.Tests/Tests/ValueConverterTests.cs b/tests/Draft.Tests/Tests/ValueConverterTests.cs
index 5d599de..21e01e7 100644
--- a/tests/Draft.Tests/Tests/ValueConverterTests.cs
+++ b/tests/Draft.Tests/Tests/ValueConverterTests.cs
@@ -11,7 +11,6 @@
 using Flurl.Http.Testing;
 
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 using Xunit;
 
@@ -24,8 +23,8 @@ public class ValueConverterTests
         public async Task Get_ShouldUseConfiguredValueConverter()
         {
             var dto = Fixtures.Dto.SimpleDataContract();
-            var converter = new XmlValueConverter<SimpleDataContractDto>();
-            var expected = converter.WriteString(dto);
+            var converter = new XmlValueConverter();
+            var expected = converter.Write(dto);
 
             using (var http = new HttpTest())
             {
@@ -65,8 +64,8 @@ public async Task Get_ShouldUseConfiguredValueConverter()
         public async Task Get_ShouldUsePassedValueConverter()
         {
             var dto = Fixtures.Dto.SimpleDataContract();
-            var converter = new XmlValueConverter<SimpleDataContractDto>();
-            var expected = converter.WriteString(dto);
+            var converter = new XmlValueConverter();
+            var expected = converter.Write(dto);
 
             using (var http = new HttpTest())
             {
@@ -99,26 +98,10 @@ public async Task Get_ShouldUsePassedValueConverter()
             }
         }
 
-        [Fact]
-        public void JsonConverter_ShouldDeserializeDynamicCorrectly()
-        {
-            var result = Converters.Json.ReadString(Fixtures.Dto.Json_SimpleDataContract);
-
-            result.Should().NotBeNull();
-            result.Should().BeAssignableTo<JObject>();
-
-            var jresult = (JObject) result;
-
-            jresult.HasValues.Should().BeTrue();
-
-            jresult.Property("id").Should().NotBeNullOrEmpty();
-            jresult.Property("NAME").Should().NotBeNullOrEmpty();
-        }
-
         [Fact]
         public void JsonConverter_ShouldDeserializeTypeCorrectly()
         {
-            var result = Converters.Json.ReadString<SimpleDataContractDto>(Fixtures.Dto.Json_SimpleDataContract);
+            var result = Converters.Json.Read<SimpleDataContractDto>(Fixtures.Dto.Json_SimpleDataContract);
 
             result.Should().NotBeNull();
 
@@ -130,7 +113,7 @@ public void JsonConverter_ShouldDeserializeTypeCorrectly()
         [Fact]
         public void StringConverter_ShouldDeserializeCorrectly()
         {
-            var result = Converters.String.ReadString(Fixtures.Dto.Json_SimpleDataContract_Name);
+            var result = Converters.String.Read<string>(Fixtures.Dto.Json_SimpleDataContract_Name);
 
             result.Should().NotBeNull();
             result.Should().Be(Fixtures.Dto.Json_SimpleDataContract_Name);
@@ -139,7 +122,7 @@ public void StringConverter_ShouldDeserializeCorrectly()
         [Fact]
         public void StringConverter_ShouldDoNothingWithStringParameterOnWriteStringMethod()
         {
-            var result = Converters.String.WriteString(Fixtures.Dto.Json_SimpleDataContract_Name);
+            var result = Converters.String.Write(Fixtures.Dto.Json_SimpleDataContract_Name);
 
             result.Should().NotBeNull();
             result.Should().Be(Fixtures.Dto.Json_SimpleDataContract_Name);
@@ -203,8 +186,8 @@ await client
         public async Task Upsert_ShouldUsedPassedValueConverter()
         {
             var dto = Fixtures.Dto.SimpleDataContract();
-            var converter = new XmlValueConverter<SimpleDataContractDto>();
-            var expected = converter.WriteString(dto);
+            var converter = new XmlValueConverter();
+            var expected = converter.Write(dto);
 
             using (var http = new HttpTest())
             {
diff --git a/tests/Draft.Tests/packages.Draft-Net45.Tests.config b/tests/Draft.Tests/packages.Draft-Net45.Tests.config
index d93e0d5..41111be 100644
--- a/tests/Draft.Tests/packages.Draft-Net45.Tests.config
+++ b/tests/Draft.Tests/packages.Draft-Net45.Tests.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoFixture" version="3.30.3" targetFramework="net45" />
-  <package id="FluentAssertions" version="3.3.0" targetFramework="net45" />
-  <package id="Flurl" version="1.0.7" targetFramework="net45" />
-  <package id="Flurl.Http" version="0.6.0" targetFramework="net45" />
+  <package id="AutoFixture" version="3.30.8" targetFramework="net45" />
+  <package id="FluentAssertions" version="3.4.1" targetFramework="net45" />
+  <package id="Flurl" version="1.0.8" targetFramework="net45" />
+  <package id="Flurl.Http" version="0.6.2" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />