diff --git a/src/GlobalSuppressions.cs b/src/GlobalSuppressions.cs
index 134b12f6..6f9f4e89 100644
--- a/src/GlobalSuppressions.cs
+++ b/src/GlobalSuppressions.cs
@@ -37,8 +37,8 @@
 #region CA1006 Nested Generic Type
 [assembly: SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Scope = "member", Target = "Microsoft.Restier.Core.ApiBaseExtensions.#QueryAsync`1(Microsoft.Restier.Core.ApiBase,System.Linq.IQueryable`1<!!0>,System.Threading.CancellationToken)")]
 [assembly: SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Scope = "member", Target = "Microsoft.Restier.Core.ApiBaseExtensions.#QueryAsync`2(Microsoft.Restier.Core.ApiBase,System.Linq.IQueryable`1<!!0>,System.Linq.Expressions.Expression`1<System.Func`2<System.Linq.IQueryable`1<!!0>,!!1>>,System.Threading.CancellationToken)")]
+[assembly: SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Scope = "member", Target = "Microsoft.Restier.Core.Model.ModelContext.#EntityTypeKeyPropertiesMapDictionary")]
 [assembly: SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Scope = "member", Target = "Microsoft.Restier.Core.Query.QueryRequest.#Create`2(System.Linq.IQueryable`1<!!0>,System.Linq.Expressions.Expression`1<System.Func`2<System.Linq.IQueryable`1<!!0>,!!1>>,System.Nullable`1<System.Boolean>)")]
-[assembly: SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Scope = "member", Target = "Microsoft.Restier.Core.Model.ModelContext.#EntitySetTypeMapCollection")]
 #endregion
 
 #region CA1020 Few types in namespace
@@ -149,7 +149,8 @@
 [assembly: SuppressMessage("Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly", Scope = "member", Target = "Microsoft.Restier.Core.ApiContext.#.ctor(Microsoft.Restier.Core.ApiConfiguration)")]
 [assembly: SuppressMessage("Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly", Scope = "member", Target = "Microsoft.Restier.Core.QueryableSource.#System.Linq.IQueryProvider.CreateQuery`1(System.Linq.Expressions.Expression)")]
 [assembly: SuppressMessage("Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly", Scope = "member", Target = "Microsoft.Restier.Core.QueryableSource.#System.Linq.IQueryProvider.CreateQuery(System.Linq.Expressions.Expression)")]
