diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Catalog_LTS.g.cs b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Catalog_LTS.g.cs
index 8eac6fdc3..5c580f005 100644
--- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Catalog_LTS.g.cs
+++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Catalog_LTS.g.cs
@@ -308,7 +308,9 @@ public string LoginID
         /// <summary>
         /// Gets or sets the associated <see cref="Employee"/> entity.
         /// </summary>
-        [Association("Employee_Employee", "ManagerID", "EmployeeID", IsForeignKey=true)]
+        [EntityAssociation("Employee_Employee", new string[] {
+                "ManagerID"}, new string[] {
+                "EmployeeID"}, IsForeignKey=true)]
         public Employee Manager
         {
             get
@@ -459,7 +461,9 @@ public string NationalIDNumber
         /// <summary>
         /// Gets the collection of associated <see cref="PurchaseOrder"/> entity instances.
         /// </summary>
-        [Association("Employee_PurchaseOrder", "EmployeeID", "EmployeeID")]
+        [EntityAssociation("Employee_PurchaseOrder", new string[] {
+                "EmployeeID"}, new string[] {
+                "EmployeeID"})]
         public EntityCollection<PurchaseOrder> PurchaseOrders
         {
             get
@@ -475,7 +479,9 @@ public EntityCollection<PurchaseOrder> PurchaseOrders
         /// <summary>
         /// Gets the collection of associated <see cref="Employee"/> entity instances.
         /// </summary>
-        [Association("Employee_Employee", "EmployeeID", "ManagerID")]
+        [EntityAssociation("Employee_Employee", new string[] {
+                "EmployeeID"}, new string[] {
+                "ManagerID"})]
         public EntityCollection<Employee> Reports
         {
             get
@@ -1164,7 +1170,9 @@ public Nullable<int> ProductSubcategoryID
         /// <summary>
         /// Gets the collection of associated <see cref="PurchaseOrderDetail"/> entity instances.
         /// </summary>
-        [Association("Product_PurchaseOrderDetail", "ProductID", "ProductID")]
+        [EntityAssociation("Product_PurchaseOrderDetail", new string[] {
+                "ProductID"}, new string[] {
+                "ProductID"})]
         public EntityCollection<PurchaseOrderDetail> PurchaseOrderDetails
         {
             get
@@ -1551,7 +1559,9 @@ public PurchaseOrder()
         /// <summary>
         /// Gets or sets the associated <see cref="Employee"/> entity.
         /// </summary>
-        [Association("Employee_PurchaseOrder", "EmployeeID", "EmployeeID", IsForeignKey=true)]
+        [EntityAssociation("Employee_PurchaseOrder", new string[] {
+                "EmployeeID"}, new string[] {
+                "EmployeeID"}, IsForeignKey=true)]
         public Employee Employee
         {
             get
@@ -1698,7 +1708,9 @@ public DateTime OrderDate
         /// <summary>
         /// Gets the collection of associated <see cref="PurchaseOrderDetail"/> entity instances.
         /// </summary>
-        [Association("PurchaseOrder_PurchaseOrderDetail", "PurchaseOrderID", "PurchaseOrderID")]
+        [EntityAssociation("PurchaseOrder_PurchaseOrderDetail", new string[] {
+                "PurchaseOrderID"}, new string[] {
+                "PurchaseOrderID"})]
         public EntityCollection<PurchaseOrderDetail> PurchaseOrderDetails
         {
             get
@@ -2155,7 +2167,9 @@ public short OrderQty
         /// <summary>
         /// Gets or sets the associated <see cref="Product"/> entity.
         /// </summary>
-        [Association("Product_PurchaseOrderDetail", "ProductID", "ProductID", IsForeignKey=true)]
+        [EntityAssociation("Product_PurchaseOrderDetail", new string[] {
+                "ProductID"}, new string[] {
+                "ProductID"}, IsForeignKey=true)]
         public Product Product
         {
             get
@@ -2224,7 +2238,9 @@ public int ProductID
         /// <summary>
         /// Gets or sets the associated <see cref="PurchaseOrder"/> entity.
         /// </summary>
-        [Association("PurchaseOrder_PurchaseOrderDetail", "PurchaseOrderID", "PurchaseOrderID", IsForeignKey=true)]
+        [EntityAssociation("PurchaseOrder_PurchaseOrderDetail", new string[] {
+                "PurchaseOrderID"}, new string[] {
+                "PurchaseOrderID"}, IsForeignKey=true)]
         public PurchaseOrder PurchaseOrder
         {
             get
diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Catalog_LTS.g.vb b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Catalog_LTS.g.vb
index 3a0ca2fd3..b5c98b882 100644
--- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Catalog_LTS.g.vb
+++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Catalog_LTS.g.vb
@@ -324,7 +324,7 @@ Namespace DataTests.AdventureWorks.LTS
         ''' <summary>
         ''' Gets or sets the associated <see cref="Employee"/> entity.
         ''' </summary>
-        <Association("Employee_Employee", "ManagerID", "EmployeeID", IsForeignKey:=true)>  _
+        <EntityAssociation("Employee_Employee", New String() {"ManagerID"}, New String() {"EmployeeID"}, IsForeignKey:=true)>  _
         Public Property Manager() As Employee
             Get
                 If (Me._manager Is Nothing) Then
@@ -450,7 +450,7 @@ Namespace DataTests.AdventureWorks.LTS
         ''' <summary>
         ''' Gets the collection of associated <see cref="PurchaseOrder"/> entity instances.
         ''' </summary>
-        <Association("Employee_PurchaseOrder", "EmployeeID", "EmployeeID")>  _
+        <EntityAssociation("Employee_PurchaseOrder", New String() {"EmployeeID"}, New String() {"EmployeeID"})>  _
         Public ReadOnly Property PurchaseOrders() As EntityCollection(Of PurchaseOrder)
             Get
                 If (Me._purchaseOrders Is Nothing) Then
@@ -463,7 +463,7 @@ Namespace DataTests.AdventureWorks.LTS
         ''' <summary>
         ''' Gets the collection of associated <see cref="Employee"/> entity instances.
         ''' </summary>
-        <Association("Employee_Employee", "EmployeeID", "ManagerID")>  _
+        <EntityAssociation("Employee_Employee", New String() {"EmployeeID"}, New String() {"ManagerID"})>  _
         Public ReadOnly Property Reports() As EntityCollection(Of Employee)
             Get
                 If (Me._reports Is Nothing) Then
@@ -1124,7 +1124,7 @@ Namespace DataTests.AdventureWorks.LTS
         ''' <summary>
         ''' Gets the collection of associated <see cref="PurchaseOrderDetail"/> entity instances.
         ''' </summary>
-        <Association("Product_PurchaseOrderDetail", "ProductID", "ProductID")>  _
+        <EntityAssociation("Product_PurchaseOrderDetail", New String() {"ProductID"}, New String() {"ProductID"})>  _
         Public ReadOnly Property PurchaseOrderDetails() As EntityCollection(Of PurchaseOrderDetail)
             Get
                 If (Me._purchaseOrderDetails Is Nothing) Then
@@ -1495,7 +1495,7 @@ Namespace DataTests.AdventureWorks.LTS
         ''' <summary>
         ''' Gets or sets the associated <see cref="Employee"/> entity.
         ''' </summary>
-        <Association("Employee_PurchaseOrder", "EmployeeID", "EmployeeID", IsForeignKey:=true)>  _
+        <EntityAssociation("Employee_PurchaseOrder", New String() {"EmployeeID"}, New String() {"EmployeeID"}, IsForeignKey:=true)>  _
         Public Property Employee() As Employee
             Get
                 If (Me._employee Is Nothing) Then
@@ -1620,7 +1620,7 @@ Namespace DataTests.AdventureWorks.LTS
         ''' <summary>
         ''' Gets the collection of associated <see cref="PurchaseOrderDetail"/> entity instances.
         ''' </summary>
-        <Association("PurchaseOrder_PurchaseOrderDetail", "PurchaseOrderID", "PurchaseOrderID")>  _
+        <EntityAssociation("PurchaseOrder_PurchaseOrderDetail", New String() {"PurchaseOrderID"}, New String() {"PurchaseOrderID"})>  _
         Public ReadOnly Property PurchaseOrderDetails() As EntityCollection(Of PurchaseOrderDetail)
             Get
                 If (Me._purchaseOrderDetails Is Nothing) Then
@@ -2052,7 +2052,7 @@ Namespace DataTests.AdventureWorks.LTS
         ''' <summary>
         ''' Gets or sets the associated <see cref="Product"/> entity.
         ''' </summary>
-        <Association("Product_PurchaseOrderDetail", "ProductID", "ProductID", IsForeignKey:=true)>  _
+        <EntityAssociation("Product_PurchaseOrderDetail", New String() {"ProductID"}, New String() {"ProductID"}, IsForeignKey:=true)>  _
         Public Property Product() As Product
             Get
                 If (Me._product Is Nothing) Then
@@ -2108,7 +2108,7 @@ Namespace DataTests.AdventureWorks.LTS
         ''' <summary>
         ''' Gets or sets the associated <see cref="PurchaseOrder"/> entity.
         ''' </summary>
-        <Association("PurchaseOrder_PurchaseOrderDetail", "PurchaseOrderID", "PurchaseOrderID", IsForeignKey:=true)>  _
+        <EntityAssociation("PurchaseOrder_PurchaseOrderDetail", New String() {"PurchaseOrderID"}, New String() {"PurchaseOrderID"}, IsForeignKey:=true)>  _
         Public Property PurchaseOrder() As PurchaseOrder
             Get
                 If (Me._purchaseOrder Is Nothing) Then
diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Northwind_LTS.g.cs b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Northwind_LTS.g.cs
index d1c03e823..a4ee800ea 100644
--- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Northwind_LTS.g.cs
+++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Northwind_LTS.g.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34209
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -173,7 +173,9 @@ public byte[] Picture
         /// <summary>
         /// Gets the collection of associated <see cref="Product"/> entity instances.
         /// </summary>
-        [Association("Category_Product", "CategoryID", "CategoryID")]
+        [EntityAssociation("Category_Product", new string[] {
+                "CategoryID"}, new string[] {
+                "CategoryID"})]
         public EntityCollection<Product> Products
         {
             get
@@ -505,7 +507,9 @@ public string Fax
         /// <summary>
         /// Gets the collection of associated <see cref="Order"/> entity instances.
         /// </summary>
-        [Association("Customer_Order", "CustomerID", "CustomerID")]
+        [EntityAssociation("Customer_Order", new string[] {
+                "CustomerID"}, new string[] {
+                "CustomerID"})]
         public EntityCollection<Order> Orders
         {
             get
@@ -717,7 +721,9 @@ public Order()
         /// <summary>
         /// Gets or sets the associated <see cref="Customer"/> entity.
         /// </summary>
-        [Association("Customer_Order", "CustomerID", "CustomerID", IsForeignKey=true)]
+        [EntityAssociation("Customer_Order", new string[] {
+                "CustomerID"}, new string[] {
+                "CustomerID"}, IsForeignKey=true)]
         public Customer Customer
         {
             get
@@ -865,7 +871,9 @@ public Nullable<decimal> Freight
         /// <summary>
         /// Gets the collection of associated <see cref="Order_Detail"/> entity instances.
         /// </summary>
-        [Association("Order_Order_Detail", "OrderID", "OrderID")]
+        [EntityAssociation("Order_Order_Detail", new string[] {
+                "OrderID"}, new string[] {
+                "OrderID"})]
         public EntityCollection<Order_Detail> Order_Details
         {
             get
@@ -1280,7 +1288,9 @@ public float Discount
         /// <summary>
         /// Gets or sets the associated <see cref="Order"/> entity.
         /// </summary>
-        [Association("Order_Order_Detail", "OrderID", "OrderID", IsForeignKey=true)]
+        [EntityAssociation("Order_Order_Detail", new string[] {
+                "OrderID"}, new string[] {
+                "OrderID"}, IsForeignKey=true)]
         public Order Order
         {
             get
@@ -1350,7 +1360,9 @@ public int OrderID
         /// <summary>
         /// Gets or sets the associated <see cref="Product"/> entity.
         /// </summary>
-        [Association("Product_Order_Detail", "ProductID", "ProductID", IsForeignKey=true)]
+        [EntityAssociation("Product_Order_Detail", new string[] {
+                "ProductID"}, new string[] {
+                "ProductID"}, IsForeignKey=true)]
         public Product Product
         {
             get
@@ -1576,7 +1588,9 @@ public Product()
         /// <summary>
         /// Gets or sets the associated <see cref="Category"/> entity.
         /// </summary>
-        [Association("Category_Product", "CategoryID", "CategoryID", IsForeignKey=true)]
+        [EntityAssociation("Category_Product", new string[] {
+                "CategoryID"}, new string[] {
+                "CategoryID"}, IsForeignKey=true)]
         public Category Category
         {
             get
@@ -1696,7 +1710,9 @@ public bool Discontinued
         /// <summary>
         /// Gets the collection of associated <see cref="Order_Detail"/> entity instances.
         /// </summary>
-        [Association("Product_Order_Detail", "ProductID", "ProductID")]
+        [EntityAssociation("Product_Order_Detail", new string[] {
+                "ProductID"}, new string[] {
+                "ProductID"})]
         public EntityCollection<Order_Detail> Order_Details
         {
             get
@@ -2278,8 +2294,10 @@ public int RegionID
         /// <summary>
         /// Gets the collection of associated <see cref="Territory"/> entity instances.
         /// </summary>
-        [Association("Region_Territory", "RegionID", "RegionID")]
         [Composition()]
+        [EntityAssociation("Region_Territory", new string[] {
+                "RegionID"}, new string[] {
+                "RegionID"})]
         public EntityCollection<Territory> Territories
         {
             get
@@ -2360,7 +2378,9 @@ public Territory()
         /// <summary>
         /// Gets or sets the associated <see cref="Region"/> entity.
         /// </summary>
-        [Association("Region_Territory", "RegionID", "RegionID", IsForeignKey=true)]
+        [EntityAssociation("Region_Territory", new string[] {
+                "RegionID"}, new string[] {
+                "RegionID"}, IsForeignKey=true)]
         public Region Region
         {
             get
diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Northwind_LTS.g.vb b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Northwind_LTS.g.vb
index ac5228ae6..bd3de8964 100644
--- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Northwind_LTS.g.vb
+++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Northwind_LTS.g.vb
@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:4.0.30319.34209
+'     Runtime Version:4.0.30319.42000
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -173,7 +173,7 @@ Namespace DataTests.Northwind.LTS
         ''' <summary>
         ''' Gets the collection of associated <see cref="Product"/> entity instances.
         ''' </summary>
-        <Association("Category_Product", "CategoryID", "CategoryID")>  _
+        <EntityAssociation("Category_Product", New String() {"CategoryID"}, New String() {"CategoryID"})>  _
         Public ReadOnly Property Products() As EntityCollection(Of Product)
             Get
                 If (Me._products Is Nothing) Then
@@ -489,7 +489,7 @@ Namespace DataTests.Northwind.LTS
         ''' <summary>
         ''' Gets the collection of associated <see cref="Order"/> entity instances.
         ''' </summary>
-        <Association("Customer_Order", "CustomerID", "CustomerID")>  _
+        <EntityAssociation("Customer_Order", New String() {"CustomerID"}, New String() {"CustomerID"})>  _
         Public ReadOnly Property Orders() As EntityCollection(Of Order)
             Get
                 If (Me._orders Is Nothing) Then
@@ -713,7 +713,7 @@ Namespace DataTests.Northwind.LTS
         ''' <summary>
         ''' Gets or sets the associated <see cref="Customer"/> entity.
         ''' </summary>
-        <Association("Customer_Order", "CustomerID", "CustomerID", IsForeignKey:=true)>  _
+        <EntityAssociation("Customer_Order", New String() {"CustomerID"}, New String() {"CustomerID"}, IsForeignKey:=true)>  _
         Public Property Customer() As Customer
             Get
                 If (Me._customer Is Nothing) Then
@@ -835,7 +835,7 @@ Namespace DataTests.Northwind.LTS
         ''' <summary>
         ''' Gets the collection of associated <see cref="Order_Detail"/> entity instances.
         ''' </summary>
-        <Association("Order_Order_Detail", "OrderID", "OrderID")>  _
+        <EntityAssociation("Order_Order_Detail", New String() {"OrderID"}, New String() {"OrderID"})>  _
         Public ReadOnly Property Order_Details() As EntityCollection(Of Order_Detail)
             Get
                 If (Me._order_Details Is Nothing) Then
@@ -1207,7 +1207,7 @@ Namespace DataTests.Northwind.LTS
         ''' <summary>
         ''' Gets or sets the associated <see cref="Order"/> entity.
         ''' </summary>
-        <Association("Order_Order_Detail", "OrderID", "OrderID", IsForeignKey:=true)>  _
+        <EntityAssociation("Order_Order_Detail", New String() {"OrderID"}, New String() {"OrderID"}, IsForeignKey:=true)>  _
         Public Property Order() As Order
             Get
                 If (Me._order Is Nothing) Then
@@ -1264,7 +1264,7 @@ Namespace DataTests.Northwind.LTS
         ''' <summary>
         ''' Gets or sets the associated <see cref="Product"/> entity.
         ''' </summary>
-        <Association("Product_Order_Detail", "ProductID", "ProductID", IsForeignKey:=true)>  _
+        <EntityAssociation("Product_Order_Detail", New String() {"ProductID"}, New String() {"ProductID"}, IsForeignKey:=true)>  _
         Public Property Product() As Product
             Get
                 If (Me._product Is Nothing) Then
@@ -1497,7 +1497,7 @@ Namespace DataTests.Northwind.LTS
         ''' <summary>
         ''' Gets or sets the associated <see cref="Category"/> entity.
         ''' </summary>
-        <Association("Category_Product", "CategoryID", "CategoryID", IsForeignKey:=true)>  _
+        <EntityAssociation("Category_Product", New String() {"CategoryID"}, New String() {"CategoryID"}, IsForeignKey:=true)>  _
         Public Property Category() As Category
             Get
                 If (Me._category Is Nothing) Then
@@ -1596,7 +1596,7 @@ Namespace DataTests.Northwind.LTS
         ''' <summary>
         ''' Gets the collection of associated <see cref="Order_Detail"/> entity instances.
         ''' </summary>
-        <Association("Product_Order_Detail", "ProductID", "ProductID")>  _
+        <EntityAssociation("Product_Order_Detail", New String() {"ProductID"}, New String() {"ProductID"})>  _
         Public ReadOnly Property Order_Details() As EntityCollection(Of Order_Detail)
             Get
                 If (Me._order_Details Is Nothing) Then
@@ -2117,8 +2117,8 @@ Namespace DataTests.Northwind.LTS
         ''' <summary>
         ''' Gets the collection of associated <see cref="Territory"/> entity instances.
         ''' </summary>
-        <Association("Region_Territory", "RegionID", "RegionID"),  _
-         Composition()>  _
+        <Composition(),  _
+         EntityAssociation("Region_Territory", New String() {"RegionID"}, New String() {"RegionID"})>  _
         Public ReadOnly Property Territories() As EntityCollection(Of Territory)
             Get
                 If (Me._territories Is Nothing) Then
@@ -2199,7 +2199,7 @@ Namespace DataTests.Northwind.LTS
         ''' <summary>
         ''' Gets or sets the associated <see cref="Region"/> entity.
         ''' </summary>
-        <Association("Region_Territory", "RegionID", "RegionID", IsForeignKey:=true)>  _
+        <EntityAssociation("Region_Territory", New String() {"RegionID"}, New String() {"RegionID"}, IsForeignKey:=true)>  _
         Public Property Region() As Region
             Get
                 If (Me._region Is Nothing) Then
diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/LTSNorthwindScenarios.g.cs b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/LTSNorthwindScenarios.g.cs
index ee3d96ab9..3ec831504 100644
--- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/LTSNorthwindScenarios.g.cs
+++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/LTSNorthwindScenarios.g.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34209
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -674,7 +674,9 @@ public Order_Bug479436()
         /// <summary>
         /// Gets or sets the associated <see cref="Customer_Bug479436"/> entity.
         /// </summary>
-        [Association("Customer_Bug479436_Order_Bug479436", "CustomerID", "CustomerID", IsForeignKey=true)]
+        [EntityAssociation("Customer_Bug479436_Order_Bug479436", new string[] {
+                "CustomerID"}, new string[] {
+                "CustomerID"}, IsForeignKey=true)]
         public Customer_Bug479436 Customer
         {
             get
diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/LTSNorthwindScenarios.g.vb b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/LTSNorthwindScenarios.g.vb
index c2e5c1b9e..30614056b 100644
--- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/LTSNorthwindScenarios.g.vb
+++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/LTSNorthwindScenarios.g.vb
@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:4.0.30319.34209
+'     Runtime Version:4.0.30319.42000
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -670,7 +670,7 @@ Namespace DataTests.Scenarios.LTS.Northwind
         ''' <summary>
         ''' Gets or sets the associated <see cref="Customer_Bug479436"/> entity.
         ''' </summary>
-        <Association("Customer_Bug479436_Order_Bug479436", "CustomerID", "CustomerID", IsForeignKey:=true)>  _
+        <EntityAssociation("Customer_Bug479436_Order_Bug479436", New String() {"CustomerID"}, New String() {"CustomerID"}, IsForeignKey:=true)>  _
         Public Property Customer() As Customer_Bug479436
             Get
                 If (Me._customer Is Nothing) Then
diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/MultipleProviderScenarios.g.cs b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/MultipleProviderScenarios.g.cs
index 40e5bdba7..d00973eae 100644
--- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/MultipleProviderScenarios.g.cs
+++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/MultipleProviderScenarios.g.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34209
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -173,7 +173,9 @@ public byte[] Picture
         /// <summary>
         /// Gets the collection of associated <see cref="Product"/> entity instances.
         /// </summary>
-        [Association("Category_Product", "CategoryID", "CategoryID")]
+        [EntityAssociation("Category_Product", new string[] {
+                "CategoryID"}, new string[] {
+                "CategoryID"})]
         public EntityCollection<Product> Products
         {
             get
@@ -505,7 +507,9 @@ public string Fax
         /// <summary>
         /// Gets the collection of associated <see cref="Order"/> entity instances.
         /// </summary>
-        [Association("Customer_Order", "CustomerID", "CustomerID")]
+        [EntityAssociation("Customer_Order", new string[] {
+                "CustomerID"}, new string[] {
+                "CustomerID"})]
         public EntityCollection<Order> Orders
         {
             get
@@ -717,7 +721,9 @@ public Order()
         /// <summary>
         /// Gets or sets the associated <see cref="Customer"/> entity.
         /// </summary>
-        [Association("Customer_Order", "CustomerID", "CustomerID", IsForeignKey=true)]
+        [EntityAssociation("Customer_Order", new string[] {
+                "CustomerID"}, new string[] {
+                "CustomerID"}, IsForeignKey=true)]
         public Customer Customer
         {
             get
@@ -865,7 +871,9 @@ public Nullable<decimal> Freight
         /// <summary>
         /// Gets the collection of associated <see cref="Order_Detail"/> entity instances.
         /// </summary>
-        [Association("Order_Order_Detail", "OrderID", "OrderID")]
+        [EntityAssociation("Order_Order_Detail", new string[] {
+                "OrderID"}, new string[] {
+                "OrderID"})]
         public EntityCollection<Order_Detail> Order_Details
         {
             get
@@ -1280,7 +1288,9 @@ public float Discount
         /// <summary>
         /// Gets or sets the associated <see cref="Order"/> entity.
         /// </summary>
-        [Association("Order_Order_Detail", "OrderID", "OrderID", IsForeignKey=true)]
+        [EntityAssociation("Order_Order_Detail", new string[] {
+                "OrderID"}, new string[] {
+                "OrderID"}, IsForeignKey=true)]
         public Order Order
         {
             get
@@ -1350,7 +1360,9 @@ public int OrderID
         /// <summary>
         /// Gets or sets the associated <see cref="Product"/> entity.
         /// </summary>
-        [Association("Product_Order_Detail", "ProductID", "ProductID", IsForeignKey=true)]
+        [EntityAssociation("Product_Order_Detail", new string[] {
+                "ProductID"}, new string[] {
+                "ProductID"}, IsForeignKey=true)]
         public Product Product
         {
             get
@@ -1576,7 +1588,9 @@ public Product()
         /// <summary>
         /// Gets or sets the associated <see cref="Category"/> entity.
         /// </summary>
-        [Association("Category_Product", "CategoryID", "CategoryID", IsForeignKey=true)]
+        [EntityAssociation("Category_Product", new string[] {
+                "CategoryID"}, new string[] {
+                "CategoryID"}, IsForeignKey=true)]
         public Category Category
         {
             get
@@ -1696,7 +1710,9 @@ public bool Discontinued
         /// <summary>
         /// Gets the collection of associated <see cref="Order_Detail"/> entity instances.
         /// </summary>
-        [Association("Product_Order_Detail", "ProductID", "ProductID")]
+        [EntityAssociation("Product_Order_Detail", new string[] {
+                "ProductID"}, new string[] {
+                "ProductID"})]
         public EntityCollection<Order_Detail> Order_Details
         {
             get
@@ -2278,8 +2294,10 @@ public int RegionID
         /// <summary>
         /// Gets the collection of associated <see cref="Territory"/> entity instances.
         /// </summary>
-        [Association("Region_Territory", "RegionID", "RegionID")]
         [Composition()]
+        [EntityAssociation("Region_Territory", new string[] {
+                "RegionID"}, new string[] {
+                "RegionID"})]
         public EntityCollection<Territory> Territories
         {
             get
@@ -2360,7 +2378,9 @@ public Territory()
         /// <summary>
         /// Gets or sets the associated <see cref="Region"/> entity.
         /// </summary>
-        [Association("Region_Territory", "RegionID", "RegionID", IsForeignKey=true)]
+        [EntityAssociation("Region_Territory", new string[] {
+                "RegionID"}, new string[] {
+                "RegionID"}, IsForeignKey=true)]
         public Region Region
         {
             get
@@ -2660,7 +2680,9 @@ public byte[] Picture
         /// <summary>
         /// Gets the collection of associated <see cref="Product"/> entity instances.
         /// </summary>
-        [Association("Category_Product", "CategoryID", "CategoryID")]
+        [EntityAssociation("Category_Product", new string[] {
+                "CategoryID"}, new string[] {
+                "CategoryID"})]
         public EntityCollection<Product> Products
         {
             get
@@ -2992,7 +3014,9 @@ public string Fax
         /// <summary>
         /// Gets the collection of associated <see cref="Order"/> entity instances.
         /// </summary>
-        [Association("Customer_Order", "CustomerID", "CustomerID")]
+        [EntityAssociation("Customer_Order", new string[] {
+                "CustomerID"}, new string[] {
+                "CustomerID"})]
         public EntityCollection<Order> Orders
         {
             get
@@ -3204,7 +3228,9 @@ public Order()
         /// <summary>
         /// Gets or sets the associated <see cref="Customer"/> entity.
         /// </summary>
-        [Association("Customer_Order", "CustomerID", "CustomerID", IsForeignKey=true)]
+        [EntityAssociation("Customer_Order", new string[] {
+                "CustomerID"}, new string[] {
+                "CustomerID"}, IsForeignKey=true)]
         public Customer Customer
         {
             get
@@ -3351,7 +3377,9 @@ public Nullable<decimal> Freight
         /// <summary>
         /// Gets the collection of associated <see cref="Order_Detail"/> entity instances.
         /// </summary>
-        [Association("Order_Order_Detail", "OrderID", "OrderID")]
+        [EntityAssociation("Order_Order_Detail", new string[] {
+                "OrderID"}, new string[] {
+                "OrderID"})]
         public EntityCollection<Order_Detail> Order_Details
         {
             get
@@ -3766,7 +3794,9 @@ public float Discount
         /// <summary>
         /// Gets or sets the associated <see cref="Order"/> entity.
         /// </summary>
-        [Association("Order_Order_Detail", "OrderID", "OrderID", IsForeignKey=true)]
+        [EntityAssociation("Order_Order_Detail", new string[] {
+                "OrderID"}, new string[] {
+                "OrderID"}, IsForeignKey=true)]
         public Order Order
         {
             get
@@ -3836,7 +3866,9 @@ public int OrderID
         /// <summary>
         /// Gets or sets the associated <see cref="Product"/> entity.
         /// </summary>
-        [Association("Product_Order_Detail", "ProductID", "ProductID", IsForeignKey=true)]
+        [EntityAssociation("Product_Order_Detail", new string[] {
+                "ProductID"}, new string[] {
+                "ProductID"}, IsForeignKey=true)]
         public Product Product
         {
             get
@@ -4062,7 +4094,9 @@ public Product()
         /// <summary>
         /// Gets or sets the associated <see cref="Category"/> entity.
         /// </summary>
-        [Association("Category_Product", "CategoryID", "CategoryID", IsForeignKey=true)]
+        [EntityAssociation("Category_Product", new string[] {
+                "CategoryID"}, new string[] {
+                "CategoryID"}, IsForeignKey=true)]
         public Category Category
         {
             get
@@ -4182,7 +4216,9 @@ public bool Discontinued
         /// <summary>
         /// Gets the collection of associated <see cref="Order_Detail"/> entity instances.
         /// </summary>
-        [Association("Product_Order_Detail", "ProductID", "ProductID")]
+        [EntityAssociation("Product_Order_Detail", new string[] {
+                "ProductID"}, new string[] {
+                "ProductID"})]
         public EntityCollection<Order_Detail> Order_Details
         {
             get
@@ -4760,8 +4796,10 @@ public int RegionID
         /// <summary>
         /// Gets the collection of associated <see cref="Territory"/> entity instances.
         /// </summary>
-        [Association("Region_Territory", "RegionID", "RegionID")]
         [Composition()]
+        [EntityAssociation("Region_Territory", new string[] {
+                "RegionID"}, new string[] {
+                "RegionID"})]
         public EntityCollection<Territory> Territories
         {
             get
@@ -4842,7 +4880,9 @@ public Territory()
         /// <summary>
         /// Gets or sets the associated <see cref="Region"/> entity.
         /// </summary>
-        [Association("Region_Territory", "RegionID", "RegionID", IsForeignKey=true)]
+        [EntityAssociation("Region_Territory", new string[] {
+                "RegionID"}, new string[] {
+                "RegionID"}, IsForeignKey=true)]
         public Region Region
         {
             get
diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/FullTypeNames/Scenarios/MultipleProviderScenarios.g.cs b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/FullTypeNames/Scenarios/MultipleProviderScenarios.g.cs
index 421852c23..bbe714fbe 100644
--- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/FullTypeNames/Scenarios/MultipleProviderScenarios.g.cs
+++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/FullTypeNames/Scenarios/MultipleProviderScenarios.g.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34209
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -163,7 +163,9 @@ public byte[] Picture
         /// <summary>
         /// Gets the collection of associated <see cref="Product"/> entity instances.
         /// </summary>
-        [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Category_Product", "CategoryID", "CategoryID")]
+        [global::OpenRiaServices.EntityAssociationAttribute("Category_Product", new string[] {
+                "CategoryID"}, new string[] {
+                "CategoryID"})]
         public global::OpenRiaServices.Client.EntityCollection<global::DataTests.Northwind.LTS.Product> Products
         {
             get
@@ -495,7 +497,9 @@ public string Fax
         /// <summary>
         /// Gets the collection of associated <see cref="Order"/> entity instances.
         /// </summary>
-        [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Customer_Order", "CustomerID", "CustomerID")]
+        [global::OpenRiaServices.EntityAssociationAttribute("Customer_Order", new string[] {
+                "CustomerID"}, new string[] {
+                "CustomerID"})]
         public global::OpenRiaServices.Client.EntityCollection<global::DataTests.Northwind.LTS.Order> Orders
         {
             get
@@ -707,7 +711,9 @@ public Order()
         /// <summary>
         /// Gets or sets the associated <see cref="Customer"/> entity.
         /// </summary>
-        [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Customer_Order", "CustomerID", "CustomerID", IsForeignKey=true)]
+        [global::OpenRiaServices.EntityAssociationAttribute("Customer_Order", new string[] {
+                "CustomerID"}, new string[] {
+                "CustomerID"}, IsForeignKey=true)]
         public global::DataTests.Northwind.LTS.Customer Customer
         {
             get
@@ -855,7 +861,9 @@ public string FormattedName
         /// <summary>
         /// Gets the collection of associated <see cref="Order_Detail"/> entity instances.
         /// </summary>
-        [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Order_Order_Detail", "OrderID", "OrderID")]
+        [global::OpenRiaServices.EntityAssociationAttribute("Order_Order_Detail", new string[] {
+                "OrderID"}, new string[] {
+                "OrderID"})]
         public global::OpenRiaServices.Client.EntityCollection<global::DataTests.Northwind.LTS.Order_Detail> Order_Details
         {
             get
@@ -1270,7 +1278,9 @@ public float Discount
         /// <summary>
         /// Gets or sets the associated <see cref="Order"/> entity.
         /// </summary>
-        [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Order_Order_Detail", "OrderID", "OrderID", IsForeignKey=true)]
+        [global::OpenRiaServices.EntityAssociationAttribute("Order_Order_Detail", new string[] {
+                "OrderID"}, new string[] {
+                "OrderID"}, IsForeignKey=true)]
         public global::DataTests.Northwind.LTS.Order Order
         {
             get
@@ -1340,7 +1350,9 @@ public int OrderID
         /// <summary>
         /// Gets or sets the associated <see cref="Product"/> entity.
         /// </summary>
-        [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Product_Order_Detail", "ProductID", "ProductID", IsForeignKey=true)]
+        [global::OpenRiaServices.EntityAssociationAttribute("Product_Order_Detail", new string[] {
+                "ProductID"}, new string[] {
+                "ProductID"}, IsForeignKey=true)]
         public global::DataTests.Northwind.LTS.Product Product
         {
             get
@@ -1566,7 +1578,9 @@ public Product()
         /// <summary>
         /// Gets or sets the associated <see cref="Category"/> entity.
         /// </summary>
-        [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Category_Product", "CategoryID", "CategoryID", IsForeignKey=true)]
+        [global::OpenRiaServices.EntityAssociationAttribute("Category_Product", new string[] {
+                "CategoryID"}, new string[] {
+                "CategoryID"}, IsForeignKey=true)]
         public global::DataTests.Northwind.LTS.Category Category
         {
             get
@@ -1686,7 +1700,9 @@ public bool Discontinued
         /// <summary>
         /// Gets the collection of associated <see cref="Order_Detail"/> entity instances.
         /// </summary>
-        [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Product_Order_Detail", "ProductID", "ProductID")]
+        [global::OpenRiaServices.EntityAssociationAttribute("Product_Order_Detail", new string[] {
+                "ProductID"}, new string[] {
+                "ProductID"})]
         public global::OpenRiaServices.Client.EntityCollection<global::DataTests.Northwind.LTS.Order_Detail> Order_Details
         {
             get
@@ -2268,7 +2284,9 @@ public int RegionID
         /// <summary>
         /// Gets the collection of associated <see cref="Territory"/> entity instances.
         /// </summary>
-        [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Region_Territory", "RegionID", "RegionID")]
+        [global::OpenRiaServices.EntityAssociationAttribute("Region_Territory", new string[] {
+                "RegionID"}, new string[] {
+                "RegionID"})]
         [global::System.ComponentModel.DataAnnotations.CompositionAttribute()]
         public global::OpenRiaServices.Client.EntityCollection<global::DataTests.Northwind.LTS.Territory> Territories
         {
@@ -2350,7 +2368,9 @@ public Territory()
         /// <summary>
         /// Gets or sets the associated <see cref="Region"/> entity.
         /// </summary>
-        [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Region_Territory", "RegionID", "RegionID", IsForeignKey=true)]
+        [global::OpenRiaServices.EntityAssociationAttribute("Region_Territory", new string[] {
+                "RegionID"}, new string[] {
+                "RegionID"}, IsForeignKey=true)]
         public global::DataTests.Northwind.LTS.Region Region
         {
             get
@@ -2640,7 +2660,9 @@ public byte[] Picture
         /// <summary>
         /// Gets the collection of associated <see cref="Product"/> entity instances.
         /// </summary>
-        [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Category_Product", "CategoryID", "CategoryID")]
+        [global::OpenRiaServices.EntityAssociationAttribute("Category_Product", new string[] {
+                "CategoryID"}, new string[] {
+                "CategoryID"})]
         public global::OpenRiaServices.Client.EntityCollection<global::NorthwindModel.Product> Products
         {
             get
@@ -2972,7 +2994,9 @@ public string Fax
         /// <summary>
         /// Gets the collection of associated <see cref="Order"/> entity instances.
         /// </summary>
-        [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Customer_Order", "CustomerID", "CustomerID")]
+        [global::OpenRiaServices.EntityAssociationAttribute("Customer_Order", new string[] {
+                "CustomerID"}, new string[] {
+                "CustomerID"})]
         public global::OpenRiaServices.Client.EntityCollection<global::NorthwindModel.Order> Orders
         {
             get
@@ -3184,7 +3208,9 @@ public Order()
         /// <summary>
         /// Gets or sets the associated <see cref="Customer"/> entity.
         /// </summary>
-        [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Customer_Order", "CustomerID", "CustomerID", IsForeignKey=true)]
+        [global::OpenRiaServices.EntityAssociationAttribute("Customer_Order", new string[] {
+                "CustomerID"}, new string[] {
+                "CustomerID"}, IsForeignKey=true)]
         public global::NorthwindModel.Customer Customer
         {
             get
@@ -3331,7 +3357,9 @@ public string FormattedName
         /// <summary>
         /// Gets the collection of associated <see cref="Order_Detail"/> entity instances.
         /// </summary>
-        [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Order_Order_Detail", "OrderID", "OrderID")]
+        [global::OpenRiaServices.EntityAssociationAttribute("Order_Order_Detail", new string[] {
+                "OrderID"}, new string[] {
+                "OrderID"})]
         public global::OpenRiaServices.Client.EntityCollection<global::NorthwindModel.Order_Detail> Order_Details
         {
             get
@@ -3746,7 +3774,9 @@ public float Discount
         /// <summary>
         /// Gets or sets the associated <see cref="Order"/> entity.
         /// </summary>
-        [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Order_Order_Detail", "OrderID", "OrderID", IsForeignKey=true)]
+        [global::OpenRiaServices.EntityAssociationAttribute("Order_Order_Detail", new string[] {
+                "OrderID"}, new string[] {
+                "OrderID"}, IsForeignKey=true)]
         public global::NorthwindModel.Order Order
         {
             get
@@ -3816,7 +3846,9 @@ public int OrderID
         /// <summary>
         /// Gets or sets the associated <see cref="Product"/> entity.
         /// </summary>
-        [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Product_Order_Detail", "ProductID", "ProductID", IsForeignKey=true)]
+        [global::OpenRiaServices.EntityAssociationAttribute("Product_Order_Detail", new string[] {
+                "ProductID"}, new string[] {
+                "ProductID"}, IsForeignKey=true)]
         public global::NorthwindModel.Product Product
         {
             get
@@ -4042,7 +4074,9 @@ public Product()
         /// <summary>
         /// Gets or sets the associated <see cref="Category"/> entity.
         /// </summary>
-        [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Category_Product", "CategoryID", "CategoryID", IsForeignKey=true)]
+        [global::OpenRiaServices.EntityAssociationAttribute("Category_Product", new string[] {
+                "CategoryID"}, new string[] {
+                "CategoryID"}, IsForeignKey=true)]
         public global::NorthwindModel.Category Category
         {
             get
@@ -4162,7 +4196,9 @@ public bool Discontinued
         /// <summary>
         /// Gets the collection of associated <see cref="Order_Detail"/> entity instances.
         /// </summary>
-        [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Product_Order_Detail", "ProductID", "ProductID")]
+        [global::OpenRiaServices.EntityAssociationAttribute("Product_Order_Detail", new string[] {
+                "ProductID"}, new string[] {
+                "ProductID"})]
         public global::OpenRiaServices.Client.EntityCollection<global::NorthwindModel.Order_Detail> Order_Details
         {
             get
@@ -4740,7 +4776,9 @@ public int RegionID
         /// <summary>
         /// Gets the collection of associated <see cref="Territory"/> entity instances.
         /// </summary>
-        [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Region_Territory", "RegionID", "RegionID")]
+        [global::OpenRiaServices.EntityAssociationAttribute("Region_Territory", new string[] {
+                "RegionID"}, new string[] {
+                "RegionID"})]
         [global::System.ComponentModel.DataAnnotations.CompositionAttribute()]
         public global::OpenRiaServices.Client.EntityCollection<global::NorthwindModel.Territory> Territories
         {
@@ -4822,7 +4860,9 @@ public Territory()
         /// <summary>
         /// Gets or sets the associated <see cref="Region"/> entity.
         /// </summary>
-        [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Region_Territory", "RegionID", "RegionID", IsForeignKey=true)]
+        [global::OpenRiaServices.EntityAssociationAttribute("Region_Territory", new string[] {
+                "RegionID"}, new string[] {
+                "RegionID"}, IsForeignKey=true)]
         public global::NorthwindModel.Region Region
         {
             get