diff --git a/.gitignore b/.gitignore
index f1e3d20..5f3a86c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -250,3 +250,4 @@ paket-files/
 # JetBrains Rider
 .idea/
 *.sln.iml
+/azure-documentdb-odata-sql/nuget.exe
diff --git a/README.md b/README.md
index c42e6ef..10c2296 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@ The above query will then be translated to DocumentDB SQL:
 ```
 SELECT TOP 5 c.revenue FROM c WHERE CONTAINS(c.englishName,'Limited') ORDER BY c.countryCode DESC 
 ```
+Note: requires  Microsoft.AspNet.OData 6.1.0.0 and .NET Framework 4.62
 
 ### Supported OData to DocumentDB SQL mappings:
 
@@ -32,7 +33,17 @@ SELECT TOP 5 c.revenue FROM c WHERE CONTAINS(c.englishName,'Limited') ORDER BY c
 
 [$orderby](http://docs.oasis-open.org/odata/odata/v4.0/errata03/os/complete/part1-protocol/odata-v4.0-errata03-os-part1-protocol-complete.html#_The_$select_System_1) => ORDER BY
 
+[$count](http://docs.oasis-open.org/odata/odata/v4.0/errata03/os/complete/part1-protocol/odata-v4.0-errata03-os-part1-protocol-complete.html#_The_$inlinecount_System) => COUNT(1)
+
+### Built-in Operators
+Items/any(d:d/Quantity gt 100)  => JOIN a in c.Items WHERE a.Quantity > 100
+Note: If more objects in 'Items' qualify for the expression, duplicate results may result. e.g.
+SELECT  value c FROM c
+JOIN a IN c.sub
+WHERE a.v=false  might return c twice, while c exists once, because the join in 'sub' has two hits
+
 #### Built-in Query Functions
+
 contains()(field, 'value')	 => CONTAINS(c.field, 'value')
 
 startswith()(field, 'value') => STARTSWITH(c.field, 'value')
@@ -53,6 +64,10 @@ trim(field)                  => LTRIM(RTRIM(c.englishName))
 
 concat(field,'value')        => CONCAT(c.englishName,'value')
 
+geo.distance(field, geography'POINT(30 10)') => ST_DISTANCE(c.location,{"type":"Point","coordinates":[30,10]})
+
+geo.intersects(field, geography'POLYGON((30 10, 10 20, 20 40, 40 40, 30 10))') => ST_INTERSECTS(c.area,{"type":"Polygon","coordinates":[[[30,10],[10.20],[20,40],[40,40],[30,10]]]})
+
 ## Installing
 
 The nuget package of this project is published on Nuget.org [Download Page](https://www.nuget.org/packages/Microsoft.Azure.Documents.OData.Sql/). To install in Visual Studio Package Manager Console, run command: 
@@ -93,3 +108,5 @@ The options can be combined with bit operators such as ```(TranslateOptions.SELE
 ## Authors
 
 * **Ziyou Zheng** - Microsoft Universal Store Team -
+* **Egbert Nierop** - Free Lance developer - Added any functionality 2017 oct 13. note: all-functionality not supported.
+* **ntanaka** - Added $count, geography'POINT and geography'POLYGON( translations
\ No newline at end of file
diff --git a/azure-documentdb-odata-sql-samples/ODataToSqlSamples.cs b/azure-documentdb-odata-sql-samples/ODataToSqlSamples.cs
index 05a6289..8345034 100644
--- a/azure-documentdb-odata-sql-samples/ODataToSqlSamples.cs
+++ b/azure-documentdb-odata-sql-samples/ODataToSqlSamples.cs
@@ -7,6 +7,7 @@
 
 using Microsoft.Azure.Documents.OData.Sql;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Web.OData.Extensions;
 
 namespace azure_documentdb_odata_sql_tests
 {
@@ -40,8 +41,13 @@ public static void ClassInitialize(TestContext testContext)
         [TestInitialize()]
         public void TestInitialize()
         {
-            httpRequestMessage = new HttpRequestMessage();
-            httpRequestMessage.Method = HttpMethod.Get;
+            httpRequestMessage = new HttpRequestMessage
+            {
+                Method = HttpMethod.Get
+            };
+            var config = new System.Web.Http.HttpConfiguration();
+            config.EnableDependencyInjection();
+            httpRequestMessage.SetConfiguration(config);
         }
 
         [TestMethod]
@@ -76,7 +82,26 @@ public void TranslateSelectWithEnumSample()
             var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.SELECT_CLAUSE);
             Assert.AreEqual("SELECT c.enumNumber, c.id FROM c ", sqlQuery);
         }
+        [TestMethod]
+        public void TranslateAnySample()
+        {
+            httpRequestMessage.RequestUri = new Uri("http://localhost/User?$filter=companies/any(p: p/id eq 'abc' or p/name eq 'blaat')");
+            var oDataQueryOptions = new ODataQueryOptions(oDataQueryContext, httpRequestMessage);
 
+            var oDataToSqlTranslator = new ODataToSqlTranslator(new SQLQueryFormatter());
+            var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.SELECT_CLAUSE | TranslateOptions.WHERE_CLAUSE);
+            Assert.AreEqual("SELECT VALUE c FROM c JOIN a IN c.companies WHERE a.id = 'abc' OR a.name = 'blaat'", sqlQuery);
+        }
+        [TestMethod]
+        public void TranslateAnySampleWithMultipleClauses()
+        {
+            httpRequestMessage.RequestUri = new Uri("http://localhost/User?$filter=(companies/any(p: p/id eq 'abc' or p/name eq 'blaat')) and customers/any(x: x/customer_name eq 'jaap')");
+            var oDataQueryOptions = new ODataQueryOptions(oDataQueryContext, httpRequestMessage);
+
+            var oDataToSqlTranslator = new ODataToSqlTranslator(new SQLQueryFormatter());
+            var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.SELECT_CLAUSE | TranslateOptions.WHERE_CLAUSE);
+            Assert.AreEqual("SELECT VALUE c FROM c JOIN a IN c.companies JOIN b IN c.customers WHERE a.id = 'abc' OR a.name = 'blaat' AND b.customer_name = 'jaap'", sqlQuery);
+        }
         [TestMethod]
         public void TranslateSelectAllTopSample()
         {
@@ -107,7 +132,18 @@ public void TranslateWhereSample()
 
             var oDataToSqlTranslator = new ODataToSqlTranslator(new SQLQueryFormatter());
             var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.WHERE_CLAUSE);
-            Assert.AreEqual("WHERE c.englishName = 'Microsoft' AND c.intField <= 5 ", sqlQuery);
+            Assert.AreEqual("WHERE c.englishName = 'Microsoft' AND c.intField <= 5", sqlQuery);
+        }
+
+        [TestMethod]
+        public void TranslateWhereSampleWithGUID()
+        {
+            httpRequestMessage.RequestUri = new Uri("http://localhost?$filter=id eq 2ED27DF5-F505-4A06-B168-7321C6B4AD0C");
+            var oDataQueryOptions = new ODataQueryOptions(oDataQueryContext, httpRequestMessage);
+
+            var oDataToSqlTranslator = new ODataToSqlTranslator(new SQLQueryFormatter());
+            var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.WHERE_CLAUSE);
+            Assert.AreEqual("WHERE c.id = '2ed27df5-f505-4a06-b168-7321c6b4ad0c'", sqlQuery);
         }
 
         [TestMethod]
@@ -118,7 +154,7 @@ public void TranslateWhereWithEnumSample()
 
             var oDataToSqlTranslator = new ODataToSqlTranslator(new SQLQueryFormatter());
             var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.WHERE_CLAUSE);
-            Assert.AreEqual("WHERE c.enumNumber = 'ONE' AND c.intField <= 5 ", sqlQuery);
+            Assert.AreEqual("WHERE c.enumNumber = 'ONE' AND c.intField <= 5", sqlQuery);
         }
 
         [TestMethod]
@@ -129,7 +165,7 @@ public void TranslateWhereWithNextedFieldsSample()
 
             var oDataToSqlTranslator = new ODataToSqlTranslator(new SQLQueryFormatter());
             var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.WHERE_CLAUSE);
-            Assert.AreEqual("WHERE c.parent.child = 'childValue' AND c.intField <= 5 ", sqlQuery);
+            Assert.AreEqual("WHERE c.parent.child = 'childValue' AND c.intField <= 5", sqlQuery);
         }
 
         [TestMethod]
@@ -140,7 +176,7 @@ public void TranslateAdditionalWhereSample()
 
             var oDataToSqlTranslator = new ODataToSqlTranslator(new SQLQueryFormatter());
             var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.WHERE_CLAUSE, "c.dataType = 'MockOpenType'");
-            Assert.AreEqual("WHERE c.dataType = 'MockOpenType' AND c.englishName = 'Microsoft' AND c.intField <= 5 ", sqlQuery);
+            Assert.AreEqual("WHERE c.dataType = 'MockOpenType' AND c.englishName = 'Microsoft' AND c.intField <= 5", sqlQuery);
         }
 
         [TestMethod]
@@ -151,7 +187,7 @@ public void TranslateSelectWhereSample()
 
             var oDataToSqlTranslator = new ODataToSqlTranslator(new SQLQueryFormatter());
             var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.SELECT_CLAUSE | TranslateOptions.WHERE_CLAUSE, "c.dataType = 'MockOpenType'");
-            Assert.AreEqual("SELECT * FROM c WHERE c.dataType = 'MockOpenType' AND c.englishName = 'Microsoft' ", sqlQuery);
+            Assert.AreEqual("SELECT * FROM c WHERE c.dataType = 'MockOpenType' AND c.englishName = 'Microsoft'", sqlQuery);
         }
 
         [TestMethod]
@@ -184,7 +220,7 @@ public void TranslateContainsSample()
 
             var oDataToSqlTranslator = new ODataToSqlTranslator(new SQLQueryFormatter());
             var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.ALL & ~TranslateOptions.TOP_CLAUSE);
-            Assert.AreEqual("SELECT * FROM c WHERE CONTAINS(c.englishName,'Microsoft') ", sqlQuery);
+            Assert.AreEqual("SELECT * FROM c WHERE CONTAINS(c.englishName,'Microsoft')", sqlQuery);
         }
 
         [TestMethod]
@@ -195,7 +231,7 @@ public void TranslateStartswithSample()
 
             var oDataToSqlTranslator = new ODataToSqlTranslator(new SQLQueryFormatter());
             var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.ALL & ~TranslateOptions.TOP_CLAUSE);
-            Assert.AreEqual("SELECT * FROM c WHERE STARTSWITH(c.englishName,'Microsoft') ", sqlQuery);
+            Assert.AreEqual("SELECT * FROM c WHERE STARTSWITH(c.englishName,'Microsoft')", sqlQuery);
         }
 
         [TestMethod]
@@ -206,7 +242,7 @@ public void TranslateEndswithSample()
 
             var oDataToSqlTranslator = new ODataToSqlTranslator(new SQLQueryFormatter());
             var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.ALL & ~TranslateOptions.TOP_CLAUSE);
-            Assert.AreEqual("SELECT * FROM c WHERE ENDSWITH(c.englishName,'Microsoft') ", sqlQuery);
+            Assert.AreEqual("SELECT * FROM c WHERE ENDSWITH(c.englishName,'Microsoft')", sqlQuery);
         }
 
         [TestMethod]
@@ -217,7 +253,7 @@ public void TranslateUpperAndLowerSample()
 
             var oDataToSqlTranslator = new ODataToSqlTranslator(new SQLQueryFormatter());
             var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.ALL & ~TranslateOptions.TOP_CLAUSE);
-            Assert.AreEqual("SELECT * FROM c WHERE UPPER(c.englishName) = 'MICROSOFT' OR LOWER(c.englishName) = 'microsoft' ", sqlQuery);
+            Assert.AreEqual("SELECT * FROM c WHERE UPPER(c.englishName) = 'MICROSOFT' OR LOWER(c.englishName) = 'microsoft'", sqlQuery);
         }
 
         [TestMethod]
@@ -228,7 +264,7 @@ public void TranslateLengthSample()
 
             var oDataToSqlTranslator = new ODataToSqlTranslator(new SQLQueryFormatter());
             var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.ALL & ~TranslateOptions.TOP_CLAUSE);
-            Assert.AreEqual("SELECT * FROM c WHERE LENGTH(c.englishName) >= 10 AND LENGTH(c.englishName) < 15 ", sqlQuery);
+            Assert.AreEqual("SELECT * FROM c WHERE LENGTH(c.englishName) >= 10 AND LENGTH(c.englishName) < 15", sqlQuery);
         }
 
         [TestMethod]
@@ -239,7 +275,7 @@ public void TranslateIndexOfSample()
 
             var oDataToSqlTranslator = new ODataToSqlTranslator(new SQLQueryFormatter());
             var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.ALL & ~TranslateOptions.TOP_CLAUSE);
-            Assert.AreEqual("SELECT * FROM c WHERE INDEX_OF(c.englishName,'soft') = 4 ", sqlQuery);
+            Assert.AreEqual("SELECT * FROM c WHERE INDEX_OF(c.englishName,'soft') = 4", sqlQuery);
         }
 
         [TestMethod]
@@ -250,7 +286,7 @@ public void TranslateSubstringSample()
 
             var oDataToSqlTranslator = new ODataToSqlTranslator(new SQLQueryFormatter());
             var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.ALL & ~TranslateOptions.TOP_CLAUSE);
-            Assert.AreEqual("SELECT * FROM c WHERE SUBSTRING(c.englishName,1,LENGTH(c.englishName)) = 'icrosoft' ", sqlQuery);
+            Assert.AreEqual("SELECT * FROM c WHERE SUBSTRING(c.englishName,1,LENGTH(c.englishName)) = 'icrosoft'", sqlQuery);
         }
 
         [TestMethod]
@@ -261,7 +297,7 @@ public void TranslateTrimSample()
 
             var oDataToSqlTranslator = new ODataToSqlTranslator(new SQLQueryFormatter());
             var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.ALL & ~TranslateOptions.TOP_CLAUSE);
-            Assert.AreEqual("SELECT * FROM c WHERE LTRIM(RTRIM(c.englishName)) = 'Microsoft' ", sqlQuery);
+            Assert.AreEqual("SELECT * FROM c WHERE LTRIM(RTRIM(c.englishName)) = 'Microsoft'", sqlQuery);
         }
 
         [TestMethod]
@@ -272,7 +308,7 @@ public void TranslateConcatSample()
 
             var oDataToSqlTranslator = new ODataToSqlTranslator(new SQLQueryFormatter());
             var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.ALL & ~TranslateOptions.TOP_CLAUSE);
-            Assert.AreEqual("SELECT * FROM c WHERE CONCAT(c.englishName,' Canada') = 'Microsoft Canada' ", sqlQuery);
+            Assert.AreEqual("SELECT * FROM c WHERE CONCAT(c.englishName,' Canada') = 'Microsoft Canada'", sqlQuery);
         }
 
         [TestMethod]
@@ -285,5 +321,38 @@ public void TranslateMasterSample()
             var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.ALL, "c._t = 'dataType'");
             Assert.AreEqual("SELECT TOP 30 c.id, c.englishName FROM c WHERE c._t = 'dataType' AND c.title = 'title1' AND c.property.field != 'val' OR c.viewedCount >= 5 AND (c.likedCount != 3 OR c.enumNumber = 'TWO') ORDER BY c._lastClientEditedDateTime ASC, c.createdDateTime DESC ", sqlQuery);
         }
+
+        [TestMethod]
+        public void TranslateCountSample()
+        {
+            httpRequestMessage.RequestUri = new Uri("http://localhost/User?$count=true&$filter=englishName eq 'Microsoft'");
+            var oDataQueryOptions = new ODataQueryOptions(oDataQueryContext, httpRequestMessage);
+
+            var oDataToSqlTranslator = new ODataToSqlTranslator(new SQLQueryFormatter());
+            var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.SELECT_CLAUSE | TranslateOptions.WHERE_CLAUSE);
+            Assert.AreEqual("SELECT VALUE COUNT(1) FROM c WHERE c.englishName = 'Microsoft'", sqlQuery);
+        }
+
+        [TestMethod]
+        public void TranslateGeoDistanceSample()
+        {
+            httpRequestMessage.RequestUri = new Uri("http://localhost/User?$filter=geo.distance(location, geography'POINT(31.9 -4.8)') lt 100");
+            var oDataQueryOptions = new ODataQueryOptions(oDataQueryContext, httpRequestMessage);
+
+            var oDataToSqlTranslator = new ODataToSqlTranslator(new SQLQueryFormatter());
+            var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.ALL & ~TranslateOptions.TOP_CLAUSE);
+            Assert.AreEqual("SELECT * FROM c WHERE ST_DISTANCE(c.location,{\"type\":\"Point\",\"coordinates\":[31.9,-4.8]}) < 100", sqlQuery);
+        }
+
+        [TestMethod]
+        public void TranslateGeoIntersectsSample()
+        {
+            httpRequestMessage.RequestUri = new Uri("http://localhost/User?$filter=geo.intersects(area, geography'POLYGON((31.8 -5, 32 -5, 32 -4.7, 31.8 -4.7, 31.8 -5))')");
+            var oDataQueryOptions = new ODataQueryOptions(oDataQueryContext, httpRequestMessage);
+
+            var oDataToSqlTranslator = new ODataToSqlTranslator(new SQLQueryFormatter());
+            var sqlQuery = oDataToSqlTranslator.Translate(oDataQueryOptions, TranslateOptions.ALL & ~TranslateOptions.TOP_CLAUSE);
+            Assert.AreEqual("SELECT * FROM c WHERE ST_INTERSECTS(c.area,{\"type\":\"Polygon\",\"coordinates\":[[[31.8,-5.0],[32.0,-5.0],[32.0,-4.7],[31.8,-4.7],[31.8,-5.0]]]})", sqlQuery);
+        }
     }
 }
diff --git a/azure-documentdb-odata-sql-samples/app.config b/azure-documentdb-odata-sql-samples/app.config
new file mode 100644
index 0000000..ceee8d6
--- /dev/null
+++ b/azure-documentdb-odata-sql-samples/app.config
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.1" newVersion="4.1.1.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.Tracing" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.OData.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.3.1.10814" newVersion="7.3.1.10814" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.OData.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.3.1.10814" newVersion="7.3.1.10814" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.3.1.10814" newVersion="7.3.1.10814" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/azure-documentdb-odata-sql-samples/azure-documentdb-odata-sql-samples.csproj b/azure-documentdb-odata-sql-samples/azure-documentdb-odata-sql-samples.csproj
index 9401caf..99c7cc8 100644
--- a/azure-documentdb-odata-sql-samples/azure-documentdb-odata-sql-samples.csproj
+++ b/azure-documentdb-odata-sql-samples/azure-documentdb-odata-sql-samples.csproj
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>azure_documentdb_odata_sql_tests</RootNamespace>
     <AssemblyName>azure-documentdb-odata-sql-tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -18,6 +18,7 @@
     <TestProjectType>UnitTest</TestProjectType>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -37,53 +38,133 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Documents.Client, Version=1.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Azure.DocumentDB.1.10.0\lib\net45\Microsoft.Azure.Documents.Client.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Documents.Client, Version=1.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Azure.DocumentDB.1.17.0\lib\net45\Microsoft.Azure.Documents.Client.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.1.1.1\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.1.1\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.OData.Core, Version=7.3.1.10814, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.OData.Core.7.3.1\lib\portable-net45+win8+wpa81\Microsoft.OData.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.OData.Edm, Version=7.3.1.10814, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.OData.Edm.7.3.1\lib\portable-net45+win8+wpa81\Microsoft.OData.Edm.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Spatial, Version=7.3.1.10814, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Spatial.7.3.1\lib\portable-net45+win8+wpa81\Microsoft.Spatial.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.OData.Core, Version=6.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.OData.Core.6.15.0\lib\portable-net45+win+wpa81\Microsoft.OData.Core.dll</HintPath>
+    <Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.OData.Edm, Version=6.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.OData.Edm.6.15.0\lib\portable-net45+win+wpa81\Microsoft.OData.Edm.dll</HintPath>
+    <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Spatial, Version=6.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Spatial.6.15.0\lib\portable-net45+win+wpa81\Microsoft.Spatial.dll</HintPath>
+    <Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.Formatting, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    <Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Net.Http, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Net.Http.4.3.2\lib\net46\System.Net.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime.InteropServices, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.InteropServices.4.3.0\lib\net462\System.Runtime.InteropServices.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Web.Http, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.2\lib\net45\System.Web.Http.dll</HintPath>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Web.OData, Version=5.9.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.OData.5.9.1\lib\net45\System.Web.OData.dll</HintPath>
+    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.OData, Version=6.1.0.10907, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.OData.6.1.0\lib\net45\System.Web.OData.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <Choose>
     <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
@@ -109,6 +190,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Choose>
@@ -131,12 +213,12 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Microsoft.Azure.DocumentDB.1.10.0\build\Microsoft.Azure.DocumentDB.targets" Condition="Exists('..\packages\Microsoft.Azure.DocumentDB.1.10.0\build\Microsoft.Azure.DocumentDB.targets')" />
+  <Import Project="..\packages\Microsoft.Azure.DocumentDB.1.17.0\build\Microsoft.Azure.DocumentDB.targets" Condition="Exists('..\packages\Microsoft.Azure.DocumentDB.1.17.0\build\Microsoft.Azure.DocumentDB.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Azure.DocumentDB.1.10.0\build\Microsoft.Azure.DocumentDB.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.DocumentDB.1.10.0\build\Microsoft.Azure.DocumentDB.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Azure.DocumentDB.1.17.0\build\Microsoft.Azure.DocumentDB.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.DocumentDB.1.17.0\build\Microsoft.Azure.DocumentDB.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/azure-documentdb-odata-sql-samples/packages.config b/azure-documentdb-odata-sql-samples/packages.config
index 55b88ae..789ccbc 100644
--- a/azure-documentdb-odata-sql-samples/packages.config
+++ b/azure-documentdb-odata-sql-samples/packages.config
@@ -1,14 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.AspNet.OData" version="5.9.1" targetFramework="net452" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net452" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.2" targetFramework="net452" />
-  <package id="Microsoft.Azure.DocumentDB" version="1.10.0" targetFramework="net452" />
-  <package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net452" />
-  <package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net452" />
-  <package id="Microsoft.OData.Core" version="6.15.0" targetFramework="net452" />
-  <package id="Microsoft.OData.Edm" version="6.15.0" targetFramework="net452" />
-  <package id="Microsoft.Spatial" version="6.15.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
-  <package id="System.Spatial" version="5.6.0" targetFramework="net452" />
+  <package id="Microsoft.AspNet.OData" version="6.1.0" targetFramework="net462" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net462" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net462" />
+  <package id="Microsoft.Azure.DocumentDB" version="1.17.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="1.1.1" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.1.1" targetFramework="net462" />
+  <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net462" />
+  <package id="Microsoft.OData.Core" version="7.3.1" targetFramework="net462" />
+  <package id="Microsoft.OData.Edm" version="7.3.1" targetFramework="net462" />
+  <package id="Microsoft.Spatial" version="7.3.1" targetFramework="net462" />
+  <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="NETStandard.Library" version="1.6.1" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net462" />
+  <package id="System.AppContext" version="4.3.0" targetFramework="net462" />
+  <package id="System.Collections" version="4.3.0" targetFramework="net462" />
+  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net462" />
+  <package id="System.ComponentModel" version="4.3.0" targetFramework="net462" />
+  <package id="System.Console" version="4.3.0" targetFramework="net462" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net462" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net462" />
+  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net462" />
+  <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net462" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="net462" />
+  <package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net462" />
+  <package id="System.IO" version="4.3.0" targetFramework="net462" />
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
+  <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net462" />
+  <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net462" />
+  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Linq" version="4.3.0" targetFramework="net462" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net462" />
+  <package id="System.Net.Http" version="4.3.2" targetFramework="net462" />
+  <package id="System.Net.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Net.Sockets" version="4.3.0" targetFramework="net462" />
+  <package id="System.ObjectModel" version="4.3.0" targetFramework="net462" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net462" />
+  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net462" />
+  <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.Handles" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net462" />
+  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net462" />
+  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net462" />
+  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net462" />
+  <package id="System.Threading" version="4.3.0" targetFramework="net462" />
+  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net462" />
+  <package id="System.Threading.Timer" version="4.3.0" targetFramework="net462" />
+  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net462" />
+  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net462" />
 </packages>
\ No newline at end of file
diff --git a/azure-documentdb-odata-sql/ODataToSqlTranslator/Constants.cs b/azure-documentdb-odata-sql/ODataToSqlTranslator/Constants.cs
index 1f6250e..267347d 100644
--- a/azure-documentdb-odata-sql/ODataToSqlTranslator/Constants.cs
+++ b/azure-documentdb-odata-sql/ODataToSqlTranslator/Constants.cs
@@ -6,7 +6,10 @@
     public static class Constants
     {
         #region SQL Clauses
-
+        /// <summary>
+        /// used e.g. to parse and recompose a SQL string containing a JOIN clause
+        /// </summary>
+        public const string Delimiter = "|";
         /// <summary>
         /// Sql "SELECT" clause
         /// </summary>
@@ -27,6 +30,14 @@ public static class Constants
         /// </summary>
         public const string SQLFromSymbol = "FROM";
 
+        /// <summary>
+        /// Sql JOIN clause
+        /// </summary>
+        public const string SQLJoinSymbol = "JOIN";
+        /// <summary>
+        /// SQL IN keyword
+        /// </summary>
+        public const string SQLInKeyword = "IN";
         /// <summary>
         /// Sql "ORDER BY" clause
         /// </summary>
@@ -57,6 +68,16 @@ public static class Constants
         /// </summary>
         public const string SQLRtrimSymbol = "RTRIM";
 
+        /// <summary>
+        /// Sql "ST_DISTANCE" function
+        /// </summary>
+        public const string SQLStDistanceSymbol = "ST_DISTANCE";
+
+        /// <summary>
+        /// Sql "ST_INTERSECTS" function
+        /// </summary>
+        public const string SQLStIntersectsSymbol = "ST_INTERSECTS";
+
         /// <summary>
         /// Sql "*" wild card
         /// </summary>
@@ -183,6 +204,15 @@ public static class Constants
         /// Close Square Bracket
         /// </summary>
         public const string SymbolCloseSquareBracket = "]";
+        /// <summary>
+        /// 
+        /// </summary>
+        public const string SqlValueKeyWord = "VALUE"; 
+
+        /// <summary>
+        /// Count
+        /// </summary>
+        public const string SqlCountKeyWord = "COUNT(1)";
 
         /// <summary>
         /// Open Curly Bracket
@@ -256,6 +286,16 @@ public static class Constants
         /// </summary>
         public const string KeywordTrim = "trim";
 
+        /// <summary>
+        /// <c>"geo.distance"</c> keyword for expressions.
+        /// </summary>
+        public const string KeywordGeoDistance = "geo.distance";
+
+        /// <summary>
+        /// <c>"geo.intersects"</c> keyword for expressions.
+        /// </summary>
+        public const string KeywordGeoIntersects = "geo.intersects";
+
         /// <summary>
         /// <c>'&amp;'</c> constant to represent the concatenation of query parts.
         /// </summary>
diff --git a/azure-documentdb-odata-sql/ODataToSqlTranslator/QueryFormatterBase.cs b/azure-documentdb-odata-sql/ODataToSqlTranslator/IQueryFormatter.cs
similarity index 52%
rename from azure-documentdb-odata-sql/ODataToSqlTranslator/QueryFormatterBase.cs
rename to azure-documentdb-odata-sql/ODataToSqlTranslator/IQueryFormatter.cs
index fe9aa99..44581c8 100644
--- a/azure-documentdb-odata-sql/ODataToSqlTranslator/QueryFormatterBase.cs
+++ b/azure-documentdb-odata-sql/ODataToSqlTranslator/IQueryFormatter.cs
@@ -1,30 +1,26 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Microsoft.OData.Edm;
 
 namespace Microsoft.Azure.Documents.OData.Sql
 {
     /// <summary>
     /// abstract class for query formatter used in <see cref="ODataNodeToStringBuilder"/>
     /// </summary>
-    public abstract class QueryFormatterBase
+    public interface  IQueryFormatter
     {
         /// <summary>
         /// method to translate fieldName
         /// </summary>
         /// <param name="fieldName"></param>
         /// <returns>returns translated field</returns>
-        public abstract string TranslateFieldName(string fieldName);
+        string TranslateFieldName(string fieldName);
 
         /// <summary>
         /// method to translate enum values
         /// </summary>
-        /// <param name="value">the enum value</param>
-        /// <param name="nameSpace">Namespace of the enum type</param>
+        /// <param name="typeName">the Odata enum type</param>
+        /// <param name="value">string value of the type a number or literal</param>
         /// <returns>returns an enumValue without the namespace</returns>
-        public abstract string TranslateEnumValue(string enumValue, string nameSpace);
+        string TranslateEnumValue(IEdmTypeReference typeName, string value);
 
         /// <summary>
         /// method to convert parent/child field
@@ -32,13 +28,25 @@ public abstract class QueryFormatterBase
         /// <param name="source">the parent field</param>
         /// <param name="edmProperty">the child field</param>
         /// <returns>returns translated parent and child</returns>
-        public abstract string TranslateSource(string source, string edmProperty);
+        string TranslateSource(string source, string edmProperty);
 
         /// <summary>
         /// method to convert function name
         /// </summary>
         /// <param name="functionName"></param>
         /// <returns>returns a translated function name</returns>
-        public abstract string TranslateFunctionName(string functionName);
+        string TranslateFunctionName(string functionName);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="joinCollection"></param>
+        /// <returns></returns>
+        string TranslateJoinClause(string joinCollection);
+        /// <summary>
+        /// returns e.g. p:/id
+        /// </summary>
+        /// <param name="source">eg. "p" (lambda parameter)</param>
+        /// <param name="edmProperty">e.g. "id"</param>
+        string TranslateJoinClause(string source, string edmProperty);
     }
 }
diff --git a/azure-documentdb-odata-sql/ODataToSqlTranslator/ODataNodeToStringBuilder.cs b/azure-documentdb-odata-sql/ODataToSqlTranslator/ODataNodeToStringBuilder.cs
index 3c0fb92..8b65777 100644
--- a/azure-documentdb-odata-sql/ODataToSqlTranslator/ODataNodeToStringBuilder.cs
+++ b/azure-documentdb-odata-sql/ODataToSqlTranslator/ODataNodeToStringBuilder.cs
@@ -1,19 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Web.OData.Query;
-
-using Microsoft.OData.Core;
-using Microsoft.OData.Core.UriParser;
-using Microsoft.OData.Core.UriParser.Semantic;
-using Microsoft.OData.Core.UriParser.TreeNodeKinds;
-using Microsoft.OData.Core.UriParser.Visitors;
+using GeoJSON.Net.Geometry;
 using Microsoft.OData.Edm;
+using Microsoft.OData.UriParser;
+using Microsoft.OData;
+using Microsoft.Spatial;
+using Newtonsoft.Json;
 
 namespace Microsoft.Azure.Documents.OData.Sql
 {
-     /// <summary>
+    /// <summary>
     /// Build QueryNode to string Representation 
     /// </summary>
     internal class ODataNodeToStringBuilder : QueryNodeVisitor<string>
@@ -22,17 +19,20 @@ internal class ODataNodeToStringBuilder : QueryNodeVisitor<string>
         /// whether translating search options or others
         /// </summary>
         private bool searchFlag;
-
+        /// <summary>
+        /// whether translating an AnyClause or not
+        /// </summary>
+        private bool joinClause;
         /// <summary>s
         /// Gets the formatter to format the query
         /// </summary>
-        private QueryFormatterBase QueryFormatter { get; set; }
+        private IQueryFormatter QueryFormatter { get; set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ODataNodeToStringBuilder"/> class
         /// </summary>
         /// <param name="queryFormatter">the query format class</param>
-        public ODataNodeToStringBuilder(QueryFormatterBase queryFormatter)
+        public ODataNodeToStringBuilder(IQueryFormatter queryFormatter)
         {
             this.QueryFormatter = queryFormatter;
         }
@@ -51,7 +51,8 @@ private ODataNodeToStringBuilder()
         /// <returns>The translated string.</returns>
         public override string Visit(AllNode node)
         {
-            string result = string.Concat(this.TranslateNode(node.Source), Constants.SymbolForwardSlash, Constants.KeywordAll, Constants.SymbolOpenParen, node.CurrentRangeVariable.Name, Constants.SymbolColon, this.TranslateNode(node.Body), Constants.SymbolClosedParen);
+            var result = string.Concat(Constants.Delimiter, this.TranslateNode(node.Source, true), Constants.Delimiter, this.TranslateNode(node.Body));
+
             return result;
         }
 
@@ -62,14 +63,15 @@ public override string Visit(AllNode node)
         /// <returns>The translated string.</returns>
         public override string Visit(AnyNode node)
         {
-            if (node.CurrentRangeVariable == null && node.Body.Kind == QueryNodeKind.Constant)
-            {
-                return string.Concat(this.TranslateNode(node.Source), Constants.SymbolForwardSlash, Constants.KeywordAny, Constants.SymbolOpenParen, Constants.SymbolClosedParen);
-            }
-            else
-            {
-                return string.Concat(this.TranslateNode(node.Source), Constants.SymbolForwardSlash, Constants.KeywordAny, Constants.SymbolOpenParen, node.CurrentRangeVariable.Name, ":", this.TranslateNode(node.Body), Constants.SymbolClosedParen);
-            }
+            //should return something like JOIN a in c.companies 
+            //if (node.CurrentRangeVariable == null && node.Body.Kind == QueryNodeKind.Constant)
+            //{
+            //    return string.Concat(Constants.Delimiter, this.TranslateNode(node.Source, true), Constants.SymbolForwardSlash, Constants.KeywordAny, Constants.SymbolOpenParen, Constants.SymbolClosedParen, Constants.Delimiter);
+            //}
+            //else
+            //{
+                return string.Concat(Constants.Delimiter, this.TranslateNode(node.Source, true), Constants.Delimiter,  this.TranslateNode(node.Body));
+            //}
         }
 
         /// <summary>
@@ -82,32 +84,32 @@ public override string Visit(BinaryOperatorNode node)
             var leftNode = node.Left;
             while (leftNode != null && leftNode.Kind == QueryNodeKind.Convert)
             {
-                leftNode = (leftNode as ConvertNode).Source;
+                leftNode = ((ConvertNode)leftNode).Source;
             }
 
             var rightNode = node.Right;
             while (rightNode != null && rightNode.Kind == QueryNodeKind.Convert)
             {
-                rightNode = (rightNode as ConvertNode).Source;
+                rightNode = ((ConvertNode)rightNode).Source;
             }
 
             var left = this.TranslateNode(node.Left);
-            if (leftNode.Kind == QueryNodeKind.BinaryOperator && this.TranslateBinaryOperatorPriority(((BinaryOperatorNode)leftNode).OperatorKind) < this.TranslateBinaryOperatorPriority(node.OperatorKind))
+            if (leftNode.Kind == QueryNodeKind.BinaryOperator && TranslateBinaryOperatorPriority(((BinaryOperatorNode)leftNode).OperatorKind) < TranslateBinaryOperatorPriority(node.OperatorKind))
             {
                 left = string.Concat(Constants.SymbolOpenParen, left, Constants.SymbolClosedParen);
             }
 
             var right = this.TranslateNode(node.Right);
-            if (rightNode.Kind == QueryNodeKind.BinaryOperator && this.TranslateBinaryOperatorPriority(((BinaryOperatorNode)rightNode).OperatorKind) < this.TranslateBinaryOperatorPriority(node.OperatorKind))
+            if (rightNode.Kind == QueryNodeKind.BinaryOperator && TranslateBinaryOperatorPriority(((BinaryOperatorNode)rightNode).OperatorKind) < TranslateBinaryOperatorPriority(node.OperatorKind))
             {
                 right = string.Concat(Constants.SymbolOpenParen, right, Constants.SymbolClosedParen);
             }
 
-            return string.Concat(left, Constants.SymbolSpace, this.BinaryOperatorNodeToString(node.OperatorKind), Constants.SymbolSpace, right);
+            return string.Concat(left, Constants.SymbolSpace, BinaryOperatorNodeToString(node.OperatorKind), Constants.SymbolSpace, right);
         }
 
         /// <summary>
-        /// Translates a <see cref="CollectionPropertyAccessNode"/> into a corresponding <see cref="string"/>.
+        /// Translates a <see cref="CollectionNavigationNode"/> into a corresponding <see cref="string"/>.
         /// </summary>
         /// <param name="node">The node to translate.</param>
         /// <returns>The translated string.</returns>
@@ -117,7 +119,7 @@ public override string Visit(CollectionNavigationNode node)
         }
 
         /// <summary>
-        /// Translates a <see cref="CollectionPropertyAccessNode"/> into a corresponding <see cref="string"/>.
+        /// Translates a <see cref="CollectionPropertyAccessNode"/> into a corresponding.
         /// </summary>
         /// <param name="node">The node to translate.</param>
         /// <returns>The translated string.</returns>
@@ -138,9 +140,71 @@ public override string Visit(ConstantNode node)
                 return Constants.KeywordNull;
             }
 
-            if (node.TypeReference.Definition.TypeKind == EdmTypeKind.Enum)
+            if (node.TypeReference.IsEnum())
             {
-                return this.QueryFormatter.TranslateEnumValue(node.LiteralText, (node.Value as ODataEnumValue).TypeName);
+                var specificNode = (ODataEnumValue)node.Value;
+
+                return this.QueryFormatter.TranslateEnumValue(node.TypeReference, specificNode.Value);
+            }
+            else if (node.TypeReference.IsGuid())
+            {
+                return string.Format("'{0}'", node.Value);
+            }
+            // Translate Geography
+            else if (node.TypeReference.IsGeography())
+            {
+                LineString createLineString(GeographyLineString lineString)
+                {
+                    var coordinates = new List<IPosition>();
+                    foreach (var point in lineString.Points)
+                    {
+                        if (!point.IsEmpty)
+                        {
+                            var position = new Position(point.Latitude, point.Longitude, point.Z);
+                            coordinates.Add(position);
+                        }
+                    }
+
+                    return new LineString(coordinates);
+                }
+
+                // Translates Point
+                if (node.TypeReference.PrimitiveKind() == EdmPrimitiveTypeKind.GeographyPoint)
+                {
+                    var point = node.Value as GeographyPoint;
+                    if (point?.IsEmpty == false)
+                    {
+                        var position = new Position(point.Latitude, point.Longitude, point.Z);
+                        return JsonConvert.SerializeObject(new Point(position));
+                    }
+                }
+                // Translate Polygon
+                else if (node.TypeReference.PrimitiveKind() == EdmPrimitiveTypeKind.GeographyPolygon)
+                {
+                    var polygon = node.Value as GeographyPolygon;
+                    if (polygon?.IsEmpty == false)
+                    {
+                        var lineStrings = new List<LineString>();
+                        foreach (var lineString in polygon.Rings)
+                        {
+                            if (!lineString.IsEmpty)
+                            {
+                                lineStrings.Add(createLineString(lineString));
+                            }
+                        }
+
+                        return JsonConvert.SerializeObject(new Polygon(lineStrings));
+                    }
+                }
+                // Translate LineString
+                else if (node.TypeReference.PrimitiveKind() == EdmPrimitiveTypeKind.GeographyLineString)
+                {
+                    var lineString = node.Value as GeographyLineString;
+                    if (lineString?.IsEmpty == false)
+                    {
+                        return JsonConvert.SerializeObject(createLineString(lineString));
+                    }
+                }
             }
 
             return node.LiteralText;
@@ -157,31 +221,31 @@ public override string Visit(ConvertNode node)
         }
 
         /// <summary>
-        /// Translates a <see cref="EntityCollectionCastNode"/> into a corresponding <see cref="string"/>.
+        /// Translates a <see cref="CollectionResourceCastNode"/> into a corresponding <see cref="string"/>.
         /// </summary>
         /// <param name="node">The node to translate.</param>
         /// <returns>The translated string of EntityCollectionCastNode.</returns>
-        public override string Visit(EntityCollectionCastNode node)
+        public override string Visit(CollectionResourceCastNode node)
         {
-            return this.TranslatePropertyAccess(node.Source, node.EntityItemType.Definition.ToString());
+            return this.TranslatePropertyAccess(node.Source, node.ItemStructuredType.Definition.ToString());
         }
 
-        /// <summary>
-        /// Visit an CollectionPropertyCastNode
-        /// </summary>
-        /// <param name="node">the node to visit</param>
-        /// <returns>The translated string of CollectionPropertyCastNode</returns>
-        public override string Visit(CollectionPropertyCastNode node)
-        {
-            return this.TranslatePropertyAccess(node.Source, node.CollectionType.Definition.ToString());
-        }
+        ///// <summary>
+        ///// Visit an CollectionResourceCastNode
+        ///// </summary>
+        ///// <param name="node">the node to visit</param>
+        ///// <returns>The translated string of CollectionPropertyCastNode</returns>
+        //public override string Visit(CollectionPropertyCastNode node)
+        //{
+        //    return this.TranslatePropertyAccess(node.Source, node.CollectionType.Definition.ToString());
+        //}
 
         /// <summary>
-        /// Translates a <see cref="EntityRangeVariableReferenceNode"/> into a corresponding <see cref="string"/>.
+        /// Translates a <see cref="ResourceRangeVariableReferenceNode"/> into a corresponding <see cref="string"/>.
         /// </summary>
         /// <param name="node">The node to translate.</param>
         /// <returns>The translated string.</returns>
-        public override string Visit(EntityRangeVariableReferenceNode node)
+        public override string Visit(ResourceRangeVariableReferenceNode  node)
         {
             if (node.Name == "$it")
             {
@@ -194,31 +258,21 @@ public override string Visit(EntityRangeVariableReferenceNode node)
         }
 
         /// <summary>
-        /// Translates a <see cref="NonentityRangeVariableReferenceNode"/> into a corresponding <see cref="string"/>.
+        /// Translates a <see cref="NonResourceRangeVariableReferenceNode"/> into a corresponding <see cref="string"/>.
         /// </summary>
         /// <param name="node">The node to translate.</param>
         /// <returns>The translated string.</returns>
-        public override string Visit(NonentityRangeVariableReferenceNode node)
+        public override string Visit(NonResourceRangeVariableReferenceNode node)
         {
             return node.Name;
         }
 
         /// <summary>
-        /// Translates a <see cref="SingleEntityCastNode"/> into a corresponding <see cref="string"/>.
+        /// Translates a <see cref="SingleResourceCastNode"/> into a corresponding <see cref="string"/>.
         /// </summary>
         /// <param name="node">The node to translate.</param>
         /// <returns>The translated string.</returns>
-        public override string Visit(SingleEntityCastNode node)
-        {
-            return this.TranslatePropertyAccess(node.Source, node.EntityTypeReference.Definition.ToString());
-        }
-
-        /// <summary>
-        /// Translates a <see cref="SingleValueCastNode"/> into a corresponding <see cref="string"/>.
-        /// </summary>
-        /// <param name="node">The node to translate.</param>
-        /// <returns>The translated string of SingleValueCastNode.</returns>
-        public override string Visit(SingleValueCastNode node)
+        public override string Visit(SingleResourceCastNode node)
         {
             return this.TranslatePropertyAccess(node.Source, node.TypeReference.Definition.ToString());
         }
@@ -232,13 +286,31 @@ public override string Visit(SingleNavigationNode node)
         {
             return this.TranslatePropertyAccess(node.Source, node.NavigationProperty.Name, node.NavigationSource);
         }
-
-        /// <summary>
-        /// Translates a <see cref="SingleEntityFunctionCallNode"/> into a corresponding <see cref="string"/>.
+      
+        //public override string Visit(SingleValueCastNode nodeIn)
+        //{
+        //    return base.Visit(nodeIn);
+        //}
+        //public override string Visit(SingleComplexNode nodeIn)
+        //{
+        //    return base.Visit(nodeIn);
+        //}
+        //public override string Visit(CountNode nodeIn)
+        //{
+        //    return base.Visit(nodeIn);
+        //}
+       
+        //public override string Visit(CollectionComplexNode node)
+        //{
+        //    return base.Visit(node);
+        //}
+      
+        /// <summary>
+        /// Translates a <see cref="SingleResourceFunctionCallNode"/> into a corresponding <see cref="string"/>.
         /// </summary>
         /// <param name="node">The node to translate.</param>
         /// <returns>The translated string.</returns>
-        public override string Visit(SingleEntityFunctionCallNode node)
+        public override string Visit(SingleResourceFunctionCallNode node)
         {
             string result = node.Name;
             if (node.Source != null)
@@ -248,7 +320,7 @@ public override string Visit(SingleEntityFunctionCallNode node)
 
             return this.TranslateFunctionCall(result, node.Parameters);
         }
-
+        
         /// <summary>
         /// Translates a <see cref="SingleValueFunctionCallNode"/> into a corresponding <see cref="string"/>.
         /// </summary>
@@ -282,11 +354,11 @@ public override string Visit(CollectionFunctionCallNode node)
         }
 
         /// <summary>
-        /// Translates a <see cref="EntityCollectionFunctionCallNode"/> into a corresponding <see cref="string"/>.
+        /// Translates a <see cref="CollectionResourceFunctionCallNode"/> into a corresponding <see cref="string"/>.
         /// </summary>
         /// <param name="node">The node to translate.</param>
         /// <returns>The translated string of EntityCollectionFunctionCallNode.</returns>
-        public override string Visit(EntityCollectionFunctionCallNode node)
+        public override string Visit(CollectionResourceFunctionCallNode node)
         {
             string result = node.Name;
             if (node.Source != null)
@@ -404,14 +476,20 @@ internal static string TranslateLevelsClause(LevelsClause levelsClause)
             return levelsStr;
         }
 
+
         /// <summary>
         /// Main dispatching visit method for translating query-nodes into expressions.
         /// </summary>
         /// <param name="node">The node to visit/translate.</param>
+        /// <param name="joinClause">true if join must be extracted</param>
         /// <returns>The LINQ string resulting from visiting the node.</returns>
-        internal string TranslateNode(QueryNode node)
+        internal string TranslateNode(QueryNode node, bool joinClause = false)
         {
-            return node.Accept(this);
+
+            if (joinClause)//starting
+                this.joinClause= joinClause;
+           
+            return  node.Accept(this);
         }
 
         /// <summary>Translates a <see cref="SearchClause"/> into a <see cref="SearchClause"/>.</summary>
@@ -420,33 +498,33 @@ internal string TranslateNode(QueryNode node)
         internal string TranslateSearchClause(SearchClause searchClause)
         {
             this.searchFlag = true;
-            string searchStr = this.TranslateNode(searchClause.Expression);
+            var searchStr = this.TranslateNode(searchClause.Expression);
             this.searchFlag = false;
-            return searchStr;
-        }
-
-        /// <summary>
-        /// Add dictionary to url and each alias value will be URL encoded.
-        /// </summary>
-        /// <param name="dictionary">key value pair dictionary</param>
-        /// <returns>The url query string of dictionary's key value pairs (URL encoded)</returns>
-        internal string TranslateParameterAliasNodes(IDictionary<string, SingleValueNode> dictionary)
-        {
-            string result = null;
-            if (dictionary != null)
-            {
-                foreach (KeyValuePair<string, SingleValueNode> keyValuePair in dictionary)
-                {
-                    if (keyValuePair.Value != null)
-                    {
-                        string tmp = this.TranslateNode(keyValuePair.Value);
-                        result = string.IsNullOrEmpty(tmp) ? result : string.Concat(result, string.IsNullOrEmpty(result) ? null : Constants.RequestParamsAggregator.ToString(), keyValuePair.Key, Constants.SymbolEqual, Uri.EscapeDataString(tmp));
-                    }
-                }
-            }
-
-            return result;
-        }
+            return  searchStr;
+        }
+
+        ///// <summary>
+        ///// Add dictionary to url and each alias value will be URL encoded.
+        ///// </summary>
+        ///// <param name="dictionary">key value pair dictionary</param>
+        ///// <returns>The url query string of dictionary's key value pairs (URL encoded)</returns>
+        //internal string TranslateParameterAliasNodes(IDictionary<string, SingleValueNode> dictionary)
+        //{
+        //    string result = null;
+        //    if (dictionary != null)
+        //    {
+        //        foreach (KeyValuePair<string, SingleValueNode> keyValuePair in dictionary)
+        //        {
+        //            if (keyValuePair.Value != null)
+        //            {
+        //                var tmp = this.TranslateNode(keyValuePair.Value);
+        //                result = string.IsNullOrEmpty(tmp) ? result : string.Concat(result, string.IsNullOrEmpty(result) ? null : Constants.RequestParamsAggregator.ToString(), keyValuePair.Key, Constants.SymbolEqual, Uri.EscapeDataString(tmp));
+        //            }
+        //        }
+        //    }
+
+        //    return result;
+        //}
 
         /// <summary>
         /// Helper for translating an access to a metadata-defined property or navigation.
@@ -457,15 +535,21 @@ internal string TranslateParameterAliasNodes(IDictionary<string, SingleValueNode
         /// <returns>The translated string.</returns>
         private string TranslatePropertyAccess(QueryNode sourceNode, string edmPropertyName, IEdmNavigationSource navigationSource = null)
         {
-            string source = this.TranslateNode(sourceNode);
+            var source = this.TranslateNode(sourceNode);
 
             if (string.IsNullOrEmpty(source))
             {
-                return this.QueryFormatter.TranslateFieldName(edmPropertyName);
+                if (joinClause)
+                    return this.QueryFormatter.TranslateJoinClause(edmPropertyName);
+                else
+                    return this.QueryFormatter.TranslateFieldName(edmPropertyName);
             }
             else
             {
-                return this.QueryFormatter.TranslateSource(source, edmPropertyName);
+                if (joinClause)
+                    return this.QueryFormatter.TranslateJoinClause(source, edmPropertyName);
+                else
+                    return this.QueryFormatter.TranslateSource(source, edmPropertyName);
             }
         }
 
@@ -494,10 +578,14 @@ private string TranslateFunctionCall(string functionName, IEnumerable<QueryNode>
         /// </summary>
         /// <param name="operatorKind">the kind of the BinaryOperatorNode</param>
         /// <returns>string format of the operator</returns>
-        private string BinaryOperatorNodeToString(BinaryOperatorKind operatorKind)
+        private static string BinaryOperatorNodeToString(BinaryOperatorKind operatorKind)
         {
             switch (operatorKind)
             {
+                case BinaryOperatorKind.Or:
+                    return Constants.SQLOrSymbol;
+                case BinaryOperatorKind.And:
+                    return Constants.SQLAndSymbol;
                 case BinaryOperatorKind.Equal:
                     return Constants.SQLEqualSymbol;
                 case BinaryOperatorKind.NotEqual:
@@ -510,10 +598,6 @@ private string BinaryOperatorNodeToString(BinaryOperatorKind operatorKind)
                     return Constants.SQLLessThanSymbol;
                 case BinaryOperatorKind.LessThanOrEqual:
                     return Constants.SQLLessThanOrEqualSymbol;
-                case BinaryOperatorKind.And:
-                    return Constants.SQLAndSymbol;
-                case BinaryOperatorKind.Or:
-                    return Constants.SQLOrSymbol;
                 default:
                     return null;
             }
@@ -525,7 +609,7 @@ private string BinaryOperatorNodeToString(BinaryOperatorKind operatorKind)
         /// </summary>
         /// <param name="operatorKind">binary operator </param>
         /// <returns>the priority value of the binary operator</returns>
-        private int TranslateBinaryOperatorPriority(BinaryOperatorKind operatorKind)
+        private static int TranslateBinaryOperatorPriority(BinaryOperatorKind operatorKind)
         {
             switch (operatorKind)
             {
diff --git a/azure-documentdb-odata-sql/ODataToSqlTranslator/ODataToSqlTranslator.cs b/azure-documentdb-odata-sql/ODataToSqlTranslator/ODataToSqlTranslator.cs
index 9f2a69f..26d2c03 100644
--- a/azure-documentdb-odata-sql/ODataToSqlTranslator/ODataToSqlTranslator.cs
+++ b/azure-documentdb-odata-sql/ODataToSqlTranslator/ODataToSqlTranslator.cs
@@ -1,10 +1,13 @@
-using System;
+using Microsoft.Azure.Documents.Client;
+using Microsoft.OData.UriParser;
+using System;
 using System.Linq;
+using System.Text;
 using System.Web.OData.Query;
 
-using Microsoft.OData.Core.UriParser;
-using Microsoft.OData.Core.UriParser.Semantic;
-using Microsoft.Azure.Documents.OData.Sql;
+//using Microsoft.OData.Core.UriParser;
+//using Microsoft.OData.Core.UriParser.Semantic;
+//using Microsoft.Azure.Documents.OData.Sql;
 
 namespace Microsoft.Azure.Documents.OData.Sql
 {
@@ -53,41 +56,60 @@ public class ODataToSqlTranslator
         /// <returns>returns an SQL expression if successfully translated, otherwise a null string</returns>
         public string Translate(ODataQueryOptions odataQueryOptions, TranslateOptions translateOptions, string additionalWhereClause = null)
         {
+            //TODO: refactor to use a StringBuilder
             string selectClause, whereClause, orderbyClause, topClause;
-            selectClause = whereClause = orderbyClause = topClause = string.Empty;
-
-            // SELECT CLAUSE
-            if ((translateOptions & TranslateOptions.SELECT_CLAUSE) == TranslateOptions.SELECT_CLAUSE)
-            {
-                // TOP CLAUSE
-                if ((translateOptions & TranslateOptions.TOP_CLAUSE) == TranslateOptions.TOP_CLAUSE)
-                {
-                    topClause = odataQueryOptions?.Top?.Value > 0
-                        ? $"{Constants.SQLTopSymbol} {odataQueryOptions.Top.Value} "
-                        : string.Empty;
-                }
-
-                selectClause = odataQueryOptions?.SelectExpand?.RawSelect == null
-                    ? "*"
-                    : string.Join(", ", odataQueryOptions.SelectExpand.RawSelect.Split(',').Select(c => string.Concat("c.", c.Trim())));
-                selectClause = $"{Constants.SQLSelectSymbol} {topClause}{selectClause} {Constants.SQLFromSymbol} {Constants.SQLFieldNameSymbol} ";
-            }
-
+            bool hasJoinClause = false;
+            selectClause =  whereClause = orderbyClause = topClause = string.Empty;
             // WHERE CLAUSE
             if ((translateOptions & TranslateOptions.WHERE_CLAUSE) == TranslateOptions.WHERE_CLAUSE)
             {
                 var customWhereClause = additionalWhereClause == null
                     ? string.Empty
                     : $"{additionalWhereClause}";
-                whereClause = odataQueryOptions?.Filter?.FilterClause == null
+                var hasFilterClause = odataQueryOptions?.Filter?.FilterClause;
+                Tuple<string, string> retVal = null;
+                if (hasFilterClause != null)
+                {
+                    retVal = this.TranslateFilterClause(hasFilterClause);
+                }
+                whereClause = hasFilterClause == null
                     ? string.Empty
-                    : $"{this.TranslateFilterClause(odataQueryOptions.Filter.FilterClause)}";
+                    : retVal.Item2;
                 whereClause = (!string.IsNullOrEmpty(customWhereClause) && !string.IsNullOrEmpty(whereClause))
                     ? $"{customWhereClause} AND {whereClause}"
                     : $"{customWhereClause}{whereClause}";
                 whereClause = string.IsNullOrEmpty(whereClause)
                     ? string.Empty
-                    : $"{Constants.SQLWhereSymbol} {whereClause} ";
+                    : $"{Constants.SQLWhereSymbol} {whereClause}";
+                if (retVal != null && !string.IsNullOrEmpty(retVal.Item1))
+                {
+                    hasJoinClause = true;
+                    whereClause = string.Concat(retVal.Item1, " ", whereClause);
+                }
+            }
+            // SELECT CLAUSE
+            if ((translateOptions & TranslateOptions.SELECT_CLAUSE) == TranslateOptions.SELECT_CLAUSE)
+            {
+                // Count CLAUSE
+                if (odataQueryOptions?.Count?.Value == true)
+                {
+                    selectClause = $"{Constants.SQLSelectSymbol} {Constants.SqlValueKeyWord} {Constants.SqlCountKeyWord} {Constants.SQLFromSymbol} {Constants.SQLFieldNameSymbol} ";
+                }
+                else
+                {
+                    // TOP CLAUSE
+                    if ((translateOptions & TranslateOptions.TOP_CLAUSE) == TranslateOptions.TOP_CLAUSE)
+                    {
+                        topClause = odataQueryOptions?.Top?.Value > 0
+                            ? $"{Constants.SQLTopSymbol} {odataQueryOptions.Top.Value} "
+                            : string.Empty;
+                    }
+
+                    selectClause = odataQueryOptions?.SelectExpand?.RawSelect == null
+                        ? hasJoinClause ? string.Concat(Constants.SqlValueKeyWord, Constants.SymbolSpace, Constants.SQLFieldNameSymbol) : Constants.SQLAsteriskSymbol
+                        : string.Join(", ", odataQueryOptions.SelectExpand.RawSelect.Split(',').Select(c => string.Concat(Constants.SQLFieldNameSymbol, Constants.SymbolDot, c.Trim())));
+                    selectClause = $"{Constants.SQLSelectSymbol} {topClause}{selectClause} {Constants.SQLFromSymbol} {Constants.SQLFieldNameSymbol} ";
+                }
             }
 
             // ORDER BY CLAUSE
@@ -97,15 +119,28 @@ public string Translate(ODataQueryOptions odataQueryOptions, TranslateOptions tr
                     ? string.Empty
                     : $"{Constants.SQLOrderBySymbol} {this.TranslateOrderByClause(odataQueryOptions.OrderBy.OrderByClause)} ";
             }
-
-            return string.Concat(selectClause, whereClause, orderbyClause);
+            var sb = new StringBuilder();
+            sb.Append(selectClause);
+           
+            sb.Append(whereClause);
+            var sp = default(string);
+            if (!string.IsNullOrEmpty(whereClause))
+            {
+                sp = " ";
+            }
+            if (!string.IsNullOrEmpty(orderbyClause))
+            {
+                sb.Append(sp);
+                sb.Append(orderbyClause);
+            }
+            return sb.ToString();
         }
 
         /// <summary>
         /// Constructor for ODataSqlTranslator
         /// </summary>
         /// <param name="queryFormatter">Optional QueryFormatter, if no formatter provided, a SQLQueryFormatter is used by default</param>
-        public ODataToSqlTranslator(QueryFormatterBase queryFormatter = null)
+        public ODataToSqlTranslator(IQueryFormatter queryFormatter = null)
         {
             queryFormatter = queryFormatter ?? new SQLQueryFormatter();
             oDataNodeToStringBuilder = new ODataNodeToStringBuilder(queryFormatter);
@@ -119,9 +154,35 @@ private ODataToSqlTranslator() { }
         /// <summary>Translates a <see cref="FilterClause"/> into a <see cref="FilterClause"/>.</summary>
         /// <param name="filterClause">The filter clause to translate.</param>
         /// <returns>The translated string.</returns>
-        private string TranslateFilterClause(FilterClause filterClause)
+        private Tuple<string, string> TranslateFilterClause(FilterClause filterClause)
         {
-            return oDataNodeToStringBuilder.TranslateNode(filterClause.Expression);
+            var tmp = oDataNodeToStringBuilder.TranslateNode(filterClause.Expression);
+            if (!string.IsNullOrEmpty(tmp) && tmp.IndexOf(Constants.Delimiter) >= 0)
+            {
+                var splited = tmp.Split(new[] { Constants.Delimiter[0] }, options:StringSplitOptions.RemoveEmptyEntries);
+                var sbJoin = new StringBuilder();
+                var sbWhere = new StringBuilder();
+                var sp = "";
+
+                foreach(var a in splited)
+                {
+                    if (a.StartsWith( Constants.SQLJoinSymbol))
+                    {
+                        sbJoin.Append(sp);
+                        sbJoin.Append(a);
+                        if (sp.Length == 0)
+                        {
+                            sp = " ";
+                        }
+                    }
+                    else
+                    {
+                        sbWhere.Append(a);
+                    }
+                }
+                return new Tuple<string, string>(sbJoin.ToString(), sbWhere.ToString());
+            }
+            return new Tuple<string, string>(null, tmp);
         }
 
         /// <summary>Translates a <see cref="OrderByClause"/> into a <see cref="OrderByClause"/>.</summary>
@@ -145,6 +206,6 @@ private string TranslateOrderByClause(OrderByClause orderByClause, string preExp
         /// <summary>
         /// Visitor patterned ODataNodeToStringBuilder
         /// </summary>
-        private ODataNodeToStringBuilder oDataNodeToStringBuilder { get; set; }
+        private readonly ODataNodeToStringBuilder oDataNodeToStringBuilder;
     }
 }
diff --git a/azure-documentdb-odata-sql/ODataToSqlTranslator/SqlQueryFormatter.cs b/azure-documentdb-odata-sql/ODataToSqlTranslator/SqlQueryFormatter.cs
index df96b27..47f88bc 100644
--- a/azure-documentdb-odata-sql/ODataToSqlTranslator/SqlQueryFormatter.cs
+++ b/azure-documentdb-odata-sql/ODataToSqlTranslator/SqlQueryFormatter.cs
@@ -1,18 +1,28 @@
-using System;
+using Microsoft.OData.Edm;
+using System;
 
 namespace Microsoft.Azure.Documents.OData.Sql
 {
     /// <summary>
     /// string formmater for OData to Sql converter
     /// </summary>
-    public class SQLQueryFormatter : QueryFormatterBase
+    public class SQLQueryFormatter : IQueryFormatter
     {
+        /// <summary>
+        /// constructor
+        /// </summary>
+        public SQLQueryFormatter
+            ()
+        {
+            startLetter = 'a';
+            startLetter--;
+        }
         /// <summary>
         /// fieldName => c.fieldName
         /// </summary>
         /// <param name="fieldName"></param>
         /// <returns></returns>
-        public override string TranslateFieldName(string fieldName)
+        public string TranslateFieldName(string fieldName)
         {
             return string.Concat(Constants.SQLFieldNameSymbol, Constants.SymbolDot, fieldName.Trim());
         }
@@ -20,12 +30,18 @@ public override string TranslateFieldName(string fieldName)
         /// <summary>
         /// Convert value to SQL format: Namespace'enumVal' => c.enumVal
         /// </summary>
-        /// <param name="value">the enum value</param>
-        /// <param name="nameSpace">Namespace of the enum type</param>
+        /// <param name="enuMType">the enum value</param>
+        /// <param name="enuMValue">Namespace of the enum type</param>
         /// <returns>enumValue without the namespace</returns>
-        public override string TranslateEnumValue(string value, string nameSpace)
+        public string TranslateEnumValue(IEdmTypeReference enuMType, string enuMValue)
         {
-            return string.Concat(value.Substring(nameSpace.Length).Trim());
+            var success = long.TryParse(enuMValue, out long result);
+            if (!success)
+            {
+
+                return enuMValue;
+            }
+            return string.Concat(Constants.SymbolSingleQuote, enuMType.AsEnum().ToStringLiteral(result), Constants.SymbolSingleQuote);
         }
 
         /// <summary>
@@ -34,7 +50,7 @@ public override string TranslateEnumValue(string value, string nameSpace)
         /// <param name="source">the parent field</param>
         /// <param name="edmProperty">the child field</param>
         /// <returns>The translated source</returns>
-        public override string TranslateSource(string source, string edmProperty)
+        public string TranslateSource(string source, string edmProperty)
         {
             var str = string.Concat(source.Trim(), Constants.SymbolDot, edmProperty.Trim());
             return str.StartsWith(Constants.SQLFieldNameSymbol + Constants.SymbolDot) ? str : string.Concat(Constants.SQLFieldNameSymbol, Constants.SymbolDot, str);
@@ -45,10 +61,11 @@ public override string TranslateSource(string source, string edmProperty)
         /// </summary>
         /// <param name="functionName"></param>
         /// <returns></returns>
-        public override string TranslateFunctionName(string functionName)
+        public string TranslateFunctionName(string functionName)
         {
             switch (functionName)
             {
+             
                 case Constants.KeywordToUpper:
                     return Constants.SQLUpperSymbol;
 
@@ -61,9 +78,43 @@ public override string TranslateFunctionName(string functionName)
                 case Constants.KeywordTrim:
                     return $"{Constants.SQLLtrimSymbol}{Constants.SymbolOpenParen}{Constants.SQLRtrimSymbol}";
 
+                case Constants.KeywordGeoDistance:
+                    return Constants.SQLStDistanceSymbol;
+
+                case Constants.KeywordGeoIntersects:
+                    return Constants.SQLStIntersectsSymbol;
+
                 default:
                     return functionName.ToUpper();
             }
         }
+        private char startLetter;
+
+        /// <summary>
+        /// returns e.g. JOIN a IN c.companies
+        /// </summary>
+        /// <param name="joinCollection"></param>
+        public string TranslateJoinClause(string joinCollection)
+        {
+            startLetter++;
+            //startLetter becomes 'b', 'c' etc
+            return string.Concat(Constants.SQLJoinSymbol, 
+                Constants.SymbolSpace, startLetter, 
+                Constants.SymbolSpace, 
+                Constants.SQLInKeyword, 
+                Constants.SymbolSpace, 
+                Constants.SQLFieldNameSymbol, 
+                Constants.SymbolDot, joinCollection);
+
+        }
+        /// <summary>
+        /// translate any expression to a where clause
+        /// </summary>
+        /// <param name="source"></param>
+        /// <param name="edmProperty"></param>
+        public string TranslateJoinClause(string source, string edmProperty)
+        {
+            return string.Concat(startLetter, Constants.SymbolDot, edmProperty);
+        }
     }
 }
diff --git a/azure-documentdb-odata-sql/Properties/AssemblyInfo.cs b/azure-documentdb-odata-sql/Properties/AssemblyInfo.cs
index 2209cba..1a6adcf 100644
--- a/azure-documentdb-odata-sql/Properties/AssemblyInfo.cs
+++ b/azure-documentdb-odata-sql/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Azure-Documentdb-OData-Sql")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyCopyright("MIT  2016-2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.2.0")]
+[assembly: AssemblyVersion("3.1.13.0")]
+[assembly: AssemblyFileVersion("3.1.13.0")]
diff --git a/azure-documentdb-odata-sql/app.config b/azure-documentdb-odata-sql/app.config
new file mode 100644
index 0000000..914a33f
--- /dev/null
+++ b/azure-documentdb-odata-sql/app.config
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.1" newVersion="4.1.1.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.Tracing" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.OData.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.3.1.10814" newVersion="7.3.1.10814" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.OData.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.3.1.10814" newVersion="7.3.1.10814" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.3.1.10814" newVersion="7.3.1.10814" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/azure-documentdb-odata-sql/azure-documentdb-odata-sql.csproj b/azure-documentdb-odata-sql/azure-documentdb-odata-sql.csproj
index 35f1dee..0078782 100644
--- a/azure-documentdb-odata-sql/azure-documentdb-odata-sql.csproj
+++ b/azure-documentdb-odata-sql/azure-documentdb-odata-sql.csproj
@@ -9,10 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Azure.Documents.OData.Sql</RootNamespace>
     <AssemblyName>Microsoft.Azure.Documents.OData.Sql</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -33,87 +34,168 @@
     <DocumentationFile>bin\Release\Microsoft.Azure.Documents.OData.Sql.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Documents.Client, Version=1.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Azure.DocumentDB.1.10.0\lib\net45\Microsoft.Azure.Documents.Client.dll</HintPath>
+    <Reference Include="GeoJSON.Net, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\GeoJSON.Net.1.1.64\lib\net45\GeoJSON.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Azure.Documents.Client, Version=1.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Azure.DocumentDB.1.17.0\lib\net45\Microsoft.Azure.Documents.Client.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.1.1.1\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.1.1\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.OData.Core, Version=7.3.1.10814, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.OData.Core.7.3.1\lib\portable-net45+win8+wpa81\Microsoft.OData.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.OData.Edm, Version=7.3.1.10814, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.OData.Edm.7.3.1\lib\portable-net45+win8+wpa81\Microsoft.OData.Edm.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Spatial, Version=7.3.1.10814, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Spatial.7.3.1\lib\portable-net45+win8+wpa81\Microsoft.Spatial.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
+    <Reference Include="System.Core" />
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.1.0.0\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+    <Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.OData.Core, Version=6.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.OData.Core.6.15.0\lib\portable-net45+win+wpa81\Microsoft.OData.Core.dll</HintPath>
+    <Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.OData.Edm, Version=6.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.OData.Edm.6.15.0\lib\portable-net45+win+wpa81\Microsoft.OData.Edm.dll</HintPath>
+    <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Spatial, Version=6.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Spatial.6.15.0\lib\portable-net45+win+wpa81\Microsoft.Spatial.dll</HintPath>
+    <Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Net.Http.Formatting, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    <Reference Include="System.Net.Http, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Net.Http.4.3.2\lib\net46\System.Net.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Web.Http, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.2\lib\net45\System.Web.Http.dll</HintPath>
+    <Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Web.OData, Version=5.9.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.OData.5.9.1\lib\net45\System.Web.OData.dll</HintPath>
+    <Reference Include="System.Runtime.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime.InteropServices, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.InteropServices.4.3.0\lib\net462\System.Runtime.InteropServices.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Web.OData, Version=6.1.0.10907, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.OData.6.1.0\lib\net45\System.Web.OData.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ODataToSqlTranslator\Constants.cs" />
     <Compile Include="ODataToSqlTranslator\ODataNodeToStringBuilder.cs" />
     <Compile Include="ODataToSqlTranslator\ODataToSqlTranslator.cs" />
-    <Compile Include="ODataToSqlTranslator\QueryFormatterBase.cs" />
+    <Compile Include="ODataToSqlTranslator\IQueryFormatter.cs" />
     <Compile Include="ODataToSqlTranslator\SqlQueryFormatter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="azure-documentdb-odata-sql.nuspec" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Microsoft.Azure.DocumentDB.1.10.0\build\Microsoft.Azure.DocumentDB.targets" Condition="Exists('..\packages\Microsoft.Azure.DocumentDB.1.10.0\build\Microsoft.Azure.DocumentDB.targets')" />
+  <Import Project="..\packages\Microsoft.Azure.DocumentDB.1.17.0\build\Microsoft.Azure.DocumentDB.targets" Condition="Exists('..\packages\Microsoft.Azure.DocumentDB.1.17.0\build\Microsoft.Azure.DocumentDB.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Azure.DocumentDB.1.10.0\build\Microsoft.Azure.DocumentDB.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.DocumentDB.1.10.0\build\Microsoft.Azure.DocumentDB.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Azure.DocumentDB.1.17.0\build\Microsoft.Azure.DocumentDB.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.DocumentDB.1.17.0\build\Microsoft.Azure.DocumentDB.targets'))" />
   </Target>
+  <PropertyGroup>
+    <PostBuildEvent>nuget.exe pack azure-documentdb-odata-sql.nuspec -Properties Configuration=Release</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/azure-documentdb-odata-sql/azure-documentdb-odata-sql.nuspec b/azure-documentdb-odata-sql/azure-documentdb-odata-sql.nuspec
index 84e985b..fe18640 100644
--- a/azure-documentdb-odata-sql/azure-documentdb-odata-sql.nuspec
+++ b/azure-documentdb-odata-sql/azure-documentdb-odata-sql.nuspec
@@ -1,43 +1,54 @@
 <?xml version="1.0"?>
 <package>
   <metadata>
-    <id>Microsoft.Azure.Documents.OData.Sql</id>
-    <version>2.0.2</version>
-    <authors>Ziyou Zheng</authors>
-    <owners>Microsoft Corporation</owners>
-    <projectUrl>https://github.com/z26zheng/azure-documentdb-odata-sql</projectUrl>
+    <id>ADCCure.Azure.Documents.OData.Sql</id>
+    <version>2.1.13</version>
+    <authors>Ziyou Zheng, Egbert Nierop, ntanaka</authors>
+    <owners>ADC Cure</owners>
+    <projectUrl>https://github.com/egbertn/azure-documentdb-odata-sql</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <title>Microsoft.Azure.Documents.OData.Sql</title>
+    <title>ADCCure.Azure.Documents.OData.Sql</title>
     <summary>
       This library contains functionality to convert OData V4 queries into DocumentDB SQL statements.
+      Note, this is a fork of the original library (Microsoft.Azure.Documents.OData.Sql) which is no longer maintained.
     </summary>
     <description>
       Currently it supports below query mappings:
-        primitive:
-          field                       => c.field
-          parent/child                => c.parent.child
-          Namespace.EnumType'enumVal' => 'enumVal'
-          
-        queries:
-          $select  => SELECT
-          $filter  => WHERE
-          $top     => TOP
-          $orderby => ORDER BY
-          
-        functions:
-          contains(field,'value')     => CONTAINS(c.field,'value')
-          startswith(field,'value')   => STARTSWITH(c.field,'value')
-          endswith(field,'value')     => ENDSWITH(c.field,'value')
-          toupper(field)              => UPPER(c.field)
-          tolower(field)              => LOWER(c.field)
-          length(field)               => LENGTH(c.field)
-          indexof(field,'value')      => INDEX_OF(c.field,'value')
-          substring(field,idx1,idx2)  => SUBSTRING(c.field,idx1,idx2)
-          trim(field)                 => LTRIM(RTRIM(c.englishName))
-          concat(field,'value')       => CONCAT(c.englishName,'value')
+      primitive:
+      field                       => c.field
+      parent/child                => c.parent.child
+      Namespace.EnumType'enumVal' => 'enumVal'
+
+      queries:
+      $select  => SELECT
+      $filter  => WHERE
+      $top     => TOP
+      $orderby => ORDER BY
+
+      functions:
+      Items/any(a: a/field op 'value') => SELECT value c FROM c JOIN a IN c.Items WHERE a.field op 'value'
+      contains(field,'value')     => CONTAINS(c.field,'value')
+      startswith(field,'value')   => STARTSWITH(c.field,'value')
+      endswith(field,'value')     => ENDSWITH(c.field,'value')
+      toupper(field)              => UPPER(c.field)
+      tolower(field)              => LOWER(c.field)
+      length(field)               => LENGTH(c.field)
+      indexof(field,'value')      => INDEX_OF(c.field,'value')
+      substring(field,idx1,idx2)  => SUBSTRING(c.field,idx1,idx2)
+      trim(field)                 => LTRIM(RTRIM(c.englishName))
+      concat(field,'value')       => CONCAT(c.englishName,'value')
+      geography'POLYGON((31.8 -5, 32 -5, 32 -4.7, 31.8 -4.7, 31.8 -5))
+      => ST_INTERSECTS(c.area,{\"type\":\"Polygon\",\"coordinates\":[[[31.8,-5.0],[32.0,-5.0],[32.0,-4.7],[31.8,-4.7],[31.8,-5.0]]]})
+      geography'POINT(31.9 -4.8)') lt 100 => ST_DISTANCE(c.location,{\"type\":\"Point\",\"coordinates\":[31.9,-4.8]}) &lt; 100
+      $count=true&amp;&#36;filter=englishName eq 'Microsoft' => VALUE COUNT(1) FROM c WHERE c.englishName = 'Microsoft'
     </description>
     
     <releaseNotes>
+      2.1.12 Fix Guid translation with quotes encapsulated
+      2.1.11 Resolve nullreference exception on empty $filter
+      2.1.5 Improved Enum parsing
+      2.1.4 Improved dependency versions
+      2.1.3 Added support for any. Note, 'all' not supported.
       2.0.2 Added support for functions: length(), indexof(), substring(), trim(), concat()
       2.0.1 Added support for functions: contains(), startswith(), endswith(), toupper() and tolower()
       2.0.0 Breaking changes: Simplified usage with newly introuduced class ODataToSqlTranslator
@@ -45,18 +56,21 @@
     </releaseNotes>
     
     <tags>odata documentdb sql translate convert</tags>
-    <copyright>Copyright ©2016 Microsoft Corporation</copyright>
+    <copyright>Copyright ©2016 Microsoft Corporation, ADC Cure 2017</copyright>
     <dependencies>
-      <dependency id="Microsoft.AspNet.OData" version="[5.9.0,6.0.0)"/>
+      <dependency id="Microsoft.AspNet.OData" version="[6.0.0,)"/>
+      <dependency id="GeoJSON.Net" version="[1.1.64,)" />
       <dependency id="Microsoft.Azure.DocumentDB" version="[1.9.5,)"/>
-      <dependency id="Microsoft.Data.OData" version="5.6.0"/>
+      <dependency id="Microsoft.OData.Core" version="[7.0.0,)"/>
+      <dependency id="Microsoft.OData.Edm" version="[7.0.0,)"/>
+      <dependency id="Microsoft.Spatial" version="[7.0.0,)" />
+      <dependency id="Newtonsoft.Json" version="[6.0.8,)" />
+      <dependency id="NETStandard.Library" version="[1.6.1,)" />
     </dependencies>
   </metadata>
   
   <files>
-    <file src="bin\Release\Microsoft.Azure.Documents.OData.Sql.dll" target="lib\net452" />
-    <file src="bin\Release\Microsoft.Azure.Documents.OData.Sql.pdb" target="lib\net452" />
-    <file src="bin\Release\Microsoft.Azure.Documents.OData.Sql.XML" target="lib\net452" />
+    <file src="bin\Release\Microsoft.Azure.Documents.OData.Sql.pdb" target="lib\net462" />
   </files>
   
 </package>
diff --git a/azure-documentdb-odata-sql/packages.config b/azure-documentdb-odata-sql/packages.config
index 9d318f4..3f17ecf 100644
--- a/azure-documentdb-odata-sql/packages.config
+++ b/azure-documentdb-odata-sql/packages.config
@@ -1,28 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.AspNet.OData" version="5.9.1" targetFramework="net452" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net452" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.2" targetFramework="net452" />
-  <package id="Microsoft.Azure.DocumentDB" version="1.10.0" targetFramework="net452" />
-  <package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net452" />
-  <package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net452" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="1.0.0" targetFramework="net452" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net452" />
-  <package id="Microsoft.OData.Core" version="6.15.0" targetFramework="net452" />
-  <package id="Microsoft.OData.Edm" version="6.15.0" targetFramework="net452" />
-  <package id="Microsoft.Spatial" version="6.15.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
-  <package id="System.Collections" version="4.0.11" targetFramework="net452" />
-  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net452" />
-  <package id="System.ComponentModel" version="4.0.1" targetFramework="net452" />
-  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net452" />
-  <package id="System.Globalization" version="4.0.11" targetFramework="net452" />
-  <package id="System.Linq" version="4.1.0" targetFramework="net452" />
-  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net452" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net452" />
-  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net452" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net452" />
-  <package id="System.Spatial" version="5.6.0" targetFramework="net452" />
-  <package id="System.Threading" version="4.0.11" targetFramework="net452" />
-  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net452" />
+  <package id="GeoJSON.Net" version="1.1.64" targetFramework="net462" />
+  <package id="Microsoft.AspNet.OData" version="6.1.0" targetFramework="net462" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net462" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net462" />
+  <package id="Microsoft.Azure.DocumentDB" version="1.17.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="1.1.1" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.1.1" targetFramework="net462" />
+  <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net462" />
+  <package id="Microsoft.OData.Core" version="7.3.1" targetFramework="net462" />
+  <package id="Microsoft.OData.Edm" version="7.3.1" targetFramework="net462" />
+  <package id="Microsoft.Spatial" version="7.3.1" targetFramework="net462" />
+  <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="NETStandard.Library" version="1.6.1" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net462" />
+  <package id="System.AppContext" version="4.3.0" targetFramework="net462" />
+  <package id="System.Collections" version="4.3.0" targetFramework="net462" />
+  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net462" />
+  <package id="System.ComponentModel" version="4.3.0" targetFramework="net462" />
+  <package id="System.Console" version="4.3.0" targetFramework="net462" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net462" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net462" />
+  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net462" />
+  <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net462" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="net462" />
+  <package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net462" />
+  <package id="System.IO" version="4.3.0" targetFramework="net462" />
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
+  <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net462" />
+  <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net462" />
+  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Linq" version="4.3.0" targetFramework="net462" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net462" />
+  <package id="System.Net.Http" version="4.3.2" targetFramework="net462" />
+  <package id="System.Net.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Net.Sockets" version="4.3.0" targetFramework="net462" />
+  <package id="System.ObjectModel" version="4.3.0" targetFramework="net462" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net462" />
+  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net462" />
+  <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.Handles" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net462" />
+  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net462" />
+  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net462" />
+  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net462" />
+  <package id="System.Threading" version="4.3.0" targetFramework="net462" />
+  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net462" />
+  <package id="System.Threading.Timer" version="4.3.0" targetFramework="net462" />
+  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net462" />
+  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net462" />
 </packages>
\ No newline at end of file