-[assembly: SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly", Scope = "member", Target = "Microsoft.Restier.Core.Model.ModelContext.#EntitySetTypeMapCollection")]
+[assembly: SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly", Scope = "member", Target = "Microsoft.Restier.Core.Model.ModelContext.#EntitySetTypeMapDictionary")]
+[assembly: SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly", Scope = "member", Target = "Microsoft.Restier.Core.Model.ModelContext.#EntityTypeKeyPropertiesMapDictionary")]
 #endregion
 
 #region CA1801 Unused Parameters
diff --git a/src/Microsoft.Restier.Core/Model/ModelContext.cs b/src/Microsoft.Restier.Core/Model/ModelContext.cs
index a9812e29..f7aa5f6b 100644
--- a/src/Microsoft.Restier.Core/Model/ModelContext.cs
+++ b/src/Microsoft.Restier.Core/Model/ModelContext.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
+using System.Reflection;
 
 namespace Microsoft.Restier.Core.Model
 {
@@ -24,8 +24,16 @@ public ModelContext(ApiContext apiContext)
         }
 
         /// <summary>
-        /// Gets or sets Entity set and entity type map collection, it will be used by publisher for model build.
+        /// Gets or sets Entity set and entity type map dictionary, it will be used by publisher for model build.
         /// </summary>
-        public Collection<KeyValuePair<string, Type>> EntitySetTypeMapCollection { get; set; }
+        public IDictionary<string, Type> EntitySetTypeMapDictionary { get; set; }
+
+        /// <summary>
+        /// Gets or sets entity type and its key properties map dictionary, and used by publisher for model build.
+        /// This is useful when key properties does not have key attribute
+        /// or follow Web Api OData key property naming convention.
+        /// Otherwise, this collection is not needed.
+        /// </summary>
+        public IDictionary<Type, ICollection<PropertyInfo>> EntityTypeKeyPropertiesMapDictionary { get; set; }
     }
 }
diff --git a/src/Microsoft.Restier.Providers.EntityFramework/Model/ModelProducer.cs b/src/Microsoft.Restier.Providers.EntityFramework/Model/ModelProducer.cs
index 36a0bd8c..209142b6 100644
--- a/src/Microsoft.Restier.Providers.EntityFramework/Model/ModelProducer.cs
+++ b/src/Microsoft.Restier.Providers.EntityFramework/Model/ModelProducer.cs
@@ -7,6 +7,9 @@
 #if !EF7
 using System.Data.Entity;
 #endif
+using System.Data.Entity.Core.Metadata.Edm;
+using System.Data.Entity.Infrastructure;
+using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
@@ -42,43 +45,35 @@ public Task<IEdmModel> GetModelAsync(ModelContext context, CancellationToken can
         {
             Ensure.NotNull(context, "context");
 
-            var entitySetTypeMapCollection = new Collection<KeyValuePair<string, Type>>();
-            var apiContext = context.ApiContext;
-            var dbContext = apiContext.GetApiService<DbContext>();
+            var entitySetTypeMapDictionary = new Dictionary<string, Type>();
+            var entityTypeKeyPropertiesMapDictionary = new Dictionary<Type, ICollection<PropertyInfo>>();
+            var dbContext = context.ApiContext.GetApiService<DbContext>();
 
-            List<PropertyInfo> props = GetDbSetProperties(dbContext);
-            foreach (var prop in props)
-            {
-                var type = prop.PropertyType.GenericTypeArguments[0];
-                var pair = new KeyValuePair<string, Type>(prop.Name, type);
-                entitySetTypeMapCollection.Add(pair);
-            }
-
-            context.EntitySetTypeMapCollection = entitySetTypeMapCollection;
-            return Task.FromResult<IEdmModel>(null);
-        }
-
-        internal static List<PropertyInfo> GetDbSetProperties(DbContext dbContext)
-        {
-            var dbSetProperties = new List<PropertyInfo>();
-            var properties = dbContext.GetType().GetProperties();
+            var efModel = (dbContext as IObjectContextAdapter).ObjectContext.MetadataWorkspace;
+            var efEntityContainer = efModel.GetItems<EntityContainer>(DataSpace.CSpace).Single();
+            var itemCollection = (ObjectItemCollection)efModel.GetItemCollection(DataSpace.OSpace);
 
-            foreach (var property in properties)
+            foreach (var efEntitySet in efEntityContainer.EntitySets)
             {
-                var type = property.PropertyType;
-#if EF7
-                var genericType = type.FindGenericType(typeof(DbSet<>));
-#else
-                var genericType = type.FindGenericType(typeof(IDbSet<>));
-#endif
+                var efEntityType = efEntitySet.ElementType;
+                var objectSpaceType = efModel.GetObjectSpaceType(efEntityType);
+                Type clrType = itemCollection.GetClrType(objectSpaceType);
 
-                if (genericType != null)
+                // As entity set name and type map
+                entitySetTypeMapDictionary.Add(efEntitySet.Name, clrType);
+
+                ICollection<PropertyInfo> keyProperties = new List<PropertyInfo>();
+                foreach (var property in efEntityType.KeyProperties)
                 {
-                    dbSetProperties.Add(property);
+                    keyProperties.Add(clrType.GetProperty(property.Name));
                 }
+
+                entityTypeKeyPropertiesMapDictionary.Add(clrType, keyProperties);
             }
 
-            return dbSetProperties;
+            context.EntitySetTypeMapDictionary = entitySetTypeMapDictionary;
+            context.EntityTypeKeyPropertiesMapDictionary = entityTypeKeyPropertiesMapDictionary;
+            return Task.FromResult<IEdmModel>(null);
         }
     }
 }
diff --git a/src/Microsoft.Restier.Publishers.OData/Model/RestierModelBuilder.cs b/src/Microsoft.Restier.Publishers.OData/Model/RestierModelBuilder.cs
index 28b80544..c86c8d63 100644
--- a/src/Microsoft.Restier.Publishers.OData/Model/RestierModelBuilder.cs
+++ b/src/Microsoft.Restier.Publishers.OData/Model/RestierModelBuilder.cs
@@ -28,8 +28,8 @@ public async Task<IEdmModel> GetModelAsync(ModelContext context, CancellationTok
                 }
             }
 
