diff --git a/.github/workflows/AutoBuild.yml b/.github/workflows/AutoBuild.yml
index e4d8960..7936026 100644
--- a/.github/workflows/AutoBuild.yml
+++ b/.github/workflows/AutoBuild.yml
@@ -1,4 +1,6 @@
 name: AutoBuild
+permissions:
+  contents: read
 
 on:
   push:
@@ -13,14 +15,14 @@ jobs:
     name: AutoBuild on ubuntu-latest
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v6.0.1
 
       - name: Pack release version
         run: dotnet pack --configuration Release
 
-      - uses: actions/setup-dotnet@v4.3.1
+      - uses: actions/setup-dotnet@v5.0.1
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '8.0.x'
           source-url: ${{ env.azure_artifacts_feed_url }}
         env:
           NUGET_AUTH_TOKEN: ${{ secrets.TASKS_TEST_FEED_API_KEY }}
diff --git a/.github/workflows/BuildMaster.yml b/.github/workflows/BuildMaster.yml
index 7bcaab7..775c1b1 100644
--- a/.github/workflows/BuildMaster.yml
+++ b/.github/workflows/BuildMaster.yml
@@ -1,4 +1,6 @@
 name: BuildMaster
+permissions:
+  contents: read
 
 on:
   push:
@@ -13,14 +15,14 @@ jobs:
     name: Build master on ubuntu-latest
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v6.0.1
 
       - name: Pack release version
         run: dotnet pack --configuration Release
 
-      - uses: actions/setup-dotnet@v4.3.1
+      - uses: actions/setup-dotnet@v5.0.1
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '8.0.x'
           source-url: ${{ env.azure_artifacts_feed_url }}
         env:
           NUGET_AUTH_TOKEN: ${{ secrets.TASKS_FEED_API_KEY }}
diff --git a/.gitignore b/.gitignore
index 8114573..3897215 100644
--- a/.gitignore
+++ b/.gitignore
@@ -467,3 +467,5 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
+# Rider idea files
+.idea/
diff --git a/Frends.Template/workflows/Execute_release.yml b/Frends.Template/.github/workflows/Execute_release.yml
similarity index 90%
rename from Frends.Template/workflows/Execute_release.yml
rename to Frends.Template/.github/workflows/Execute_release.yml
index 70dd6b7..7e14a12 100644
--- a/Frends.Template/workflows/Execute_release.yml
+++ b/Frends.Template/.github/workflows/Execute_release.yml
@@ -1,4 +1,6 @@
 name: Execute_release
+permissions:
+  contents: write
 
 on:
   workflow_dispatch:
diff --git a/Frends.Template/workflows/Execute_build_and_test_on_main.yml b/Frends.Template/.github/workflows/Execute_test_on_main.yml
similarity index 87%
rename from Frends.Template/workflows/Execute_build_and_test_on_main.yml
rename to Frends.Template/.github/workflows/Execute_test_on_main.yml
index a661c08..1609f17 100644
--- a/Frends.Template/workflows/Execute_build_and_test_on_main.yml
+++ b/Frends.Template/.github/workflows/Execute_test_on_main.yml
@@ -1,4 +1,6 @@
-name: Execute_build_main
+name: Execute_test_on_main
+permissions:
+  contents: read
 
 on:
   push:
diff --git a/Frends.Template/workflows/Execute_build_and_test_on_push.yml b/Frends.Template/.github/workflows/Execute_test_on_push.yml
similarity index 88%
rename from Frends.Template/workflows/Execute_build_and_test_on_push.yml
rename to Frends.Template/.github/workflows/Execute_test_on_push.yml
index 68ef71b..7315059 100644
--- a/Frends.Template/workflows/Execute_build_and_test_on_push.yml
+++ b/Frends.Template/.github/workflows/Execute_test_on_push.yml
@@ -1,4 +1,6 @@
-name: Execute_build_test
+name: Execute_test_on_push
+permissions:
+  contents: read
 
 on:
   push:
diff --git a/Frends.Template/.template.config/template.json b/Frends.Template/.template.config/template.json
index 85c11b5..e93bcda 100644
--- a/Frends.Template/.template.config/template.json
+++ b/Frends.Template/.template.config/template.json
@@ -5,38 +5,59 @@
     "Solution"
   ],
   "name": "Frends Task",
