diff --git a/.github/workflows/Pipeline.yml b/.github/workflows/Pipeline.yml
index 0ba07ce61..da7c32c64 100644
--- a/.github/workflows/Pipeline.yml
+++ b/.github/workflows/Pipeline.yml
@@ -9,12 +9,12 @@ on:
 jobs:
 
   Params:
-    uses: pyTooling/Actions/.github/workflows/Parameters.yml@dev
+    uses: pyTooling/Actions/.github/workflows/Parameters.yml@r1
     with:
       name: pyVHDLModel
 
   UnitTesting:
-    uses: pyTooling/Actions/.github/workflows/UnitTesting.yml@dev
+    uses: pyTooling/Actions/.github/workflows/UnitTesting.yml@r1
     needs:
       - Params
     with:
@@ -22,7 +22,7 @@ jobs:
       artifact: ${{ fromJson(needs.Params.outputs.artifact_names).unittesting_xml }}
 
   Coverage:
-    uses: pyTooling/Actions/.github/workflows/CoverageCollection.yml@dev
+    uses: pyTooling/Actions/.github/workflows/CoverageCollection.yml@r1
     needs:
       - Params
     with:
@@ -32,7 +32,7 @@ jobs:
       codacy_token: ${{ secrets.CODACY_PROJECT_TOKEN }}
 
   StaticTypeCheck:
-    uses: pyTooling/Actions/.github/workflows/StaticTypeCheck.yml@dev
+    uses: pyTooling/Actions/.github/workflows/StaticTypeCheck.yml@r1
     needs:
       - Params
     with:
@@ -42,12 +42,12 @@ jobs:
       html_artifact: ${{ fromJson(needs.Params.outputs.artifact_names).statictyping_html }}
 
   PublishTestResults:
-    uses: pyTooling/Actions/.github/workflows/PublishTestResults.yml@dev
+    uses: pyTooling/Actions/.github/workflows/PublishTestResults.yml@r1
     needs:
       - UnitTesting
 
   Package:
-    uses: pyTooling/Actions/.github/workflows/Package.yml@dev
+    uses: pyTooling/Actions/.github/workflows/Package.yml@r1
     needs:
       - Params
       - Coverage
@@ -56,7 +56,7 @@ jobs:
       artifact: ${{ fromJson(needs.Params.outputs.artifact_names).package_all }}
 
   Release:
-    uses: pyTooling/Actions/.github/workflows/Release.yml@dev
+    uses: pyTooling/Actions/.github/workflows/Release.yml@r1
     if: startsWith(github.ref, 'refs/tags')
     needs:
       - UnitTesting
@@ -65,7 +65,7 @@ jobs:
       - Package
 
   PublishOnPyPI:
-    uses: pyTooling/Actions/.github/workflows/PublishOnPyPI.yml@dev
+    uses: pyTooling/Actions/.github/workflows/PublishOnPyPI.yml@r1
     if: startsWith(github.ref, 'refs/tags')
     needs:
       - Params
@@ -129,7 +129,7 @@ jobs:
           python3 example.py
 
   BuildTheDocs:
-    uses: pyTooling/Actions/.github/workflows/BuildTheDocs.yml@dev
+    uses: pyTooling/Actions/.github/workflows/BuildTheDocs.yml@r1
     needs:
       - Params
       - VerifyDocs
@@ -137,7 +137,7 @@ jobs:
       artifact: ${{ fromJson(needs.Params.outputs.artifact_names).documentation_html }}
 
   PublishToGitHubPages:
-    uses: pyTooling/Actions/.github/workflows/PublishToGitHubPages.yml@dev
+    uses: pyTooling/Actions/.github/workflows/PublishToGitHubPages.yml@r1
     needs:
       - Params
       - BuildTheDocs
@@ -149,7 +149,7 @@ jobs:
       typing: ${{ fromJson(needs.Params.outputs.artifact_names).statictyping_html }}
 
   ArtifactCleanUp:
-    uses: pyTooling/Actions/.github/workflows/ArtifactCleanUp.yml@dev
+    uses: pyTooling/Actions/.github/workflows/ArtifactCleanUp.yml@r1
     needs:
       - Params
       - UnitTesting
diff --git a/.idea/pyVHDLModel.iml b/.idea/pyVHDLModel.iml
index 815ed973e..a48c3eee2 100644
--- a/.idea/pyVHDLModel.iml
+++ b/.idea/pyVHDLModel.iml
@@ -13,7 +13,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/bdist.win-amd64" />
       <excludeFolder url="file://$MODULE_DIR$/build/lib" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.11" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.12" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TestRunnerService">
diff --git a/doc/conf.py b/doc/conf.py
index bc75984df..9f75be6e7 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -223,8 +223,8 @@
 # Sphinx.Ext.ExtLinks
 # ==============================================================================
 extlinks = {
-	"ghissue": ('https://GitHub.com/vhdl/pyVHDLModel/issues/%s', 'issue #'),
-	"ghpull":  ('https://GitHub.com/vhdl/pyVHDLModel/pull/%s', 'pull request #'),
+	"ghissue": ('https://GitHub.com/vhdl/pyVHDLModel/issues/%s', 'issue #%s'),
+	"ghpull":  ('https://GitHub.com/vhdl/pyVHDLModel/pull/%s', 'pull request #%s'),
 	"ghsrc":   ('https://GitHub.com/vhdl/pyVHDLModel/blob/main/%s?ts=2', None),
 }
 
diff --git a/pyVHDLModel/Concurrent.py b/pyVHDLModel/Concurrent.py
index 3145b129b..fb53af15c 100644
--- a/pyVHDLModel/Concurrent.py
+++ b/pyVHDLModel/Concurrent.py
@@ -704,17 +704,16 @@ def LoopIndex(self) -> str:
 	def Range(self) -> Range:
 		return self._range
 
-	IterateInstantiations = ConcurrentStatementsMixin.IterateInstantiations
-
 	# IndexDeclaredItems = ConcurrentStatements.IndexDeclaredItems
 
 	def IndexStatement(self) -> None:
 		self.IndexStatements()
 
-	IndexStatements = ConcurrentStatementsMixin.IndexStatements
+	def IndexStatements(self) -> None:
+		super().IndexStatements()
 
-	# def IterateInstantiations(self) -> Generator[Instantiation, None, None]:
-	# 	return ConcurrentStatements.IterateInstantiations(self)
+	def IterateInstantiations(self) -> Generator[Instantiation, None, None]:
+		return ConcurrentStatementsMixin.IterateInstantiations(self)
 
 
 @export
diff --git a/pyproject.toml b/pyproject.toml
index e2906375e..a4388632a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,7 +2,7 @@
 requires = [
   "setuptools >= 68.0.0",
   "wheel >= 0.40.0",
-  "pyTooling >= 5.0.0"
+  "pyTooling ~= 6.0"
 ]
 build-backend = "setuptools.build_meta"
 
diff --git a/requirements.txt b/requirements.txt
index 013cc1f0e..3bea232d8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-pyTooling >= 5.0.0, <6.0
+pyTooling ~= 6.0