diff --git a/EntityFramework Reverse POCO Generator/ItemTemplates/efrpoco.zip b/EntityFramework Reverse POCO Generator/ItemTemplates/efrpoco.zip
index 2e31c781..8749da48 100644
Binary files a/EntityFramework Reverse POCO Generator/ItemTemplates/efrpoco.zip and b/EntityFramework Reverse POCO Generator/ItemTemplates/efrpoco.zip differ
diff --git a/EntityFramework Reverse POCO Generator/Properties/AssemblyInfo.cs b/EntityFramework Reverse POCO Generator/Properties/AssemblyInfo.cs
index cfab1a5d..40f4477b 100644
--- a/EntityFramework Reverse POCO Generator/Properties/AssemblyInfo.cs	
+++ b/EntityFramework Reverse POCO Generator/Properties/AssemblyInfo.cs	
@@ -30,5 +30,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.35.0.0")]
-[assembly: AssemblyFileVersion("2.35.0.0")]
+[assembly: AssemblyVersion("2.36.0.0")]
+[assembly: AssemblyFileVersion("2.36.0.0")]
diff --git a/EntityFramework Reverse POCO Generator/source.extension.vsixmanifest b/EntityFramework Reverse POCO Generator/source.extension.vsixmanifest
index 3686e9fd..8da7c1b7 100644
--- a/EntityFramework Reverse POCO Generator/source.extension.vsixmanifest	
+++ b/EntityFramework Reverse POCO Generator/source.extension.vsixmanifest	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="EntityFramework_Reverse_POCO_Generator..d542a934-8bd6-4136-b490-5f0049d62033" Version="2.35.0" Language="en-US" Publisher="Simon Hughes" />
+        <Identity Id="EntityFramework_Reverse_POCO_Generator..d542a934-8bd6-4136-b490-5f0049d62033" Version="2.36.0" Language="en-US" Publisher="Simon Hughes" />
         <DisplayName>EntityFramework Reverse POCO Generator</DisplayName>
         <Description xml:space="preserve">Reverse engineers an existing database and generates EntityFramework Code First POCO classes, Configuration mappings and DbContext.</Description>
         <MoreInfo>https://github.com/sjh37/EntityFramework-Reverse-POCO-Code-First-Generator</MoreInfo>