-  "identity": "FrendsTaskTemplate",
-  "shortName": "frendstasktemplate",
+  "identity": "FrendsTask",
+  "shortName": "frends-task",
   "tags": {
     "language": "C#",
     "type": "solution"
   },
   "sourceName": "Frends.Echo.Execute",
-  "preferNameDirectory": true,
   "symbols": {
+    "Description": {
+      "type": "parameter",
+      "datatype": "string",
+      "defaultValue": "Description of the Task",
+      "description": "Description of what the Task will do.",
+      "replaces": "TaskDescription"
+    },
     "FullTaskName": {
+      "isRequired": true,
       "type": "parameter",
       "datatype": "string",
       "defaultValue": "Frends.Echo.Execute",
-      "replaces": "Frends.Echo.Execute",
-      "description": "Full name in format: Frends.ClassName.MethodName"
+      "description": "Full name in format: Company.System.Action e.g. Frends.Xml.Write"
     },
-    "className": {
+    "name": {
+      "type": "generated",
+      "generator": "join",
+      "parameters": {
+        "symbols": [
+          {
+            "type": "ref",
+            "value": "FullTaskName"
+          }
+        ]
+      }
+    },
+    "CompanyName": {
       "type": "derived",
       "valueSource": "FullTaskName",
-      "valueTransform": "GetClassName",
-      "replaces": "Echo"
+      "valueTransform": "GetCompanyName",
+      "replaces": "Frends",
+      "FileRename": "Frends"
     },
-    "taskName": {
+    "ClassName": {
       "type": "derived",
       "valueSource": "FullTaskName",
-      "valueTransform": "GetMethodName",
-      "replaces": "Execute"
+      "valueTransform": "GetSystemName",
+      "replaces": "Echo",
+      "FileRename": "Echo"
     },
-    "workflows": {
+    "TaskName": {
       "type": "derived",
       "valueSource": "FullTaskName",
-      "valueTransform": "GetMethodName",
+      "valueTransform": "GetActionName",
+      "replaces": "Execute",
       "FileRename": "Execute"
     },
     "CurrentDate": {
@@ -57,117 +78,20 @@
     }
   },
   "forms": {
-    "GetClassName": {
+    "GetCompanyName": {
+      "identifier": "replace",
+      "pattern": "^([^.]+)\\.[^.]+\\.[^.]+$",
+      "replacement": "$1"
+    },
+    "GetSystemName": {
       "identifier": "replace",
       "pattern": "^.*\\.([^.]+)\\.[^.]+$",
       "replacement": "$1"
     },
-    "GetMethodName": {
+    "GetActionName": {
       "identifier": "replace",
       "pattern": "^.*\\.([^.]+)$",
       "replacement": "$1"
     }
-  },
-  "SpecialCustomOperations": {
-    "**/*.md": {
-      "operations": [
-        {
-          "type": "conditional",
-          "configuration": {
-            "if": [
-              "---#if"
-            ],
-            "else": [
-              "---#else"
-            ],
-            "elseif": [
-              "---#elseif",
-              "---#elif"
-            ],
-            "endif": [
-              "---#endif"
-            ],
-            "trim": "true",
-            "wholeLine": "true"
-          }
-        }
-      ]
-    },
-    "**/*.csproj": {
-      "operations": [
-        {
-          "type": "conditional",
-          "configuration": {
-            "actionableIf": [
-              "<!--#if"
-            ],
-            "actionableElse": [
-              "#else",
-              "<!--#else"
-            ],
-            "actionableElseif": [
-              "#elseif",
-              "<!--#elseif"
-            ],
-            "endif": [
-              "#endif",
-              "<!--#endif"
-            ],
-            "trim": "true",
-            "wholeLine": "true"
-          }
-        }
-      ]
-    }
-  },
-  "postActions": [
-    {
-      "condition": "(OS == \"Windows_NT\")",
-      "actionId": "3A7C4B45-1F5D-4A30-959A-51B88E82B5D2",
-      "args": {
-        "executable": "setup.cmd",
-        "args": "/Y",
-        "redirectStandardOutput": false,
-        "redirectStandardError": false
-      },
-      "manualInstructions": [
-        {
-          "text": "Run 'setup.cmd'"
-        }
-      ],
-      "continueOnError": false,
-      "description": "setups the project by calling setup.cmd"
-    },
-    {
-      "condition": "(OS != \"Windows_NT\")",
-      "description": "Make scripts executable",
-      "manualInstructions": [
-        {
-          "text": "Run 'chmod +x setup.sh'"
-        }
-      ],
-      "actionId": "cb9a6cf3-4f5c-4860-b9d2-03a574959774",
-      "args": {
-        "+x": "setup.sh"
-      },
-      "continueOnError": true
-    },
-    {
-      "condition": "(OS != \"Windows_NT\")",
-      "description": "setups the project by calling setup.sh",
-      "manualInstructions": [
-        {
-          "text": "Run 'bash ./setup.sh'"
-        }
-      ],
-      "actionId": "3A7C4B45-1F5D-4A30-959A-51B88E82B5D2",
-      "args": {
-        "+x": "setup.sh",
-        "executable": "setup.sh",
-        "redirectStandardOutput": false,
-        "redirectStandardError": false
-      },
-      "continueOnError": false
-    }
-  ]
-}
\ No newline at end of file
+  }
+}
diff --git a/Frends.Template/Apache-2.0 b/Frends.Template/Apache-2.0
deleted file mode 100644
index a20cf5a..0000000
--- a/Frends.Template/Apache-2.0
+++ /dev/null
@@ -1,93 +0,0 @@
-Apache License 2.0
-SPDX identifier
-Apache-2.0
-License text
-
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-    1. Definitions.
-
-        "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-        "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-        "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-        "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-        "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-        "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-        "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-        "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-        "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-        "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-    2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-    3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-    4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-        (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
-        (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
-        (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-        (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
-
-        You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-    5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-    6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-    7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-    8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-    9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-Standard License Header
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-Notes
-
-This license was released January 2004
-SPDX web page
-
-    https://spdx.org/licenses/Apache-2.0.html
-
-Notice
-
-This license content is provided by the SPDX project. For more information about licenses.nuget.org, see our documentation.
-
-Data pulled from spdx/license-list-data on February 9, 2023.
diff --git a/Frends.Template/Frends.Echo.Execute.Tests/Frends.Echo.Execute.Tests.csproj b/Frends.Template/Frends.Echo.Execute.Tests/Frends.Echo.Execute.Tests.csproj
deleted file mode 100644
index 8621dcb..0000000
--- a/Frends.Template/Frends.Echo.Execute.Tests/Frends.Echo.Execute.Tests.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-
-        <IsPackable>false</IsPackable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\Frends.Echo.Execute\Frends.Echo.Execute.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="6.0.4">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
-        <PackageReference Include="NUnit" Version="4.3.2" />
-        <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
-        <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-    </ItemGroup>
-
-</Project>
diff --git a/Frends.Template/Frends.Echo.Execute.Tests/GlobalSuppressions.cs b/Frends.Template/Frends.Echo.Execute.Tests/GlobalSuppressions.cs
deleted file mode 100644
index 8a31c19..0000000
--- a/Frends.Template/Frends.Echo.Execute.Tests/GlobalSuppressions.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-
-[assembly: SuppressMessage("StyleCop.CSharp.SpecialRules", "SA0001::XmlCommentAnalysisDisabled", Justification = "Following Frends documentation guidelines")]
-[assembly: SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1000:KeywordsMustBeSpacedCorrectly", Justification = "Incorrect for .NET 8.0")]
-[assembly: SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1010:OpeningSquareBracketsMustBeSpacedCorrectly", Justification = "Incorrect for .NET 8.0")]
-[assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1101:PrefixLocalCallsWithThis", Justification = "Following Frends documentation guidelines")]
-[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1200:UsingDirectivesMustBePlacedWithinNamespace", Justification = "Following Frends documentation guidelines")]
-[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1206:DeclarationKeywordsMustFollowOrder", Justification = "Incorrect for .NET 8.0")]
-[assembly: SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1503:BracesMustNotBeOmitted", Justification = "Following Frends documentation guidelines")]
-[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:ElementsMustBeDocumented", Justification = "Following Frends documentation guidelines")]
-[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1633:FileMustHaveHeader", Justification = "Following Frends documentation guidelines")]
\ No newline at end of file
diff --git a/Frends.Template/Frends.Echo.Execute/.gitignore b/Frends.Template/Frends.Echo.Execute/.gitignore
new file mode 100644
index 0000000..851b71d
--- /dev/null
+++ b/Frends.Template/Frends.Echo.Execute/.gitignore
@@ -0,0 +1,417 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+*.env
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+[Aa][Rr][Mm]64[Ee][Cc]/
+bld/
+[Oo]bj/
+[Oo]ut/
+[Ll]og/
+[Ll]ogs/
+
+# Build results on 'Bin' directories
+**/[Bb]in/*
+# Uncomment if you have tasks that rely on *.refresh files to move binaries
+# (https://github.com/github/gitignore/pull/3736)
+#!**/[Bb]in/*.refresh
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+*.trx
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Approval Tests result files
+*.received.*
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.idb
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+# but not Directory.Build.rsp, as it configures directory-level build defaults
+!Directory.Build.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.tlog
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio 6 auto-generated project file (contains which files were open etc.)
+*.vbp
+
+# Visual Studio 6 workspace and project file (working project files containing files to include in project)
+*.dsw
+*.dsp
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+**/.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+**/.fake/
+
+# CodeRush personal settings
+**/.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+**/__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+#tools/**
+#!tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+MSBuild_Logs/
+
+# AWS SAM Build and Temporary Artifacts folder
+.aws-sam
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+**/.mfractor/
+
+# Local History for Visual Studio
+**/.localhistory/
+
+# Visual Studio History (VSHistory) files
+.vshistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+**/.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+
+# VS Code files for those working on multiple tools
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+
+# Windows Installer files from build outputs
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Rider idea files
+.idea/
diff --git a/Frends.Template/CHANGELOG.md b/Frends.Template/Frends.Echo.Execute/CHANGELOG.md
similarity index 100%
rename from Frends.Template/CHANGELOG.md
rename to Frends.Template/Frends.Echo.Execute/CHANGELOG.md
diff --git a/Frends.Template/Frends.Echo.Execute.Tests/ErrorHandlerTest.cs b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute.Tests/ErrorHandlerTest.cs
similarity index 100%
rename from Frends.Template/Frends.Echo.Execute.Tests/ErrorHandlerTest.cs
rename to Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute.Tests/ErrorHandlerTest.cs
diff --git a/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute.Tests/Frends.Echo.Execute.Tests.csproj b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute.Tests/Frends.Echo.Execute.Tests.csproj
new file mode 100644
index 0000000..a7ea522
--- /dev/null
+++ b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute.Tests/Frends.Echo.Execute.Tests.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <IsPackable>false</IsPackable>
+        <Nullable>disable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Frends.Echo.Execute\Frends.Echo.Execute.csproj"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556"/>
+        <PackageReference Include="coverlet.collector" Version="6.*"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.*" />
+        <PackageReference Include="NUnit" Version="4.*"/>
+        <PackageReference Include="NUnit3TestAdapter" Version="6.*" />
+    </ItemGroup>
+</Project>
diff --git a/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute.Tests/GlobalSuppressions.cs b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute.Tests/GlobalSuppressions.cs
new file mode 100644
index 0000000..f05c0f6
--- /dev/null
+++ b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute.Tests/GlobalSuppressions.cs
@@ -0,0 +1,7 @@
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("StyleCop.CSharp.SpecialRules", "SA0001::XmlCommentAnalysisDisabled", Justification = "Following Frends documentation guidelines")]
+[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1200:UsingDirectivesMustBePlacedWithinNamespace", Justification = "Following Frends documentation guidelines")]
+[assembly: SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1503:BracesMustNotBeOmitted", Justification = "Following Frends documentation guidelines")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:ElementsMustBeDocumented", Justification = "Documentation checked by custom analyzers")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1633:FileMustHaveHeader", Justification = "Following Frends documentation guidelines")]
diff --git a/Frends.Template/Frends.Echo.Execute.Tests/UnitTests.cs b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute.Tests/UnitTests.cs
similarity index 100%
rename from Frends.Template/Frends.Echo.Execute.Tests/UnitTests.cs
rename to Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute.Tests/UnitTests.cs
diff --git a/Frends.Template/Frends.Echo.Execute.sln b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute.sln
similarity index 89%
rename from Frends.Template/Frends.Echo.Execute.sln
rename to Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute.sln
index 34d2f9f..b5a1a9f 100644
--- a/Frends.Template/Frends.Echo.Execute.sln
+++ b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute.sln
@@ -10,8 +10,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{78F7F22E-6E20-4BCE-8362-0C558568B729}"
 	ProjectSection(SolutionItems) = preProject
 		CHANGELOG.md = CHANGELOG.md
-		..\.github\workflows\Execute_build_and_test_on_main.yml = ..\.github\workflows\Execute_build_and_test_on_main.yml
-		..\.github\workflows\Execute_build_and_test_on_push.yml = ..\.github\workflows\Execute_build_and_test_on_push.yml
+		..\.github\workflows\Execute_test_on_main.yml = ..\.github\workflows\Execute_test_on_main.yml
+		..\.github\workflows\Execute_test_on_push.yml = ..\.github\workflows\Execute_test_on_push.yml
 		..\.github\workflows\Execute_release.yml = ..\.github\workflows\Execute_release.yml
 		README.md = README.md
 	EndProjectSection
diff --git a/Frends.Template/Frends.Echo.Execute/Definitions/Connection.cs b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Definitions/Connection.cs
similarity index 100%
rename from Frends.Template/Frends.Echo.Execute/Definitions/Connection.cs
rename to Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Definitions/Connection.cs
diff --git a/Frends.Template/Frends.Echo.Execute/Definitions/Error.cs b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Definitions/Error.cs
similarity index 100%
rename from Frends.Template/Frends.Echo.Execute/Definitions/Error.cs
rename to Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Definitions/Error.cs
diff --git a/Frends.Template/Frends.Echo.Execute/Definitions/Input.cs b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Definitions/Input.cs
similarity index 100%
rename from Frends.Template/Frends.Echo.Execute/Definitions/Input.cs
rename to Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Definitions/Input.cs
diff --git a/Frends.Template/Frends.Echo.Execute/Definitions/Options.cs b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Definitions/Options.cs
similarity index 96%
rename from Frends.Template/Frends.Echo.Execute/Definitions/Options.cs
rename to Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Definitions/Options.cs
index d912f10..58cfe92 100644
--- a/Frends.Template/Frends.Echo.Execute/Definitions/Options.cs
+++ b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Definitions/Options.cs
@@ -19,7 +19,7 @@ public class Options
     /// <summary>
     /// Whether to throw an error on failure.
     /// </summary>
-    /// <example>false</example>
+    /// <example>true</example>
     [DefaultValue(true)]
     public bool ThrowErrorOnFailure { get; set; } = true;
 
diff --git a/Frends.Template/Frends.Echo.Execute/Definitions/Result.cs b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Definitions/Result.cs
similarity index 99%
rename from Frends.Template/Frends.Echo.Execute/Definitions/Result.cs
rename to Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Definitions/Result.cs
index 9aeca65..6f047fc 100644
--- a/Frends.Template/Frends.Echo.Execute/Definitions/Result.cs
+++ b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Definitions/Result.cs
@@ -22,4 +22,4 @@ public class Result
     /// </summary>
     /// <example>object { string Message, Exception AdditionalInfo }</example>
     public Error Error { get; set; }
-}
\ No newline at end of file
+}
diff --git a/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute.cs b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Frends.Echo.Execute.cs
similarity index 96%
rename from Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute.cs
rename to Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Frends.Echo.Execute.cs
index 19b68ac..aff1ce9 100644
--- a/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute.cs
+++ b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Frends.Echo.Execute.cs
@@ -13,7 +13,7 @@ namespace Frends.Echo.Execute;
 public static class Echo
 {
     /// <summary>
-    /// Echoes the input string the specified number of times.
+    /// TaskDescription
     /// [Documentation](https://tasks.frends.com/tasks/frends-tasks/Frends-Echo-Execute)
     /// </summary>
     /// <param name="input">Essential parameters.</param>
diff --git a/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute.csproj b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Frends.Echo.Execute.csproj
similarity index 52%
rename from Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute.csproj
rename to Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Frends.Echo.Execute.csproj
index 03975b7..1e4d1f7 100644
--- a/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute.csproj
+++ b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Frends.Echo.Execute.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
         <LangVersion>latest</LangVersion>
@@ -11,41 +10,26 @@
         <PackageTags>Frends</PackageTags>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <Description>Description of the Task</Description>
+        <Description>TaskDescription</Description>
         <PackageProjectUrl>https://frends.com/</PackageProjectUrl>
         <RepositoryUrl>https://github.com/FrendsPlatform/Frends.Echo/tree/main/Frends.Echo.Execute</RepositoryUrl>
+        <Nullable>disable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
+        <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="FrendsTaskAnalyzers" Version="1.*">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-            <_Parameter1>$(MSBuildProjectName).Tests</_Parameter1>
-        </AssemblyAttribute>
     </ItemGroup>
 
     <ItemGroup>
-		<AdditionalFiles Include="FrendsTaskMetadata.json" Pack="true" PackagePath="/">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </AdditionalFiles>
+        <Content Include="migration.json" PackagePath="/" Pack="true"/>
+        <Content Include="../CHANGELOG.md" PackagePath="/" Pack="true"/>
+        <AdditionalFiles Include="FrendsTaskMetadata.json" PackagePath="/" Pack="true"/>
     </ItemGroup>
-	
-	<ItemGroup>
-		<Content Include="migration.json" PackagePath="/" Pack="true" />
-		<Content Include="../CHANGELOG.md" PackagePath="/" Pack="true" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="FrendsTaskAnalyzers" Version="*">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-	</ItemGroup>
-
 </Project>
diff --git a/Frends.Template/Frends.Echo.Execute/FrendsTaskMetadata.json b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/FrendsTaskMetadata.json
similarity index 100%
rename from Frends.Template/Frends.Echo.Execute/FrendsTaskMetadata.json
rename to Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/FrendsTaskMetadata.json
diff --git a/Frends.Template/Frends.Echo.Execute/GlobalSuppressions.cs b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/GlobalSuppressions.cs
similarity index 51%
rename from Frends.Template/Frends.Echo.Execute/GlobalSuppressions.cs
rename to Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/GlobalSuppressions.cs
index cf208b2..87e3388 100644
--- a/Frends.Template/Frends.Echo.Execute/GlobalSuppressions.cs
+++ b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/GlobalSuppressions.cs
@@ -1,12 +1,9 @@
 using System.Diagnostics.CodeAnalysis;
 
-[assembly: SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1000:KeywordsMustBeSpacedCorrectly", Justification = "Incorrect for .NET 8.0")]
-[assembly: SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1010:OpeningSquareBracketsMustBeSpacedCorrectly", Justification = "Incorrect for .NET 8.0")]
-[assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1101:PrefixLocalCallsWithThis", Justification = "Following Frends documentation guidelines")]
 [assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1200:UsingDirectivesMustBePlacedWithinNamespace", Justification = "Following Frends documentation guidelines")]
-[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1206:DeclarationKeywordsMustFollowOrder", Justification = "Incorrect for .NET 8.0")]
 [assembly: SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1503:BracesMustNotBeOmitted", Justification = "Following Frends documentation guidelines")]
-[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "Documentation checked by custom analyzers")]
-[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1623:PropertySummaryDocumentationMustMatchAccessors", Justification = "Following Frends documentation guidelines")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:ElementsMustBeDocumented", Justification = "Documentation checked by custom analyzers")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1623:PropertySummaryDocumentationMustMatchAccessors", Justification = "Following Frends Tasks guidelines")]
 [assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1629:DocumentationTextMustEndWithAPeriod", Justification = "Following Frends Tasks guidelines")]
-[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1633:FileMustHaveHeader", Justification = "Following Frends documentation guidelines")]
\ No newline at end of file
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1633:FileMustHaveHeader", Justification = "Following Frends documentation guidelines")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649:FileNameMustMatchTypeName", Justification = "Following Frends Tasks guidelines")]
diff --git a/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Helpers/ErrorHandler.cs b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Helpers/ErrorHandler.cs
new file mode 100644
index 0000000..9c5e89c
--- /dev/null
+++ b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/Helpers/ErrorHandler.cs
@@ -0,0 +1,24 @@
+using System;
+using Frends.Echo.Execute.Definitions;
+
+namespace Frends.Echo.Execute.Helpers;
+
+internal static class ErrorHandler
+{
+    internal static Result Handle(Exception exception, bool throwOnFailure, string errorMessageOnFailure)
+    {
+        if (throwOnFailure)
+        {
+            if (string.IsNullOrEmpty(errorMessageOnFailure))
+                throw new Exception(exception.Message, exception);
+
+            throw new Exception(errorMessageOnFailure, exception);
+        }
+
+        var errorMessage = !string.IsNullOrEmpty(errorMessageOnFailure)
+            ? $"{errorMessageOnFailure}: {exception.Message}"
+            : exception.Message;
+
+        return new Result { Success = false, Error = new Error { Message = errorMessage, AdditionalInfo = exception } };
+    }
+}
diff --git a/Frends.Template/Frends.Echo.Execute/migration.json b/Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/migration.json
similarity index 100%
rename from Frends.Template/Frends.Echo.Execute/migration.json
rename to Frends.Template/Frends.Echo.Execute/Frends.Echo.Execute/migration.json
diff --git a/Frends.Template/Frends.Echo.Execute/Helpers/ErrorHandler.cs b/Frends.Template/Frends.Echo.Execute/Helpers/ErrorHandler.cs
deleted file mode 100644
index d1487c9..0000000
--- a/Frends.Template/Frends.Echo.Execute/Helpers/ErrorHandler.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using Frends.Echo.Execute.Definitions;
-
-namespace Frends.Echo.Execute.Helpers;
-
-internal static class ErrorHandler
-{
-    internal static Result Handle(Exception exception, bool throwOnFailure, string errorMessageOnFailure)
-    {
-        if (throwOnFailure)
-        {
-            if (!string.IsNullOrEmpty(errorMessageOnFailure))
-            {
-                throw new Exception(errorMessageOnFailure, exception);
-            }
-
-            throw exception;
-        }
-
-        var errorMessage = string.IsNullOrEmpty(errorMessageOnFailure)
-            ? exception.Message
-            : $"{errorMessageOnFailure}: {exception.Message}";
-
-        var error = new Error
-        {
-            Message = errorMessage,
-            AdditionalInfo = exception,
-        };
-
-        return new Result { Success = false, Error = error };
-    }
-}
diff --git a/Frends.Template/LICENSE b/Frends.Template/Frends.Echo.Execute/LICENSE
similarity index 100%
rename from Frends.Template/LICENSE
rename to Frends.Template/Frends.Echo.Execute/LICENSE
diff --git a/Frends.Template/README.md b/Frends.Template/Frends.Echo.Execute/README.md
similarity index 60%
rename from Frends.Template/README.md
rename to Frends.Template/Frends.Echo.Execute/README.md
index cbdc2d0..7f32c35 100644
--- a/Frends.Template/README.md
+++ b/Frends.Template/Frends.Echo.Execute/README.md
@@ -1,8 +1,8 @@
 # Frends.Echo.Execute
 
-Description of what the Task will do.
+TaskDescription
 
-[![Execute_build](https://github.com/FrendsPlatform/Frends.Echo/actions/workflows/Execute_build_and_test_on_main.yml/badge.svg)](https://github.com/FrendsPlatform/Frends.Echo/actions/workflows/Execute_build_and_test_on_main.yml)
+[![Execute_build](https://github.com/FrendsPlatform/Frends.Echo/actions/workflows/Execute_test_on_main.yml/badge.svg)](https://github.com/FrendsPlatform/Frends.Echo/actions/workflows/Execute_test_on_main.yml)
 ![Coverage](https://app-github-custom-badges.azurewebsites.net/Badge?key=FrendsPlatform/Frends.Echo/Frends.Echo.Execute|main)
 [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT)
 
@@ -30,7 +30,5 @@ Run the tests
 
 `dotnet pack --configuration Release`
 
-### Third-party licenses
-
-StyleCop.Analyzer version (unmodified version 1.1.118) used to analyze code uses Apache-2.0 license, full text and
-source code can be found at https://github.com/DotNetAnalyzers/StyleCopAnalyzers
+### StyleCop.Analyzers Version
+This project uses StyleCop.Analyzers 1.2.0-beta.556, as recommended by the author, to get the latest fixes and improvements not available in the last stable release.
diff --git a/Frends.Template/setup.cmd b/Frends.Template/setup.cmd
deleted file mode 100644
index 07dc4d4..0000000
--- a/Frends.Template/setup.cmd
+++ /dev/null
@@ -1,17 +0,0 @@
-@echo off
-
-IF exist "../LICENSE" ( del "./LICENSE" && echo "../LICENSE" exists ) ELSE ( move "./LICENSE" ".." )
-
-IF exist "../.github/workflows" ( echo "../.github/workflows" exists ) ELSE ( mkdir "../.github/workflows" && echo "../.github/workflows" created)
-
-for /R "./workflows" %%f in (*) do (
-	move /Y "%%f" "../.github/workflows"
-)
-
-echo "workflow files moved."
-
-rmdir "./workflows"
-
-del "setup.sh"
-
-(goto) 2>nul & del "setup.cmd.bak" & del "%~f0"
diff --git a/Frends.Template/setup.sh b/Frends.Template/setup.sh
deleted file mode 100644
index cf2546a..0000000
--- a/Frends.Template/setup.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-dir="../.github/workflows"
-
-if [[ ! -f "../LICENSE" ]]; 
-then
-	mv "./LICENSE" "../LICENSE"
-else
-	rm "./LICENSE"
-fi
-
-if [[ ! -d $dir ]];
-then
-	mkdir -p $dir;
-fi
-
-cd "workflows"
-
-for filename in *; do
-	echo $filename
-	mv "$filename" "../../.github/workflows";
-done
-
-cd ..
-
-echo "workflow files moved."
-
-rmdir "workflows"
-
-rm "setup.cmd"
-
-rm setup.sh
diff --git a/FrendsTaskTemplate.csproj b/FrendsTaskTemplate.csproj
index 685dbe5..1c6019b 100644
--- a/FrendsTaskTemplate.csproj
+++ b/FrendsTaskTemplate.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <PackageType>Template</PackageType>
-        <PackageVersion>1.4.0</PackageVersion>
+        <PackageVersion>1.5.0</PackageVersion>
         <PackageId>frendstasktemplate</PackageId>
         <Title>Frends Task template</Title>
         <Authors>Frends</Authors>
@@ -14,12 +14,12 @@
         <IncludeContentInPack>true</IncludeContentInPack>
         <IncludeBuildOutput>false</IncludeBuildOutput>
         <ContentTargetFolders>content</ContentTargetFolders>
+        <NoDefaultExcludes>true</NoDefaultExcludes>
     </PropertyGroup>
 
     <ItemGroup>
         <Content Include="Frends.Template\**\*" Exclude="Frends.Template\**\bin\**;Frends.Template\**\obj\**" />
         <Compile Remove="**\*" />
-
         <None Include="README.md" Pack="true" PackagePath="\" />
     </ItemGroup>
 
diff --git a/README.md b/README.md
index 34c7f55..06ba4ad 100644
--- a/README.md
+++ b/README.md
@@ -34,38 +34,39 @@ You need to clone the repository for the new Task. After cloning, move to that f
 
 You can create a new Task by running the following command in the Task's repository folder.
 
-`dotnet new frendstasktemplate --FullTaskName Frends.ClassName.TaskName --allow-scripts yes`
+`dotnet new frends-task -F Frends.ClassName.MethodName -D "Description of the Task"`
 
 ## Get help using the template
 
-`dotnet new frendstasktemplate -h`
+`dotnet new frends-task -h`
 
-Example output:
+### Example output:
 
 ```
 Frends Task (C#)
 Author: Frends
 
 Usage:
-  dotnet new frendstasktemplate [options] [template options]
+  dotnet new frends-task [options] [template options]
 
 Options:
-  -n, --name <name>                The name for the output being created. If no name is specified, the name of the
-                                   output directory is used.
-  -o, --output <output>            Location to place the generated output.
-  --dry-run                        Displays a summary of what would happen if the given command line were run if it
-                                   would result in a template creation.
-  --force                          Forces content to be generated even if it would change existing files.
-  --no-update-check                Disables checking for the template package updates when instantiating a template.
-  --project <project>              The project that should be used for context evaluation.
-  -lang, --language <C#>           Specifies the template language to instantiate.
-  --type <solution>                Specifies the template type to instantiate.
-  --allow-scripts <No|Prompt|Yes>  Specifies if post action scripts should run. [default: Prompt]
+  -n, --name <name>       The name for the output being created. If no name is specified, the name of the output directory is used.
+  -o, --output <output>   Location to place the generated output.
+  --dry-run               Displays a summary of what would happen if the given command line were run if it would result in a template creation.
+  --force                 Forces content to be generated even if it would change existing files.
+  --no-update-check       Disables checking for the template package updates when instantiating a template.
+  --project <project>     The project that should be used for context evaluation.
+  -lang, --language <C#>  Specifies the template language to instantiate.
+  --type <solution>       Specifies the template type to instantiate.
 
 Template options:
-  --FullTaskName <FullTaskName>    Full name in format: Frends.ClassName.TaskName
-                                   Type: string
-                                   Default: Frends.Echo.Execute
+  -D, --Description <Description>    Description of what the Task will do.
+                                     Type: string
+                                     Default: Description of the Task
+  -F, --FullTaskName <FullTaskName>  Full name in format: Company.System.Action e.g. Frends.Xml.Write
+                                     Required: *true*
+                                     Type: string
+                                     Default: Frends.Echo.Execute
 ```
 
 ## Update the template