diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
new file mode 100644
index 00000000..e463006f
--- /dev/null
+++ b/.config/dotnet-tools.json
@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-t4": {
+      "version": "3.0.0",
+      "commands": [
+        "t4"
+      ],
+      "rollForward": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 59a22f74..e524f79f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,6 +28,9 @@ jobs:
           cache: true
           cache-dependency-path: '**/packages.lock.json'
 
+      - name: Restore tools
+        run: dotnet tool restore
+
       - name: Restore
         run: dotnet restore Linq2GraphQL.CI.slnf --locked-mode
 
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index a2169e36..7c27d797 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -25,6 +25,9 @@ jobs:
           cache: true
           cache-dependency-path: '**/packages.lock.json'
 
+      - name: Restore tools
+        run: dotnet tool restore
+
       - name: Publish
         working-directory: docs/Linq2GraphQL.Docs
         run: dotnet publish -c:Release -o:publish
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6bc60275..f2bc6d80 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,6 +31,9 @@ jobs:
         id: nbgv
       - run: echo 'SemVer2=${{ steps.nbgv.outputs.SemVer2 }}'
 
+      - name: Restore tools
+        run: dotnet tool restore
+
       - name: Restore
         run: dotnet restore Linq2GraphQL.Release.slnf --locked-mode
 
diff --git a/.gitignore b/.gitignore
index d6151772..9e118511 100644
--- a/.gitignore
+++ b/.gitignore
@@ -369,3 +369,6 @@ FodyWeavers.xsd
 .build-timestamp
 config.json
 local-nuget/
+
+# Preprocessed T4 templates (generated at build time by dotnet-t4)
+src/Linq2GraphQL.Generator/Templates/**/*.g.cs
diff --git a/CLAUDE.md b/CLAUDE.md
index 5aa7f1b4..9eb69778 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -55,7 +55,7 @@ Key details that bite:
 
 `ClientGenerator.GenerateAsync` posts an introspection query (`General.IntrospectionQuery`, or the `IncludeDeprecated` variant), deserializes into `GraphQLSchema/RootSchema`, and drives one T4 template per output kind (`Templates/{Client,Class,Interface,Methods,Enum,Scalars}`). Templates return `FileEntry` objects; `Program.cs` writes them with `ReplaceLineEndings("\n")` — generated files are always LF, keep it that way.
 
-**T4 workflow (from DEVELOPER.md — read it before touching templates):** each template is three files — `X.tt` (source, edit this), `X.tt.cs` (hand-written partial with constructor params and helpers), and `X.cs` (preprocessed output, **checked in**). Editing a `.tt` does nothing until the `.cs` is regenerated via Visual Studio's *Run Custom Tool* on the `.tt` file. There is no CLI equivalent wired up, so a template change made outside Visual Studio will silently build and run the old logic.
+**T4 workflow (from DEVELOPER.md — read it before touching templates):** each template is three files — `X.tt` (source, edit this), `X.tt.cs` (hand-written partial with constructor params and helpers), and `X.g.cs` (preprocessed output, **generated at build time, gitignored**). The generator's csproj runs the pinned `dotnet-t4` local tool (`.config/dotnet-tools.json`) over every `Templates\**\*.tt` before compiling, so editing a `.tt` and building is the whole loop and stale template logic cannot be built. Compile errors inside template code are reported against the `.tt` file and line. A template in a new folder needs a `T4Template` item with a `TemplateNamespace` in the csproj.
 
 `GeneratorSettings.Current.Nullable` is ambient static state read from inside templates; the nullable and non-nullable clients differ mainly in nullable annotations and `#pragma warning disable CS8618`.
 
diff --git a/DEVELOPER.md b/DEVELOPER.md
index 80df6442..9aca6f75 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -13,9 +13,11 @@ This document provides comprehensive guidance for developers working on the Linq
 
 ## Prerequisites
 
-- **Visual Studio 2022** (recommended) or Visual Studio 2019/2022
-- **.NET 8.0 SDK** or later
-- **T4 Template Support** - Ensure the "Text Template Transformation" workload is installed in Visual Studio
+- **.NET 10.0 SDK** or later
+- **Any editor** - Visual Studio, Rider, VS Code or plain `dotnet build` all work;
+  T4 preprocessing runs as part of the build, so no IDE-specific tooling is required
+- **`dotnet tool restore`** once per clone, to fetch the pinned `dotnet-t4` CLI tool
+  (the build does this for you)
 
 ## Project Structure
 
@@ -27,7 +29,8 @@ src/
 │   │   ├── Class/                     # Class generation templates
 │   │   ├── Interface/                 # Interface generation templates
 │   │   ├── Methods/                   # Method generation templates
-│   │   └── Enum/                      # Enum generation templates
+│   │   ├── Enum/                      # Enum generation templates
+│   │   └── Scalars/                   # Custom scalar templates
 │   ├── GraphQLSchema/                 # Schema parsing and processing
 │   └── ClientGenerator.cs             # Main generation orchestration
 └── Linq2GraphQL.Client/              # Core client library
@@ -43,7 +46,8 @@ This project uses **T4 (Text Template Transformation Toolkit)** for code generat
 
 - **`.tt`** - Source T4 template files (human-editable)
 - **`.tt.cs`** - Partial class definitions for template variables and helper methods
-- **`.cs`** - Preprocessed T4 templates (auto-generated, contains the actual `TransformText()` method)
+- **`.g.cs`** - Preprocessed T4 templates (contains the actual `TransformText()` method).
+  **Generated at build time, gitignored, never checked in.**
 
 ### Template Development Workflow
 
@@ -52,27 +56,44 @@ This project uses **T4 (Text Template Transformation Toolkit)** for code generat
 When modifying `.tt` files:
 
 1. **Edit the `.tt` file** with your changes
-2. **Manually regenerate the `.cs` file** using Visual Studio's custom tool
-3. **Build the project** to ensure compilation
-4. **Test the generation** by running the client generator
+2. **Build the project** - the `.g.cs` file is regenerated automatically
+3. **Test the generation** by running the client generator
 
-#### 2. Manual Template Regeneration
+That is the whole loop. There is no manual regeneration step, and no way to build
+stale template logic: compile errors in a template point straight back at the
+`.tt` file and line number.
 
-**⚠️ IMPORTANT: After modifying any `.tt` file, you MUST manually regenerate the corresponding `.cs` file.**
+#### 2. How Build-Time Preprocessing Works
 
