diff --git a/README.md b/README.md
index 5cdb1ab..90f4d56 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ PM> Install-Package M31.FluentApi
 A package reference will be added to your `csproj` file. Moreover, since this library provides code via source code generation, consumers of your project don't need the reference to `M31.FluentApi`. Therefore, it is recommended to use the `PrivateAssets` metadata tag:
 
 ```xml
-<PackageReference Include="M31.FluentApi" Version="1.9.0" PrivateAssets="all"/>
+<PackageReference Include="M31.FluentApi" Version="1.9.1" PrivateAssets="all"/>
 ```
 
 If you would like to examine the generated code, you may emit it by adding the following lines to your `csproj` file:
diff --git a/src/M31.FluentApi.Generator/CodeGeneration/CodeBoardElements/CodeBoard.cs b/src/M31.FluentApi.Generator/CodeGeneration/CodeBoardElements/CodeBoard.cs
index f3d921f..e3b05ce 100644
--- a/src/M31.FluentApi.Generator/CodeGeneration/CodeBoardElements/CodeBoard.cs
+++ b/src/M31.FluentApi.Generator/CodeGeneration/CodeBoardElements/CodeBoard.cs
@@ -95,6 +95,11 @@ internal static CodeBoard Create(
 
         foreach (string usingStatement in usingStatements)
         {
+            if (usingStatement == "using M31.FluentApi.Attributes;")
+            {
+                continue;
+            }
+
             codeFile.AddUsingStatement(usingStatement);
         }
 
diff --git a/src/M31.FluentApi.Generator/M31.FluentApi.Generator.csproj b/src/M31.FluentApi.Generator/M31.FluentApi.Generator.csproj
index fe5b9ee..5ccac8f 100644
--- a/src/M31.FluentApi.Generator/M31.FluentApi.Generator.csproj
+++ b/src/M31.FluentApi.Generator/M31.FluentApi.Generator.csproj
@@ -11,7 +11,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
-    <PackageVersion>1.9.0</PackageVersion>
+    <PackageVersion>1.9.1</PackageVersion>
     <Authors>Kevin Schaal</Authors>
     <Description>The generator package for M31.FluentAPI. Don't install this package explicitly, install M31.FluentAPI instead.</Description>
     <PackageTags>fluentapi fluentbuilder fluentinterface fluentdesign fluent codegeneration</PackageTags>
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/AliasNamespaceClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/AliasNamespaceClass/CreateStudent.expected.txt
index 411b9b2..821be84 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/AliasNamespaceClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/AliasNamespaceClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using MyList = System.Collections.Generic.IList<string>;
 using System.Collections.Generic;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/AliasNamespaceClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/AliasNamespaceClass/CreateStudent.g.cs
index 411b9b2..821be84 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/AliasNamespaceClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/AliasNamespaceClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using MyList = System.Collections.Generic.IList<string>;
 using System.Collections.Generic;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionInterfaceMemberClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionInterfaceMemberClass/CreateStudent.expected.txt
index f2133c2..802436e 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionInterfaceMemberClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionInterfaceMemberClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.CollectionInterfaceMemberClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionInterfaceMemberClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionInterfaceMemberClass/CreateStudent.g.cs
index f2133c2..802436e 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionInterfaceMemberClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionInterfaceMemberClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.CollectionInterfaceMemberClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionMemberClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionMemberClass/CreateStudent.expected.txt
index 13db61d..3b60fb5 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionMemberClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionMemberClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.CollectionMemberClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionMemberClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionMemberClass/CreateStudent.g.cs
index 13db61d..3b60fb5 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionMemberClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionMemberClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.CollectionMemberClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionNullableArrayClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionNullableArrayClass/CreateStudent.expected.txt
index a5202d9..2a90b10 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionNullableArrayClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionNullableArrayClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.CollectionNullableArrayClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionNullableArrayClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionNullableArrayClass/CreateStudent.g.cs
index a5202d9..2a90b10 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionNullableArrayClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CollectionNullableArrayClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.CollectionNullableArrayClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithAfterCompoundClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithAfterCompoundClass/CreateStudent.expected.txt
index 11e384f..1c54279 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithAfterCompoundClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithAfterCompoundClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ContinueWithAfterCompoundClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithAfterCompoundClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithAfterCompoundClass/CreateStudent.g.cs
index 11e384f..1c54279 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithAfterCompoundClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithAfterCompoundClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ContinueWithAfterCompoundClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithInForkClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithInForkClass/CreateStudent.expected.txt
index 746d76a..bb8518e 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithInForkClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithInForkClass/CreateStudent.expected.txt
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ContinueWithInForkClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithInForkClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithInForkClass/CreateStudent.g.cs
index 746d76a..bb8518e 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithInForkClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithInForkClass/CreateStudent.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ContinueWithInForkClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithOfOverloadedMethodClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithOfOverloadedMethodClass/CreateStudent.expected.txt
index dfc82e1..74bc6b3 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithOfOverloadedMethodClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithOfOverloadedMethodClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ContinueWithOfOverloadedMethodClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithOfOverloadedMethodClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithOfOverloadedMethodClass/CreateStudent.g.cs
index dfc82e1..74bc6b3 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithOfOverloadedMethodClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithOfOverloadedMethodClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ContinueWithOfOverloadedMethodClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithSelfClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithSelfClass/CreateStudent.expected.txt
index db3109b..af35b7d 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithSelfClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithSelfClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ContinueWithSelfClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithSelfClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithSelfClass/CreateStudent.g.cs
index db3109b..af35b7d 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithSelfClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ContinueWithSelfClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ContinueWithSelfClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CustomFluentMethodNameClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CustomFluentMethodNameClass/CreateStudent.expected.txt
index 84b174b..dc7c1b9 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CustomFluentMethodNameClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CustomFluentMethodNameClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.CustomFluentMethodNameClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CustomFluentMethodNameClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CustomFluentMethodNameClass/CreateStudent.g.cs
index 84b174b..dc7c1b9 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CustomFluentMethodNameClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/CustomFluentMethodNameClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.CustomFluentMethodNameClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/DefaultFluentMethodNameClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/DefaultFluentMethodNameClass/CreateStudent.expected.txt
index 5588f47..c6806b8 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/DefaultFluentMethodNameClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/DefaultFluentMethodNameClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.DefaultFluentMethodNameClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/DefaultFluentMethodNameClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/DefaultFluentMethodNameClass/CreateStudent.g.cs
index 5588f47..c6806b8 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/DefaultFluentMethodNameClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/DefaultFluentMethodNameClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.DefaultFluentMethodNameClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/EmptyClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/EmptyClass/CreateStudent.expected.txt
index 96329e2..d5158d7 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/EmptyClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/EmptyClass/CreateStudent.expected.txt
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.EmptyClass;
 
 public class CreateStudent : CreateStudent.ICreateStudent
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/EmptyClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/EmptyClass/CreateStudent.g.cs
index 96329e2..d5158d7 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/EmptyClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/EmptyClass/CreateStudent.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.EmptyClass;
 
 public class CreateStudent : CreateStudent.ICreateStudent
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentDefaultMemberClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentDefaultMemberClass/CreateStudent.expected.txt
index 678285f..9919ad8 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentDefaultMemberClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentDefaultMemberClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentDefaultMemberClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentDefaultMemberClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentDefaultMemberClass/CreateStudent.g.cs
index 678285f..9919ad8 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentDefaultMemberClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentDefaultMemberClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentDefaultMemberClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClass/CreateAddress.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClass/CreateAddress.g.cs
index ba07be5..3939252 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClass/CreateAddress.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClass/CreateAddress.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaClass;
 
 public class CreateAddress :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClass/CreateStudent.expected.txt
index 86156cd..cd2bc47 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClass/CreateStudent.g.cs
index 86156cd..cd2bc47 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClassInDifferentNamespace/CreateAddress.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClassInDifferentNamespace/CreateAddress.g.cs
index fbf7d47..e81183e 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClassInDifferentNamespace/CreateAddress.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClassInDifferentNamespace/CreateAddress.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace SomeOtherNamespace;
 
 public class CreateAddress :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClassInDifferentNamespace/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClassInDifferentNamespace/CreateStudent.expected.txt
index b89916b..432bf4b 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClassInDifferentNamespace/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClassInDifferentNamespace/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using SomeOtherNamespace;
 using System;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClassInDifferentNamespace/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClassInDifferentNamespace/CreateStudent.g.cs
index b89916b..432bf4b 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClassInDifferentNamespace/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaClassInDifferentNamespace/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using SomeOtherNamespace;
 using System;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCollectionClass/CreateAddress.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCollectionClass/CreateAddress.g.cs
index 4f89690..27364f5 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCollectionClass/CreateAddress.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCollectionClass/CreateAddress.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaCollectionClass;
 
 public class CreateAddress :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCollectionClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCollectionClass/CreateStudent.expected.txt
index 35431ed..d31ba5a 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCollectionClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCollectionClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 using System;
 using System.Linq;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCollectionClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCollectionClass/CreateStudent.g.cs
index 35431ed..d31ba5a 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCollectionClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCollectionClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 using System;
 using System.Linq;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundClass/CreateAddress.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundClass/CreateAddress.g.cs
index b909212..70908b4 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundClass/CreateAddress.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundClass/CreateAddress.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaCompoundClass;
 
 public class CreateAddress :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundClass/CreatePhone.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundClass/CreatePhone.g.cs
index 6ee3c40..56e0e5f 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundClass/CreatePhone.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundClass/CreatePhone.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaCompoundClass;
 
 public class CreatePhone :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundClass/CreateStudent.expected.txt
index acb10c5..55a5dae 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaCompoundClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundClass/CreateStudent.g.cs
index acb10c5..55a5dae 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaCompoundClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundOfSameTypeClass/CreateAddress.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundOfSameTypeClass/CreateAddress.g.cs
index 70febaa..018552b 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundOfSameTypeClass/CreateAddress.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundOfSameTypeClass/CreateAddress.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaCompoundOfSameTypeClass;
 
 public class CreateAddress :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundOfSameTypeClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundOfSameTypeClass/CreateStudent.expected.txt
index 10904f4..1fcde12 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundOfSameTypeClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundOfSameTypeClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaCompoundOfSameTypeClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundOfSameTypeClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundOfSameTypeClass/CreateStudent.g.cs
index 10904f4..1fcde12 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundOfSameTypeClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaCompoundOfSameTypeClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaCompoundOfSameTypeClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyCollectionsClass/CreateAddress.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyCollectionsClass/CreateAddress.g.cs
index eff0e04..a14f1e1 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyCollectionsClass/CreateAddress.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyCollectionsClass/CreateAddress.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaManyCollectionsClass;
 
 public class CreateAddress :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyCollectionsClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyCollectionsClass/CreateStudent.expected.txt
index 9e0bee7..65c2677 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyCollectionsClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyCollectionsClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 using System;
 using System.Linq;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyCollectionsClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyCollectionsClass/CreateStudent.g.cs
index 9e0bee7..65c2677 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyCollectionsClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyCollectionsClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 using System;
 using System.Linq;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyPrivateCollectionsClass/CreateAddress.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyPrivateCollectionsClass/CreateAddress.g.cs
index 6dfa814..c9a50f8 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyPrivateCollectionsClass/CreateAddress.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyPrivateCollectionsClass/CreateAddress.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaManyPrivateCollectionsClass;
 
 public class CreateAddress :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyPrivateCollectionsClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyPrivateCollectionsClass/CreateStudent.expected.txt
index f993191..1d592ca 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyPrivateCollectionsClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyPrivateCollectionsClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 using System;
 using System.Linq;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyPrivateCollectionsClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyPrivateCollectionsClass/CreateStudent.g.cs
index f993191..1d592ca 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyPrivateCollectionsClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaManyPrivateCollectionsClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 using System;
 using System.Linq;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaNullablePropertyClass/CreateAddress.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaNullablePropertyClass/CreateAddress.g.cs
index eebde2e..62e7604 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaNullablePropertyClass/CreateAddress.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaNullablePropertyClass/CreateAddress.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaNullablePropertyClass;
 
 public class CreateAddress :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaNullablePropertyClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaNullablePropertyClass/CreateStudent.expected.txt
index e3afbda..91690f8 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaNullablePropertyClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaNullablePropertyClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaNullablePropertyClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaNullablePropertyClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaNullablePropertyClass/CreateStudent.g.cs
index e3afbda..91690f8 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaNullablePropertyClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaNullablePropertyClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaNullablePropertyClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaRecursiveClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaRecursiveClass/CreateStudent.expected.txt
index 5d78bd4..113c8de 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaRecursiveClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaRecursiveClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaRecursiveClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaRecursiveClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaRecursiveClass/CreateStudent.g.cs
index 5d78bd4..113c8de 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaRecursiveClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaRecursiveClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaRecursiveClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaSingleStepClass/CreateAddress.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaSingleStepClass/CreateAddress.g.cs
index 447e2b4..ba08ec2 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaSingleStepClass/CreateAddress.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaSingleStepClass/CreateAddress.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaSingleStepClass;
 
 public class CreateAddress :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaSingleStepClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaSingleStepClass/CreateStudent.expected.txt
index 441a772..17e9faf 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaSingleStepClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaSingleStepClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaSingleStepClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaSingleStepClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaSingleStepClass/CreateStudent.g.cs
index 441a772..17e9faf 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaSingleStepClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentLambdaSingleStepClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentLambdaSingleStepClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodClass/CreateStudent.expected.txt
index 4a1bcee..d6217e2 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentMethodClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodClass/CreateStudent.g.cs
index 4a1bcee..d6217e2 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentMethodClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodDefaultValuesClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodDefaultValuesClass/CreateStudent.expected.txt
index e037e7e..a369db3 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodDefaultValuesClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodDefaultValuesClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentMethodDefaultValuesClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodDefaultValuesClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodDefaultValuesClass/CreateStudent.g.cs
index e037e7e..a369db3 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodDefaultValuesClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodDefaultValuesClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentMethodDefaultValuesClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodParameterModifiersClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodParameterModifiersClass/CreateStudent.expected.txt
index 890841b..aaafeb2 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodParameterModifiersClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodParameterModifiersClass/CreateStudent.expected.txt
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentMethodParameterModifiersClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodParameterModifiersClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodParameterModifiersClass/CreateStudent.g.cs
index 890841b..aaafeb2 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodParameterModifiersClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentMethodParameterModifiersClass/CreateStudent.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentMethodParameterModifiersClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableClass/CreateStudent.expected.txt
index bf691c9..fe01942 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentNullableClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableClass/CreateStudent.g.cs
index bf691c9..fe01942 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentNullableClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableNoNullableAnnotationClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableNoNullableAnnotationClass/CreateStudent.expected.txt
index 00c116c..e667c08 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableNoNullableAnnotationClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableNoNullableAnnotationClass/CreateStudent.expected.txt
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentNullableNoNullableAnnotationClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableNoNullableAnnotationClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableNoNullableAnnotationClass/CreateStudent.g.cs
index 00c116c..e667c08 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableNoNullableAnnotationClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableNoNullableAnnotationClass/CreateStudent.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentNullableNoNullableAnnotationClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableNoNullableAnnotationPrivateSetClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableNoNullableAnnotationPrivateSetClass/CreateStudent.expected.txt
index d64030e..8f488bf 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableNoNullableAnnotationPrivateSetClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableNoNullableAnnotationPrivateSetClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentNullableNoNullableAnnotationPrivateSetClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableNoNullableAnnotationPrivateSetClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableNoNullableAnnotationPrivateSetClass/CreateStudent.g.cs
index d64030e..8f488bf 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableNoNullableAnnotationPrivateSetClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentNullableNoNullableAnnotationPrivateSetClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentNullableNoNullableAnnotationPrivateSetClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnMultiStepClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnMultiStepClass/CreateStudent.expected.txt
index eec5ddf..c6bc5cb 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnMultiStepClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnMultiStepClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentReturnMultiStepClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnMultiStepClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnMultiStepClass/CreateStudent.g.cs
index eec5ddf..c6bc5cb 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnMultiStepClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnMultiStepClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentReturnMultiStepClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnMultiStepPrivateMethodsClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnMultiStepPrivateMethodsClass/CreateStudent.expected.txt
index 3f8239f..a6ca1af 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnMultiStepPrivateMethodsClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnMultiStepPrivateMethodsClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 using System;
 using System.Reflection;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnMultiStepPrivateMethodsClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnMultiStepPrivateMethodsClass/CreateStudent.g.cs
index 3f8239f..a6ca1af 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnMultiStepPrivateMethodsClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnMultiStepPrivateMethodsClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 using System;
 using System.Reflection;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnSingleStepClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnSingleStepClass/CreateStudent.expected.txt
index 25e3b7a..6a4a255 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnSingleStepClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnSingleStepClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentReturnSingleStepClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnSingleStepClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnSingleStepClass/CreateStudent.g.cs
index 25e3b7a..6a4a255 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnSingleStepClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnSingleStepClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FluentReturnSingleStepClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnSingleStepPrivateMethodsClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnSingleStepPrivateMethodsClass/CreateStudent.expected.txt
index 8485a53..e3f1903 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnSingleStepPrivateMethodsClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnSingleStepPrivateMethodsClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 using System;
 using System.Reflection;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnSingleStepPrivateMethodsClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnSingleStepPrivateMethodsClass/CreateStudent.g.cs
index 8485a53..e3f1903 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnSingleStepPrivateMethodsClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FluentReturnSingleStepPrivateMethodsClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 using System;
 using System.Reflection;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ForkClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ForkClass/CreateStudent.expected.txt
index cb7c0d0..a360917 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ForkClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ForkClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ForkClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ForkClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ForkClass/CreateStudent.g.cs
index cb7c0d0..a360917 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ForkClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ForkClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ForkClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FullyQualifiedTypeClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FullyQualifiedTypeClass/CreateStudent.expected.txt
index 8bd62f1..456fae4 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FullyQualifiedTypeClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FullyQualifiedTypeClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Collections.Generic;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FullyQualifiedTypeClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FullyQualifiedTypeClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FullyQualifiedTypeClass/CreateStudent.g.cs
index 8bd62f1..456fae4 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FullyQualifiedTypeClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/FullyQualifiedTypeClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Collections.Generic;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.FullyQualifiedTypeClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClass/CreateStudent.expected.txt
index de01564..e75241a 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClass/CreateStudent.expected.txt
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.GenericClass;
 
 public class CreateStudent<T1, T2> :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClass/CreateStudent.g.cs
index de01564..e75241a 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClass/CreateStudent.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.GenericClass;
 
 public class CreateStudent<T1, T2> :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassPrivateConstructor/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassPrivateConstructor/CreateStudent.expected.txt
index c71f86a..aeee832 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassPrivateConstructor/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassPrivateConstructor/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 using System;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassPrivateConstructor/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassPrivateConstructor/CreateStudent.g.cs
index c71f86a..aeee832 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassPrivateConstructor/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassPrivateConstructor/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 using System;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassPrivateDefaultConstructor/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassPrivateDefaultConstructor/CreateStudent.expected.txt
index 9502d63..9a2b765 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassPrivateDefaultConstructor/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassPrivateDefaultConstructor/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.GenericClassPrivateDefaultConstructor;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassPrivateDefaultConstructor/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassPrivateDefaultConstructor/CreateStudent.g.cs
index 9502d63..9a2b765 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassPrivateDefaultConstructor/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassPrivateDefaultConstructor/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.GenericClassPrivateDefaultConstructor;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithConstraints/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithConstraints/CreateStudent.expected.txt
index c1ddea5..ab8f1f3 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithConstraints/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithConstraints/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.GenericClassWithConstraints;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithConstraints/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithConstraints/CreateStudent.g.cs
index c1ddea5..ab8f1f3 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithConstraints/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithConstraints/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.GenericClassWithConstraints;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithGenericMethods/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithGenericMethods/CreateStudent.expected.txt
index f70e56e..adaf370 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithGenericMethods/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithGenericMethods/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.GenericClassWithGenericMethods;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithGenericMethods/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithGenericMethods/CreateStudent.g.cs
index f70e56e..adaf370 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithGenericMethods/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithGenericMethods/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.GenericClassWithGenericMethods;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithPrivateGenericMethods/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithPrivateGenericMethods/CreateStudent.expected.txt
index b540a49..f6111be 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithPrivateGenericMethods/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithPrivateGenericMethods/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 using System;
 using System.Reflection;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithPrivateGenericMethods/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithPrivateGenericMethods/CreateStudent.g.cs
index b540a49..f6111be 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithPrivateGenericMethods/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericClassWithPrivateGenericMethods/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 using System;
 using System.Reflection;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericMethodWithConstraintsClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericMethodWithConstraintsClass/CreateStudent.expected.txt
index a2fca0b..031cf81 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericMethodWithConstraintsClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericMethodWithConstraintsClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.GenericMethodWithConstraintsClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericMethodWithConstraintsClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericMethodWithConstraintsClass/CreateStudent.g.cs
index a2fca0b..031cf81 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericMethodWithConstraintsClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericMethodWithConstraintsClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.GenericMethodWithConstraintsClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericOverloadedMethodClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericOverloadedMethodClass/CreateStudent.expected.txt
index cf25136..992c34d 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericOverloadedMethodClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericOverloadedMethodClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.GenericOverloadedMethodClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericOverloadedMethodClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericOverloadedMethodClass/CreateStudent.g.cs
index cf25136..992c34d 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericOverloadedMethodClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericOverloadedMethodClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.GenericOverloadedMethodClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericOverloadedPrivateMethodClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericOverloadedPrivateMethodClass/CreateStudent.expected.txt
index 941bc15..bcf0035 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericOverloadedPrivateMethodClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericOverloadedPrivateMethodClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 using System;
 using System.Reflection;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericOverloadedPrivateMethodClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericOverloadedPrivateMethodClass/CreateStudent.g.cs
index 941bc15..bcf0035 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericOverloadedPrivateMethodClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GenericOverloadedPrivateMethodClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 using System;
 using System.Reflection;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetInitPropertyClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetInitPropertyClass/CreateStudent.expected.txt
index e83e62f..1344659 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetInitPropertyClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetInitPropertyClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.GetInitPropertyClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetInitPropertyClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetInitPropertyClass/CreateStudent.g.cs
index e83e62f..1344659 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetInitPropertyClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetInitPropertyClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.GetInitPropertyClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetPrivateInitPropertyClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetPrivateInitPropertyClass/CreateStudent.expected.txt
index 1c90f06..7a2636b 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetPrivateInitPropertyClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetPrivateInitPropertyClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.GetPrivateInitPropertyClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetPrivateInitPropertyClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetPrivateInitPropertyClass/CreateStudent.g.cs
index 1c90f06..7a2636b 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetPrivateInitPropertyClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetPrivateInitPropertyClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.GetPrivateInitPropertyClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetPrivateSetPropertyClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetPrivateSetPropertyClass/CreateStudent.expected.txt
index 1379573..277ef96 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetPrivateSetPropertyClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetPrivateSetPropertyClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.GetPrivateSetPropertyClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetPrivateSetPropertyClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetPrivateSetPropertyClass/CreateStudent.g.cs
index 1379573..277ef96 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetPrivateSetPropertyClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/GetPrivateSetPropertyClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.GetPrivateSetPropertyClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClass/CreatePerson.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClass/CreatePerson.g.cs
index e0494f0..f0d1a88 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClass/CreatePerson.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClass/CreatePerson.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.InheritedClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClass/CreateStudent.expected.txt
index bccf1b4..7c77f8e 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.InheritedClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClass/CreateStudent.g.cs
index bccf1b4..7c77f8e 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.InheritedClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassPrivateSetters/CreatePerson.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassPrivateSetters/CreatePerson.g.cs
index f78dd93..7577fd7 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassPrivateSetters/CreatePerson.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassPrivateSetters/CreatePerson.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.InheritedClassPrivateSetters;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassPrivateSetters/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassPrivateSetters/CreateStudent.expected.txt
index a4ca5b5..daaca81 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassPrivateSetters/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassPrivateSetters/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.InheritedClassPrivateSetters;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassPrivateSetters/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassPrivateSetters/CreateStudent.g.cs
index a4ca5b5..daaca81 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassPrivateSetters/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassPrivateSetters/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.InheritedClassPrivateSetters;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedMembers/CreatePerson.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedMembers/CreatePerson.g.cs
index e429f72..497753b 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedMembers/CreatePerson.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedMembers/CreatePerson.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.InheritedClassProtectedMembers;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedMembers/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedMembers/CreateStudent.expected.txt
index 268142c..8c0fe13 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedMembers/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedMembers/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.InheritedClassProtectedMembers;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedMembers/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedMembers/CreateStudent.g.cs
index 268142c..8c0fe13 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedMembers/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedMembers/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.InheritedClassProtectedMembers;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedSetters/CreatePerson.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedSetters/CreatePerson.g.cs
index ed0341a..6007df7 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedSetters/CreatePerson.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedSetters/CreatePerson.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.InheritedClassProtectedSetters;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedSetters/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedSetters/CreateStudent.expected.txt
index f48c704..b938be3 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedSetters/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedSetters/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.InheritedClassProtectedSetters;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedSetters/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedSetters/CreateStudent.g.cs
index f48c704..b938be3 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedSetters/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedClassProtectedSetters/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.InheritedClassProtectedSetters;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedRecord/CreatePerson.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedRecord/CreatePerson.g.cs
index 168a7a5..414001d 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedRecord/CreatePerson.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedRecord/CreatePerson.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.InheritedRecord;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedRecord/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedRecord/CreateStudent.expected.txt
index c3c4286..0df334a 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedRecord/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedRecord/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.InheritedRecord;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedRecord/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedRecord/CreateStudent.g.cs
index c3c4286..0df334a 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedRecord/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InheritedRecord/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.InheritedRecord;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InternalClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InternalClass/CreateStudent.expected.txt
index dd67db6..2b81e3a 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InternalClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InternalClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.InternalClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InternalClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InternalClass/CreateStudent.g.cs
index dd67db6..2b81e3a 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InternalClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InternalClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.InternalClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InternalPropertyClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InternalPropertyClass/CreateStudent.expected.txt
index a4ea12d..d1be796 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InternalPropertyClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InternalPropertyClass/CreateStudent.expected.txt
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.InternalPropertyClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InternalPropertyClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InternalPropertyClass/CreateStudent.g.cs
index a4ea12d..d1be796 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InternalPropertyClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/InternalPropertyClass/CreateStudent.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.InternalPropertyClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/NonGenericCollectionMemberClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/NonGenericCollectionMemberClass/CreateStudent.expected.txt
index 97d9897..0ca931f 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/NonGenericCollectionMemberClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/NonGenericCollectionMemberClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections;
-using M31.FluentApi.Attributes;
 using System.Collections.Generic;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.NonGenericCollectionMemberClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/NonGenericCollectionMemberClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/NonGenericCollectionMemberClass/CreateStudent.g.cs
index 97d9897..0ca931f 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/NonGenericCollectionMemberClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/NonGenericCollectionMemberClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections;
-using M31.FluentApi.Attributes;
 using System.Collections.Generic;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.NonGenericCollectionMemberClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/NullablePredicateAndCollectionClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/NullablePredicateAndCollectionClass/CreateStudent.expected.txt
index 293c5fc..afb62d7 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/NullablePredicateAndCollectionClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/NullablePredicateAndCollectionClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.NullablePredicateAndCollectionClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/NullablePredicateAndCollectionClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/NullablePredicateAndCollectionClass/CreateStudent.g.cs
index 293c5fc..afb62d7 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/NullablePredicateAndCollectionClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/NullablePredicateAndCollectionClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.NullablePredicateAndCollectionClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/OneMemberClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/OneMemberClass/CreateStudent.expected.txt
index 308a44e..0778048 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/OneMemberClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/OneMemberClass/CreateStudent.expected.txt
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.OneMemberClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/OneMemberClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/OneMemberClass/CreateStudent.g.cs
index 308a44e..0778048 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/OneMemberClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/OneMemberClass/CreateStudent.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.OneMemberClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/OverloadedMethodClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/OverloadedMethodClass/CreateStudent.expected.txt
index e6dc1cc..20f2429 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/OverloadedMethodClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/OverloadedMethodClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 using System.Reflection;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/OverloadedMethodClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/OverloadedMethodClass/CreateStudent.g.cs
index e6dc1cc..20f2429 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/OverloadedMethodClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/OverloadedMethodClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 using System.Reflection;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PartialClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PartialClass/CreateStudent.expected.txt
index e7fc837..abd6770 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PartialClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PartialClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PartialClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PartialClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PartialClass/CreateStudent.g.cs
index e7fc837..abd6770 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PartialClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PartialClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PartialClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PredicateClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PredicateClass/CreateStudent.expected.txt
index 535f9c2..8fc6dfa 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PredicateClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PredicateClass/CreateStudent.expected.txt
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PredicateClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PredicateClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PredicateClass/CreateStudent.g.cs
index 535f9c2..8fc6dfa 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PredicateClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PredicateClass/CreateStudent.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PredicateClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PredicatePrivateFieldClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PredicatePrivateFieldClass/CreateStudent.expected.txt
index 013c743..da30821 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PredicatePrivateFieldClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PredicatePrivateFieldClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PredicatePrivateFieldClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PredicatePrivateFieldClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PredicatePrivateFieldClass/CreateStudent.g.cs
index 013c743..da30821 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PredicatePrivateFieldClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PredicatePrivateFieldClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PredicatePrivateFieldClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateConstructorClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateConstructorClass/CreateStudent.expected.txt
index 1807682..cc5417c 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateConstructorClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateConstructorClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PrivateConstructorClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateConstructorClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateConstructorClass/CreateStudent.g.cs
index 1807682..cc5417c 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateConstructorClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateConstructorClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PrivateConstructorClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFieldClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFieldClass/CreateStudent.expected.txt
index 0952651..66082b9 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFieldClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFieldClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PrivateFieldClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFieldClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFieldClass/CreateStudent.g.cs
index 0952651..66082b9 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFieldClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFieldClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PrivateFieldClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodClass/CreateStudent.expected.txt
index f75df13..d4e01ba 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PrivateFluentMethodClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodClass/CreateStudent.g.cs
index f75df13..d4e01ba 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PrivateFluentMethodClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodNullableParameterClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodNullableParameterClass/CreateStudent.expected.txt
index 21e61a6..eb64caa 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodNullableParameterClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodNullableParameterClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PrivateFluentMethodNullableParameterClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodNullableParameterClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodNullableParameterClass/CreateStudent.g.cs
index 21e61a6..eb64caa 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodNullableParameterClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodNullableParameterClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PrivateFluentMethodNullableParameterClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodParameterModifiersClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodParameterModifiersClass/CreateStudent.expected.txt
index 918986d..27401ae 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodParameterModifiersClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodParameterModifiersClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 using System.Reflection;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodParameterModifiersClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodParameterModifiersClass/CreateStudent.g.cs
index 918986d..27401ae 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodParameterModifiersClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateFluentMethodParameterModifiersClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 using System.Reflection;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateReadonlyFieldClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateReadonlyFieldClass/CreateStudent.expected.txt
index 42ae2cc..5834cdd 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateReadonlyFieldClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateReadonlyFieldClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PrivateReadonlyFieldClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateReadonlyFieldClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateReadonlyFieldClass/CreateStudent.g.cs
index 42ae2cc..5834cdd 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateReadonlyFieldClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateReadonlyFieldClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PrivateReadonlyFieldClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateUnderscoreFieldClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateUnderscoreFieldClass/CreateStudent.expected.txt
index 6ad07dd..b1f5958 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateUnderscoreFieldClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateUnderscoreFieldClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PrivateUnderscoreFieldClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateUnderscoreFieldClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateUnderscoreFieldClass/CreateStudent.g.cs
index 6ad07dd..b1f5958 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateUnderscoreFieldClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PrivateUnderscoreFieldClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PrivateUnderscoreFieldClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PublicFieldClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PublicFieldClass/CreateStudent.expected.txt
index 9e036d5..61950fb 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PublicFieldClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PublicFieldClass/CreateStudent.expected.txt
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PublicFieldClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PublicFieldClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PublicFieldClass/CreateStudent.g.cs
index 9e036d5..61950fb 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PublicFieldClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PublicFieldClass/CreateStudent.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PublicFieldClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PublicReadonlyFieldClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PublicReadonlyFieldClass/CreateStudent.expected.txt
index bfa5017..f4abb14 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PublicReadonlyFieldClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PublicReadonlyFieldClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PublicReadonlyFieldClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PublicReadonlyFieldClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PublicReadonlyFieldClass/CreateStudent.g.cs
index bfa5017..f4abb14 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PublicReadonlyFieldClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/PublicReadonlyFieldClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.PublicReadonlyFieldClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SameNameMemberClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SameNameMemberClass/CreateStudent.expected.txt
index 15821da..80fadc2 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SameNameMemberClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SameNameMemberClass/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.SameNameMemberClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SameNameMemberClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SameNameMemberClass/CreateStudent.g.cs
index 15821da..80fadc2 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SameNameMemberClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SameNameMemberClass/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.SameNameMemberClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableFirstMemberClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableFirstMemberClass/CreateStudent.expected.txt
index 3d80ad2..54aa98a 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableFirstMemberClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableFirstMemberClass/CreateStudent.expected.txt
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.SkippableFirstMemberClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableFirstMemberClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableFirstMemberClass/CreateStudent.g.cs
index 3d80ad2..54aa98a 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableFirstMemberClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableFirstMemberClass/CreateStudent.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.SkippableFirstMemberClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableFirstTwoMembersClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableFirstTwoMembersClass/CreateStudent.expected.txt
index a962d07..55b8e9f 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableFirstTwoMembersClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableFirstTwoMembersClass/CreateStudent.expected.txt
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.SkippableFirstTwoMembersClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableFirstTwoMembersClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableFirstTwoMembersClass/CreateStudent.g.cs
index a962d07..55b8e9f 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableFirstTwoMembersClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableFirstTwoMembersClass/CreateStudent.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.SkippableFirstTwoMembersClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableForkMembersClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableForkMembersClass/CreateStudent.expected.txt
index 86931ec..7172471 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableForkMembersClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableForkMembersClass/CreateStudent.expected.txt
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.SkippableForkMembersClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableForkMembersClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableForkMembersClass/CreateStudent.g.cs
index 86931ec..7172471 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableForkMembersClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableForkMembersClass/CreateStudent.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.SkippableForkMembersClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableLoopClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableLoopClass/CreateStudent.expected.txt
index cf92eea..5b6fb06 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableLoopClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableLoopClass/CreateStudent.expected.txt
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.SkippableLoopClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableLoopClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableLoopClass/CreateStudent.g.cs
index cf92eea..5b6fb06 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableLoopClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableLoopClass/CreateStudent.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.SkippableLoopClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableMemberClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableMemberClass/CreateStudent.expected.txt
index f4bc42d..ace9ae9 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableMemberClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableMemberClass/CreateStudent.expected.txt
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.SkippableMemberClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableMemberClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableMemberClass/CreateStudent.g.cs
index f4bc42d..ace9ae9 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableMemberClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableMemberClass/CreateStudent.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.SkippableMemberClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableSeveralMembersClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableSeveralMembersClass/CreateStudent.expected.txt
index 99b706b..f500f6f 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableSeveralMembersClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableSeveralMembersClass/CreateStudent.expected.txt
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.SkippableSeveralMembersClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableSeveralMembersClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableSeveralMembersClass/CreateStudent.g.cs
index 99b706b..f500f6f 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableSeveralMembersClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableSeveralMembersClass/CreateStudent.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.SkippableSeveralMembersClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableTwoLoopsClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableTwoLoopsClass/CreateStudent.expected.txt
index ab8b757..87b5177 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableTwoLoopsClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableTwoLoopsClass/CreateStudent.expected.txt
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.SkippableTwoLoopsClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableTwoLoopsClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableTwoLoopsClass/CreateStudent.g.cs
index ab8b757..87b5177 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableTwoLoopsClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/SkippableTwoLoopsClass/CreateStudent.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.SkippableTwoLoopsClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberClass/CreateStudent.expected.txt
index 36d9eca..003aa94 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ThreeMemberClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberClass/CreateStudent.g.cs
index 36d9eca..003aa94 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ThreeMemberClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecord/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecord/CreateStudent.expected.txt
index 9e7ef54..8d48db4 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecord/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecord/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ThreeMemberRecord;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecord/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecord/CreateStudent.g.cs
index 9e7ef54..8d48db4 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecord/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecord/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ThreeMemberRecord;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecordPrimaryConstructor/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecordPrimaryConstructor/CreateStudent.expected.txt
index 22aa772..5e768fa 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecordPrimaryConstructor/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecordPrimaryConstructor/CreateStudent.expected.txt
@@ -7,7 +7,6 @@
 
 using System;
 using System.Reflection.Metadata;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ThreeMemberRecordPrimaryConstructor;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecordPrimaryConstructor/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecordPrimaryConstructor/CreateStudent.g.cs
index 22aa772..5e768fa 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecordPrimaryConstructor/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecordPrimaryConstructor/CreateStudent.g.cs
@@ -7,7 +7,6 @@
 
 using System;
 using System.Reflection.Metadata;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ThreeMemberRecordPrimaryConstructor;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecordStruct/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecordStruct/CreateStudent.expected.txt
index 49e69c1..87b9e49 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecordStruct/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecordStruct/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ThreeMemberRecordStruct;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecordStruct/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecordStruct/CreateStudent.g.cs
index 49e69c1..87b9e49 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecordStruct/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberRecordStruct/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ThreeMemberRecordStruct;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberStruct/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberStruct/CreateStudent.expected.txt
index 449321c..5a56440 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberStruct/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberStruct/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ThreeMemberStruct;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberStruct/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberStruct/CreateStudent.g.cs
index 449321c..5a56440 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberStruct/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreeMemberStruct/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ThreeMemberStruct;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreePrivateMembersClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreePrivateMembersClass/CreateStudent.expected.txt
index 95de352..10e4cc1 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreePrivateMembersClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreePrivateMembersClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ThreePrivateMembersClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreePrivateMembersClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreePrivateMembersClass/CreateStudent.g.cs
index 95de352..10e4cc1 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreePrivateMembersClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/ThreePrivateMembersClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.ThreePrivateMembersClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass1/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass1/CreateStudent.expected.txt
index 3074933..b6a12a9 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass1/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass1/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 using System.Reflection;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass1/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass1/CreateStudent.g.cs
index 3074933..b6a12a9 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass1/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass1/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 using System.Reflection;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass2/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass2/CreateStudent.expected.txt
index 1bdd500..d371a1c 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass2/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass2/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 using System.Reflection;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass2/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass2/CreateStudent.g.cs
index 1bdd500..d371a1c 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass2/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass2/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 using System.Reflection;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass3/CreateAddress.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass3/CreateAddress.g.cs
index fa03061..f89403d 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass3/CreateAddress.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass3/CreateAddress.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.TryBreakFluentApiClass3;
 
 public class CreateAddress :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass3/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass3/CreateStudent.expected.txt
index 2d76be7..5fc9e10 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass3/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass3/CreateStudent.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.TryBreakFluentApiClass3;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass3/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass3/CreateStudent.g.cs
index 2d76be7..5fc9e10 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass3/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TryBreakFluentApiClass3/CreateStudent.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.TryBreakFluentApiClass3;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoMemberClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoMemberClass/CreateStudent.expected.txt
index df727a7..6c11a95 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoMemberClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoMemberClass/CreateStudent.expected.txt
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.TwoMemberClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoMemberClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoMemberClass/CreateStudent.g.cs
index df727a7..6c11a95 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoMemberClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoMemberClass/CreateStudent.g.cs
@@ -6,7 +6,6 @@
 #nullable enable
 
 using System;
-using M31.FluentApi.Attributes;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.TwoMemberClass;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoParameterCompoundClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoParameterCompoundClass/CreateStudent.expected.txt
index c27c83b..e405afd 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoParameterCompoundClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoParameterCompoundClass/CreateStudent.expected.txt
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.TwoParameterCompoundClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoParameterCompoundClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoParameterCompoundClass/CreateStudent.g.cs
index c27c83b..e405afd 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoParameterCompoundClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoParameterCompoundClass/CreateStudent.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.TwoParameterCompoundClass;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoParameterCompoundClassReversedParameters/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoParameterCompoundClassReversedParameters/CreateStudent.expected.txt
index bf767bb..7b8f60a 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoParameterCompoundClassReversedParameters/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoParameterCompoundClassReversedParameters/CreateStudent.expected.txt
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.TwoParameterCompoundClassReversedParameters;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoParameterCompoundClassReversedParameters/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoParameterCompoundClassReversedParameters/CreateStudent.g.cs
index bf767bb..7b8f60a 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoParameterCompoundClassReversedParameters/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/Abstract/TwoParameterCompoundClassReversedParameters/CreateStudent.g.cs
@@ -5,8 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
-
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.Abstract.TwoParameterCompoundClassReversedParameters;
 
 public class CreateStudent :
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/PersonClass/CreatePerson.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/PersonClass/CreatePerson.expected.txt
index 0c9e065..f77cf4b 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/PersonClass/CreatePerson.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/PersonClass/CreatePerson.expected.txt
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 using System.Reflection;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/PersonClass/CreatePerson.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/PersonClass/CreatePerson.g.cs
index 0c9e065..f77cf4b 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/PersonClass/CreatePerson.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/PersonClass/CreatePerson.g.cs
@@ -5,7 +5,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #nullable enable
 
-using M31.FluentApi.Attributes;
 using System;
 using System.Reflection;
 
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/StudentClass/CreateStudent.expected.txt b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/StudentClass/CreateStudent.expected.txt
index 0519377..c986c10 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/StudentClass/CreateStudent.expected.txt
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/StudentClass/CreateStudent.expected.txt
@@ -7,7 +7,6 @@
 
 using System;
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.StudentClass;
diff --git a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/StudentClass/CreateStudent.g.cs b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/StudentClass/CreateStudent.g.cs
index 0519377..c986c10 100644
--- a/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/StudentClass/CreateStudent.g.cs
+++ b/src/M31.FluentApi.Tests/CodeGeneration/TestClasses/StudentClass/CreateStudent.g.cs
@@ -7,7 +7,6 @@
 
 using System;
 using System.Collections.Generic;
-using M31.FluentApi.Attributes;
 using System.Reflection;
 
 namespace M31.FluentApi.Tests.CodeGeneration.TestClasses.StudentClass;
diff --git a/src/M31.FluentApi/M31.FluentApi.csproj b/src/M31.FluentApi/M31.FluentApi.csproj
index 5d6e46a..1dbe75b 100644
--- a/src/M31.FluentApi/M31.FluentApi.csproj
+++ b/src/M31.FluentApi/M31.FluentApi.csproj
@@ -7,7 +7,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageVersion>1.9.0</PackageVersion>
+    <PackageVersion>1.9.1</PackageVersion>
     <Authors>Kevin Schaal</Authors>
     <Description>Generate fluent builders in C#.</Description>
     <PackageTags>fluentapi fluentbuilder fluentinterface fluentdesign fluent codegeneration</PackageTags>