diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Api/TrippinApi.cs b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Api/TrippinApi.cs
index a9641fdf..55344b65 100644
--- a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Api/TrippinApi.cs
+++ b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Api/TrippinApi.cs
@@ -125,7 +125,7 @@ public IQueryable<Airport> Airports
         /// <returns>
         ///     <see cref="Person">
         /// </returns>
-        [Operation(EntitySet = "People")]
+        [UnboundOperation(EntitySet = "People")]
         public Person GetPersonWithMostFriends()
         {
             Person result = null;
@@ -158,7 +158,7 @@ public Person GetPersonWithMostFriends()
         /// <returns>
         ///     <see cref="Airport">
         /// </returns>
-        [Operation(EntitySet = "Airports")]
+        [UnboundOperation(EntitySet = "Airports")]
         public Airport GetNearestAirport(double lat, double lon)
         {
             var startPoint = GeographyPoint.Create(lat, lon);
@@ -178,7 +178,7 @@ public Airport GetNearestAirport(double lat, double lon)
             return nearestAirport;
         }
 
-        [Operation(IsBound = true)]
+        [BoundOperation]
         public Airline GetFavoriteAirline(Person person)
         {
             var countDict = new Dictionary<string, int>();
@@ -216,7 +216,7 @@ public Airline GetFavoriteAirline(Person person)
         /// <summary>
         ///     Bound Function, get the trips of one friend with userName
         /// </summary>
-        [Operation(IsBound = true)]
+        [BoundOperation]
         public ICollection<Trip> GetFriendsTrips(Person person, string userName)
         {
             var friends = person.Friends.Where(p => p.UserName.Equals(userName)).ToArray();
@@ -231,7 +231,7 @@ public ICollection<Trip> GetFriendsTrips(Person person, string userName)
             }
         }
 
-        [Operation(IsBound = true)]
+        [BoundOperation]
         public ICollection<Person> GetInvolvedPeople(Trip trip)
         {
             var shareID = trip.ShareId;
@@ -258,7 +258,7 @@ public ICollection<Person> GetInvolvedPeople(Trip trip)
         /// <summary>
         ///     Unbound action, reset datasource.
         /// </summary>
-        [Operation(OperationType = OperationType.Action)]
+        [UnboundOperation(OperationType = OperationType.Action)]
         public void ResetDataSource()
         {
             DataStoreManager.ResetDataStoreInstance(Key);
@@ -270,7 +270,7 @@ public void ResetDataSource()
         /// <param name="person">The person to be updated.</param>
         /// <param name="lastName">The value of last name to be updated.</param>
         /// <returns>True if update successfully.</returns>
-        [Operation(IsBound = true, OperationType = OperationType.Action)]
+        [BoundOperation(OperationType = OperationType.Action)]
         public bool UpdateLastName(Person person, string lastName)
         {
             if (person != null)
@@ -284,7 +284,7 @@ public bool UpdateLastName(Person person, string lastName)
             }
         }
 
-        [Operation(IsBound = true, OperationType = OperationType.Action)]
+        [BoundOperation(OperationType = OperationType.Action)]
         public void ShareTrip(Person personInstance, string userName, int tripId)
         {
             if (personInstance == null)
@@ -343,7 +343,7 @@ private static double CalculateDistance(GeographyPoint p1, GeographyPoint p2)
 
         internal class ModelBuilder : IModelBuilder
         {
-            public Task<IEdmModel> GetModelAsync(ModelContext context, CancellationToken cancellationToken)
+            public IEdmModel GetModel(ModelContext context)
             {
                 var modelBuilder = new ODataConventionModelBuilder();
                 modelBuilder.Namespace = "Trippin";
@@ -351,7 +351,7 @@ public Task<IEdmModel> GetModelAsync(ModelContext context, CancellationToken can
                 modelBuilder.EntitySet<Airline>("Airlines");
                 modelBuilder.EntitySet<Airport>("Airports");
                 modelBuilder.Singleton<Person>("Me");
-                return Task.FromResult(modelBuilder.GetEdmModel());
+                return modelBuilder.GetEdmModel();
             }
         }
     }
diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/App_Start/WebApiConfig.cs b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/App_Start/WebApiConfig.cs
index 990f1eb9..ab89de43 100644
--- a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/App_Start/WebApiConfig.cs
+++ b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/App_Start/WebApiConfig.cs
@@ -33,50 +33,48 @@ public static void Register(HttpConfiguration config)
             config.MessageHandlers.Add(new ETagMessageHandler());
             config.SetUrlKeyDelimiter(ODataUrlKeyDelimiter.Slash);
             config.EnableCors(new EnableCorsAttribute("*", "*", "*"));
-            config.Routes.MapHttpRoute("Options", "{*OPTIONS}", new { controller = "CORS", action = "Options" }, new { Options = new myHttpRouteConstraint()});
-            config.UseRestier<TrippinApi>((services) =>
+            config.Routes.MapHttpRoute("Options", "{*OPTIONS}", new { controller = "CORS", action = "Options" }, new { Options = new myHttpRouteConstraint() });
+            config.Filter().Expand().Select().OrderBy().MaxTop(100).Count().SetTimeZoneInfo(TimeZoneInfo.Utc);
+            config.UseRestier((builder) =>
             {
-                Func<IServiceProvider, IDataStoreManager<string, TripPinDataSource>> defaultDataStoreManager =
-                sp => new DefaultDataStoreManager<string, TripPinDataSource>()
+                builder.AddRestierApi<TrippinApi>(services =>
                 {
-                    MaxDataStoreInstanceCapacity = 1000,
-                    MaxDataStoreInstanceLifeTime = new TimeSpan(0, 30, 0)
-                };
+                    Func<IServiceProvider, IDataStoreManager<string, TripPinDataSource>> defaultDataStoreManager =
+                    sp => new DefaultDataStoreManager<string, TripPinDataSource>()
+                    {
+                        MaxDataStoreInstanceCapacity = 1000,
+                        MaxDataStoreInstanceLifeTime = new TimeSpan(0, 30, 0)
+                    };
 
-                Func<IServiceProvider, ODataValidationSettings> validationSettingFactory = sp => new ODataValidationSettings
-                {
-                    MaxAnyAllExpressionDepth = 4,
-                    MaxExpansionDepth = 4
-                };
+                    Func<IServiceProvider, ODataValidationSettings> validationSettingFactory = sp => new ODataValidationSettings
+                    {
+                        MaxAnyAllExpressionDepth = 4,
+                        MaxExpansionDepth = 4
+                    };
 
-                services.AddSingleton<ODataValidationSettings>(validationSettingFactory);
-                services.AddChainedService<IModelBuilder>((sp, next) => new TrippinApi.ModelBuilder());
-                services.AddChainedService<IChangeSetInitializer>((sp, next) => new ChangeSetInitializer<TripPinDataSource>());
-                services.AddChainedService<ISubmitExecutor>((sp, next) => new SubmitExecutor());
-                services.AddSingleton(defaultDataStoreManager);
+                    services.AddSingleton<ODataValidationSettings>(validationSettingFactory);
+                    services.AddChainedService<IModelBuilder>((sp, next) => new TrippinApi.ModelBuilder());
+                    services.AddChainedService<IChangeSetInitializer>((sp, next) => new ChangeSetInitializer<TripPinDataSource>());
+                    services.AddChainedService<ISubmitExecutor>((sp, next) => new SubmitExecutor());
+                    services.AddSingleton(defaultDataStoreManager);
 
-                // Add custom TrippinBatchHandler
-                ODataBatchHandler trippinBatchHandler = new TrippinBatchHandler(GlobalConfiguration.DefaultServer);
-                trippinBatchHandler.ODataRouteName = routeName;
-                services.AddSingleton(trippinBatchHandler);
+                    // Add custom TrippinBatchHandler
+                    ODataBatchHandler trippinBatchHandler = new TrippinBatchHandler(GlobalConfiguration.DefaultServer);
+                    trippinBatchHandler.ODataRouteName = routeName;
+                    services.AddSingleton(trippinBatchHandler);
+                });
             });
 
-            RegisterTrippin(config, GlobalConfiguration.DefaultServer);
-            
-        }
-
-        public static void RegisterTrippin(
-            HttpConfiguration config, HttpServer server)
-        {
-            // enable query options for all properties
-            config.Filter().Expand().Select().OrderBy().MaxTop(null).Count();
-            config.SetTimeZoneInfo(TimeZoneInfo.Utc);
-            config.MapRestier<TrippinApi>(
-                routeName,
-                "",
-                false); // Custom TrippinBatchHandler registered in UseRestier 
+            config.MapRestier((builder) =>
+            {
+                builder.MapApiRoute<TrippinApi>(
+                    routeName,
+                    "",
+                    false); // Custom TrippinBatchHandler registered in UseRestier 
+            });
         }
     }
+
     public class myHttpRouteConstraint : IHttpRouteConstraint
     {
         bool IHttpRouteConstraint.Match(HttpRequestMessage request, IHttpRoute route, string parameterName, IDictionary<string, object> values, HttpRouteDirection routeDirection)
diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory.csproj b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory.csproj
index 3cf12c51..c2a74c09 100644
--- a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory.csproj
+++ b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\EntityFramework.6.4.0\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.0\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -43,45 +44,51 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ben.Demystifier, Version=0.1.0.0, Culture=neutral, PublicKeyToken=a6d206e05440431a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Ben.Demystifier.0.1.6\lib\net45\Ben.Demystifier.dll</HintPath>
+    <Reference Include="Ben.Demystifier, Version=0.4.0.0, Culture=neutral, PublicKeyToken=a6d206e05440431a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ben.Demystifier.0.4.1\lib\net45\Ben.Demystifier.dll</HintPath>
+    </Reference>
+    <Reference Include="Ben.TypeDictionary, Version=0.1.0.0, Culture=neutral, PublicKeyToken=a6d206e05440431a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ben.TypeDictionary.0.1.4\lib\netstandard2.0\Ben.TypeDictionary.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.4.0\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.4.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNet.OData, Version=7.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.OData.7.5.0\lib\net45\Microsoft.AspNet.OData.dll</HintPath>
+    <Reference Include="Microsoft.AspNet.OData, Version=7.7.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.OData.7.7.5\lib\net45\Microsoft.AspNet.OData.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.31.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.3.1.31\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=6.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.6.0.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.31.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.31\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.ObjectPool, Version=6.0.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.ObjectPool.6.0.3\lib\net461\Microsoft.Extensions.ObjectPool.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.OData.Core, Version=7.7.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.OData.Core.7.7.2\lib\net45\Microsoft.OData.Core.dll</HintPath>
+    <Reference Include="Microsoft.OData.Core, Version=7.21.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.OData.Core.7.21.3\lib\net45\Microsoft.OData.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.OData.Edm, Version=7.7.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.OData.Edm.7.7.2\lib\net45\Microsoft.OData.Edm.dll</HintPath>
+    <Reference Include="Microsoft.OData.Edm, Version=7.21.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.OData.Edm.7.21.3\lib\net45\Microsoft.OData.Edm.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Restier.AspNet, Version=1.0.0.0, Culture=neutral, PublicKeyToken=bd2d67c4036fede0, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Restier.AspNet.1.0.0-rc5.20201113.1\lib\net472\Microsoft.Restier.AspNet.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Restier.AspNet.1.1.0\lib\net472\Microsoft.Restier.AspNet.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Restier.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=bd2d67c4036fede0, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Restier.Core.1.0.0-rc5.20201113.1\lib\net472\Microsoft.Restier.Core.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Restier.Core.1.1.0\lib\net472\Microsoft.Restier.Core.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Restier.EntityFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=bd2d67c4036fede0, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Restier.EntityFramework.1.0.0-rc5.20201113.1\lib\net472\Microsoft.Restier.EntityFramework.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Restier.EntityFramework.1.1.0\lib\net472\Microsoft.Restier.EntityFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Spatial, Version=7.7.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Spatial.7.7.2\lib\net45\Microsoft.Spatial.dll</HintPath>
+    <Reference Include="Microsoft.Spatial, Version=7.21.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Spatial.7.21.3\lib\net45\Microsoft.Spatial.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -89,39 +96,39 @@
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
-    <Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
+    <Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ComponentModel.Annotations.4.5.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\packages\System.ComponentModel.Annotations.5.0.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.9\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reflection.Metadata, Version=1.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath>
+    <Reference Include="System.Reflection.Metadata, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reflection.Metadata.8.0.0\lib\net462\System.Reflection.Metadata.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
-    <Reference Include="System.Text.Encodings.Web, Version=4.0.5.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Encodings.Web.4.7.2\lib\net461\System.Text.Encodings.Web.dll</HintPath>
+    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
     </Reference>
-    <Reference Include="System.Text.Json, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.4.7.2\lib\net461\System.Text.Json.dll</HintPath>
+    <Reference Include="System.Text.Json, Version=8.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.8.0.4\lib\net462\System.Text.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
@@ -138,14 +145,14 @@
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
+    <Reference Include="System.Web.Http, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.9\lib\net45\System.Web.Http.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Http.Cors, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Cors.5.2.7\lib\net45\System.Web.Http.Cors.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Http.WebHost, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll</HintPath>
+    <Reference Include="System.Web.Http.WebHost, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.9\lib\net45\System.Web.Http.WebHost.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Xml.Linq" />
@@ -220,6 +227,14 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
+  <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\EntityFramework.6.4.0\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.0\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\packages\EntityFramework.6.4.0\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.0\build\EntityFramework.targets'))" />
+  </Target>
+  <Import Project="..\packages\EntityFramework.6.4.0\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.0\build\EntityFramework.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Employee.cs b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Employee.cs
index 374b3cba..dd433b6b 100644
--- a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Employee.cs
+++ b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Employee.cs
@@ -10,5 +10,10 @@ public class Employee : Person
         public virtual ICollection<Person> Peers { get; set; }
 
         public long Cost { get; set; }
+
+        public Employee()
+        {
+            Peers = new List<Person>();
+        }
     }
 }
diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Person.cs b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Person.cs
index 6215db4d..ea58840d 100644
--- a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Person.cs
+++ b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Person.cs
@@ -53,5 +53,14 @@ public class Person
         public Feature FavoriteFeature { get; set; }
 
         public virtual ICollection<Feature> Features { get; set; }
+
+        public Person()
+        {
+            Emails = new List<string>();
+            AddressInfo = new List<Location>();
+            Friends = new List<Person>();
+            Trips = new List<Trip>();
+            Features = new List<Feature>();
+        }
     }
 }
\ No newline at end of file
diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Trip.cs b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Trip.cs
index 1e0878cc..3c39e4dd 100644
--- a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Trip.cs
+++ b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Trip.cs
@@ -27,6 +27,12 @@ public class Trip
 
         public virtual ICollection<PlanItem> PlanItems { get; set; }
 
+        public Trip()
+        {
+            Tags = new List<string>();
+            PlanItems = new List<PlanItem>();
+        }
+
         public object Clone()
         {
             Trip newTrip = new Trip()
@@ -37,23 +43,23 @@ public object Clone()
                 Budget = this.Budget,
                 Description = this.Description,
                 StartsAt = this.StartsAt,
-                EndsAt = this.EndsAt,
-                Tags = null,
+                EndsAt = this.EndsAt
             };
 
             if (this.Tags != null)
             {
-                newTrip.Tags = new Collection<string>();
                 foreach (var tag in this.Tags)
                 {
                     newTrip.Tags.Add(tag);
                 }
             }
 