-**In Visual Studio 2022:**
+`Linq2GraphQL.Generator.csproj` preprocesses every `Templates\**\*.tt` into a
+sibling `<Template>.g.cs` before compiling, using the
+[dotnet-t4](https://www.nuget.org/packages/dotnet-t4) CLI tool pinned in
+`.config/dotnet-tools.json`:
 
-1. Right-click on the `.tt` file in Solution Explorer
-2. Select **"Run Custom Tool"**
-3. This will regenerate the `.cs` file with your changes
-4. Verify the `.cs` file contains your updated template logic
+| Target | Does |
+| --- | --- |
+| `RestoreT4Tool` | Runs `dotnet tool restore` (once per project file change) |
+| `PreprocessT4Templates` | Runs `dotnet t4 --class=<ns>.<Name> --out=<Name>.g.cs <Name>.tt` per template, incrementally |
+| `IncludeT4Output` | Adds the `.g.cs` files to `Compile` before `BeforeCompile` |
 
-**Alternative method:**
-1. Right-click on the `.tt` file
-2. Select **"Properties"**
-3. Set **"Custom Tool"** to `TextTemplatingFilePreprocessor`
-4. Set **"Custom Tool Namespace"** to your desired namespace
-5. Save the file to trigger regeneration
+New template folders need one line in the `T4Template` item group so the class
+namespace can be derived:
+
+```xml
+<T4Template Include="Templates\MyFolder\*.tt" TemplateNamespace="Templates.MyFolder"/>
+```
+
+To preprocess a single template by hand (rarely needed - the build does it):
+
+```powershell
+dotnet tool restore
+cd src/Linq2GraphQL.Generator
+dotnet t4 --class="Linq2GraphQL.Generator.Templates.Enum.EnumTemplate" --out="Templates/Enum/EnumTemplate.g.cs" "Templates/Enum/EnumTemplate.tt"
+```
+
+Visual Studio's *Run Custom Tool* is **no longer used** and the `.tt` files
+deliberately carry no `Generator`/`LastGenOutput` metadata - the build owns
+generation on every platform, IDE or CI.
 
 #### 3. Template File Dependencies
 
@@ -80,7 +101,7 @@ Each T4 template requires:
 
 - **`.tt` file** - Contains the template logic and output format
 - **`.tt.cs` file** - Provides the partial class with constructor parameters and helper methods
-- **`.cs` file** - Auto-generated preprocessed template (regenerated from `.tt`)
+- **`.g.cs` file** - Preprocessed template, produced by the build (never edited or committed)
 
 ### Template Syntax
 
@@ -130,7 +151,7 @@ public partial class TemplateName
 ### 1. Development Cycle
 
 ```
-Edit .tt file → Run Custom Tool → Build Project → Test Generation → Repeat
+Edit .tt file → Build Project → Test Generation → Repeat
 ```
 
 ### 2. Testing Changes
@@ -161,19 +182,26 @@ dotnet run --project src/Linq2GraphQL.Generator -- <endpoint> [options]
 **Problem:** Changes to `.tt` files not reflected in generated output.
 
 **Solution:**
-1. Ensure you've run the **"Run Custom Tool"** on the `.tt` file
-2. Check that the `.cs` file was updated with your changes
-3. Clean and rebuild the project
-4. Verify the T4 preprocessor is working in Visual Studio
+1. Confirm the template folder has a `T4Template` entry in
+   `Linq2GraphQL.Generator.csproj` - a template outside those globs is never preprocessed
+2. Check the timestamp of the sibling `.g.cs` file; delete it and rebuild to force regeneration
+3. Run `dotnet build src/Linq2GraphQL.Generator -v:n` and look for the `dotnet t4` command lines
+
+#### `dotnet t4` Not Found
+
+**Problem:** Build fails with "Cannot find command 'dotnet t4'".
+
+**Solution:** Run `dotnet tool restore` from the repository root - the tool is a local
+tool pinned in `.config/dotnet-tools.json`. The build normally does this for you.
 
 #### Missing TransformText Method
 
 **Problem:** Compilation error "does not contain a definition for 'TransformText'".
 
 **Solution:**
-1. The `.cs` file is missing or outdated
-2. Run **"Run Custom Tool"** on the corresponding `.tt` file
-3. Ensure the `.tt.cs` file exists and has the correct partial class definition
+1. The `.g.cs` file was not produced - see *T4 Templates Not Regenerating* above
+2. Ensure the `.tt.cs` file exists, and that its namespace and class name match the
+   `--class` value the build derives (`$(RootNamespace).<TemplateNamespace>.<Filename>`)
 
 #### Template Variables Not Available
 
@@ -186,10 +214,12 @@ dotnet run --project src/Linq2GraphQL.Generator -- <endpoint> [options]
 
 ### Debugging Tips
 
-1. **Check the `.cs` file content** - It should contain your template logic in the `TransformText()` method
-2. **Verify template compilation** - Build errors often indicate template syntax issues
-3. **Use Visual Studio's T4 debugging** - Set breakpoints in the generated `.cs` files
-4. **Check build output** - Look for T4-related error messages
+1. **Read the compile error location** - errors inside template code are reported against
+   the `.tt` file and line, thanks to the `#line` pragmas in the generated `.g.cs`
+2. **Inspect the `.g.cs` file** - it sits next to the `.tt` and contains the generated
+   `TransformText()` method
+3. **Set breakpoints in the `.g.cs` file** to step through template execution
+4. **Check build output** - `dotnet t4` failures surface as `Exec` task errors
 
 ## Best Practices
 
@@ -217,7 +247,7 @@ dotnet run --project src/Linq2GraphQL.Generator -- <endpoint> [options]
 ### Version Control
 
 1. **Commit `.tt` and `.tt.cs` files** - These are source files
-2. **Ignore generated `.cs` files** - Add `**/*.cs` to `.gitignore` for auto-generated files
+2. **Never commit `.g.cs` files** - they are build output and are gitignored
 3. **Document template changes** - Include clear commit messages for template modifications
 4. **Review generated output** - Verify that template changes produce the expected results
 
diff --git a/REPO_REPORT.md b/REPO_REPORT.md
index 70d9407b..b37f9625 100644
--- a/REPO_REPORT.md
+++ b/REPO_REPORT.md
@@ -52,7 +52,7 @@ Three stages, and understanding them is usually the whole job:
 
 ## 5. Highlights — the risks
 
-- **T4 is the sharpest edge in the repo.** Each template is three files: `X.tt` (source), `X.tt.cs` (hand-written partial), `X.cs` (**preprocessed output, checked in**). Regeneration happens only via Visual Studio's *Run Custom Tool*; there is no CLI equivalent wired up. A template edit made outside VS **builds and runs the old logic silently**. This is the single most likely way to lose an afternoon here.
+- ~~**T4 is the sharpest edge in the repo.**~~ **Fixed.** Templates are now preprocessed at build time by the pinned `dotnet-t4` local tool into gitignored `X.g.cs` files, so a `.tt` edit takes effect on the next `dotnet build` on any platform and stale template logic cannot be built. (Switching it on revealed one already-dormant edit: `ScalarTemplate.tt` referenced a non-existent `GraphqlType.ScalarTypeName` and had never been regenerated.)
 - **Generated test clients are checked in but never regenerated by the build.** `TestClient`/`TestClientNullable` must be re-generated by hand against a locally running TestServer after any template or schema change. Nothing in CI detects the drift — the tests keep passing against stale output.
 - **Coupling between alias hashing and deserialization.** `Utilities.GetArgumentsId` must produce the *same* hash at write time and read time. Any change to argument hashing breaks reads as well as writes, and the failure mode is a silently missing field rather than an exception.
 - **Ambient static generator state.** `GeneratorSettings.Current` is read from inside templates, so nullable/non-nullable output depends on global mutable state rather than a passed parameter. Fine today; awkward if generation ever needs to run concurrently.
@@ -69,7 +69,7 @@ Three stages, and understanding them is usually the whole job:
 
 ## 7. If I were picking up work here
 
-1. Wire up **CLI T4 regeneration** (or a CI check that regenerating produces no diff). This removes the repo's one silent-failure trap.
+1. ~~Wire up **CLI T4 regeneration**~~ — done: `dotnet-t4` runs from the generator's csproj on every build, and the preprocessed output is no longer checked in.
 2. Add a **CI job that regenerates the test clients and diffs them** — it closes the stale-generated-output gap for free.
 3. Pull `docs/` and `StartGG/` into a **build-only CI job** so they cannot rot unnoticed.
 4. Get the **WebSocket subscription transport under test**, even against a standalone host outside `WebApplicationFactory`.
diff --git a/src/Linq2GraphQL.Generator/Linq2GraphQL.Generator.csproj b/src/Linq2GraphQL.Generator/Linq2GraphQL.Generator.csproj
index da1833b1..2efe417f 100644
--- a/src/Linq2GraphQL.Generator/Linq2GraphQL.Generator.csproj
+++ b/src/Linq2GraphQL.Generator/Linq2GraphQL.Generator.csproj
@@ -25,105 +25,41 @@
         <PackageReference Include="Macross.Json.Extensions"/>
     </ItemGroup>
 
+    <!--
+      T4 templates are preprocessed at build time by the dotnet-t4 CLI tool
+      (pinned in .config/dotnet-tools.json) into "<Template>.g.cs" next to each
+      .tt file. That output is generated, gitignored and never checked in, so
+      editing a .tt file can never silently build stale logic. See DEVELOPER.md.
+    -->
     <ItemGroup>
-        <None Update="Templates\Class\InputClassTemplate.tt">
-            <LastGenOutput>InputClassTemplate.cs</LastGenOutput>
-            <Generator>TextTemplatingFilePreprocessor</Generator>
-        </None>
-        <None Update="Templates\Class\ClassTemplate.tt">
-            <Generator>TextTemplatingFilePreprocessor</Generator>
-            <LastGenOutput>ClassTemplate.cs</LastGenOutput>
-        </None>
-        <None Update="Templates\Client\ClientTemplate.tt">
-            <Generator>TextTemplatingFilePreprocessor</Generator>
-            <LastGenOutput>ClientTemplate.cs</LastGenOutput>
-        </None>
-        <None Update="Templates\Client\IClientTemplate.tt">
-            <Generator>TextTemplatingFilePreprocessor</Generator>
-            <LastGenOutput>IClientTemplate.cs</LastGenOutput>
-        </None>
-        <None Update="Templates\Enum\EnumTemplate.tt">
-            <Generator>TextTemplatingFilePreprocessor</Generator>
-            <LastGenOutput>EnumTemplate.cs</LastGenOutput>
-        </None>
-        <None Update="Templates\Interface\InterfaceTemplate.tt">
-            <LastGenOutput>InterfaceTemplate.cs</LastGenOutput>
-            <Generator>TextTemplatingFilePreprocessor</Generator>
-        </None>
-        <None Update="Templates\Methods\IMethodsTemplate.tt">
-            <Generator>TextTemplatingFilePreprocessor</Generator>
-            <LastGenOutput>IMethodsTemplate.cs</LastGenOutput>
-        </None>
-        <None Update="Templates\Class\InputFactoryClassTemplate.tt">
-            <LastGenOutput>InputFactoryClassTemplate.cs</LastGenOutput>
-            <Generator>TextTemplatingFilePreprocessor</Generator>
-        </None>
-        <None Update="Templates\Client\ClientExtensionsTemplate.tt">
-            <Generator>TextTemplatingFilePreprocessor</Generator>
-            <LastGenOutput>ClientExtensionsTemplate.cs</LastGenOutput>
-        </None>
-        <None Update="Templates\Scalars\ScalarTemplate.tt">
-            <Generator>TextTemplatingFilePreprocessor</Generator>
-            <LastGenOutput>ScalarTemplate.cs</LastGenOutput>
-        </None>
-    </ItemGroup>
+        <T4Template Include="Templates\Class\*.tt" TemplateNamespace="Templates.Class"/>
+        <T4Template Include="Templates\Client\*.tt" TemplateNamespace="Templates.Client"/>
+        <T4Template Include="Templates\Enum\*.tt" TemplateNamespace="Templates.Enum"/>
+        <T4Template Include="Templates\Interface\*.tt" TemplateNamespace="Templates.Interface"/>
+        <T4Template Include="Templates\Methods\*.tt" TemplateNamespace="Templates.Methods"/>
+        <T4Template Include="Templates\Scalars\*.tt" TemplateNamespace="Templates.Scalars"/>
 
-    <ItemGroup>
-        <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}"/>
+        <!-- Added by IncludeT4Output below, once the files exist. -->
+        <Compile Remove="Templates\**\*.g.cs"/>
     </ItemGroup>
 
