diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1d9be20..daf4af5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,6 @@ on:
       - "Package.swift"
       - "Source/**"
       - "Tests/**"
-
 jobs:
   SwiftLint:
     runs-on: ubuntu-latest
@@ -23,71 +22,54 @@ jobs:
         with:
           args: --strict
         env:
-          
           DIFF_BASE: ${{ github.base_ref }}
-          
-
-  
   macOS:
-    
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.runsOn }}
-    
     env:
-      
       DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}.app/Contents/Developer"
-      
     timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:
         include:
+          - xcode: "Xcode_16.0"
+            runsOn: macos-14
+            name: "macOS 14, Xcode 16.0, Swift 6.0"
+            testPlan: "macOS"
+          - xcode: "Xcode_15.4"
+            runsOn: macos-14
+            name: "macOS 14, Xcode 15.4, Swift 5.10"
+            testPlan: "macOS"
+          - xcode: "Xcode_15.2"
+            runsOn: macos-13
+            name: "macOS 14, Xcode 15.2, Swift 5.9.2"
+          - xcode: "Xcode_15.1"
+            runsOn: macOS-13
+            name: "macOS 14, Xcode 15.1, Swift 5.9.1"
+            testPlan: "macOS"
           - xcode: "Xcode_15.0"
             runsOn: macos-13
             name: "macOS 13, Xcode 15.0, Swift 5.9.0"
-          - xcode: "Xcode_14.3.1"
-            runsOn: macos-13
-            name: "macOS 13, Xcode 14.3.1, Swift 5.8.0"
-          - xcode: "Xcode_14.2"
-            runsOn: macOS-12
-            name: "macOS 12, Xcode 14.2, Swift 5.7.2"
-          - xcode: "Xcode_14.1"
-            runsOn: macOS-12
-            name: "macOS 12, Xcode 14.1, Swift 5.7.1"
     steps:
       - uses: actions/checkout@v3
-      
       - name: ${{ matrix.name }}
-        run: xcodebuild test -scheme "{{ cookiecutter.name }}" -destination "platform=macOS" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1
-      
+        run: xcodebuild test -scheme "BuilderMacroClient" -destination "platform=macOS" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3.1.0
         with:
-          
           token: ${{ secrets.CODECOV_TOKEN }}
-          
           xcode: true
-          
           xcode_archive_path: test_output/${{ matrix.name }}.xcresult
-          
       - uses: actions/upload-artifact@v4
         with:
-          
           name: ${{ matrix.name }}
-          
           path: test_output
-  
-
-  
   iOS:
-    
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.runsOn }}
-    
     env:
-      
       DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}.app/Contents/Developer"
-      
     timeout-minutes: 20
     strategy:
       fail-fast: false
@@ -103,28 +85,17 @@ jobs:
             runsOn: macos-13
     steps:
       - uses: actions/checkout@v3
-        
       - name: ${{ matrix.name }}
-        run: xcodebuild test -scheme "{{ cookiecutter.name }}" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1
-        
+        run: xcodebuild test -scheme "BuilderMacroClient" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1
       - uses: actions/upload-artifact@v4
         with:
-          
           name: ${{ matrix.name }}
           path: test_output
-          
-  
-
-  
   tvOS:
-    
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.runsOn }}
-    
     env:
-      
       DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}.app/Contents/Developer"
-      
     timeout-minutes: 20
     strategy:
       fail-fast: false
@@ -140,38 +111,23 @@ jobs:
             runsOn: macos-13
     steps:
       - uses: actions/checkout@v3
-      
       - name: ${{ matrix.name }}
-        run: xcodebuild test -scheme "{{ cookiecutter.name }}" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1
-      
+        run: xcodebuild test -scheme "BuilderMacroClient" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3.1.0
         with:
-          
           token: ${{ secrets.CODECOV_TOKEN }}
-          
           xcode: true
-          
           xcode_archive_path: test_output/${{ matrix.name }}.xcresult
-          
       - uses: actions/upload-artifact@v4
         with:
-          
           name: ${{ matrix.name }}
-          
           path: test_output
-  
-
-  
   watchOS:
-    
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.runsOn }}
-    
     env:
-      
       DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}.app/Contents/Developer"
-      
     timeout-minutes: 20
     strategy:
       fail-fast: false
@@ -191,37 +147,23 @@ jobs:
             runsOn: macos-13
     steps:
       - uses: actions/checkout@v3
-      
       - name: ${{ matrix.name }}
-        run: xcodebuild test -scheme "{{ cookiecutter.name }}" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1
-      
+        run: xcodebuild test -scheme "BuilderMacroClient" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3.1.0
         with:
-          
           token: ${{ secrets.CODECOV_TOKEN }}
-          
           xcode: true
-          
           xcode_archive_path: test_output/${{ matrix.name }}.xcresult
-          
       - uses: actions/upload-artifact@v4
         with:
-          
           name: ${{ matrix.name }}
-          
           path: test_output
-  
-
   spm:
-    
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.runsOn }}
-    
     env:
-      
       DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}.app/Contents/Developer"
-      
     timeout-minutes: 20
     strategy:
       fail-fast: false
@@ -235,9 +177,8 @@ jobs:
             runsOn: macos-13
     steps:
       - uses: actions/checkout@v3
-      
       - name: ${{ matrix.name }}
-        run: swift build -c release --target "{{ cookiecutter.name }}"
+        run: swift build -c release --target "BuilderMacro"
       
   merge-test-reports:
     needs: [iOS, macOS, watchOS, tvOS]
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/BuilderMacro-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/BuilderMacro-Package.xcscheme
new file mode 100644
index 0000000..d370188
--- /dev/null
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/BuilderMacro-Package.xcscheme
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BuilderMacro"
+               BuildableName = "BuilderMacro"
+               BlueprintName = "BuilderMacro"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BuilderMacroClient"
+               BuildableName = "BuilderMacroClient"
+               BlueprintName = "BuilderMacroClient"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BuilderMacroTests"
+               BuildableName = "BuilderMacroTests"
+               BlueprintName = "BuilderMacroTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BuilderMacroClient"
+            BuildableName = "BuilderMacroClient"
+            BlueprintName = "BuilderMacroClient"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BuilderMacroClient"
+            BuildableName = "BuilderMacroClient"
+            BlueprintName = "BuilderMacroClient"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/BuilderMacro.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/BuilderMacro.xcscheme
new file mode 100644
index 0000000..b1b7327
--- /dev/null
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/BuilderMacro.xcscheme
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BuilderMacro"
+               BuildableName = "BuilderMacro"
+               BlueprintName = "BuilderMacro"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BuilderMacro"
+            BuildableName = "BuilderMacro"
+            BlueprintName = "BuilderMacro"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/BuilderMacroClient.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/BuilderMacroClient.xcscheme
new file mode 100644
index 0000000..fc65e63
--- /dev/null
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/BuilderMacroClient.xcscheme
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BuilderMacroClient"
+               BuildableName = "BuilderMacroClient"
+               BlueprintName = "BuilderMacroClient"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BuilderMacroTests"
+               BuildableName = "BuilderMacroTests"
+               BlueprintName = "BuilderMacroTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BuilderMacroClient"
+            BuildableName = "BuilderMacroClient"
+            BlueprintName = "BuilderMacroClient"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BuilderMacroClient"
+            BuildableName = "BuilderMacroClient"
+            BlueprintName = "BuilderMacroClient"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>