-            var collection = context.EntitySetTypeMapCollection;
-            if (collection == null || collection.Count == 0)
+            var entitySetTypeMapDictionary = context.EntitySetTypeMapDictionary;
+            if (entitySetTypeMapDictionary == null || entitySetTypeMapDictionary.Count == 0)
             {
                 return null;
             }
@@ -41,7 +41,7 @@ public async Task<IEdmModel> GetModelAsync(ModelContext context, CancellationTok
             MethodInfo method = typeof(ODataConventionModelBuilder)
                 .GetMethod("EntitySet", BindingFlags.Public | BindingFlags.Instance | BindingFlags.FlattenHierarchy);
 
-            foreach (var pair in collection)
+            foreach (var pair in entitySetTypeMapDictionary)
             {
                 // Build a method with the specific type argument
                 var specifiedMethod = method.MakeGenericMethod(pair.Value);
@@ -53,7 +53,27 @@ public async Task<IEdmModel> GetModelAsync(ModelContext context, CancellationTok
                 specifiedMethod.Invoke(builder, parameters);
             }
 
-            context.EntitySetTypeMapCollection.Clear();
+            entitySetTypeMapDictionary.Clear();
+
+            var entityTypeKeyPropertiesMapDictionary = context.EntityTypeKeyPropertiesMapDictionary;
+            if (entityTypeKeyPropertiesMapDictionary != null)
+            {
+                foreach (var pair in entityTypeKeyPropertiesMapDictionary)
+                {
+                    var edmTypeConfiguration = builder.GetTypeConfigurationOrNull(pair.Key) as EntityTypeConfiguration;
+                    if (edmTypeConfiguration == null)
+                    {
+                        continue;
+                    }
+
+                    foreach (var property in pair.Value)
+                    {
+                        edmTypeConfiguration.HasKey(property);
+                    }
+                }
+
+                entityTypeKeyPropertiesMapDictionary.Clear();
+            }
 
             return builder.GetEdmModel();
         }
diff --git a/test/Microsoft.Restier.Publishers.OData.Test/Microsoft.Restier.Publishers.OData.Test.csproj b/test/Microsoft.Restier.Publishers.OData.Test/Microsoft.Restier.Publishers.OData.Test.csproj
index 4dad07bb..32adecd8 100644
--- a/test/Microsoft.Restier.Publishers.OData.Test/Microsoft.Restier.Publishers.OData.Test.csproj
+++ b/test/Microsoft.Restier.Publishers.OData.Test/Microsoft.Restier.Publishers.OData.Test.csproj
@@ -35,8 +35,13 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EntityFramework">
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.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-rc2-final\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
diff --git a/test/Microsoft.Restier.Publishers.OData.Test/app.config b/test/Microsoft.Restier.Publishers.OData.Test/app.config
index 6101cbb7..24b854b1 100644
--- a/test/Microsoft.Restier.Publishers.OData.Test/app.config
+++ b/test/Microsoft.Restier.Publishers.OData.Test/app.config
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <configSections>
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+  </configSections>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
@@ -16,4 +20,13 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
+  <entityFramework>
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+    </providers>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
+  </entityFramework>
+  <connectionStrings>
+    <add name="LibraryContext" connectionString="data source=(localdb)\MSSQLLocalDB;initial catalog=LibraryAPIDB;integrated security=True;connect timeout=30;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
+  </connectionStrings>
 </configuration>
\ No newline at end of file
diff --git a/test/Microsoft.Restier.Publishers.OData.Test/packages.config b/test/Microsoft.Restier.Publishers.OData.Test/packages.config
index 7dc15fa2..fbf6eeb4 100644
--- a/test/Microsoft.Restier.Publishers.OData.Test/packages.config
+++ b/test/Microsoft.Restier.Publishers.OData.Test/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="EntityFramework" version="6.1.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.OData" version="5.9.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
diff --git a/test/Microsoft.Restier.TestCommon/PublicApi.bsl b/test/Microsoft.Restier.TestCommon/PublicApi.bsl
index a710d8ac..a111bd88 100644
--- a/test/Microsoft.Restier.TestCommon/PublicApi.bsl
+++ b/test/Microsoft.Restier.TestCommon/PublicApi.bsl
@@ -299,7 +299,8 @@ public interface Microsoft.Restier.Core.Model.IModelMapper {
 public class Microsoft.Restier.Core.Model.ModelContext : Microsoft.Restier.Core.InvocationContext {
 	public ModelContext (Microsoft.Restier.Core.ApiContext apiContext)
 
-	System.Collections.ObjectModel.Collection`1[[System.Collections.Generic.KeyValuePair`2[[System.String],[System.Type]]]] EntitySetTypeMapCollection  { [CompilerGeneratedAttribute(),]public get; [CompilerGeneratedAttribute(),]public set; }
+	System.Collections.Generic.IDictionary`2[[System.String],[System.Type]] EntitySetTypeMapDictionary  { [CompilerGeneratedAttribute(),]public get; [CompilerGeneratedAttribute(),]public set; }
+	System.Collections.Generic.IDictionary`2[[System.Type],[System.Collections.Generic.ICollection`1[[System.Reflection.PropertyInfo]]]] EntityTypeKeyPropertiesMapDictionary  { [CompilerGeneratedAttribute(),]public get; [CompilerGeneratedAttribute(),]public set; }
 }
 
 public interface Microsoft.Restier.Core.Query.IQueryExecutor {
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind.Tests/Baselines/TestGetNorthwindMetadata.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind.Tests/Baselines/TestGetNorthwindMetadata.txt
index 70017644..2d96d116 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind.Tests/Baselines/TestGetNorthwindMetadata.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind.Tests/Baselines/TestGetNorthwindMetadata.txt
@@ -12,34 +12,71 @@
         <Property Name="Picture" Type="Edm.Binary" />
         <NavigationProperty Name="Products" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Product)" />
       </EntityType>
-      <EntityType Name="Contact">
+      <EntityType Name="Product">
         <Key>
-          <PropertyRef Name="ContactID" />
+          <PropertyRef Name="ProductID" />
         </Key>
-        <Property Name="ContactID" Type="Edm.Int32" Nullable="false" />
-        <Property Name="ContactType" Type="Edm.String" />
-        <Property Name="CompanyName" Type="Edm.String" Nullable="false" />
-        <Property Name="ContactName" Type="Edm.String" />
-        <Property Name="ContactTitle" Type="Edm.String" />
-        <Property Name="Address" Type="Edm.String" />
-        <Property Name="City" Type="Edm.String" />
-        <Property Name="Region" Type="Edm.String" />
-        <Property Name="PostalCode" Type="Edm.String" />
-        <Property Name="CountryRegion" Type="Edm.String" />
-        <Property Name="Phone" Type="Edm.String" />
-        <Property Name="Extension" Type="Edm.String" />
-        <Property Name="Fax" Type="Edm.String" />
-        <Property Name="HomePage" Type="Edm.String" />
-        <Property Name="PhotoPath" Type="Edm.String" />
-        <Property Name="Photo" Type="Edm.Binary" />
+        <Property Name="ProductID" Type="Edm.Int32" Nullable="false" />
+        <Property Name="ProductName" Type="Edm.String" Nullable="false" />
+        <Property Name="SupplierID" Type="Edm.Int32" />
+        <Property Name="CategoryID" Type="Edm.Int32" />
+        <Property Name="QuantityPerUnit" Type="Edm.String" />
+        <Property Name="UnitPrice" Type="Edm.Decimal" />
+        <Property Name="UnitsInStock" Type="Edm.Int16" />
+        <Property Name="UnitsOnOrder" Type="Edm.Int16" />
+        <Property Name="ReorderLevel" Type="Edm.Int16" />
+        <Property Name="Discontinued" Type="Edm.Boolean" Nullable="false" />
+        <NavigationProperty Name="Category" Type="Microsoft.OData.Service.Sample.Northwind.Models.Category">
+          <ReferentialConstraint Property="CategoryID" ReferencedProperty="CategoryID" />
+        </NavigationProperty>
+        <NavigationProperty Name="Order_Details" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Order_Detail)" />
+        <NavigationProperty Name="Supplier" Type="Microsoft.OData.Service.Sample.Northwind.Models.Supplier">
+          <ReferentialConstraint Property="SupplierID" ReferencedProperty="SupplierID" />
+        </NavigationProperty>
       </EntityType>
-      <EntityType Name="CustomerDemographic">
+      <EntityType Name="Order_Detail">
         <Key>
-          <PropertyRef Name="CustomerTypeID" />
+          <PropertyRef Name="OrderID" />
+          <PropertyRef Name="ProductID" />
         </Key>
-        <Property Name="CustomerTypeID" Type="Edm.String" Nullable="false" />
-        <Property Name="CustomerDesc" Type="Edm.String" />
-        <NavigationProperty Name="Customers" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Customer)" />
+        <Property Name="OrderID" Type="Edm.Int32" />
+        <Property Name="ProductID" Type="Edm.Int32" />
+        <Property Name="UnitPrice" Type="Edm.Decimal" Nullable="false" />
+        <Property Name="Quantity" Type="Edm.Int16" Nullable="false" />
+        <Property Name="Discount" Type="Edm.Single" Nullable="false" />
+        <NavigationProperty Name="Order" Type="Microsoft.OData.Service.Sample.Northwind.Models.Order">
+          <ReferentialConstraint Property="OrderID" ReferencedProperty="OrderID" />
+        </NavigationProperty>
+        <NavigationProperty Name="Product" Type="Microsoft.OData.Service.Sample.Northwind.Models.Product">
+          <ReferentialConstraint Property="ProductID" ReferencedProperty="ProductID" />
+        </NavigationProperty>
+      </EntityType>
+      <EntityType Name="Order">
+        <Key>
+          <PropertyRef Name="OrderID" />
+        </Key>
+        <Property Name="OrderID" Type="Edm.Int32" Nullable="false" />
+        <Property Name="CustomerID" Type="Edm.String" />
+        <Property Name="EmployeeID" Type="Edm.Int32" />
+        <Property Name="OrderDate" Type="Edm.Date" />
+        <Property Name="RequiredDate" Type="Edm.Date" />
+        <Property Name="ShippedDate" Type="Edm.Date" />
+        <Property Name="ShipVia" Type="Edm.Int32" />
+        <Property Name="Freight" Type="Edm.Decimal" />
+        <Property Name="ShipName" Type="Edm.String" />
+        <Property Name="ShipAddress" Type="Edm.String" />
+        <Property Name="ShipCity" Type="Edm.String" />
+        <Property Name="ShipRegion" Type="Edm.String" />
+        <Property Name="ShipPostalCode" Type="Edm.String" />
+        <Property Name="ShipCountry" Type="Edm.String" />
+        <NavigationProperty Name="Customer" Type="Microsoft.OData.Service.Sample.Northwind.Models.Customer">
+          <ReferentialConstraint Property="CustomerID" ReferencedProperty="CustomerID" />
+        </NavigationProperty>
+        <NavigationProperty Name="Employee" Type="Microsoft.OData.Service.Sample.Northwind.Models.Employee">
+          <ReferentialConstraint Property="EmployeeID" ReferencedProperty="EmployeeID" />
+        </NavigationProperty>
+        <NavigationProperty Name="Order_Details" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Order_Detail)" />
+        <NavigationProperty Name="Shipper" Type="Microsoft.OData.Service.Sample.Northwind.Models.Shipper" />
       </EntityType>
       <EntityType Name="Customer">
         <Key>
@@ -59,6 +96,14 @@
         <NavigationProperty Name="Orders" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Order)" />
         <NavigationProperty Name="CustomerDemographics" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.CustomerDemographic)" />
       </EntityType>
+      <EntityType Name="CustomerDemographic">
+        <Key>
+          <PropertyRef Name="CustomerTypeID" />
+        </Key>
+        <Property Name="CustomerTypeID" Type="Edm.String" Nullable="false" />
+        <Property Name="CustomerDesc" Type="Edm.String" />
+        <NavigationProperty Name="Customers" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Customer)" />
+      </EntityType>
       <EntityType Name="Employee">
         <Key>
           <PropertyRef Name="EmployeeID" />
@@ -88,71 +133,17 @@
         <NavigationProperty Name="Orders" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Order)" />
         <NavigationProperty Name="Territories" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Territory)" />
       </EntityType>
-      <EntityType Name="Order_Detail">
-        <Key>
-          <PropertyRef Name="OrderID" />
-          <PropertyRef Name="ProductID" />
-        </Key>
-        <Property Name="OrderID" Type="Edm.Int32" />
-        <Property Name="ProductID" Type="Edm.Int32" />
-        <Property Name="UnitPrice" Type="Edm.Decimal" Nullable="false" />
-        <Property Name="Quantity" Type="Edm.Int16" Nullable="false" />
-        <Property Name="Discount" Type="Edm.Single" Nullable="false" />
-        <NavigationProperty Name="Order" Type="Microsoft.OData.Service.Sample.Northwind.Models.Order">
-          <ReferentialConstraint Property="OrderID" ReferencedProperty="OrderID" />
-        </NavigationProperty>
-        <NavigationProperty Name="Product" Type="Microsoft.OData.Service.Sample.Northwind.Models.Product">
-          <ReferentialConstraint Property="ProductID" ReferencedProperty="ProductID" />
-        </NavigationProperty>
-      </EntityType>
-      <EntityType Name="Order">
-        <Key>
-          <PropertyRef Name="OrderID" />
-        </Key>
-        <Property Name="OrderID" Type="Edm.Int32" Nullable="false" />
-        <Property Name="CustomerID" Type="Edm.String" />
-        <Property Name="EmployeeID" Type="Edm.Int32" />
-        <Property Name="OrderDate" Type="Edm.Date" />
-        <Property Name="RequiredDate" Type="Edm.Date" />
-        <Property Name="ShippedDate" Type="Edm.Date" />
-        <Property Name="ShipVia" Type="Edm.Int32" />
-        <Property Name="Freight" Type="Edm.Decimal" />
-        <Property Name="ShipName" Type="Edm.String" />
-        <Property Name="ShipAddress" Type="Edm.String" />
-        <Property Name="ShipCity" Type="Edm.String" />
-        <Property Name="ShipRegion" Type="Edm.String" />
-        <Property Name="ShipPostalCode" Type="Edm.String" />
-        <Property Name="ShipCountry" Type="Edm.String" />
-        <NavigationProperty Name="Customer" Type="Microsoft.OData.Service.Sample.Northwind.Models.Customer">
-          <ReferentialConstraint Property="CustomerID" ReferencedProperty="CustomerID" />
-        </NavigationProperty>
-        <NavigationProperty Name="Employee" Type="Microsoft.OData.Service.Sample.Northwind.Models.Employee">
-          <ReferentialConstraint Property="EmployeeID" ReferencedProperty="EmployeeID" />
-        </NavigationProperty>
-        <NavigationProperty Name="Order_Details" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Order_Detail)" />
-        <NavigationProperty Name="Shipper" Type="Microsoft.OData.Service.Sample.Northwind.Models.Shipper" />
-      </EntityType>
-      <EntityType Name="Product">
+      <EntityType Name="Territory">
         <Key>
-          <PropertyRef Name="ProductID" />
+          <PropertyRef Name="TerritoryID" />
         </Key>
-        <Property Name="ProductID" Type="Edm.Int32" Nullable="false" />
-        <Property Name="ProductName" Type="Edm.String" Nullable="false" />
-        <Property Name="SupplierID" Type="Edm.Int32" />
-        <Property Name="CategoryID" Type="Edm.Int32" />
-        <Property Name="QuantityPerUnit" Type="Edm.String" />
-        <Property Name="UnitPrice" Type="Edm.Decimal" />
-        <Property Name="UnitsInStock" Type="Edm.Int16" />
-        <Property Name="UnitsOnOrder" Type="Edm.Int16" />
-        <Property Name="ReorderLevel" Type="Edm.Int16" />
-        <Property Name="Discontinued" Type="Edm.Boolean" Nullable="false" />
-        <NavigationProperty Name="Category" Type="Microsoft.OData.Service.Sample.Northwind.Models.Category">
-          <ReferentialConstraint Property="CategoryID" ReferencedProperty="CategoryID" />
-        </NavigationProperty>
-        <NavigationProperty Name="Order_Details" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Order_Detail)" />
-        <NavigationProperty Name="Supplier" Type="Microsoft.OData.Service.Sample.Northwind.Models.Supplier">
-          <ReferentialConstraint Property="SupplierID" ReferencedProperty="SupplierID" />
+        <Property Name="TerritoryID" Type="Edm.String" Nullable="false" />
+        <Property Name="TerritoryDescription" Type="Edm.String" Nullable="false" />
+        <Property Name="RegionID" Type="Edm.Int32" />
+        <NavigationProperty Name="Region" Type="Microsoft.OData.Service.Sample.Northwind.Models.Region">
+          <ReferentialConstraint Property="RegionID" ReferencedProperty="RegionID" />
         </NavigationProperty>
+        <NavigationProperty Name="Employees" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Employee)" />
       </EntityType>
       <EntityType Name="Region">
         <Key>
@@ -189,17 +180,26 @@
         <Property Name="HomePage" Type="Edm.String" />
         <NavigationProperty Name="Products" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Product)" />
       </EntityType>
-      <EntityType Name="Territory">
+      <EntityType Name="Contact">
         <Key>
-          <PropertyRef Name="TerritoryID" />
+          <PropertyRef Name="ContactID" />
         </Key>
-        <Property Name="TerritoryID" Type="Edm.String" Nullable="false" />
-        <Property Name="TerritoryDescription" Type="Edm.String" Nullable="false" />
-        <Property Name="RegionID" Type="Edm.Int32" />
-        <NavigationProperty Name="Region" Type="Microsoft.OData.Service.Sample.Northwind.Models.Region">
-          <ReferentialConstraint Property="RegionID" ReferencedProperty="RegionID" />
-        </NavigationProperty>
-        <NavigationProperty Name="Employees" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Employee)" />
+        <Property Name="ContactID" Type="Edm.Int32" Nullable="false" />
+        <Property Name="ContactType" Type="Edm.String" />
+        <Property Name="CompanyName" Type="Edm.String" Nullable="false" />
+        <Property Name="ContactName" Type="Edm.String" />
+        <Property Name="ContactTitle" Type="Edm.String" />
+        <Property Name="Address" Type="Edm.String" />
+        <Property Name="City" Type="Edm.String" />
+        <Property Name="Region" Type="Edm.String" />
+        <Property Name="PostalCode" Type="Edm.String" />
+        <Property Name="CountryRegion" Type="Edm.String" />
+        <Property Name="Phone" Type="Edm.String" />
+        <Property Name="Extension" Type="Edm.String" />
+        <Property Name="Fax" Type="Edm.String" />
+        <Property Name="HomePage" Type="Edm.String" />
+        <Property Name="PhotoPath" Type="Edm.String" />
+        <Property Name="Photo" Type="Edm.Binary" />
       </EntityType>
       <Function Name="MostExpensive" IsBound="true">
         <Parameter Name="bindingParameter" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Product)" />
@@ -216,19 +216,10 @@
         <EntitySet Name="Categories" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Category">
           <NavigationPropertyBinding Path="Products" Target="Products" />
         </EntitySet>
-        <EntitySet Name="Contacts" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Contact" />
-        <EntitySet Name="CustomerDemographics" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.CustomerDemographic">
-          <NavigationPropertyBinding Path="Customers" Target="Customers" />
-        </EntitySet>
-        <EntitySet Name="Customers" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Customer">
-          <NavigationPropertyBinding Path="Orders" Target="Orders" />
-          <NavigationPropertyBinding Path="CustomerDemographics" Target="CustomerDemographics" />
-        </EntitySet>
-        <EntitySet Name="Employees" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Employee">
-          <NavigationPropertyBinding Path="Employees1" Target="Employees" />
-          <NavigationPropertyBinding Path="Employee1" Target="Employees" />
-          <NavigationPropertyBinding Path="Orders" Target="Orders" />
-          <NavigationPropertyBinding Path="Territories" Target="Territories" />
+        <EntitySet Name="Products" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Product">
+          <NavigationPropertyBinding Path="Category" Target="Categories" />
+          <NavigationPropertyBinding Path="Order_Details" Target="Order_Details" />
+          <NavigationPropertyBinding Path="Supplier" Target="Suppliers" />
         </EntitySet>
         <EntitySet Name="Order_Details" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Order_Detail">
           <NavigationPropertyBinding Path="Order" Target="Orders" />
@@ -240,10 +231,22 @@
           <NavigationPropertyBinding Path="Order_Details" Target="Order_Details" />
           <NavigationPropertyBinding Path="Shipper" Target="Shippers" />
         </EntitySet>
-        <EntitySet Name="Products" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Product">
-          <NavigationPropertyBinding Path="Category" Target="Categories" />
-          <NavigationPropertyBinding Path="Order_Details" Target="Order_Details" />
-          <NavigationPropertyBinding Path="Supplier" Target="Suppliers" />
+        <EntitySet Name="Customers" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Customer">
+          <NavigationPropertyBinding Path="Orders" Target="Orders" />
+          <NavigationPropertyBinding Path="CustomerDemographics" Target="CustomerDemographics" />
+        </EntitySet>
+        <EntitySet Name="CustomerDemographics" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.CustomerDemographic">
+          <NavigationPropertyBinding Path="Customers" Target="Customers" />
+        </EntitySet>
+        <EntitySet Name="Employees" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Employee">
+          <NavigationPropertyBinding Path="Employees1" Target="Employees" />
+          <NavigationPropertyBinding Path="Employee1" Target="Employees" />
+          <NavigationPropertyBinding Path="Orders" Target="Orders" />
+          <NavigationPropertyBinding Path="Territories" Target="Territories" />
+        </EntitySet>
+        <EntitySet Name="Territories" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Territory">
+          <NavigationPropertyBinding Path="Region" Target="Regions" />
+          <NavigationPropertyBinding Path="Employees" Target="Employees" />
         </EntitySet>
         <EntitySet Name="Regions" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Region">
           <NavigationPropertyBinding Path="Territories" Target="Territories" />
@@ -254,10 +257,7 @@
         <EntitySet Name="Suppliers" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Supplier">
           <NavigationPropertyBinding Path="Products" Target="Products" />
         </EntitySet>
-        <EntitySet Name="Territories" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Territory">
-          <NavigationPropertyBinding Path="Region" Target="Regions" />
-          <NavigationPropertyBinding Path="Employees" Target="Employees" />
-        </EntitySet>
+        <EntitySet Name="Contacts" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Contact" />
         <EntitySet Name="ExpensiveProducts" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Product">
           <NavigationPropertyBinding Path="Category" Target="Categories" />
           <NavigationPropertyBinding Path="Order_Details" Target="Order_Details" />
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind/Models/NorthwindApi.cs b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind/Models/NorthwindApi.cs
index 5b3c7cf6..db318787 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind/Models/NorthwindApi.cs
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind/Models/NorthwindApi.cs
@@ -126,7 +126,7 @@ public async Task<IEdmModel> GetModelAsync(ModelContext context, CancellationTok
                 // EF Model builder does not build model any more but just entity set name and entity type map
                 if (model == null)
                 {
-                    var collection = context.EntitySetTypeMapCollection;
+                    var collection = context.EntitySetTypeMapDictionary;
                     if (collection == null || collection.Count == 0)
                     {
                         return null;
@@ -149,7 +149,7 @@ public async Task<IEdmModel> GetModelAsync(ModelContext context, CancellationTok
                     }
 
                     // Clear the map collection to make RESTier model builder will not build the model again.
-                    context.EntitySetTypeMapCollection.Clear();
+                    collection.Clear();
                     model = builder.GetEdmModel();
                 }
 
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Trippin/Models/Airline.cs b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Trippin/Models/Airline.cs
index 4d717e58..fb5f01d3 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Trippin/Models/Airline.cs
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Trippin/Models/Airline.cs
@@ -8,7 +8,6 @@ namespace Microsoft.OData.Service.Sample.Trippin.Models
 {
     public class Airline
     {
-        [Key]
         public string AirlineCode { get; set; }
 
         public string Name { get; set; }
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Trippin/Models/TrippinModel.cs b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Trippin/Models/TrippinModel.cs
index 68a26033..a2861d4d 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Trippin/Models/TrippinModel.cs
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Trippin/Models/TrippinModel.cs
@@ -22,6 +22,8 @@ public TrippinModel()
 
         protected override void OnModelCreating(DbModelBuilder modelBuilder)
         {
+            modelBuilder.Entity<Airline>().HasKey(a =>a.AirlineCode);
+
             modelBuilder.Entity<Trip>().HasMany<Flight>(s => s.Flights).WithMany().Map(c =>
             {
                 c.MapLeftKey("TripId");