-    <ItemGroup>
-        <Compile Update="Templates\Class\InputClassTemplate.cs">
-            <DependentUpon>InputClassTemplate.tt</DependentUpon>
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-        </Compile>
-        <Compile Update="Templates\Class\ClassTemplate.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>ClassTemplate.tt</DependentUpon>
-        </Compile>
-        <Compile Update="Templates\Client\ClientExtensionsTemplate.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>ClientExtensionsTemplate.tt</DependentUpon>
-        </Compile>
-        <Compile Update="Templates\Client\ClientTemplate.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>ClientTemplate.tt</DependentUpon>
-        </Compile>
-        <Compile Update="Templates\Client\IClientTemplate.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>IClientTemplate.tt</DependentUpon>
-        </Compile>
-        <Compile Update="Templates\Enum\EnumTemplate.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>EnumTemplate.tt</DependentUpon>
-        </Compile>
-        <Compile Update="Templates\Interface\InterfaceTemplate.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>InterfaceTemplate.tt</DependentUpon>
-        </Compile>
-        <Compile Update="Templates\Methods\IMethodsTemplate.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>IMethodsTemplate.tt</DependentUpon>
-        </Compile>
-        <Compile Update="Templates\Class\InputFactoryClassTemplate.cs">
-            <AutoGen>True</AutoGen>
-            <DesignTime>True</DesignTime>
-            <DependentUpon>InputFactoryClassTemplate.tt</DependentUpon>
-        </Compile>
-        <Compile Update="Templates\Scalars\ScalarTemplate.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>ScalarTemplate.tt</DependentUpon>
-        </Compile>
-    </ItemGroup>
+    <Target Name="RestoreT4Tool" Inputs="$(MSBuildThisFileFullPath)" Outputs="$(IntermediateOutputPath)t4-tool.restored">
+        <Exec Command="dotnet tool restore"/>
+        <Touch Files="$(IntermediateOutputPath)t4-tool.restored" AlwaysCreate="true"/>
+    </Target>
+
+    <Target Name="PreprocessT4Templates"
+            DependsOnTargets="RestoreT4Tool"
+            Inputs="@(T4Template)"
+            Outputs="@(T4Template->'%(RelativeDir)%(Filename).g.cs')">
+        <Exec Command="dotnet t4 --class=&quot;$(RootNamespace).%(T4Template.TemplateNamespace).%(T4Template.Filename)&quot; --out=&quot;%(T4Template.RelativeDir)%(T4Template.Filename).g.cs&quot; &quot;%(T4Template.Identity)&quot;"/>
+    </Target>
+
+    <Target Name="IncludeT4Output" DependsOnTargets="PreprocessT4Templates" BeforeTargets="BeforeCompile">
+        <ItemGroup>
+            <Compile Include="@(T4Template->'%(RelativeDir)%(Filename).g.cs')"/>
+        </ItemGroup>
+    </Target>
 
     <ItemGroup>
         <ProjectReference Include="..\Linq2GraphQL.Client\Linq2GraphQL.Client.csproj"/>
