diff --git a/BlueWest.Api/BlueWest.Api.csproj b/BlueWest.Api/BlueWest.Api.csproj
index e594f7c..c63356d 100644
--- a/BlueWest.Api/BlueWest.Api.csproj
+++ b/BlueWest.Api/BlueWest.Api.csproj
@@ -19,6 +19,7 @@
   </ItemGroup>
   <ItemGroup>
     <AdditionalFiles Include=".\Extensions\AddToEntityTemplate.csx" />
+    <AdditionalFiles Include="Context\Templates\AddToEntityTemplate.csx" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/BlueWest.Api/Context/AttributeNavigation.cs b/BlueWest.Api/Context/AttributeNavigation.cs
new file mode 100644
index 0000000..b00cbc4
--- /dev/null
+++ b/BlueWest.Api/Context/AttributeNavigation.cs
@@ -0,0 +1,10 @@
+namespace BlueWest.WebApi.Context;
+
+public class AttributeNavigation<T>
+{
+    object HasForeignKey<TDependentEntity>(
+        Expression<Func<TDependentEntity, object?>> foreignKeyExpression)
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/BlueWest.Api/Context/CountryDbContext.cs b/BlueWest.Api/Context/CountryDbContext.cs
index 280ed87..d6a276d 100644
--- a/BlueWest.Api/Context/CountryDbContext.cs
+++ b/BlueWest.Api/Context/CountryDbContext.cs
@@ -1,4 +1,5 @@
 using BlueWest.Data;
+using BlueWest.WebApi.Context;
 using BlueWest.WebApi.EF.Model;
 using MapTo;
 using Microsoft.EntityFrameworkCore;
@@ -16,15 +17,36 @@ namespace BlueWest.WebApi.EF
         /// <summary>
         /// Countries Database Table
         /// </summary>
-        [EfAddMethods(typeof(CountryCreate), typeof(CountryUnique))]
+        [EfAddMethods(
+            createDto: typeof(CountryCreate),
+            returnType: typeof(CountryUnique))
+        ]
+        
+        [EfAddUpdateMethods(
+            updateType: typeof(CountryUpdate), 
+            returnType: typeof(CountryUnique),
+            keyPropertyName: "Id", 
+            keyPropertyType: typeof(System.Int64))
+        ]
         public DbSet<Country> Countries { get; set; }
     
         /// <summary>
         /// Currencies Database Table
         /// </summary>
+        // Generate Add extension methods
         [EfAddMethods(typeof(CurrencyCreate), typeof(CurrencyUnique))]
+        
+        [EfAddUpdateMethods(
+            updateType: typeof(CurrencyUpdate), 
+            returnType: typeof(CurrencyUnique),
+            keyPropertyName: "Id", 
+            keyPropertyType: typeof(System.Int64))
+        ]
         public DbSet<Currency> Currencies { get; set; }
         
+        ////////////////////////////////////////////////
+        ////////////////////////////////////////////////
+
         /// <summary>
         /// App Configuration
         /// </summary>
diff --git a/BlueWest.Api/Context/EfAddUpdateMethodsAttribute.cs b/BlueWest.Api/Context/EfAddUpdateMethodsAttribute.cs
new file mode 100644
index 0000000..8959196
--- /dev/null
+++ b/BlueWest.Api/Context/EfAddUpdateMethodsAttribute.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Linq.Expressions;
+using BlueWest.Data;
+
+namespace BlueWest.WebApi.Context;
+
+[AttributeUsage(AttributeTargets.Property)]
+public class EfAddUpdateMethodsAttribute : Attribute
+{
+    public EfAddUpdateMethodsAttribute(Type returnType, Type updateType,  string keyPropertyName, Type keyPropertyType) { }
+}
\ No newline at end of file
diff --git a/BlueWest.Api/Context/Templates/AddToEntityTemplate.csx b/BlueWest.Api/Context/Templates/AddToEntityTemplate.csx
new file mode 100644
index 0000000..1c12f32
--- /dev/null
+++ b/BlueWest.Api/Context/Templates/AddToEntityTemplate.csx
@@ -0,0 +1,10 @@
+
+public static partial class {entityTypeName}Extensions {
+    public static (bool, {readTypeFullName}) Add{entityTypeName}(
+    this {contextFullName} dbContext, {createTypeFullName} {toCreateVarName}) {
+          var {newEntityVarName} = new {entityTypeFullName}({toCreateVarName});
+          dbContext.{propertyName}.Add({newEntityVarName});  
+          var success = dbContext.SaveChanges() >= 0;
+          return (success, new {readTypeFullName}({newEntityVarName}));
+    } 
+}
diff --git a/BlueWest.Api/Extensions/AddToListTemplate.csx b/BlueWest.Api/Context/Templates/AddToListTemplate.csx
similarity index 100%
rename from BlueWest.Api/Extensions/AddToListTemplate.csx
rename to BlueWest.Api/Context/Templates/AddToListTemplate.csx
diff --git a/BlueWest.Api/Context/Templates/EfEntityClass.csx b/BlueWest.Api/Context/Templates/EfEntityClass.csx
new file mode 100644
index 0000000..5ff8576
--- /dev/null
+++ b/BlueWest.Api/Context/Templates/EfEntityClass.csx
@@ -0,0 +1,6 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace {Namespace} 
+{
+    {Code}
+}
\ No newline at end of file
diff --git a/BlueWest.Api/Extensions/AddToEntityTemplate.csx b/BlueWest.Api/Context/Templates/UpdateEntityTemplate.csx
similarity index 69%
rename from BlueWest.Api/Extensions/AddToEntityTemplate.csx
rename to BlueWest.Api/Context/Templates/UpdateEntityTemplate.csx
index 5c98dcf..e710861 100644
--- a/BlueWest.Api/Extensions/AddToEntityTemplate.csx
+++ b/BlueWest.Api/Context/Templates/UpdateEntityTemplate.csx
@@ -3,9 +3,9 @@ using Microsoft.EntityFrameworkCore;
 namespace {Namespace} 
 {
     public static partial class {entityTypeName}Extensions {
-        public static (bool, {readTypeFullName}) Add{entityTypeName}(
-        this {contextFullName} dbContext, {createTypeFullName} {toCreateVarName}) {
-              var {newEntityVarName} = new {entityTypeFullName}({toCreateVarName});
+        public static (bool, {readTypeFullName}) Update{entityTypeName}(
+        this {contextFullName} dbContext, {updateTypeFullName} {toUpdateVarName}) {
+              var {newEntityVarName} = new {entityTypeFullName}({toUpdateVarName});
               dbContext.{propertyName}.Add({newEntityVarName});  
               var success = dbContext.SaveChanges() >= 0;
               return (success, new {readTypeFullName}({newEntityVarName}));
diff --git a/include/BlueWest.MapTo b/include/BlueWest.MapTo
index 340a89b..4d9cc4b 160000
--- a/include/BlueWest.MapTo
+++ b/include/BlueWest.MapTo
@@ -1 +1 @@
-Subproject commit 340a89bbd2e3d94cfb84f9a365d5e7db10f99bb8
+Subproject commit 4d9cc4b029b15049b5d9a8bb8e87f6d9a513b712