-            newTrip.PlanItems = new List<PlanItem>();
-            foreach (var planItem in this.PlanItems)
+            if (this.PlanItems != null)
             {
-                newTrip.PlanItems.Add(planItem.Clone() as PlanItem);
+                foreach (var planItem in this.PlanItems)
+                {
+                    newTrip.PlanItems.Add(planItem.Clone() as PlanItem);
+                }
             }
 
             return newTrip;
diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/TripPinDataSource.cs b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/TripPinDataSource.cs
index 16036983..b46664a5 100644
--- a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/TripPinDataSource.cs
+++ b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/TripPinDataSource.cs
@@ -599,7 +599,8 @@ private void Initialize()
                     UserName = "clydeguess",
                     Gender = PersonGender.Male,
                     HomeAddress = new Location(),
-                    Trips = new List<Trip>()
+                    Trips = new List<Trip>(),
+                    AddressInfo = new List<Location>()
                 },
                 new Person()
                 {
diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Web.config b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Web.config
index 2680dca6..cde07ceb 100644
--- a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Web.config
+++ b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Web.config
@@ -4,6 +4,10 @@
   http://go.microsoft.com/fwlink/?LinkId=301879
   -->
 <configuration>
+  <configSections>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  </configSections>
   <appSettings />
   <!--
     For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
@@ -14,7 +18,7 @@
       </system.Web>
   -->
   <system.web>
-<customErrors mode="Off" />
+    <customErrors mode="Off" />
     <compilation debug="true" targetFramework="4.7.2" />
     <httpRuntime targetFramework="4.5" />
     <sessionState cookieless="true" regenerateExpiredSessionId="false" timeout="20" sessionIDManagerType="Microsoft.Restier.Providers.InMemory.Utils.ODataSessionIdManager, Microsoft.Restier.Providers.InMemory" />
@@ -27,7 +31,7 @@
       <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
       <remove name="OPTIONSVerbHandler" />
       <remove name="TRACEVerbHandler" />
-      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*" verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
     </handlers>
   </system.webServer>
   <uri>
@@ -53,39 +57,39 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.OData.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.7.2.0" newVersion="7.7.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.21.3.0" newVersion="7.21.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.31.0" newVersion="3.1.31.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.OData.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.7.2.0" newVersion="7.7.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.21.3.0" newVersion="7.21.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.31.0" newVersion="3.1.31.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.7.2.0" newVersion="7.7.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.21.3.0" newVersion="7.21.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.AspNet.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.7.5.0" newVersion="7.7.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -105,11 +109,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.4.3.0" newVersion="1.4.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
@@ -119,6 +123,27 @@
         <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.5.1" newVersion="4.0.5.1" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Http.WebHost" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Ben.Demystifier" publicKeyToken="a6d206e05440431a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.1.0.0" newVersion="0.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
+  <entityFramework>
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+    </providers>
+  </entityFramework>
 </configuration>
\ No newline at end of file
diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/packages.config b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/packages.config
index 72bd4957..86a5e1ae 100644
--- a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/packages.config
+++ b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/packages.config
@@ -1,43 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Ben.Demystifier" version="0.1.6" targetFramework="net472" />
-  <package id="EntityFramework" version="6.2.0" targetFramework="net472" />
+  <package id="Ben.Demystifier" version="0.4.1" targetFramework="net472" />
+  <package id="Ben.TypeDictionary" version="0.1.4" targetFramework="net472" />
+  <package id="EntityFramework" version="6.4.0" targetFramework="net472" />
   <package id="Microsoft.AspNet.Cors" version="5.2.7" targetFramework="net452" />
-  <package id="Microsoft.AspNet.OData" version="7.5.0" targetFramework="net472" />
-  <package id="Microsoft.AspNet.WebApi" version="5.2.7" targetFramework="net472" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net452" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net452" />
+  <package id="Microsoft.AspNet.OData" version="7.7.5" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi" version="5.2.9" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.9" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.9" targetFramework="net472" />
   <package id="Microsoft.AspNet.WebApi.Cors" version="5.2.7" targetFramework="net452" />
-  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.1" targetFramework="net472" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="3.1.31" targetFramework="net472" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.31" targetFramework="net472" />
-  <package id="Microsoft.OData.Core" version="7.7.2" targetFramework="net472" />
-  <package id="Microsoft.OData.Edm" version="7.7.2" targetFramework="net472" />
-  <package id="Microsoft.Restier.AspNet" version="1.0.0-rc5.20201113.1" targetFramework="net472" />
-  <package id="Microsoft.Restier.Core" version="1.0.0-rc5.20201113.1" targetFramework="net472" />
-  <package id="Microsoft.Restier.EntityFramework" version="1.0.0-rc5.20201113.1" targetFramework="net472" />
-  <package id="Microsoft.Spatial" version="7.7.2" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.9" targetFramework="net472" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net472" />
+  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="6.0.1" targetFramework="net472" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.ObjectPool" version="6.0.3" targetFramework="net472" />
+  <package id="Microsoft.OData.Core" version="7.21.3" targetFramework="net472" />
+  <package id="Microsoft.OData.Edm" version="7.21.3" targetFramework="net472" />
+  <package id="Microsoft.Restier.AspNet" version="1.1.0" targetFramework="net472" />
+  <package id="Microsoft.Restier.Core" version="1.1.0" targetFramework="net472" />
+  <package id="Microsoft.Restier.EntityFramework" version="1.1.0" targetFramework="net472" />
+  <package id="Microsoft.Spatial" version="7.21.3" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.Collections" version="4.0.11" targetFramework="net452" />
   <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net452" />
-  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net472" />
+  <package id="System.Collections.Immutable" version="8.0.0" targetFramework="net472" />
   <package id="System.ComponentModel" version="4.0.1" targetFramework="net45" />
-  <package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net472" />
+  <package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="net472" />
   <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net45" />
   <package id="System.Globalization" version="4.0.11" targetFramework="net45" />
   <package id="System.Linq" version="4.1.0" targetFramework="net45" requireReinstallation="true" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net45" requireReinstallation="true" />
-  <package id="System.Memory" version="4.5.4" targetFramework="net472" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net472" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
   <package id="System.Reflection" version="4.1.0" targetFramework="net45" requireReinstallation="true" />
-  <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net472" />
+  <package id="System.Reflection.Metadata" version="8.0.0" targetFramework="net472" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net45" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
   <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net452" requireReinstallation="true" />
-  <package id="System.Text.Encodings.Web" version="4.7.2" targetFramework="net472" />
-  <package id="System.Text.Json" version="4.7.2" targetFramework="net472" />
+  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net472" />
+  <package id="System.Text.Json" version="8.0.4" targetFramework="net472" />
   <package id="System.Threading" version="4.0.11" targetFramework="net452" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net452" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
diff --git a/RESTier/TripPinInMemory/Microsoft.Restier.Providers.InMemory/Microsoft.Restier.Providers.InMemory.csproj b/RESTier/TripPinInMemory/Microsoft.Restier.Providers.InMemory/Microsoft.Restier.Providers.InMemory.csproj
index d341416f..8e5faad3 100644
--- a/RESTier/TripPinInMemory/Microsoft.Restier.Providers.InMemory/Microsoft.Restier.Providers.InMemory.csproj
+++ b/RESTier/TripPinInMemory/Microsoft.Restier.Providers.InMemory/Microsoft.Restier.Providers.InMemory.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\EntityFramework.6.4.0\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.0\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,6 +13,8 @@
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -31,91 +34,100 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ben.Demystifier, Version=0.1.0.0, Culture=neutral, PublicKeyToken=a6d206e05440431a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Ben.Demystifier.0.1.6\lib\net45\Ben.Demystifier.dll</HintPath>
+    <Reference Include="Ben.Demystifier, Version=0.4.0.0, Culture=neutral, PublicKeyToken=a6d206e05440431a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ben.Demystifier.0.4.1\lib\net45\Ben.Demystifier.dll</HintPath>
+    </Reference>
+    <Reference Include="Ben.TypeDictionary, Version=0.1.0.0, Culture=neutral, PublicKeyToken=a6d206e05440431a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ben.TypeDictionary.0.1.4\lib\netstandard2.0\Ben.TypeDictionary.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.4.0\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.4.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.OData, Version=7.7.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.OData.7.7.5\lib\net45\Microsoft.AspNet.OData.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNet.OData, Version=7.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.OData.7.5.0\lib\net45\Microsoft.AspNet.OData.dll</HintPath>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=6.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.6.0.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.2.2.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.ObjectPool, Version=6.0.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.ObjectPool.6.0.3\lib\net461\Microsoft.Extensions.ObjectPool.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.OData.Core, Version=7.7.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.OData.Core.7.7.2\lib\net45\Microsoft.OData.Core.dll</HintPath>
+    <Reference Include="Microsoft.OData.Core, Version=7.21.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.OData.Core.7.21.3\lib\net45\Microsoft.OData.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.OData.Edm, Version=7.7.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.OData.Edm.7.7.2\lib\net45\Microsoft.OData.Edm.dll</HintPath>
+    <Reference Include="Microsoft.OData.Edm, Version=7.21.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.OData.Edm.7.21.3\lib\net45\Microsoft.OData.Edm.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Restier.AspNet, Version=1.0.0.0, Culture=neutral, PublicKeyToken=bd2d67c4036fede0, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Restier.AspNet.1.0.0-rc5.20201113.1\lib\net472\Microsoft.Restier.AspNet.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Restier.AspNet.1.1.0\lib\net472\Microsoft.Restier.AspNet.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Restier.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=bd2d67c4036fede0, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Restier.Core.1.0.0-rc5.20201113.1\lib\net472\Microsoft.Restier.Core.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Restier.Core.1.1.0\lib\net472\Microsoft.Restier.Core.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Restier.EntityFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=bd2d67c4036fede0, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Restier.EntityFramework.1.0.0-rc5.20201113.1\lib\net472\Microsoft.Restier.EntityFramework.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Restier.EntityFramework.1.1.0\lib\net472\Microsoft.Restier.EntityFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Spatial, Version=7.7.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Spatial.7.7.2\lib\net45\Microsoft.Spatial.dll</HintPath>
+    <Reference Include="Microsoft.Spatial, Version=7.21.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Spatial.7.21.3\lib\net45\Microsoft.Spatial.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
-    <Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
+    <Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ComponentModel.Annotations.4.5.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\packages\System.ComponentModel.Annotations.5.0.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
     </Reference>
-    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.9\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reflection.Metadata, Version=1.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath>
+    <Reference Include="System.Reflection.Metadata, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reflection.Metadata.8.0.0\lib\net462\System.Reflection.Metadata.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
-    <Reference Include="System.Text.Encodings.Web, Version=4.0.5.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Encodings.Web.4.7.2\lib\net461\System.Text.Encodings.Web.dll</HintPath>
+    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
     </Reference>
-    <Reference Include="System.Text.Json, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.4.6.0\lib\net461\System.Text.Json.dll</HintPath>
+    <Reference Include="System.Text.Json, Version=8.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.8.0.4\lib\net462\System.Text.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
+    <Reference Include="System.Web.Http, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.9\lib\net45\System.Web.Http.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Http.WebHost, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll</HintPath>
+    <Reference Include="System.Web.Http.WebHost, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.9\lib\net45\System.Web.Http.WebHost.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -149,6 +161,14 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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\EntityFramework.6.4.0\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.0\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\packages\EntityFramework.6.4.0\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.0\build\EntityFramework.targets'))" />
+  </Target>
+  <Import Project="..\packages\EntityFramework.6.4.0\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.0\build\EntityFramework.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/RESTier/TripPinInMemory/Microsoft.Restier.Providers.InMemory/app.config b/RESTier/TripPinInMemory/Microsoft.Restier.Providers.InMemory/app.config
index 4bb267f8..4ca783bd 100644
--- a/RESTier/TripPinInMemory/Microsoft.Restier.Providers.InMemory/app.config
+++ b/RESTier/TripPinInMemory/Microsoft.Restier.Providers.InMemory/app.config
@@ -1,34 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <configSections>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  </configSections>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.OData.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.7.2.0" newVersion="7.7.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.21.3.0" newVersion="7.21.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.OData.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.7.2.0" newVersion="7.7.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.21.3.0" newVersion="7.21.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.7.2.0" newVersion="7.7.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.21.3.0" newVersion="7.21.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -48,8 +52,37 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.AspNet.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.7.5.0" newVersion="7.7.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
+  <entityFramework>
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+    </providers>
+  </entityFramework>
 </configuration>
\ No newline at end of file
diff --git a/RESTier/TripPinInMemory/Microsoft.Restier.Providers.InMemory/packages.config b/RESTier/TripPinInMemory/Microsoft.Restier.Providers.InMemory/packages.config
index a5a62e02..51733243 100644
--- a/RESTier/TripPinInMemory/Microsoft.Restier.Providers.InMemory/packages.config
+++ b/RESTier/TripPinInMemory/Microsoft.Restier.Providers.InMemory/packages.config
@@ -1,42 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Ben.Demystifier" version="0.1.6" targetFramework="net472" />
-  <package id="EntityFramework" version="6.2.0" targetFramework="net472" />
-  <package id="Microsoft.AspNet.OData" version="7.5.0" targetFramework="net472" />
-  <package id="Microsoft.AspNet.WebApi" version="5.2.7" targetFramework="net472" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net472" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net472" />
-  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net472" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="2.2.0" targetFramework="net472" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.2.0" targetFramework="net472" />
-  <package id="Microsoft.OData.Core" version="7.7.2" targetFramework="net472" />
-  <package id="Microsoft.OData.Edm" version="7.7.2" targetFramework="net472" />
-  <package id="Microsoft.Restier.AspNet" version="1.0.0-rc5.20201113.1" targetFramework="net472" />
-  <package id="Microsoft.Restier.Core" version="1.0.0-rc5.20201113.1" targetFramework="net472" />
-  <package id="Microsoft.Restier.EntityFramework" version="1.0.0-rc5.20201113.1" targetFramework="net472" />
-  <package id="Microsoft.Spatial" version="7.7.2" targetFramework="net472" />
+  <package id="Ben.Demystifier" version="0.4.1" targetFramework="net472" />
+  <package id="Ben.TypeDictionary" version="0.1.4" targetFramework="net472" />
+  <package id="EntityFramework" version="6.4.0" targetFramework="net472" />
+  <package id="Microsoft.AspNet.OData" version="7.7.5" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi" version="5.2.9" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.9" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.9" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.9" targetFramework="net472" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net472" />
+  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="6.0.1" targetFramework="net472" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.ObjectPool" version="6.0.3" targetFramework="net472" />
+  <package id="Microsoft.OData.Core" version="7.21.3" targetFramework="net472" />
+  <package id="Microsoft.OData.Edm" version="7.21.3" targetFramework="net472" />
+  <package id="Microsoft.Restier.AspNet" version="1.1.0" targetFramework="net472" />
+  <package id="Microsoft.Restier.Core" version="1.1.0" targetFramework="net472" />
+  <package id="Microsoft.Restier.EntityFramework" version="1.1.0" targetFramework="net472" />
+  <package id="Microsoft.Spatial" version="7.21.3" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.Collections" version="4.0.11" targetFramework="net452" />
   <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net452" />
-  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net472" />
+  <package id="System.Collections.Immutable" version="8.0.0" targetFramework="net472" />
   <package id="System.ComponentModel" version="4.0.1" targetFramework="net452" />
-  <package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net472" />
+  <package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="net472" />
   <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" requireReinstallation="true" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net452" requireReinstallation="true" />
-  <package id="System.Memory" version="4.5.4" targetFramework="net472" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net472" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
   <package id="System.Reflection" version="4.1.0" targetFramework="net452" requireReinstallation="true" />
-  <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net472" />
+  <package id="System.Reflection.Metadata" version="8.0.0" targetFramework="net472" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net452" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
   <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net452" requireReinstallation="true" />
-  <package id="System.Text.Encodings.Web" version="4.7.2" targetFramework="net472" />
-  <package id="System.Text.Json" version="4.6.0" targetFramework="net472" />
+  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net472" />
+  <package id="System.Text.Json" version="8.0.4" targetFramework="net472" />
   <package id="System.Threading" version="4.0.11" targetFramework="net452" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net452" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.3" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
 </packages>
\ No newline at end of file