diff --git a/src/Linq2GraphQL.Generator/Templates/Class/ClassTemplate.cs b/src/Linq2GraphQL.Generator/Templates/Class/ClassTemplate.cs
deleted file mode 100644
index abed5e90..00000000
--- a/src/Linq2GraphQL.Generator/Templates/Class/ClassTemplate.cs
+++ /dev/null
@@ -1,680 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version: 17.0.0.0
-//  
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace Linq2GraphQL.Generator.Templates.Class
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
-    public partial class ClassTemplate : ClassTemplateBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("using System;\r\nusing System.Collections.Generic;\r\nusing System.Text.Json.Serializ" +
-                    "ation;\r\nusing Linq2GraphQL.Client;\r\nusing Linq2GraphQL.Client.Common;\r\n\r\nnamespa" +
-                    "ce ");
-            
-            #line 9 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(namespaceName));
-            
-            #line default
-            #line hidden
-            this.Write(";\r\n\r\n");
-            
-            #line 11 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- if (NullableEnabled()) { 
-            
-            #line default
-            #line hidden
-            this.Write("#pragma warning disable CS8618\r\n");
-            
-            #line 13 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            this.Write("\r\n");
-            
-            #line 15 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- if (classType.AllFields.Any(e => e.IsMethod)) { 
-            
-            #line default
-            #line hidden
-            this.Write("public static class ");
-            
-            #line 16 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.Name));
-            
-            #line default
-            #line hidden
-            this.Write("Extensions\r\n{\r\n");
-            
-            #line 18 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- foreach (var field in classType.AllFields.Where(e => e.IsMethod)) { 
-            
-            #line default
-            #line hidden
-            this.Write("    [GraphQLMember(\"");
-            
-            #line 19 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
-            
-            #line default
-            #line hidden
-            this.Write("\")]\r\n");
-            
-            #line 20 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- if (field.IsDeprecated) { 
-            
-            #line default
-            #line hidden
-            this.Write("    [Obsolete(\"");
-            
-            #line 21 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.SafeDeprecationReason));
-            
-            #line default
-            #line hidden
-            this.Write("\")]\r\n");
-            
-            #line 22 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            this.Write("    public static ");
-            
-            #line 23 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetFieldCSharpName(field)));
-            
-            #line default
-            #line hidden
-            this.Write(" ");
-            
-            #line 23 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.CSharpName));
-            
-            #line default
-            #line hidden
-            this.Write("(this ");
-            
-            #line 23 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.Name));
-            
-            #line default
-            #line hidden
-            this.Write("  ");
-            
-            #line 23 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.CSharpVariableName));
-            
-            #line default
-            #line hidden
-            this.Write(", ");
-            
-            #line 23 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.GetArgString(true)));
-            
-            #line default
-            #line hidden
-            this.Write(")\r\n    {\r\n        return ");
-            
-            #line 25 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.CSharpVariableName));
-            
-            #line default
-            #line hidden
-            this.Write(".GetMethodValue<");
-            
-            #line 25 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetFieldCSharpName(field)));
-            
-            #line default
-            #line hidden
-            this.Write(">(\"");
-            
-            #line 25 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
-            
-            #line default
-            #line hidden
-            this.Write("\", ");
-            
-            #line 25 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.GetArgNames()));
-            
-            #line default
-            #line hidden
-            this.Write(");\r\n    }\r\n\r\n");
-            
-            #line 28 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            this.Write("}\r\n\r\n");
-            
-            #line 31 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-
-    }
-
-            
-            #line default
-            #line hidden
-            
-            #line 34 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- if (classType.HasDescription) {
-            
-            #line default
-            #line hidden
-            this.Write("/// <summary>\r\n/// ");
-            
-            #line 36 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.SummaryDescription));
-            
-            #line default
-            #line hidden
-            this.Write("\r\n/// </summary>\r\n");
-            
-            #line 38 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- 
-} 
-
-            
-            #line default
-            #line hidden
-            this.Write("public partial class ");
-            
-            #line 41 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.Name));
-            
-            #line default
-            #line hidden
-            this.Write(" ");
-            
-            #line 41 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.GetInterfacesString("GraphQLTypeBase")));
-            
-            #line default
-            #line hidden
-            this.Write("\r\n{\r\n");
-            
-            #line 43 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- foreach (var field in classType.AllFields) { 
-            
-            #line default
-            #line hidden
-            
-            #line 44 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- if (field.IsMethod) { 
-            
-            #line default
-            #line hidden
-            this.Write("    private LazyProperty<");
-            
-            #line 45 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetFieldCSharpName(field)));
-            
-            #line default
-            #line hidden
-            this.Write("> _");
-            
-            #line 45 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
-            
-            #line default
-            #line hidden
-            this.Write(" = new();\r\n    /// <summary>\r\n    /// Do not use in Query, only to retrive result" +
-                    "\r\n    /// </summary>\r\n");
-            
-            #line 49 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- if (field.IsDeprecated) { 
-            
-            #line default
-            #line hidden
-            this.Write("    [Obsolete(\"");
-            
-            #line 50 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.SafeDeprecationReason));
-            
-            #line default
-            #line hidden
-            this.Write("\")]\r\n");
-            
-            #line 51 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            this.Write("    public ");
-            
-            #line 52 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetFieldCSharpName(field)));
-            
-            #line default
-            #line hidden
-            this.Write(" ");
-            
-            #line 52 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.CSharpName));
-            
-            #line default
-            #line hidden
-            this.Write(" => _");
-            
-            #line 52 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
-            
-            #line default
-            #line hidden
-            this.Write(".Value(() => GetFirstMethodValue<");
-            
-            #line 52 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetFieldCSharpName(field)));
-            
-            #line default
-            #line hidden
-            this.Write(">(\"");
-            
-            #line 52 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
-            
-            #line default
-            #line hidden
-            this.Write("\"));\r\n\r\n");
-            
-            #line 54 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- } else { 
-            
-            #line default
-            #line hidden
-            
-            #line 55 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- if (field.HasDescription) { 
-            
-            #line default
-            #line hidden
-            this.Write("    /// <summary>\r\n    /// ");
-            
-            #line 57 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.SummaryDescription));
-            
-            #line default
-            #line hidden
-            this.Write("\r\n    /// </summary>\r\n");
-            
-            #line 59 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            
-            #line 60 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- if (field.IsDeprecated) { 
-            
-            #line default
-            #line hidden
-            this.Write("    [Obsolete(\"");
-            
-            #line 61 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.SafeDeprecationReason));
-            
-            #line default
-            #line hidden
-            this.Write("\")]\r\n");
-            
-            #line 62 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            this.Write("    [GraphQLMember(\"");
-            
-            #line 63 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
-            
-            #line default
-            #line hidden
-            this.Write("\")]\r\n    [JsonPropertyName(\"");
-            
-            #line 64 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
-            
-            #line default
-            #line hidden
-            this.Write("\")]\r\n    public ");
-            
-            #line 65 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetFieldCSharpName(field)));
-            
-            #line default
-            #line hidden
-            this.Write(" ");
-            
-            #line 65 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.CSharpName));
-            
-            #line default
-            #line hidden
-            this.Write(" { get; set; }\r\n\r\n");
-            
-            #line 67 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            
-            #line 68 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            
-            #line 69 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- if (classType.HasInterfaces) { 
-            
-            #line default
-            #line hidden
-            this.Write("    [GraphQLMember(\"__typename\")]\r\n    [JsonPropertyName(\"__typename\")]\r\n    publ" +
-                    "ic string __TypeName { get; set; }\r\n");
-            
-            #line 73 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            this.Write("}\r\n");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
-    public class ClassTemplateBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        public System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Linq2GraphQL.Generator/Templates/Class/InputClassTemplate.cs b/src/Linq2GraphQL.Generator/Templates/Class/InputClassTemplate.cs
deleted file mode 100644
index 75b687ba..00000000
--- a/src/Linq2GraphQL.Generator/Templates/Class/InputClassTemplate.cs
+++ /dev/null
@@ -1,418 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version: 17.0.0.0
-//  
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace Linq2GraphQL.Generator.Templates.Class
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputClassTemplate.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
-    public partial class InputClassTemplate : InputClassTemplateBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("using System;\r\nusing System.Collections.Generic;\r\nusing System.Text.Json.Serializ" +
-                    "ation;\r\nusing Linq2GraphQL.Client;\r\n\r\nnamespace ");
-            
-            #line 8 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(namespaceName));
-            
-            #line default
-            #line hidden
-            this.Write(";\r\n\r\n[JsonConverter(typeof(GraphInputConverter<");
-            
-            #line 10 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.Name));
-            
-            #line default
-            #line hidden
-            this.Write(">))]\r\npublic partial class ");
-            
-            #line 11 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.Name));
-            
-            #line default
-            #line hidden
-            this.Write(" : GraphInputBase\r\n{\r\n");
-            
-            #line 13 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputClassTemplate.tt"
-
-    foreach (var field in classType.AllFields)
-    {
-        var coreType = field.CoreType;
-
-            
-            #line default
-            #line hidden
-            
-            #line 18 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputClassTemplate.tt"
- if (field.IsDeprecated) { 
-            
-            #line default
-            #line hidden
-            this.Write("    [Obsolete(\"");
-            
-            #line 19 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.DeprecationReason));
-            
-            #line default
-            #line hidden
-            this.Write("\")]\r\n");
-            
-            #line 20 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputClassTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            this.Write("\t[GraphQLMember(\"");
-            
-            #line 21 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
-            
-            #line default
-            #line hidden
-            this.Write("\")]\r\n\t[JsonPropertyName(\"");
-            
-            #line 22 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
-            
-            #line default
-            #line hidden
-            this.Write("\")]\r\n\tpublic ");
-            
-            #line 23 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetPropertyDefinition(field)));
-            
-            #line default
-            #line hidden
-            this.Write(" ");
-            
-            #line 23 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.CSharpName));
-            
-            #line default
-            #line hidden
-            this.Write(" \r\n\t{\r\n\t\tget => GetValue<");
-            
-            #line 25 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(coreType.CSharpTypeDefinition));
-            
-            #line default
-            #line hidden
-            this.Write(">(\"");
-            
-            #line 25 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
-            
-            #line default
-            #line hidden
-            this.Write("\");\r\n    \tset => SetValue(\"");
-            
-            #line 26 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
-            
-            #line default
-            #line hidden
-            this.Write("\", value);\r\n\t}\r\n\r\n");
-            
-            #line 29 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputClassTemplate.tt"
-
-    }
-
-            
-            #line default
-            #line hidden
-            this.Write("}");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
-    public class InputClassTemplateBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        public System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Linq2GraphQL.Generator/Templates/Class/InputFactoryClassTemplate.cs b/src/Linq2GraphQL.Generator/Templates/Class/InputFactoryClassTemplate.cs
deleted file mode 100644
index 33ac1aad..00000000
--- a/src/Linq2GraphQL.Generator/Templates/Class/InputFactoryClassTemplate.cs
+++ /dev/null
@@ -1,510 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version: 17.0.0.0
-//  
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace Linq2GraphQL.Generator.Templates.Class
-{
-    using Linq2GraphQL.Client;
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
-    public partial class InputFactoryClassTemplate : InputFactoryClassTemplateBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("using System;\r\nusing System.Collections.Generic;\r\nusing System.Text.Json.Serializ" +
-                    "ation;\r\nusing Linq2GraphQL.Client;\r\n\r\nnamespace ");
-            
-            #line 9 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(namespaceName));
-            
-            #line default
-            #line hidden
-            this.Write(";\r\n\r\npublic static class IF \r\n{ \r\n");
-            
-            #line 13 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-
-    foreach (var field in inputs)
-    {
-
-            
-            #line default
-            #line hidden
-            this.Write("\tpublic static ");
-            
-            #line 17 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.CSharpName));
-            
-            #line default
-            #line hidden
-            this.Write(" ");
-            
-            #line 17 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.CSharpName.RemoveFromEnd("Input")));
-            
-            #line default
-            #line hidden
-            this.Write("() \r\n\t{\r\n\t\treturn new ");
-            
-            #line 19 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.CSharpName));
-            
-            #line default
-            #line hidden
-            this.Write("();\r\n\t}\r\n");
-            
-            #line 21 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-
-    }
-
-            
-            #line default
-            #line hidden
-            this.Write("}\r\n\r\n\r\n");
-            
-            #line 27 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-
-    foreach (var input in inputs.Where(x => x.AllFields.Any()))
-    {
-
-            
-            #line default
-            #line hidden
-            this.Write("\r\npublic static class ");
-            
-            #line 32 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(input.CSharpName));
-            
-            #line default
-            #line hidden
-            this.Write("Extensions\r\n{ \r\n\t");
-            
-            #line 34 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-
-        foreach (var field in input.AllFields)
-        {
-            var coreType = field.CoreType;
-
-            
-            #line default
-            #line hidden
-            
-            #line 39 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-
-            if (coreType.CSharpType.IsValueTypeOrString() || coreType.IsEnum)
-            {
-
-            
-            #line default
-            #line hidden
-            this.Write("\r\n");
-            if (field.IsDeprecated) {
-            this.Write("    [Obsolete(\"");
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.SafeDeprecationReason));
-            this.Write("\")]\r\n");
-            }
-            this.Write("    public static ");
-            
-            #line 44 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(input.CSharpName));
-            
-            #line default
-            #line hidden
-            this.Write(" ");
-            
-            #line 44 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.CSharpName));
-            
-            #line default
-            #line hidden
-            this.Write("(this ");
-            
-            #line 44 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(input.CSharpName));
-            
-            #line default
-            #line hidden
-            this.Write(" input, ");
-            
-            #line 44 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(coreType.CSharpTypeDefinition));
-            
-            #line default
-            #line hidden
-            this.Write(" val)\r\n    {\r\n         input.");
-            
-            #line 46 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.CSharpName));
-            
-            #line default
-            #line hidden
-            this.Write(" = val;\r\n         return input;\r\n    }\r\n\r\n");
-            
-            #line 50 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-
-            }
-            else
-            {
-
-            
-            #line default
-            #line hidden
-            if (field.IsDeprecated) {
-            this.Write("    [Obsolete(\"");
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.SafeDeprecationReason));
-            this.Write("\")]\r\n");
-            }
-            this.Write("    public static ");
-            
-            #line 55 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(input.CSharpName));
-            
-            #line default
-            #line hidden
-            this.Write(" ");
-            
-            #line 55 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.CSharpName));
-            
-            #line default
-            #line hidden
-            this.Write("(this ");
-            
-            #line 55 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(input.CSharpName));
-            
-            #line default
-            #line hidden
-            this.Write(" input, Action<");
-            
-            #line 55 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(coreType.CSharpTypeDefinition));
-            
-            #line default
-            #line hidden
-            this.Write("> mod)\r\n    {\r\n        var filter = new ");
-            
-            #line 57 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(coreType.CSharpTypeDefinitionNeverNull));
-            
-            #line default
-            #line hidden
-            this.Write("();\r\n        mod ??= _ => { };\r\n        mod(filter); \r\n        input.");
-            
-            #line 60 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.CSharpName));
-            
-            #line default
-            #line hidden
-            this.Write(" = filter;\r\n        return input;\r\n    }\r\n\r\n");
-            
-            #line 64 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-
-            }
-        }
-
-            
-            #line default
-            #line hidden
-            this.Write("}\r\n");
-            
-            #line 69 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Class\InputFactoryClassTemplate.tt"
-
-    }
-
-            
-            #line default
-            #line hidden
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
-    public class InputFactoryClassTemplateBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        public System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Linq2GraphQL.Generator/Templates/Client/ClientExtensionsTemplate.cs b/src/Linq2GraphQL.Generator/Templates/Client/ClientExtensionsTemplate.cs
deleted file mode 100644
index ca82de6c..00000000
--- a/src/Linq2GraphQL.Generator/Templates/Client/ClientExtensionsTemplate.cs
+++ /dev/null
@@ -1,387 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version: 17.0.0.0
-//  
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace Linq2GraphQL.Generator.Templates.Client
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
-    public partial class ClientExtensionsTemplate : ClientExtensionsTemplateBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("using Linq2GraphQL.Client;\r\nusing Microsoft.Extensions.DependencyInjection;\r\nusin" +
-                    "g Microsoft.Extensions.Options;\r\n\r\nnamespace ");
-            
-            #line 7 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(namespaceName));
-            
-            #line default
-            #line hidden
-            this.Write(";\r\n\r\npublic static class ");
-            
-            #line 9 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(clientName));
-            
-            #line default
-            #line hidden
-            this.Write("Extensions \r\n{\r\n    private const string ClientName = \"");
-            
-            #line 11 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(clientName));
-            
-            #line default
-            #line hidden
-            this.Write("\";\r\n        \r\n    public static IGraphClientBuilder<");
-            
-            #line 13 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(clientName));
-            
-            #line default
-            #line hidden
-            this.Write("> Add");
-            
-            #line 13 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(clientName));
-            
-            #line default
-            #line hidden
-            this.Write("(this IServiceCollection services)\r\n    {\r\n        var graphClientOptions = new G" +
-                    "raphClientOptions();\r\n        return GraphClientBuilder(services, graphClientOpt" +
-                    "ions);\r\n    }\r\n    \r\n    public static IGraphClientBuilder<");
-            
-            #line 19 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(clientName));
-            
-            #line default
-            #line hidden
-            this.Write("> Add");
-            
-            #line 19 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(clientName));
-            
-            #line default
-            #line hidden
-            this.Write(@"(this IServiceCollection services, Action<GraphClientOptions> opts)
-    {
-        var graphClientOptions = new GraphClientOptions();
-        opts(graphClientOptions);
-        
-        return GraphClientBuilder(services, graphClientOptions);
-    }
-
-    private static IGraphClientBuilder<");
-            
-            #line 27 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(clientName));
-            
-            #line default
-            #line hidden
-            this.Write(@"> GraphClientBuilder(IServiceCollection services,
-        GraphClientOptions graphClientOptions)
-    {
-        var opts = Options.Create(graphClientOptions);
-        services.AddKeyedSingleton(ClientName, opts);
-        services.AddMemoryCache();        
-        return new ClientBuilder<");
-            
-            #line 33 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(clientName));
-            
-            #line default
-            #line hidden
-            this.Write(">(ClientName, services);\r\n    }\r\n}");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
-    public class ClientExtensionsTemplateBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        public System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Linq2GraphQL.Generator/Templates/Client/ClientTemplate.cs b/src/Linq2GraphQL.Generator/Templates/Client/ClientTemplate.cs
deleted file mode 100644
index eeafeb24..00000000
--- a/src/Linq2GraphQL.Generator/Templates/Client/ClientTemplate.cs
+++ /dev/null
@@ -1,579 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version: 16.0.0.0
-//  
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace Linq2GraphQL.Generator.Templates.Client
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class ClientTemplate : ClientTemplateBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("using Linq2GraphQL.Client;\r\nusing Microsoft.Extensions.DependencyInjection;\r\nusing Microsoft.Extensions.Options;\r\n\r\nnamespace ");
-            
-            #line 7 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(namespaceName));
-            
-            #line default
-            #line hidden
-            this.Write(";\r\n\r\n/// <summary>\r\n/// GraphQL client for ");
-            
-            #line 10 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(name));
-            
-            #line default
-            #line hidden
-            this.Write(" operations\r\n/// </summary>\r\n/// <remarks>\r\n/// Provides strongly-typed access to GraphQL queries, mutations, and subscriptions.\r\n/// Supports dependency injection for better testability and flexibility.\r\n/// </remarks>\r\npublic class ");
-            
-            #line 16 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(name));
-            
-            #line default
-            #line hidden
-            this.Write(" : I");
-            
-            #line 16 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(name));
-            
-            #line default
-            #line hidden
-            this.Write("\r\n{ \r\n    /// <summary>\r\n    /// Constructor with dependency injection support\r\n    /// </summary>\r\n    /// <param name=\"httpClient\">HTTP client for GraphQL requests</param>\r\n    /// <param name=\"options\">GraphQL client configuration options</param>\r\n    /// <param name=\"provider\">Service provider for dependency resolution</param>\r\n");
-            
-            #line 24 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- if (includeQuery) { 
-            
-            #line default
-            #line hidden
-            this.Write("    /// <param name=\"queryMethods\">Optional query methods implementation (uses default if null)</param>\r\n");
-            
-            #line 26 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            
-            #line 27 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- if (includeMutation) { 
-            
-            #line default
-            #line hidden
-            this.Write("    /// <param name=\"mutationMethods\">Optional mutation methods implementation (uses default if null)</param>\r\n");
-            
-            #line 29 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            
-            #line 30 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- if (includeSubscriptions) { 
-            
-            #line default
-            #line hidden
-            this.Write("    /// <param name=\"subscriptionMethods\">Optional subscription methods implementation (uses default if null)</param>\r\n");
-            
-            #line 32 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            this.Write("    public ");
-            
-            #line 33 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(name));
-            
-            #line default
-            #line hidden
-            this.Write("(\r\n        HttpClient httpClient, \r\n        [FromKeyedServices(\"");
-            
-            #line 35 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(name));
-            
-            #line default
-            #line hidden
-            this.Write("\")] IOptions<GraphClientOptions> options, \r\n        IServiceProvider provider");
-            
-            #line 36 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- if (includeQuery) { 
-            
-            #line default
-            #line hidden
-            this.Write(",\r\n        I");
-            
-            #line 37 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetParameterName(queryType)));
-            
-            #line default
-            #line hidden
-            this.Write(" queryMethods = null");
-            
-            #line 37 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            
-            #line 37 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- if (includeMutation) { 
-            
-            #line default
-            #line hidden
-            this.Write(",\r\n        I");
-            
-            #line 38 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetParameterName(mutationType)));
-            
-            #line default
-            #line hidden
-            this.Write(" mutationMethods = null");
-            
-            #line 38 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            
-            #line 38 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- if (includeSubscriptions) { 
-            
-            #line default
-            #line hidden
-            this.Write(",\r\n        I");
-            
-            #line 39 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetParameterName(subscriptionType)));
-            
-            #line default
-            #line hidden
-            this.Write(" subscriptionMethods = null");
-            
-            #line 39 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            this.Write(")\r\n    {\r\n        var client = new GraphClient(httpClient, options, provider, ");
-            
-            #line 41 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(includeDeprecated.ToString().ToLower()));
-            
-            #line default
-            #line hidden
-            this.Write(");\r\n");
-            
-            #line 42 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- if (includeQuery) { 
-            
-            #line default
-            #line hidden
-            this.Write("        Query = queryMethods ?? new ");
-            
-            #line 43 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeName(queryType)));
-            
-            #line default
-            #line hidden
-            this.Write("(client);\r\n");
-            
-            #line 44 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            
-            #line 45 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- if (includeMutation) { 
-            
-            #line default
-            #line hidden
-            this.Write("        Mutation = mutationMethods ?? new ");
-            
-            #line 46 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeName(mutationType)));
-            
-            #line default
-            #line hidden
-            this.Write("(client);\r\n");
-            
-            #line 47 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            
-            #line 48 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- if (includeSubscriptions) { 
-            
-            #line default
-            #line hidden
-            this.Write("        Subscription = subscriptionMethods ?? new ");
-            
-            #line 49 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeName(subscriptionType)));
-            
-            #line default
-            #line hidden
-            this.Write("(client);\r\n");
-            
-            #line 50 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            this.Write("    }\r\n\r\n");
-            
-            #line 53 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- if (includeQuery) { 
-            
-            #line default
-            #line hidden
-            this.Write("    /// <summary>\r\n    /// Gets the query methods for this GraphQL client\r\n    /// </summary>\r\n    public I");
-            
-            #line 57 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeName(queryType)));
-            
-            #line default
-            #line hidden
-            this.Write(" Query { get; private set; }\r\n");
-            
-            #line 58 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            
-            #line 59 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- if (includeMutation) { 
-            
-            #line default
-            #line hidden
-            this.Write("    /// <summary>\r\n    /// Gets the mutation methods for this GraphQL client\r\n    /// </summary>\r\n    public I");
-            
-            #line 63 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeName(mutationType)));
-            
-            #line default
-            #line hidden
-            this.Write(" Mutation { get; private set; }\r\n");
-            
-            #line 64 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            
-            #line 65 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- if (includeSubscriptions) { 
-            
-            #line default
-            #line hidden
-            this.Write("    /// <summary>\r\n    /// Gets the subscription methods for this GraphQL client\r\n    /// </summary>\r\n    public I");
-            
-            #line 69 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeName(subscriptionType)));
-            
-            #line default
-            #line hidden
-            this.Write(" Subscription { get; private set; }\r\n");
-            
-            #line 70 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            this.Write("}");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class ClientTemplateBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Linq2GraphQL.Generator/Templates/Client/IClientTemplate.cs b/src/Linq2GraphQL.Generator/Templates/Client/IClientTemplate.cs
deleted file mode 100644
index 8d36a766..00000000
--- a/src/Linq2GraphQL.Generator/Templates/Client/IClientTemplate.cs
+++ /dev/null
@@ -1,382 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version: 17.0.0.0
-//  
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace Linq2GraphQL.Generator.Templates.Client
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\IClientTemplate.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
-    public partial class IClientTemplate : IClientTemplateBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("using Linq2GraphQL.Client;\r\n\r\nnamespace ");
-            
-            #line 5 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\IClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(namespaceName));
-            
-            #line default
-            #line hidden
-            this.Write(";\r\n\r\npublic interface I");
-            
-            #line 7 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\IClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(name));
-            
-            #line default
-            #line hidden
-            this.Write("\r\n{\r\n");
-            
-            #line 9 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\IClientTemplate.tt"
- if (includeQuery) { 
-            
-            #line default
-            #line hidden
-            this.Write("    I");
-            
-            #line 10 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\IClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetMehodName(queryType)));
-            
-            #line default
-            #line hidden
-            this.Write(" Query { get; }\r\n");
-            
-            #line 11 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\IClientTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            
-            #line 12 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\IClientTemplate.tt"
- if (includeMutation) { 
-            
-            #line default
-            #line hidden
-            this.Write("    I");
-            
-            #line 13 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\IClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetMehodName(mutationType)));
-            
-            #line default
-            #line hidden
-            this.Write(" Mutation { get; }\r\n");
-            
-            #line 14 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\IClientTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            
-            #line 15 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\IClientTemplate.tt"
- if (includeSubscriptions) { 
-            
-            #line default
-            #line hidden
-            this.Write("    I");
-            
-            #line 16 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\IClientTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetMehodName(subscriptionType)));
-            
-            #line default
-            #line hidden
-            this.Write(" Subscription { get; }\r\n");
-            
-            #line 17 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Client\IClientTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            this.Write("}\r\n");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
-    public class IClientTemplateBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        public System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Linq2GraphQL.Generator/Templates/Enum/EnumTemplate.cs b/src/Linq2GraphQL.Generator/Templates/Enum/EnumTemplate.cs
deleted file mode 100644
index a9da04e0..00000000
--- a/src/Linq2GraphQL.Generator/Templates/Enum/EnumTemplate.cs
+++ /dev/null
@@ -1,396 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version: 17.0.0.0
-//  
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace Linq2GraphQL.Generator.Templates.Enum
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Enum\EnumTemplate.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
-    public partial class EnumTemplate : EnumTemplateBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("using Linq2GraphQL.Client;\r\nusing System.Runtime.Serialization;\r\nusing System.Tex" +
-                    "t.Json.Serialization;\r\n\r\nnamespace ");
-            
-            #line 7 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Enum\EnumTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(namespaceName));
-            
-            #line default
-            #line hidden
-            this.Write(";\r\n\r\n[JsonConverter(typeof(JsonStringEnumMemberConverter))]\r\npublic enum ");
-            
-            #line 10 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Enum\EnumTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(enumType.Name));
-            
-            #line default
-            #line hidden
-            this.Write("\r\n{\r\n");
-            
-            #line 12 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Enum\EnumTemplate.tt"
-
-    foreach (var enumValue in enumType.EnumValues)
-    {
-
-            
-            #line default
-            #line hidden
-            
-            #line 16 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Enum\EnumTemplate.tt"
- if (enumValue.IsDeprecated) { 
-            
-            #line default
-            #line hidden
-            this.Write("    [Obsolete(\"");
-            
-            #line 17 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Enum\EnumTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(enumValue.SafeDeprecationReason));
-            
-            #line default
-            #line hidden
-            this.Write("\")]\r\n");
-            
-            #line 18 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Enum\EnumTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            this.Write("    [EnumMember(Value = \"");
-            
-            #line 19 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Enum\EnumTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(enumValue.Name));
-            
-            #line default
-            #line hidden
-            this.Write("\")]\r\n    ");
-            
-            #line 20 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Enum\EnumTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(enumValue.GetCSharpName()));
-            
-            #line default
-            #line hidden
-            this.Write(",\r\n");
-            
-            #line 21 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Enum\EnumTemplate.tt"
-
-    }
-
-            
-            #line default
-            #line hidden
-            
-            #line 24 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Enum\EnumTemplate.tt"
-
-    if (enumGeneratorStrategy == EnumGeneratorStrategy.AddUnknownOption)
-    {
-
-            
-            #line default
-            #line hidden
-            this.Write("    /// <summary>\r\n    /// Unknown values are mapped to this member. \r\n    /// Ge" +
-                    "nerated via --es/-enum-strategy command line option upon generation. \r\n    /// D" +
-                    "on\'t set explicitly. \r\n    /// </summary>\r\n    [EnumMember(Value = \"\")]\r\n    __U" +
-                    "nknown\r\n");
-            
-            #line 35 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Enum\EnumTemplate.tt"
-
-    }
-
-            
-            #line default
-            #line hidden
-            this.Write("}");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
-    public class EnumTemplateBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        public System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Linq2GraphQL.Generator/Templates/Interface/InterfaceTemplate.cs b/src/Linq2GraphQL.Generator/Templates/Interface/InterfaceTemplate.cs
deleted file mode 100644
index a48126bc..00000000
--- a/src/Linq2GraphQL.Generator/Templates/Interface/InterfaceTemplate.cs
+++ /dev/null
@@ -1,638 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version: 18.0.0.0
-//  
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace Linq2GraphQL.Generator.Templates.Interface
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "18.0.0.0")]
-    public partial class InterfaceTemplate : InterfaceTemplateBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("using System;\r\nusing System.Text.Json;\r\nusing System.Text.Json.Nodes;\r\nusing Syst" +
-                    "em.Text.Json.Serialization;\r\nusing Linq2GraphQL.Client;\r\nusing Linq2GraphQL.Clie" +
-                    "nt.Converters;\r\n\r\nnamespace ");
-            
-            #line 10 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(namespaceName));
-            
-            #line default
-            #line hidden
-            this.Write(";\r\n\r\n/// <summary>\r\n/// Extension methods for ");
-            
-            #line 13 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.Name));
-            
-            #line default
-            #line hidden
-            this.Write(" interface type casting\r\n/// </summary>\r\npublic static class ");
-            
-            #line 15 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.Name));
-            
-            #line default
-            #line hidden
-            this.Write("Extensions\r\n{\r\n");
-            
-            #line 17 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-
-    foreach (var field in implementedBy)
-    {
-
-            
-            #line default
-            #line hidden
-            this.Write("    /// <summary>\r\n    /// Casts ");
-            
-            #line 22 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.Name));
-            
-            #line default
-            #line hidden
-            this.Write(" to ");
-            
-            #line 22 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field));
-            
-            #line default
-            #line hidden
-            this.Write(" if the runtime type matches\r\n    /// </summary>\r\n    /// <param name=\"value\">The" +
-                    " interface value to cast</param>\r\n    /// <returns>");
-            
-            #line 25 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field));
-            
-            #line default
-            #line hidden
-            this.Write(" instance or null if type doesn\'t match</returns>\r\n    [GraphQLMember(\"");
-            
-            #line 26 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field));
-            
-            #line default
-            #line hidden
-            this.Write("\", true)]\r\n    public static ");
-            
-            #line 27 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field));
-            
-            #line default
-            #line hidden
-            this.Write(" ");
-            
-            #line 27 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field));
-            
-            #line default
-            #line hidden
-            this.Write("(this ");
-            
-            #line 27 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.Name));
-            
-            #line default
-            #line hidden
-            this.Write(" value)\r\n    {\r\n        if (value.__TypeName == \"");
-            
-            #line 29 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field));
-            
-            #line default
-            #line hidden
-            this.Write("\")\r\n        {\r\n            return (");
-            
-            #line 31 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field));
-            
-            #line default
-            #line hidden
-            this.Write(")value;\r\n        }\r\n        return null;\r\n    }\r\n\r\n");
-            
-            #line 36 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-
-    }
-
-            
-            #line default
-            #line hidden
-            this.Write("}\r\n\r\n/// <summary>\r\n/// JSON converter for ");
-            
-            #line 42 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.Name));
-            
-            #line default
-            #line hidden
-            this.Write(" interface deserialization\r\n/// </summary>\r\ninternal class ");
-            
-            #line 44 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetInterfaceConverterName()));
-            
-            #line default
-            #line hidden
-            this.Write(" : InterfaceJsonConverter<");
-            
-            #line 44 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.Name));
-            
-            #line default
-            #line hidden
-            this.Write(@">
-{
-    /// <summary>
-    /// Deserializes JSON to the appropriate concrete type based on __typename
-    /// </summary>
-    /// <param name=""typeName"">The GraphQL type name from __typename field</param>
-    /// <param name=""json"">The JSON object to deserialize</param>
-    /// <returns>Deserialized instance of the appropriate concrete type</returns>
-    public override ");
-            
-            #line 52 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.Name));
-            
-            #line default
-            #line hidden
-            this.Write(" Deserialize(string typeName, JsonObject json) => typeName switch\r\n    {\r\n");
-            
-            #line 54 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-
-    foreach (var field in implementedBy)
-    {
-
-            
-            #line default
-            #line hidden
-            this.Write("        \"");
-            
-            #line 58 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field));
-            
-            #line default
-            #line hidden
-            this.Write("\" => json.Deserialize<");
-            
-            #line 58 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field));
-            
-            #line default
-            #line hidden
-            this.Write(">(),\r\n");
-            
-            #line 59 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-
-    }
-
-            
-            #line default
-            #line hidden
-            this.Write("        _ => json.Deserialize<");
-            
-            #line 62 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetInterfaceConcreteName()));
-            
-            #line default
-            #line hidden
-            this.Write(">()\r\n    };\r\n}\r\n\r\n/// <summary>\r\n/// GraphQL interface ");
-            
-            #line 67 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.Name));
-            
-            #line default
-            #line hidden
-            this.Write(" with all common fields\r\n/// </summary>\r\n[JsonConverter(typeof(");
-            
-            #line 69 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetInterfaceConverterName()));
-            
-            #line default
-            #line hidden
-            this.Write("))]\r\npublic interface ");
-            
-            #line 70 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.Name));
-            
-            #line default
-            #line hidden
-            this.Write(" ");
-            
-            #line 70 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.GetInterfacesString()));
-            
-            #line default
-            #line hidden
-            this.Write("\r\n{\r\n");
-            
-            #line 72 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-
-    foreach (var field in classType.AllFields)
-    {
-        var coreType = field.CoreType;
-
-            
-            #line default
-            #line hidden
-            this.Write("    /// <summary>\r\n    /// ");
-            
-            #line 78 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
-            
-            #line default
-            #line hidden
-            this.Write(" field from GraphQL schema\r\n    /// </summary>\r\n    [GraphQLMember(\"");
-            
-            #line 80 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
-            
-            #line default
-            #line hidden
-            this.Write("\")]\r\n    ");
-            
-            #line 81 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(coreType.CSharpTypeDefinition));
-            
-            #line default
-            #line hidden
-            this.Write(" ");
-            
-            #line 81 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.CSharpName));
-            
-            #line default
-            #line hidden
-            this.Write(" { get; set; }\r\n\r\n");
-            
-            #line 83 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-
-    }
-
-            
-            #line default
-            #line hidden
-            this.Write("    /// <summary>\r\n    /// GraphQL __typename field for runtime type resolution\r\n" +
-                    "    /// </summary>\r\n    [GraphQLMember(\"__typename\")]\r\n    string __TypeName { g" +
-                    "et; set; }\r\n}\r\n\r\n/// <summary>\r\n/// Concrete implementation of ");
-            
-            #line 94 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.Name));
-            
-            #line default
-            #line hidden
-            this.Write(" interface for fallback deserialization\r\n/// </summary>\r\ninternal class ");
-            
-            #line 96 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetInterfaceConcreteName()));
-            
-            #line default
-            #line hidden
-            this.Write(" : ");
-            
-            #line 96 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(classType.Name));
-            
-            #line default
-            #line hidden
-            this.Write("\r\n{\r\n");
-            
-            #line 98 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-
-    foreach (var field in classType.AllFields)
-    {
-        var coreType = field.CoreType;
-
-            
-            #line default
-            #line hidden
-            this.Write("    /// <summary>\r\n    /// ");
-            
-            #line 104 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
-            
-            #line default
-            #line hidden
-            this.Write(" field from GraphQL schema\r\n    /// </summary>\r\n    [GraphQLMember(\"");
-            
-            #line 106 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
-            
-            #line default
-            #line hidden
-            this.Write("\")]\r\n    public ");
-            
-            #line 107 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(coreType.CSharpTypeDefinition));
-            
-            #line default
-            #line hidden
-            this.Write(" ");
-            
-            #line 107 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.CSharpName));
-            
-            #line default
-            #line hidden
-            this.Write(" { get; set; }\r\n\r\n");
-            
-            #line 109 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
-
-    }
-
-            
-            #line default
-            #line hidden
-            this.Write("    /// <summary>\r\n    /// GraphQL __typename field for runtime type resolution\r\n" +
-                    "    /// </summary>\r\n    [GraphQLMember(\"__typename\")]\r\n    public string __TypeN" +
-                    "ame { get; set; }\r\n}");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "18.0.0.0")]
-    public class InterfaceTemplateBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        public System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Linq2GraphQL.Generator/Templates/Methods/IMethodsTemplate.cs b/src/Linq2GraphQL.Generator/Templates/Methods/IMethodsTemplate.cs
deleted file mode 100644
index 6fcf978d..00000000
--- a/src/Linq2GraphQL.Generator/Templates/Methods/IMethodsTemplate.cs
+++ /dev/null
@@ -1,428 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version: 17.0.0.0
-//  
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace Linq2GraphQL.Generator.Templates.Methods
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\IMethodsTemplate.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
-    public partial class IMethodsTemplate : IMethodsTemplateBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("using System;\r\nusing System.Collections.Generic;\r\nusing Linq2GraphQL.Client;\r\n");
-            
-            #line 6 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\IMethodsTemplate.tt"
- if (isSubscription) { 
-            
-            #line default
-            #line hidden
-            this.Write("using Linq2GraphQL.Client.Subscriptions;\r\n");
-            
-            #line 8 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\IMethodsTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            this.Write("\r\nnamespace ");
-            
-            #line 10 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\IMethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(namespaceName));
-            
-            #line default
-            #line hidden
-            this.Write(";\r\n\r\n/// <summary>\r\n/// Interface for ");
-            
-            #line 13 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\IMethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(ClassName));
-            
-            #line default
-            #line hidden
-            this.Write(" GraphQL operations\r\n/// </summary>\r\npublic interface I");
-            
-            #line 15 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\IMethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(ClassName));
-            
-            #line default
-            #line hidden
-            this.Write("\r\n{\r\n");
-            
-            #line 17 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\IMethodsTemplate.tt"
- foreach (var field in methodsType.AllFields) { 
-    var coreType = field.CoreType; 
-            
-            #line default
-            #line hidden
-            this.Write("    /// <summary>\r\n    /// Executes ");
-            
-            #line 20 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\IMethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
-            
-            #line default
-            #line hidden
-            this.Write(" GraphQL operation\r\n    /// </summary>\r\n");
-            
-            #line 22 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\IMethodsTemplate.tt"
- if (field.IsDeprecated) { 
-            
-            #line default
-            #line hidden
-            this.Write("    /// <remarks>\r\n    /// This operation is deprecated: ");
-            
-            #line 24 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\IMethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.DeprecationReason));
-            
-            #line default
-            #line hidden
-            this.Write("\r\n    /// </remarks>\r\n    [Obsolete(\"");
-            
-            #line 26 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\IMethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.DeprecationReason));
-            
-            #line default
-            #line hidden
-            this.Write("\")]\r\n");
-            
-            #line 27 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\IMethodsTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            this.Write("    /// <param name=\"");
-            
-            #line 28 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\IMethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.CSharpName.ToCamelCase()));
-            
-            #line default
-            #line hidden
-            this.Write("\">The operation parameters</param>\r\n    /// <returns>GraphQL query result of type" +
-                    " ");
-            
-            #line 29 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\IMethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetReturnTypeString(field)));
-            
-            #line default
-            #line hidden
-            this.Write("</returns>\r\n    ");
-            
-            #line 30 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\IMethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetReturnTypeString(field)));
-            
-            #line default
-            #line hidden
-            this.Write(" ");
-            
-            #line 30 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\IMethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.CSharpName));
-            
-            #line default
-            #line hidden
-            this.Write("(");
-            
-            #line 30 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\IMethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.GetArgString(false)));
-            
-            #line default
-            #line hidden
-            this.Write(");\r\n\r\n");
-            
-            #line 32 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\IMethodsTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            this.Write("}\r\n");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
-    public class IMethodsTemplateBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        public System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Linq2GraphQL.Generator/Templates/Methods/MethodsTemplate.cs b/src/Linq2GraphQL.Generator/Templates/Methods/MethodsTemplate.cs
deleted file mode 100644
index 0f0da9d7..00000000
--- a/src/Linq2GraphQL.Generator/Templates/Methods/MethodsTemplate.cs
+++ /dev/null
@@ -1,476 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version: 17.0.0.0
-//  
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace Linq2GraphQL.Generator.Templates.Methods
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
-    public partial class MethodsTemplate : MethodsTemplateBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("using System.Collections.Generic;\r\nusing System;\r\nusing Linq2GraphQL.Client;\r\n");
-            
-            #line 6 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-
-    if (isSubscription)
-    {
-
-            
-            #line default
-            #line hidden
-            this.Write("using Linq2GraphQL.Client.Subscriptions;\r\n");
-            
-            #line 11 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-
-    }
-
-            
-            #line default
-            #line hidden
-            this.Write("\r\nnamespace ");
-            
-            #line 15 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(namespaceName));
-            
-            #line default
-            #line hidden
-            this.Write(";\r\n\r\npublic class ");
-            
-            #line 17 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(ClassName));
-            
-            #line default
-            #line hidden
-            this.Write(" : I");
-            
-            #line 17 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(ClassName));
-            
-            #line default
-            #line hidden
-            this.Write("\r\n{\r\n    private readonly GraphClient client;\r\n\r\n    public ");
-            
-            #line 21 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(ClassName));
-            
-            #line default
-            #line hidden
-            this.Write("(GraphClient client)\r\n    {\r\n        this.client = client;\r\n    }\r\n\r\n    ");
-            
-            #line 26 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-
-    foreach (var field in methodsType.AllFields)
-    {
-        var coreType = field.CoreType;
-
-            
-            #line default
-            #line hidden
-            
-            #line 31 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
- if (field.IsDeprecated) { 
-            
-            #line default
-            #line hidden
-            this.Write("[Obsolete(\"");
-            
-            #line 32 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.DeprecationReason));
-            
-            #line default
-            #line hidden
-            this.Write("\")]\r\n    ");
-            
-            #line 33 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
- } 
-            
-            #line default
-            #line hidden
-            this.Write("public ");
-            
-            #line 34 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetReturnTypeString(field)));
-            
-            #line default
-            #line hidden
-            this.Write(" ");
-            
-            #line 34 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.CSharpName));
-            
-            #line default
-            #line hidden
-            this.Write("(");
-            
-            #line 34 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.GetArgString(false)));
-            
-            #line default
-            #line hidden
-            this.Write(")\r\n    {\r\n\t    var arguments = new List<ArgumentValue>\r\n        {\r\n    ");
-            
-            #line 38 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-
-        foreach (var arg in field.Args)
-        {
-
-            
-            #line default
-            #line hidden
-            this.Write("\t    new(\"");
-            
-            #line 42 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(arg.Name));
-            
-            #line default
-            #line hidden
-            this.Write("\",\"");
-            
-            #line 42 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(arg.CoreType.GraphQLTypeDefinition));
-            
-            #line default
-            #line hidden
-            this.Write("\", ");
-            
-            #line 42 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(arg.Name.ToCamelCase()));
-            
-            #line default
-            #line hidden
-            this.Write("),\r\n    ");
-            
-            #line 43 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-
-        }
-
-            
-            #line default
-            #line hidden
-            this.Write("    };\r\n\r\n        return ");
-            
-            #line 48 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetReturnBuilderString(field)));
-            
-            #line default
-            #line hidden
-            this.Write("(client,  \"");
-            
-            #line 48 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
-            
-            #line default
-            #line hidden
-            this.Write("\", ");
-            
-            #line 48 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(operationType));
-            
-            #line default
-            #line hidden
-            this.Write(", arguments); \r\n    }\r\n\r\n    ");
-            
-            #line 51 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Methods\MethodsTemplate.tt"
-
-    }
-
-            
-            #line default
-            #line hidden
-            this.Write("}\r\n");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
-    public class MethodsTemplateBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        public System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Linq2GraphQL.Generator/Templates/Scalars/ScalarTemplate.cs b/src/Linq2GraphQL.Generator/Templates/Scalars/ScalarTemplate.cs
deleted file mode 100644
index d47349c1..00000000
--- a/src/Linq2GraphQL.Generator/Templates/Scalars/ScalarTemplate.cs
+++ /dev/null
@@ -1,339 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version: 17.0.0.0
-//  
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace Linq2GraphQL.Generator.Templates.Scalars
-{
-    using System.Linq;
-    using System.Text;
-    using System.Collections.Generic;
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Scalars\ScalarTemplate.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
-    public partial class ScalarTemplate : ScalarTemplateBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("\r\nusing Linq2GraphQL.Client;\r\nusing System.Text.Json.Serialization;\r\n\r\nnamespace " +
-                    "");
-            
-            #line 10 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Scalars\ScalarTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(namespaceName));
-            
-            #line default
-            #line hidden
-            this.Write(";\r\n\r\n    /// <summary>\r\n    /// ");
-
-            #line 13 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Scalars\ScalarTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(scalarType.SummaryDescription ?? $"Represents the {scalarType.Name} scalar type"));
-
-            #line default
-            #line hidden
-            this.Write("\r\n    /// </summary>\r\n    [JsonConverter(typeof(CustomScalarConverter<");
-            
-            #line 15 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Scalars\ScalarTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(className));
-            
-            #line default
-            #line hidden
-            this.Write(">))]\r\n    public partial class ");
-            
-            #line 16 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Scalars\ScalarTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(className));
-            
-            #line default
-            #line hidden
-            this.Write(" : CustomScalar {}");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
-    public class ScalarTemplateBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        public System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Linq2GraphQL.Generator/Templates/Scalars/ScalarTemplate.tt b/src/Linq2GraphQL.Generator/Templates/Scalars/ScalarTemplate.tt
index d3d34702..b3f009e4 100644
--- a/src/Linq2GraphQL.Generator/Templates/Scalars/ScalarTemplate.tt
+++ b/src/Linq2GraphQL.Generator/Templates/Scalars/ScalarTemplate.tt
@@ -10,7 +10,7 @@ using System.Text.Json.Serialization;
 namespace <#= namespaceName #>;
 
     /// <summary>
-    /// <#= scalarType.SummaryDescription ?? $"Represents the {scalarType.ScalarTypeName} scalar type" #>
+    /// <#= scalarType.SummaryDescription ?? $"Represents the {scalarType.Name} scalar type" #>
     /// </summary>
     [JsonConverter(typeof(CustomScalarConverter<<#= className #>>))]
     public partial class <#= className #> : CustomScalar {}
\ No newline at end of file