diff --git a/EntityFramework.Reverse.POCO.Generator/Database NorthwindSqlCe40.cs b/EntityFramework.Reverse.POCO.Generator/Database NorthwindSqlCe40.cs
index 8d2275d7..cf0d0342 100644
--- a/EntityFramework.Reverse.POCO.Generator/Database NorthwindSqlCe40.cs	
+++ b/EntityFramework.Reverse.POCO.Generator/Database NorthwindSqlCe40.cs	
@@ -60,7 +60,7 @@ public interface IMyDbContextSqlCE4 : System.IDisposable
 
     #region Database context
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class MyDbContextSqlCE4 : System.Data.Entity.DbContext, IMyDbContextSqlCE4
     {
         public System.Data.Entity.DbSet<Category> Categories { get; set; } // Categories
@@ -150,7 +150,7 @@ public MyDbContextSqlCE4 Create()
 
     #region Fake Database context
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeMyDbContextSqlCE4 : IMyDbContextSqlCE4
     {
         public System.Data.Entity.DbSet<Category> Categories { get; set; }
@@ -252,7 +252,7 @@ public override string ToString()
     //          }
     //      }
     //      Read more about it here: https://msdn.microsoft.com/en-us/data/dn314431.aspx
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeDbSet<TEntity> : System.Data.Entity.DbSet<TEntity>, IQueryable, System.Collections.Generic.IEnumerable<TEntity>, System.Data.Entity.Infrastructure.IDbAsyncEnumerable<TEntity> where TEntity : class
     {
         private readonly System.Reflection.PropertyInfo[] _primaryKeys;
@@ -388,7 +388,7 @@ System.Data.Entity.Infrastructure.IDbAsyncEnumerator<TEntity> System.Data.Entity
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeDbAsyncQueryProvider<TEntity> : System.Data.Entity.Infrastructure.IDbAsyncQueryProvider
     {
         private readonly IQueryProvider _inner;
@@ -429,7 +429,7 @@ public System.Threading.Tasks.Task<TResult> ExecuteAsync<TResult>(System.Linq.Ex
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeDbAsyncEnumerable<T> : EnumerableQuery<T>, System.Data.Entity.Infrastructure.IDbAsyncEnumerable<T>, IQueryable<T>
     {
         public FakeDbAsyncEnumerable(System.Collections.Generic.IEnumerable<T> enumerable)
@@ -456,7 +456,7 @@ IQueryProvider IQueryable.Provider
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeDbAsyncEnumerator<T> : System.Data.Entity.Infrastructure.IDbAsyncEnumerator<T>
     {
         private readonly System.Collections.Generic.IEnumerator<T> _inner;
@@ -492,7 +492,7 @@ object System.Data.Entity.Infrastructure.IDbAsyncEnumerator.Current
     #region POCO classes
 
     // Categories
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Category
     {
         public int CategoryId { get; set; } // Category ID (Primary key)
@@ -514,7 +514,7 @@ public Category()
     }
 
     // Customers
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Customer
     {
         public string CustomerId { get; set; } // Customer ID (Primary key) (length: 5)
@@ -543,7 +543,7 @@ public Customer()
     }
 
     // Employees
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Employee
     {
         public int EmployeeId { get; set; } // Employee ID (Primary key)
@@ -577,7 +577,7 @@ public Employee()
     }
 
     // Orders
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Order
     {
         public int OrderId { get; set; } // Order ID (Primary key)
@@ -626,7 +626,7 @@ public Order()
     }
 
     // Order Details
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class OrderDetail
     {
         public int OrderId { get; set; } // Order ID (Primary key)
@@ -649,7 +649,7 @@ public class OrderDetail
     }
 
     // Products
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Product
     {
         public int ProductId { get; set; } // Product ID (Primary key)
@@ -690,7 +690,7 @@ public Product()
     }
 
     // Shippers
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Shipper
     {
         public int ShipperId { get; set; } // Shipper ID (Primary key)
@@ -710,7 +710,7 @@ public Shipper()
     }
 
     // Suppliers
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Supplier
     {
         public int SupplierId { get; set; } // Supplier ID (Primary key)
@@ -743,7 +743,7 @@ public Supplier()
     #region POCO Configuration
 
     // Categories
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class CategoryConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Category>
     {
         public CategoryConfiguration()
@@ -764,7 +764,7 @@ public CategoryConfiguration(string schema)
     }
 
     // Customers
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class CustomerConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Customer>
     {
         public CustomerConfiguration()
@@ -792,7 +792,7 @@ public CustomerConfiguration(string schema)
     }
 
     // Employees
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class EmployeeConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Employee>
     {
         public EmployeeConfiguration()
@@ -825,7 +825,7 @@ public EmployeeConfiguration(string schema)
     }
 
     // Orders
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class OrderConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Order>
     {
         public OrderConfiguration()
@@ -861,7 +861,7 @@ public OrderConfiguration(string schema)
     }
 
     // Order Details
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class OrderDetailConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OrderDetail>
     {
         public OrderDetailConfiguration()
@@ -887,7 +887,7 @@ public OrderDetailConfiguration(string schema)
     }
 
     // Products
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class ProductConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Product>
     {
         public ProductConfiguration()
@@ -919,7 +919,7 @@ public ProductConfiguration(string schema)
     }
 
     // Shippers
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class ShipperConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Shipper>
     {
         public ShipperConfiguration()
@@ -938,7 +938,7 @@ public ShipperConfiguration(string schema)
     }
 
     // Suppliers
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class SupplierConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Supplier>
     {
         public SupplierConfiguration()
diff --git a/EntityFramework.Reverse.POCO.Generator/Database NorthwindSqlCe40.tt b/EntityFramework.Reverse.POCO.Generator/Database NorthwindSqlCe40.tt
index 4c57d1cd..750b94f7 100644
--- a/EntityFramework.Reverse.POCO.Generator/Database NorthwindSqlCe40.tt	
+++ b/EntityFramework.Reverse.POCO.Generator/Database NorthwindSqlCe40.tt	
@@ -1,6 +1,6 @@
 <#@ include file="EF.Reverse.POCO.Core.ttinclude" #>
 <#
-    // v2.35.0
+    // v2.36.0
     // Please make changes to the settings below.
     // All you have to do is save this file, and the output file(s) is/are generated. Compiling does not regenerate the file(s).
     // A course for this generator is available on Pluralsight at https://www.pluralsight.com/courses/code-first-entity-framework-legacy-databases
diff --git a/EntityFramework.Reverse.POCO.Generator/Database.cs b/EntityFramework.Reverse.POCO.Generator/Database.cs
index afb64204..ace07286 100644
--- a/EntityFramework.Reverse.POCO.Generator/Database.cs
+++ b/EntityFramework.Reverse.POCO.Generator/Database.cs
@@ -111,7 +111,7 @@ public interface IMyDbContext : System.IDisposable
 
     #region Database context
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class MyDbContext : System.Data.Entity.DbContext, IMyDbContext
     {
         public System.Data.Entity.DbSet<AlphabeticalListOfProduct> AlphabeticalListOfProducts { get; set; } // Alphabetical list of products
@@ -492,7 +492,7 @@ public MyDbContext Create()
 
     #region Fake Database context
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeMyDbContext : IMyDbContext
     {
         public System.Data.Entity.DbSet<AlphabeticalListOfProduct> AlphabeticalListOfProducts { get; set; }
@@ -765,7 +765,7 @@ public System.Collections.Generic.List<TenMostExpensiveProductsReturnModel> TenM
     //          }
     //      }
     //      Read more about it here: https://msdn.microsoft.com/en-us/data/dn314431.aspx
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeDbSet<TEntity> : System.Data.Entity.DbSet<TEntity>, IQueryable, System.Collections.Generic.IEnumerable<TEntity>, System.Data.Entity.Infrastructure.IDbAsyncEnumerable<TEntity> where TEntity : class
     {
         private readonly System.Reflection.PropertyInfo[] _primaryKeys;
@@ -901,7 +901,7 @@ System.Data.Entity.Infrastructure.IDbAsyncEnumerator<TEntity> System.Data.Entity
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeDbAsyncQueryProvider<TEntity> : System.Data.Entity.Infrastructure.IDbAsyncQueryProvider
     {
         private readonly IQueryProvider _inner;
@@ -942,7 +942,7 @@ public System.Threading.Tasks.Task<TResult> ExecuteAsync<TResult>(System.Linq.Ex
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeDbAsyncEnumerable<T> : EnumerableQuery<T>, System.Data.Entity.Infrastructure.IDbAsyncEnumerable<T>, IQueryable<T>
     {
         public FakeDbAsyncEnumerable(System.Collections.Generic.IEnumerable<T> enumerable)
@@ -969,7 +969,7 @@ IQueryProvider IQueryable.Provider
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeDbAsyncEnumerator<T> : System.Data.Entity.Infrastructure.IDbAsyncEnumerator<T>
     {
         private readonly System.Collections.Generic.IEnumerator<T> _inner;
@@ -1005,7 +1005,7 @@ object System.Data.Entity.Infrastructure.IDbAsyncEnumerator.Current
     #region POCO classes
 
     // Alphabetical list of products
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class AlphabeticalListOfProduct
     {
         public int ProductId { get; set; } // ProductID (Primary key)
@@ -1022,7 +1022,7 @@ public class AlphabeticalListOfProduct
     }
 
     // Categories
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Category
     {
         public int CategoryId { get; set; } // CategoryID (Primary key)
@@ -1044,7 +1044,7 @@ public Category()
     }
 
     // Category Sales for 1997
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class CategorySalesFor1997
     {
         public string CategoryName { get; set; } // CategoryName (Primary key) (length: 15)
@@ -1052,7 +1052,7 @@ public class CategorySalesFor1997
     }
 
     // Current Product List
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class CurrentProductList
     {
         public int ProductId { get; set; } // ProductID (Primary key)
@@ -1060,7 +1060,7 @@ public class CurrentProductList
     }
 
     // Customers
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Customer
     {
         public string CustomerId { get; set; } // CustomerID (Primary key) (length: 5)
@@ -1094,7 +1094,7 @@ public Customer()
     }
 
     // Customer and Suppliers by City
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class CustomerAndSuppliersByCity
     {
         public string City { get; set; } // City (length: 15)
@@ -1104,7 +1104,7 @@ public class CustomerAndSuppliersByCity
     }
 
     // CustomerDemographics
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class CustomerDemographic
     {
         public string CustomerTypeId { get; set; } // CustomerTypeID (Primary key) (length: 10)
@@ -1124,7 +1124,7 @@ public CustomerDemographic()
     }
 
     // Employees
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Employee
     {
         public int EmployeeId { get; set; } // EmployeeID (Primary key)
@@ -1177,7 +1177,7 @@ public Employee()
     }
 
     // Invoices
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Invoice
     {
         public string ShipName { get; set; } // ShipName (length: 40)
@@ -1209,7 +1209,7 @@ public class Invoice
     }
 
     // Orders
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Order
     {
         public int OrderId { get; set; } // OrderID (Primary key)
@@ -1259,7 +1259,7 @@ public Order()
     }
 
     // Order Details
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class OrderDetail
     {
         public int OrderId { get; set; } // OrderID (Primary key)
@@ -1289,7 +1289,7 @@ public OrderDetail()
     }
 
     // Order Details Extended
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class OrderDetailsExtended
     {
         public int OrderId { get; set; } // OrderID (Primary key)
@@ -1302,7 +1302,7 @@ public class OrderDetailsExtended
     }
 
     // Orders Qry
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class OrdersQry
     {
         public int OrderId { get; set; } // OrderID (Primary key)
@@ -1328,7 +1328,7 @@ public class OrdersQry
     }
 
     // Order Subtotals
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class OrderSubtotal
     {
         public int OrderId { get; set; } // OrderID (Primary key)
@@ -1336,7 +1336,7 @@ public class OrderSubtotal
     }
 
     // Products
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Product
     {
         public int ProductId { get; set; } // ProductID (Primary key)
@@ -1381,7 +1381,7 @@ public Product()
     }
 
     // Products Above Average Price
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class ProductsAboveAveragePrice
     {
         public string ProductName { get; set; } // ProductName (Primary key) (length: 40)
@@ -1389,7 +1389,7 @@ public class ProductsAboveAveragePrice
     }
 
     // Product Sales for 1997
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class ProductSalesFor1997
     {
         public string CategoryName { get; set; } // CategoryName (Primary key) (length: 15)
@@ -1398,7 +1398,7 @@ public class ProductSalesFor1997
     }
 
     // Products by Category
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class ProductsByCategory
     {
         public string CategoryName { get; set; } // CategoryName (Primary key) (length: 15)
@@ -1411,7 +1411,7 @@ public class ProductsByCategory
     // The table 'Quarterly Orders' is not usable by entity framework because it
     // does not have a primary key. It is listed here for completeness.
     // Quarterly Orders
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class QuarterlyOrder
     {
         public string CustomerId { get; set; } // CustomerID (length: 5)
@@ -1421,7 +1421,7 @@ public class QuarterlyOrder
     }
 
     // Region
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Region
     {
         public int RegionId { get; set; } // RegionID (Primary key)
@@ -1441,7 +1441,7 @@ public Region()
     }
 
     // Sales by Category
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class SalesByCategory
     {
         public int CategoryId { get; set; } // CategoryID (Primary key)
@@ -1451,7 +1451,7 @@ public class SalesByCategory
     }
 
     // Sales Totals by Amount
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class SalesTotalsByAmount
     {
         public decimal? SaleAmount { get; set; } // SaleAmount
@@ -1461,7 +1461,7 @@ public class SalesTotalsByAmount
     }
 
     // Shippers
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Shipper
     {
         public int ShipperId { get; set; } // ShipperID (Primary key)
@@ -1482,7 +1482,7 @@ public Shipper()
     }
 
     // Summary of Sales by Quarter
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class SummaryOfSalesByQuarter
     {
         public System.DateTime? ShippedDate { get; set; } // ShippedDate
@@ -1491,7 +1491,7 @@ public class SummaryOfSalesByQuarter
     }
 
     // Summary of Sales by Year
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class SummaryOfSalesByYear
     {
         public System.DateTime? ShippedDate { get; set; } // ShippedDate
@@ -1500,7 +1500,7 @@ public class SummaryOfSalesByYear
     }
 
     // Suppliers
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Supplier
     {
         public int SupplierId { get; set; } // SupplierID (Primary key)
@@ -1530,7 +1530,7 @@ public Supplier()
     }
 
     // Territories
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Territory
     {
         public string TerritoryId { get; set; } // TerritoryID (Primary key) (length: 20)
@@ -1562,7 +1562,7 @@ public Territory()
     #region POCO Configuration
 
     // Alphabetical list of products
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class AlphabeticalListOfProductConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<AlphabeticalListOfProduct>
     {
         public AlphabeticalListOfProductConfiguration()
@@ -1590,7 +1590,7 @@ public AlphabeticalListOfProductConfiguration(string schema)
     }
 
     // Categories
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class CategoryConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Category>
     {
         public CategoryConfiguration()
@@ -1611,7 +1611,7 @@ public CategoryConfiguration(string schema)
     }
 
     // Category Sales for 1997
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class CategorySalesFor1997Configuration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<CategorySalesFor1997>
     {
         public CategorySalesFor1997Configuration()
@@ -1630,7 +1630,7 @@ public CategorySalesFor1997Configuration(string schema)
     }
 
     // Current Product List
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class CurrentProductListConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<CurrentProductList>
     {
         public CurrentProductListConfiguration()
@@ -1649,7 +1649,7 @@ public CurrentProductListConfiguration(string schema)
     }
 
     // Customers
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class CustomerConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Customer>
     {
         public CustomerConfiguration()
@@ -1677,7 +1677,7 @@ public CustomerConfiguration(string schema)
     }
 
     // Customer and Suppliers by City
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class CustomerAndSuppliersByCityConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<CustomerAndSuppliersByCity>
     {
         public CustomerAndSuppliersByCityConfiguration()
@@ -1698,7 +1698,7 @@ public CustomerAndSuppliersByCityConfiguration(string schema)
     }
 
     // CustomerDemographics
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class CustomerDemographicConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<CustomerDemographic>
     {
         public CustomerDemographicConfiguration()
@@ -1723,7 +1723,7 @@ public CustomerDemographicConfiguration(string schema)
     }
 
     // Employees
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class EmployeeConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Employee>
     {
         public EmployeeConfiguration()
@@ -1761,7 +1761,7 @@ public EmployeeConfiguration(string schema)
     }
 
     // Invoices
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class InvoiceConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Invoice>
     {
         public InvoiceConfiguration()
@@ -1804,7 +1804,7 @@ public InvoiceConfiguration(string schema)
     }
 
     // Orders
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class OrderConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Order>
     {
         public OrderConfiguration()
@@ -1840,7 +1840,7 @@ public OrderConfiguration(string schema)
     }
 
     // Order Details
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class OrderDetailConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OrderDetail>
     {
         public OrderDetailConfiguration()
@@ -1866,7 +1866,7 @@ public OrderDetailConfiguration(string schema)
     }
 
     // Order Details Extended
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class OrderDetailsExtendedConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OrderDetailsExtended>
     {
         public OrderDetailsExtendedConfiguration()
@@ -1890,7 +1890,7 @@ public OrderDetailsExtendedConfiguration(string schema)
     }
 
     // Orders Qry
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class OrdersQryConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OrdersQry>
     {
         public OrdersQryConfiguration()
@@ -1927,7 +1927,7 @@ public OrdersQryConfiguration(string schema)
     }
 
     // Order Subtotals
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class OrderSubtotalConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OrderSubtotal>
     {
         public OrderSubtotalConfiguration()
@@ -1946,7 +1946,7 @@ public OrderSubtotalConfiguration(string schema)
     }
 
     // Products
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class ProductConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Product>
     {
         public ProductConfiguration()
@@ -1977,7 +1977,7 @@ public ProductConfiguration(string schema)
     }
 
     // Products Above Average Price
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class ProductsAboveAveragePriceConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<ProductsAboveAveragePrice>
     {
         public ProductsAboveAveragePriceConfiguration()
@@ -1996,7 +1996,7 @@ public ProductsAboveAveragePriceConfiguration(string schema)
     }
 
     // Product Sales for 1997
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class ProductSalesFor1997Configuration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<ProductSalesFor1997>
     {
         public ProductSalesFor1997Configuration()
@@ -2016,7 +2016,7 @@ public ProductSalesFor1997Configuration(string schema)
     }
 
     // Products by Category
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class ProductsByCategoryConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<ProductsByCategory>
     {
         public ProductsByCategoryConfiguration()
@@ -2038,7 +2038,7 @@ public ProductsByCategoryConfiguration(string schema)
     }
 
     // Region
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class RegionConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Region>
     {
         public RegionConfiguration()
@@ -2057,7 +2057,7 @@ public RegionConfiguration(string schema)
     }
 
     // Sales by Category
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class SalesByCategoryConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<SalesByCategory>
     {
         public SalesByCategoryConfiguration()
@@ -2078,7 +2078,7 @@ public SalesByCategoryConfiguration(string schema)
     }
 
     // Sales Totals by Amount
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class SalesTotalsByAmountConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<SalesTotalsByAmount>
     {
         public SalesTotalsByAmountConfiguration()
@@ -2099,7 +2099,7 @@ public SalesTotalsByAmountConfiguration(string schema)
     }
 
     // Shippers
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class ShipperConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Shipper>
     {
         public ShipperConfiguration()
@@ -2119,7 +2119,7 @@ public ShipperConfiguration(string schema)
     }
 
     // Summary of Sales by Quarter
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class SummaryOfSalesByQuarterConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<SummaryOfSalesByQuarter>
     {
         public SummaryOfSalesByQuarterConfiguration()
@@ -2139,7 +2139,7 @@ public SummaryOfSalesByQuarterConfiguration(string schema)
     }
 
     // Summary of Sales by Year
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class SummaryOfSalesByYearConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<SummaryOfSalesByYear>
     {
         public SummaryOfSalesByYearConfiguration()
@@ -2159,7 +2159,7 @@ public SummaryOfSalesByYearConfiguration(string schema)
     }
 
     // Suppliers
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class SupplierConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Supplier>
     {
         public SupplierConfiguration()
@@ -2188,7 +2188,7 @@ public SupplierConfiguration(string schema)
     }
 
     // Territories
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class TerritoryConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Territory>
     {
         public TerritoryConfiguration()
@@ -2220,14 +2220,14 @@ public TerritoryConfiguration(string schema)
 
     #region Stored procedure return models
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class CustOrderHistReturnModel
     {
         public System.String ProductName { get; set; }
         public System.Int32? Total { get; set; }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class CustOrdersDetailReturnModel
     {
         public System.String ProductName { get; set; }
@@ -2237,7 +2237,7 @@ public class CustOrdersDetailReturnModel
         public System.Decimal? ExtendedPrice { get; set; }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class CustOrdersOrdersReturnModel
     {
         public System.Int32 OrderID { get; set; }
@@ -2246,7 +2246,7 @@ public class CustOrdersOrdersReturnModel
         public System.DateTime? ShippedDate { get; set; }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class EmployeeSalesByCountryReturnModel
     {
         public System.String Country { get; set; }
@@ -2257,14 +2257,14 @@ public class EmployeeSalesByCountryReturnModel
         public System.Decimal? SaleAmount { get; set; }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class SalesByCategoryReturnModel
     {
         public System.String ProductName { get; set; }
         public System.Decimal? TotalPurchase { get; set; }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class SalesByYearReturnModel
     {
         public System.DateTime? ShippedDate { get; set; }
@@ -2273,7 +2273,7 @@ public class SalesByYearReturnModel
         public System.String Year { get; set; }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class TenMostExpensiveProductsReturnModel
     {
         public System.String TenMostExpensiveProducts { get; set; }
diff --git a/EntityFramework.Reverse.POCO.Generator/Database.tt b/EntityFramework.Reverse.POCO.Generator/Database.tt
index 19dd3590..a65c7b8e 100644
--- a/EntityFramework.Reverse.POCO.Generator/Database.tt
+++ b/EntityFramework.Reverse.POCO.Generator/Database.tt
@@ -1,6 +1,6 @@
 <#@ include file="EF.Reverse.POCO.Core.ttinclude" #>
 <#
-    // v2.35.0
+    // v2.36.0
     // Please make changes to the settings below.
     // All you have to do is save this file, and the output file(s) is/are generated. Compiling does not regenerate the file(s).
     // A course for this generator is available on Pluralsight at https://www.pluralsight.com/courses/code-first-entity-framework-legacy-databases
diff --git a/EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.Core.ttinclude b/EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.Core.ttinclude
index 965482e0..593ee292 100644
--- a/EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.Core.ttinclude
+++ b/EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.Core.ttinclude
@@ -1,6 +1,6 @@
 <#
 // Copyright (C) Simon Hughes 2012
-// v2.35.0
+// v2.36.0
 #>
 <#@ template debug="true" hostspecific="true" language="C#" #>
 <#@ include file="EF6.Utility.CS.ttinclude"#>
@@ -145,7 +145,7 @@
         };
     };
 
-    const string CodeGeneratedAttribute = "[System.CodeDom.Compiler.GeneratedCode(\"EF.Reverse.POCO.Generator\", \"2.35.0.0\")]";
+    const string CodeGeneratedAttribute = "[System.CodeDom.Compiler.GeneratedCode(\"EF.Reverse.POCO.Generator\", \"2.36.0.0\")]";
     const string DataDirectory = "|DataDirectory|";
 
     static readonly List<string> NotNullable = new List<string>
diff --git a/EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.ttinclude b/EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.ttinclude
index 22799074..a68e85ae 100644
--- a/EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.ttinclude
+++ b/EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.ttinclude
@@ -2,7 +2,7 @@
 <#
 fileManager.StartHeader();
 // Copyright (C) Simon Hughes 2012
-// v2.35.0
+// v2.36.0
 #>
 // <auto-generated>
 // ReSharper disable ConvertPropertyToExpressionBody
diff --git a/EntityFramework.Reverse.POCO.Generator/Properties/VersionInfo.cs b/EntityFramework.Reverse.POCO.Generator/Properties/VersionInfo.cs
index 29905229..de9be6ce 100644
--- a/EntityFramework.Reverse.POCO.Generator/Properties/VersionInfo.cs
+++ b/EntityFramework.Reverse.POCO.Generator/Properties/VersionInfo.cs
@@ -1,3 +1,3 @@
 using System.Reflection;
-[assembly: AssemblyVersion("2.35.0.0")]
-[assembly: AssemblyFileVersion("2.35.0.0")]
+[assembly: AssemblyVersion("2.36.0.0")]
+[assembly: AssemblyFileVersion("2.36.0.0")]
diff --git a/ItemTemplate/ItemTemplates/efrpoco.zip b/ItemTemplate/ItemTemplates/efrpoco.zip
index 2e31c781..8749da48 100644
Binary files a/ItemTemplate/ItemTemplates/efrpoco.zip and b/ItemTemplate/ItemTemplates/efrpoco.zip differ
diff --git a/ItemTemplate/MyTemplate.vstemplate b/ItemTemplate/MyTemplate.vstemplate
index 1e2bbcd1..a7b19fd9 100644
--- a/ItemTemplate/MyTemplate.vstemplate
+++ b/ItemTemplate/MyTemplate.vstemplate
@@ -9,7 +9,7 @@
         <PreviewImage>PreviewImage.png</PreviewImage>
         <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
         <RequiredFrameworkVersion>4.0</RequiredFrameworkVersion>
-        <Version>2.35.0</Version>
+        <Version>2.36.0</Version>
     </TemplateData>
     <TemplateContent>
         <References>
diff --git a/ItemTemplate/extension.vsixmanifest b/ItemTemplate/extension.vsixmanifest
index 2b56ac7f..0d8102e3 100644
--- a/ItemTemplate/extension.vsixmanifest
+++ b/ItemTemplate/extension.vsixmanifest
@@ -3,7 +3,7 @@
     <Identifier Id="04ecda2b-7b46-41e1-8f87-ba03ea87aa71">
         <Name>EntityFramework Reverse POCO CodeFirst Generator</Name>
         <Author>Simon Hughes</Author>
-        <Version>2.35.0.0</Version>
+        <Version>2.36.0.0</Version>
         <Description xml:space="preserve">Reverse engineers an existing database and generates EntityFramework Code First POCO classes, Configuration mappings and DbContext.</Description>
         <Locale>1033</Locale>
         <MoreInfoUrl>https://github.com/sjh37/EntityFramework-Reverse-POCO-Code-First-Generator</MoreInfoUrl>
diff --git a/Tester/TestDatabase_DataAnnotation.cs b/Tester/TestDatabase_DataAnnotation.cs
index 9a790c00..171a9612 100644
--- a/Tester/TestDatabase_DataAnnotation.cs
+++ b/Tester/TestDatabase_DataAnnotation.cs
@@ -74,7 +74,7 @@ public interface ITestDbContext : System.IDisposable
 
     #region Database context
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class TestDbContext : System.Data.Entity.DbContext, ITestDbContext
     {
         public System.Data.Entity.DbSet<ColumnName> ColumnNames { get; set; } // ColumnNames
@@ -213,7 +213,7 @@ public TestDbContext Create()
 
     #region Fake Database context
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeTestDbContext : ITestDbContext
     {
         public System.Data.Entity.DbSet<ColumnName> ColumnNames { get; set; }
@@ -339,7 +339,7 @@ public IQueryable<CsvToIntReturnModel> CsvToInt(string array, string array2)
     //          }
     //      }
     //      Read more about it here: https://msdn.microsoft.com/en-us/data/dn314431.aspx
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeDbSet<TEntity> : System.Data.Entity.DbSet<TEntity>, IQueryable, System.Collections.Generic.IEnumerable<TEntity>, System.Data.Entity.Infrastructure.IDbAsyncEnumerable<TEntity> where TEntity : class
     {
         private readonly System.Reflection.PropertyInfo[] _primaryKeys;
@@ -475,7 +475,7 @@ System.Data.Entity.Infrastructure.IDbAsyncEnumerator<TEntity> System.Data.Entity
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeDbAsyncQueryProvider<TEntity> : System.Data.Entity.Infrastructure.IDbAsyncQueryProvider
     {
         private readonly IQueryProvider _inner;
@@ -516,7 +516,7 @@ public System.Threading.Tasks.Task<TResult> ExecuteAsync<TResult>(System.Linq.Ex
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeDbAsyncEnumerable<T> : EnumerableQuery<T>, System.Data.Entity.Infrastructure.IDbAsyncEnumerable<T>, IQueryable<T>
     {
         public FakeDbAsyncEnumerable(System.Collections.Generic.IEnumerable<T> enumerable)
@@ -543,7 +543,7 @@ IQueryProvider IQueryable.Provider
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeDbAsyncEnumerator<T> : System.Data.Entity.Infrastructure.IDbAsyncEnumerator<T>
     {
         private readonly System.Collections.Generic.IEnumerator<T> _inner;
@@ -584,7 +584,7 @@ object System.Data.Entity.Infrastructure.IDbAsyncEnumerator.Current
     ///     table with poor column name choices
     ///</summary>
     [Table("ColumnNames", Schema = "dbo")]
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class ColumnName
     {
         [DatabaseGenerated(DatabaseGeneratedOption.None)]
@@ -697,7 +697,7 @@ public ColumnName()
     // does not have a primary key. It is listed here for completeness.
     // NoPrimaryKeys
     [NotMapped]
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class NoPrimaryKey
     {
         [Column(@"Id", Order = 1, TypeName = "int")]
@@ -713,7 +713,7 @@ public class NoPrimaryKey
 
     // Boo
     [Table("Boo", Schema = "Stafford")]
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Stafford_Boo
     {
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -741,7 +741,7 @@ public class Stafford_Boo
 
     // ComputedColumns
     [Table("ComputedColumns", Schema = "Stafford")]
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Stafford_ComputedColumn
     {
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -769,7 +769,7 @@ public class Stafford_ComputedColumn
 
     // Foo
     [Table("Foo", Schema = "Stafford")]
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Stafford_Foo
     {
         [DatabaseGenerated(DatabaseGeneratedOption.None)]
@@ -798,7 +798,7 @@ public class Stafford_Foo
 
     // Child
     [Table("Child", Schema = "Synonyms")]
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Synonyms_Child
     {
         [DatabaseGenerated(DatabaseGeneratedOption.None)]
@@ -830,7 +830,7 @@ public class Synonyms_Child
 
     // Parent
     [Table("Parent", Schema = "Synonyms")]
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Synonyms_Parent
     {
         [DatabaseGenerated(DatabaseGeneratedOption.None)]
@@ -866,7 +866,7 @@ public Synonyms_Parent()
     #region POCO Configuration
 
     // ColumnNames
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class ColumnNameConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<ColumnName>
     {
         public ColumnNameConfiguration()
@@ -896,7 +896,7 @@ public ColumnNameConfiguration(string schema)
     }
 
     // Boo
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Stafford_BooConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Stafford_Boo>
     {
         public Stafford_BooConfiguration()
@@ -911,7 +911,7 @@ public Stafford_BooConfiguration(string schema)
     }
 
     // ComputedColumns
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Stafford_ComputedColumnConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Stafford_ComputedColumn>
     {
         public Stafford_ComputedColumnConfiguration()
@@ -927,7 +927,7 @@ public Stafford_ComputedColumnConfiguration(string schema)
     }
 
     // Foo
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Stafford_FooConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Stafford_Foo>
     {
         public Stafford_FooConfiguration()
@@ -943,7 +943,7 @@ public Stafford_FooConfiguration(string schema)
     }
 
     // Child
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Synonyms_ChildConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Synonyms_Child>
     {
         public Synonyms_ChildConfiguration()
@@ -959,7 +959,7 @@ public Synonyms_ChildConfiguration(string schema)
     }
 
     // Parent
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Synonyms_ParentConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Synonyms_Parent>
     {
         public Synonyms_ParentConfiguration()
@@ -977,13 +977,13 @@ public Synonyms_ParentConfiguration(string schema)
 
     #region Stored procedure return models
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class CsvToIntReturnModel
     {
         public System.Int32? IntValue { get; set; }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Synonyms_SimpleStoredProcReturnModel
     {
         public System.String ReturnValue { get; set; }
diff --git a/Tester/TestDatabase_DataAnnotation.tt b/Tester/TestDatabase_DataAnnotation.tt
index 9a933b4b..9e368946 100644
--- a/Tester/TestDatabase_DataAnnotation.tt
+++ b/Tester/TestDatabase_DataAnnotation.tt
@@ -1,6 +1,6 @@
 <#@ include file="..\EntityFramework.Reverse.POCO.Generator\EF.Reverse.POCO.Core.ttinclude" #>
 <#
-    // v2.35.0
+    // v2.36.0
     // Please make changes to the settings below.
     // All you have to do is save this file, and the output file(s) is/are generated. Compiling does not regenerate the file(s).
     // A course for this generator is available on Pluralsight at https://www.pluralsight.com/courses/code-first-entity-framework-legacy-databases
diff --git a/Tester/TestDatabase_NoDataAnnotation.cs b/Tester/TestDatabase_NoDataAnnotation.cs
index 04e52d8c..28aaeba7 100644
--- a/Tester/TestDatabase_NoDataAnnotation.cs
+++ b/Tester/TestDatabase_NoDataAnnotation.cs
@@ -72,7 +72,7 @@ public interface ITestDbContext : System.IDisposable
 
     #region Database context
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class TestDbContext : System.Data.Entity.DbContext, ITestDbContext
     {
         public System.Data.Entity.DbSet<ColumnName> ColumnNames { get; set; } // ColumnNames
@@ -211,7 +211,7 @@ public TestDbContext Create()
 
     #region Fake Database context
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeTestDbContext : ITestDbContext
     {
         public System.Data.Entity.DbSet<ColumnName> ColumnNames { get; set; }
@@ -337,7 +337,7 @@ public IQueryable<CsvToIntReturnModel> CsvToInt(string array, string array2)
     //          }
     //      }
     //      Read more about it here: https://msdn.microsoft.com/en-us/data/dn314431.aspx
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeDbSet<TEntity> : System.Data.Entity.DbSet<TEntity>, IQueryable, System.Collections.Generic.IEnumerable<TEntity>, System.Data.Entity.Infrastructure.IDbAsyncEnumerable<TEntity> where TEntity : class
     {
         private readonly System.Reflection.PropertyInfo[] _primaryKeys;
@@ -473,7 +473,7 @@ System.Data.Entity.Infrastructure.IDbAsyncEnumerator<TEntity> System.Data.Entity
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeDbAsyncQueryProvider<TEntity> : System.Data.Entity.Infrastructure.IDbAsyncQueryProvider
     {
         private readonly IQueryProvider _inner;
@@ -514,7 +514,7 @@ public System.Threading.Tasks.Task<TResult> ExecuteAsync<TResult>(System.Linq.Ex
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeDbAsyncEnumerable<T> : EnumerableQuery<T>, System.Data.Entity.Infrastructure.IDbAsyncEnumerable<T>, IQueryable<T>
     {
         public FakeDbAsyncEnumerable(System.Collections.Generic.IEnumerable<T> enumerable)
@@ -541,7 +541,7 @@ IQueryProvider IQueryable.Provider
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeDbAsyncEnumerator<T> : System.Data.Entity.Infrastructure.IDbAsyncEnumerator<T>
     {
         private readonly System.Collections.Generic.IEnumerator<T> _inner;
@@ -581,7 +581,7 @@ object System.Data.Entity.Infrastructure.IDbAsyncEnumerator.Current
     /// This is to document the
     ///     table with poor column name choices
     ///</summary>
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class ColumnName
     {
         public int C36 { get; set; } // $ (Primary key)
@@ -619,7 +619,7 @@ public ColumnName()
     // The table 'NoPrimaryKeys' is not usable by entity framework because it
     // does not have a primary key. It is listed here for completeness.
     // NoPrimaryKeys
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class NoPrimaryKey
     {
         public int? Id { get; set; } // Id
@@ -627,7 +627,7 @@ public class NoPrimaryKey
     }
 
     // Boo
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Stafford_Boo
     {
         public int Id { get; set; } // id (Primary key)
@@ -642,7 +642,7 @@ public class Stafford_Boo
     }
 
     // ComputedColumns
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Stafford_ComputedColumn
     {
         public int Id { get; set; } // Id (Primary key)
@@ -651,7 +651,7 @@ public class Stafford_ComputedColumn
     }
 
     // Foo
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Stafford_Foo
     {
         public int Id { get; set; } // id (Primary key)
@@ -666,7 +666,7 @@ public class Stafford_Foo
     }
 
     // Child
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Synonyms_Child
     {
         public int ChildId { get; set; } // ChildId (Primary key)
@@ -682,7 +682,7 @@ public class Synonyms_Child
     }
 
     // Parent
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Synonyms_Parent
     {
         public int ParentId { get; set; } // ParentId (Primary key)
@@ -706,7 +706,7 @@ public Synonyms_Parent()
     #region POCO Configuration
 
     // ColumnNames
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class ColumnNameConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<ColumnName>
     {
         public ColumnNameConfiguration()
@@ -741,7 +741,7 @@ public ColumnNameConfiguration(string schema)
     }
 
     // Boo
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Stafford_BooConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Stafford_Boo>
     {
         public Stafford_BooConfiguration()
@@ -760,7 +760,7 @@ public Stafford_BooConfiguration(string schema)
     }
 
     // ComputedColumns
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Stafford_ComputedColumnConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Stafford_ComputedColumn>
     {
         public Stafford_ComputedColumnConfiguration()
@@ -780,7 +780,7 @@ public Stafford_ComputedColumnConfiguration(string schema)
     }
 
     // Foo
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Stafford_FooConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Stafford_Foo>
     {
         public Stafford_FooConfiguration()
@@ -802,7 +802,7 @@ public Stafford_FooConfiguration(string schema)
     }
 
     // Child
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Synonyms_ChildConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Synonyms_Child>
     {
         public Synonyms_ChildConfiguration()
@@ -825,7 +825,7 @@ public Synonyms_ChildConfiguration(string schema)
     }
 
     // Parent
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Synonyms_ParentConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Synonyms_Parent>
     {
         public Synonyms_ParentConfiguration()
@@ -847,13 +847,13 @@ public Synonyms_ParentConfiguration(string schema)
 
     #region Stored procedure return models
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class CsvToIntReturnModel
     {
         public System.Int32? IntValue { get; set; }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Synonyms_SimpleStoredProcReturnModel
     {
         public System.String ReturnValue { get; set; }
diff --git a/Tester/TestDatabase_NoDataAnnotation.tt b/Tester/TestDatabase_NoDataAnnotation.tt
index 2361698d..f0af03b5 100644
--- a/Tester/TestDatabase_NoDataAnnotation.tt
+++ b/Tester/TestDatabase_NoDataAnnotation.tt
@@ -1,6 +1,6 @@
 <#@ include file="..\EntityFramework.Reverse.POCO.Generator\EF.Reverse.POCO.Core.ttinclude" #>
 <#
-    // v2.35.0
+    // v2.36.0
     // Please make changes to the settings below.
     // All you have to do is save this file, and the output file(s) is/are generated. Compiling does not regenerate the file(s).
     // A course for this generator is available on Pluralsight at https://www.pluralsight.com/courses/code-first-entity-framework-legacy-databases
diff --git a/Tester/TestSynonymsDatabase.cs b/Tester/TestSynonymsDatabase.cs
index 0451b773..1bbcefba 100644
--- a/Tester/TestSynonymsDatabase.cs
+++ b/Tester/TestSynonymsDatabase.cs
@@ -65,7 +65,7 @@ public interface ITestDbContext : System.IDisposable
 
     #region Database context
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class TestDbContext : System.Data.Entity.DbContext, ITestDbContext
     {
         public System.Data.Entity.DbSet<Child> Children { get; set; } // Child
@@ -181,7 +181,7 @@ public TestDbContext Create()
 
     #region Fake Database context
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeTestDbContext : ITestDbContext
     {
         public System.Data.Entity.DbSet<Child> Children { get; set; }
@@ -293,7 +293,7 @@ public System.Collections.Generic.List<SimpleStoredProcReturnModel> SimpleStored
     //          }
     //      }
     //      Read more about it here: https://msdn.microsoft.com/en-us/data/dn314431.aspx
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeDbSet<TEntity> : System.Data.Entity.DbSet<TEntity>, IQueryable, System.Collections.Generic.IEnumerable<TEntity>, System.Data.Entity.Infrastructure.IDbAsyncEnumerable<TEntity> where TEntity : class
     {
         private readonly System.Reflection.PropertyInfo[] _primaryKeys;
@@ -429,7 +429,7 @@ System.Data.Entity.Infrastructure.IDbAsyncEnumerator<TEntity> System.Data.Entity
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeDbAsyncQueryProvider<TEntity> : System.Data.Entity.Infrastructure.IDbAsyncQueryProvider
     {
         private readonly IQueryProvider _inner;
@@ -470,7 +470,7 @@ public System.Threading.Tasks.Task<TResult> ExecuteAsync<TResult>(System.Linq.Ex
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeDbAsyncEnumerable<T> : EnumerableQuery<T>, System.Data.Entity.Infrastructure.IDbAsyncEnumerable<T>, IQueryable<T>
     {
         public FakeDbAsyncEnumerable(System.Collections.Generic.IEnumerable<T> enumerable)
@@ -497,7 +497,7 @@ IQueryProvider IQueryable.Provider
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class FakeDbAsyncEnumerator<T> : System.Data.Entity.Infrastructure.IDbAsyncEnumerator<T>
     {
         private readonly System.Collections.Generic.IEnumerator<T> _inner;
@@ -533,7 +533,7 @@ object System.Data.Entity.Infrastructure.IDbAsyncEnumerator.Current
     #region POCO classes
 
     // Child
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Child
     {
         public int ChildId { get; set; } // ChildId (Primary key)
@@ -549,7 +549,7 @@ public class Child
     }
 
     // Parent
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class Parent
     {
         public int ParentId { get; set; } // ParentId (Primary key)
@@ -573,7 +573,7 @@ public Parent()
     #region POCO Configuration
 
     // Child
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class ChildConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Child>
     {
         public ChildConfiguration()
@@ -596,7 +596,7 @@ public ChildConfiguration(string schema)
     }
 
     // Parent
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class ParentConfiguration : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<Parent>
     {
         public ParentConfiguration()
@@ -618,7 +618,7 @@ public ParentConfiguration(string schema)
 
     #region Stored procedure return models
 
-    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.35.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("EF.Reverse.POCO.Generator", "2.36.0.0")]
     public class SimpleStoredProcReturnModel
     {
         public System.String ReturnValue { get; set; }
diff --git a/Tester/TestSynonymsDatabase.tt b/Tester/TestSynonymsDatabase.tt
index c473230d..7ebc01de 100644
--- a/Tester/TestSynonymsDatabase.tt
+++ b/Tester/TestSynonymsDatabase.tt
@@ -1,6 +1,6 @@
 <#@ include file="..\EntityFramework.Reverse.POCO.Generator\EF.Reverse.POCO.Core.ttinclude" #>
 <#
-    // v2.35.0
+    // v2.36.0
     // Please make changes to the settings below.
     // All you have to do is save this file, and the output file(s) is/are generated. Compiling does not regenerate the file(s).
     // A course for this generator is available on Pluralsight at https://www.pluralsight.com/courses/code-first-entity-framework-legacy-databases