diff --git a/BlueWest.Api/BlueWest.Api.csproj b/BlueWest.Api/BlueWest.Api.csproj
index c63356d..6018318 100644
--- a/BlueWest.Api/BlueWest.Api.csproj
+++ b/BlueWest.Api/BlueWest.Api.csproj
@@ -18,8 +18,7 @@
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
   </ItemGroup>
   <ItemGroup>
-    <AdditionalFiles Include=".\Extensions\AddToEntityTemplate.csx" />
-    <AdditionalFiles Include="Context\Templates\AddToEntityTemplate.csx" />
+    <AdditionalFiles Include=".\Context\Templates\AddToEntityTemplate.csx" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/BlueWest.Api/Context/AttributeNavigation.cs b/BlueWest.Api/Context/AttributeNavigation.cs
deleted file mode 100644
index b00cbc4..0000000
--- a/BlueWest.Api/Context/AttributeNavigation.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-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/Templates/AddToEntityTemplate.csx b/BlueWest.Api/Context/Templates/AddToEntityTemplate.csx
index 1c12f32..cc863fd 100644
--- a/BlueWest.Api/Context/Templates/AddToEntityTemplate.csx
+++ b/BlueWest.Api/Context/Templates/AddToEntityTemplate.csx
@@ -1,10 +1,8 @@
 
-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}));
-    } 
-}
+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/include/BlueWest.MapTo b/include/BlueWest.MapTo
index 4d9cc4b..12d5839 160000
--- a/include/BlueWest.MapTo
+++ b/include/BlueWest.MapTo
@@ -1 +1 @@
-Subproject commit 4d9cc4b029b15049b5d9a8bb8e87f6d9a513b712
+Subproject commit 12d5839f1660c0cf89be22d391b1f744a37c202e