diff --git a/BlueWest.Api/BlueWest.Api.csproj b/BlueWest.Api/BlueWest.Api.csproj
index abae3ba..09cd8f9 100644
--- a/BlueWest.Api/BlueWest.Api.csproj
+++ b/BlueWest.Api/BlueWest.Api.csproj
@@ -20,7 +20,7 @@
   <ItemGroup>
     <AdditionalFiles Include=".\Context\Templates\AddToEntityTemplate.csx" />
     <AdditionalFiles Include=".\Context\Templates\UpdateEntityTemplate.csx" />
-
+    <AdditionalFiles Include=".\Context\Templates\GetOneByTemplate.csx" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/BlueWest.Api/Context/CountryDbContext.cs b/BlueWest.Api/Context/CountryDbContext.cs
index f652ef7..232018d 100644
--- a/BlueWest.Api/Context/CountryDbContext.cs
+++ b/BlueWest.Api/Context/CountryDbContext.cs
@@ -10,6 +10,7 @@ namespace BlueWest.WebApi.EF
     /// <summary>
     /// Countries and Currencies
     /// </summary>
+    [EfGenerator]
     public sealed class CountryDbContext  : DbContext
     {
 
@@ -17,9 +18,9 @@ namespace BlueWest.WebApi.EF
         /// Countries Database Table
         /// </summary>
         
-        [EfGetOne(
-            returnType: typeof(CountryUnique), 
-            keyMembernameof: nameof(Country.Id))
+        [EfGetOneBy(
+            nameof(Country.Id),
+            typeof(CountryUnique))
         ]
         
         [EfAddEntityToList(
diff --git a/BlueWest.Api/Context/Extensions/EfGetManyAttribute.cs b/BlueWest.Api/Context/Extensions/EfGetManyAttribute.cs
deleted file mode 100644
index 711fa26..0000000
--- a/BlueWest.Api/Context/Extensions/EfGetManyAttribute.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace BlueWest.WebApi.EF;
-
-[AttributeUsage(AttributeTargets.Property)]
-public class EfGetManyAttribute : Attribute
-{
-    public EfGetManyAttribute(Type returnType, string keyMemberName)
-    {
-        
-    }
-}
\ No newline at end of file
diff --git a/BlueWest.Api/Context/Extensions/EfGetOneAttribute.cs b/BlueWest.Api/Context/Extensions/EfGetOneAttribute.cs
deleted file mode 100644
index 86a81cf..0000000
--- a/BlueWest.Api/Context/Extensions/EfGetOneAttribute.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace BlueWest.WebApi.EF;
-
-[AttributeUsage(AttributeTargets.Property)]
-public sealed class EfGetOneAttribute : Attribute
-{
-    public EfGetOneAttribute(Type returnType, string keyMembernameof)
-    {
-        
-    }
-}
\ No newline at end of file
diff --git a/BlueWest.Api/Context/Templates/AddToEntityTemplate.csx b/BlueWest.Api/Context/Templates/AddToEntityTemplate.csx
index b3f3d82..ef7744b 100644
--- a/BlueWest.Api/Context/Templates/AddToEntityTemplate.csx
+++ b/BlueWest.Api/Context/Templates/AddToEntityTemplate.csx
@@ -1,8 +1,8 @@
 /// <summary>
-/// Adds a new {entityTypeName} to <see cref="{contextFullName}"></see> DbSet.
+/// Adds a new {entityTypeName} and returns a projection of type {returnTypeFullName}.
 /// </summary>
 /// <param name="dbContext">The database context.</param>
-/// <param name="{toCreateVarName}">The data type with the add data to create {entityTypeName}</param>
+/// <param name="{toCreateVarName}">Projection data of {entityTypeName}</param>
 /// <returns>The added data.</returns>
 
 public static (bool, {returnTypeFullName}) Add{entityTypeName}(this {contextFullName} dbContext, {createTypeFullName} {toCreateVarName}) 
diff --git a/BlueWest.Api/Context/Templates/GetOneByTemplate.csx b/BlueWest.Api/Context/Templates/GetOneByTemplate.csx
new file mode 100644
index 0000000..d886875
--- /dev/null
+++ b/BlueWest.Api/Context/Templates/GetOneByTemplate.csx
@@ -0,0 +1,16 @@
+/// <summary>
+/// Gets the first result in the table, and returns a projection of <see cref="{returnTypeFullName}"></see> .
+/// </summary>
+/// <param name="dbContext">The database context.</param>
+/// <param name="{byParamVarName}">By {byParamPropertyName} <see cref="{byParamFullType}"></see></param>
+/// <returns>A bool if the result is successfull, and the first occurrence of {entityTypeName} as a projection <see cref="{returnTypeFullName}"> </returns>
+
+public static (bool, {returnTypeFullName}) GetOne{entityTypeName}By{byParamPropertyName} (this {contextFullName} dbContext, {byParamFullType} {byParamVarName}) 
+{
+    var {findEntityVarName} = dbContext.{propertyName}
+        .Where(x => x.{byParamPropertyName} == {byParamVarName})
+        .Select(x => new {returnTypeFullName}(x))
+        .FirstOrDefault();
+
+    return ({findEntityVarName} != null, {findEntityVarName});
+}
\ No newline at end of file
diff --git a/BlueWest.Api/Controllers/CountryController.cs b/BlueWest.Api/Controllers/CountryController.cs
index 27cf9e4..2df9cc0 100644
--- a/BlueWest.Api/Controllers/CountryController.cs
+++ b/BlueWest.Api/Controllers/CountryController.cs
@@ -16,6 +16,8 @@ namespace BlueWest.WebApi.Controllers
     [Route("[controller]")]
     public class CountryController : ControllerBase
     {
+
+        #region Initialization
         private readonly CountryDbContext _dbContext;
 
         /// <summary>
@@ -27,7 +29,8 @@ namespace BlueWest.WebApi.Controllers
             _dbContext = dbContext;
         }
 
-        
+        #endregion
+
 
         /// <summary>
         /// Get countries
@@ -58,13 +61,9 @@ namespace BlueWest.WebApi.Controllers
         [HttpGet("{countryId}", Name = nameof(GetCountryById))]
         public ActionResult GetCountryById(int countryId)
         {
-            var country = _dbContext.Countries
-                .Where(x => x.Id == countryId)
-                .Select(x => new CountryUnique(x))
-                .FirstOrDefault();
+            var (success, country) = _dbContext.GetOneCountryById(countryId);
                 
-
-            if (country != null)
+            if (success)
             {
                 return Ok(country);
             }
diff --git a/include/BlueWest.MapTo b/include/BlueWest.MapTo
index 07c8fc4..32bf670 160000
--- a/include/BlueWest.MapTo
+++ b/include/BlueWest.MapTo
@@ -1 +1 @@
-Subproject commit 07c8fc48536f3bda6b2f261b4bb3d4e485f0d801
+Subproject commit 32bf670b9e09a8d5c2f130be30b473f9e26cd61f