diff --git a/.gitignore b/.gitignore
index a374536a..1c6827be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,6 +106,7 @@ celerybeat.pid
 .venv
 env/
 venv/
+venv_*/
 ENV/
 env.bak/
 venv.bak/
diff --git a/LICENSE b/LICENSE
index 557a6647..c13cc5ee 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-MIT License Copyright (c) 2020 - 2021 sh-edraft.de
+MIT License Copyright (c) 2020 - 2022 sh-edraft.de
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/scripts/publish.sh b/scripts/publish.sh
index eabbcb9c..d46291b5 100755
--- a/scripts/publish.sh
+++ b/scripts/publish.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # activate venv
-source /home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_cpl/cpl-env/bin/activate
+source /home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_cpl/venv/bin/activate
 
 # CPL
 cd /home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_cpl/src/cpl_core
diff --git a/scripts/upload.sh b/scripts/upload.sh
index 8b0d0d73..19e38a46 100644
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
 
 if [ $1 == "-prod" ]; then
-  twine upload -r pip.sh-edraft.de dist/sh_cpl-cli/publish/setup/*
-  twine upload -r pip.sh-edraft.de dist/sh_cpl-core/publish/setup/*
-  twine upload -r pip.sh-edraft.de dist/sh_cpl-query/publish/setup/*
-elif [ $1 == "-prod" ]; then
-  twine upload -r pip-exp.sh-edraft.de dist/sh_cpl-cli/publish/setup/*
-  twine upload -r pip-exp.sh-edraft.de dist/sh_cpl-core/publish/setup/*
-  twine upload -r pip-.sh-edraft.de dist/sh_cpl-query/publish/setup/*
+  twine upload -r pip.sh-edraft.de dist/cpl-cli/publish/setup/*
+  twine upload -r pip.sh-edraft.de dist/cpl-core/publish/setup/*
+  twine upload -r pip.sh-edraft.de dist/cpl-query/publish/setup/*
+elif [ $1 == "-exp" ]; then
+  twine upload -r pip-exp.sh-edraft.de dist/cpl-cli/publish/setup/*
+  twine upload -r pip-exp.sh-edraft.de dist/cpl-core/publish/setup/*
+  twine upload -r pip-.sh-edraft.de dist/cpl-query/publish/setup/*
 
 else
-  twine upload -r pip-dev.sh-edraft.de dist/sh_cpl-cli/publish/setup/*
-  twine upload -r pip-dev.sh-edraft.de dist/sh_cpl-core/publish/setup/*
-  twine upload -r pip-dev.sh-edraft.de dist/sh_cpl-query/publish/setup/*
+  twine upload -r pip-dev.sh-edraft.de dist/cpl-cli/publish/setup/*
+  twine upload -r pip-dev.sh-edraft.de dist/cpl-core/publish/setup/*
+  twine upload -r pip-dev.sh-edraft.de dist/cpl-query/publish/setup/*
 fi
diff --git a/src/cpl_cli/__init__.py b/src/cpl_cli/__init__.py
index e072da59..283a11c1 100644
--- a/src/cpl_cli/__init__.py
+++ b/src/cpl_cli/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-cli sh-edraft Common Python library CLI
+cpl-cli sh-edraft Common Python library CLI
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Command Line Interface
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,8 +14,8 @@ sh-edraft Common Python library Command Line Interface
 __title__ = 'cpl_cli'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
@@ -29,4 +29,4 @@ from .main import main
 from .startup import Startup
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_cli/_templates/__init__.py b/src/cpl_cli/_templates/__init__.py
index a65016c8..8b1fd416 100644
--- a/src/cpl_cli/_templates/__init__.py
+++ b/src/cpl_cli/_templates/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-cli sh-edraft Common Python library CLI
+cpl-cli sh-edraft Common Python library CLI
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Command Line Interface
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
 __title__ = 'cpl_cli._templates'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_cli/_templates/build/__init__.py b/src/cpl_cli/_templates/build/__init__.py
index 2278d1bf..6e99f636 100644
--- a/src/cpl_cli/_templates/build/__init__.py
+++ b/src/cpl_cli/_templates/build/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-cli sh-edraft Common Python library CLI
+cpl-cli sh-edraft Common Python library CLI
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Command Line Interface
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
 __title__ = 'cpl_cli._templates.build'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_cli/_templates/generate/__init__.py b/src/cpl_cli/_templates/generate/__init__.py
index 316ac362..85c86198 100644
--- a/src/cpl_cli/_templates/generate/__init__.py
+++ b/src/cpl_cli/_templates/generate/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-cli sh-edraft Common Python library CLI
+cpl-cli sh-edraft Common Python library CLI
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Command Line Interface
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
 __title__ = 'cpl_cli._templates.generate'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_cli/_templates/new/__init__.py b/src/cpl_cli/_templates/new/__init__.py
index 61104b7c..89efbf46 100644
--- a/src/cpl_cli/_templates/new/__init__.py
+++ b/src/cpl_cli/_templates/new/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-cli sh-edraft Common Python library CLI
+cpl-cli sh-edraft Common Python library CLI
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Command Line Interface
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
 __title__ = 'cpl_cli._templates.new'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_cli/_templates/new/console/__init__.py b/src/cpl_cli/_templates/new/console/__init__.py
index 81d3f534..8f8455f7 100644
--- a/src/cpl_cli/_templates/new/console/__init__.py
+++ b/src/cpl_cli/_templates/new/console/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-cli sh-edraft Common Python library CLI
+cpl-cli sh-edraft Common Python library CLI
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Command Line Interface
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
 __title__ = 'cpl_cli._templates.new.console'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_cli/_templates/new/console/source/__init__.py b/src/cpl_cli/_templates/new/console/source/__init__.py
index e8ff1b99..3a71ce79 100644
--- a/src/cpl_cli/_templates/new/console/source/__init__.py
+++ b/src/cpl_cli/_templates/new/console/source/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-cli sh-edraft Common Python library CLI
+cpl-cli sh-edraft Common Python library CLI
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Command Line Interface
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
 __title__ = 'cpl_cli._templates.new.console.source'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_cli/_templates/new/console/source/name/__init__.py b/src/cpl_cli/_templates/new/console/source/name/__init__.py
index 78bdbb83..14611e2c 100644
--- a/src/cpl_cli/_templates/new/console/source/name/__init__.py
+++ b/src/cpl_cli/_templates/new/console/source/name/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-cli sh-edraft Common Python library CLI
+cpl-cli sh-edraft Common Python library CLI
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Command Line Interface
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
 __title__ = 'cpl_cli._templates.new.console.source.name'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_cli/_templates/new/console/source/tests/__init__.py b/src/cpl_cli/_templates/new/console/source/tests/__init__.py
index 7fa9ac7a..38d68d91 100644
--- a/src/cpl_cli/_templates/new/console/source/tests/__init__.py
+++ b/src/cpl_cli/_templates/new/console/source/tests/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-cli sh-edraft Common Python library CLI
+cpl-cli sh-edraft Common Python library CLI
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Command Line Interface
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
 __title__ = 'cpl_cli._templates.new.console.source.tests'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_cli/_templates/new/library/__init__.py b/src/cpl_cli/_templates/new/library/__init__.py
index 1e9a1690..c0ee86ea 100644
--- a/src/cpl_cli/_templates/new/library/__init__.py
+++ b/src/cpl_cli/_templates/new/library/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-cli sh-edraft Common Python library CLI
+cpl-cli sh-edraft Common Python library CLI
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Command Line Interface
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
 __title__ = 'cpl_cli._templates.new.library'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_cli/_templates/new/library/source/__init__.py b/src/cpl_cli/_templates/new/library/source/__init__.py
index b38b2238..8611f624 100644
--- a/src/cpl_cli/_templates/new/library/source/__init__.py
+++ b/src/cpl_cli/_templates/new/library/source/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-cli sh-edraft Common Python library CLI
+cpl-cli sh-edraft Common Python library CLI
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Command Line Interface
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
 __title__ = 'cpl_cli._templates.new.library.source'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_cli/_templates/new/library/source/name/__init__.py b/src/cpl_cli/_templates/new/library/source/name/__init__.py
index 9ef677f6..9b6f5be1 100644
--- a/src/cpl_cli/_templates/new/library/source/name/__init__.py
+++ b/src/cpl_cli/_templates/new/library/source/name/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-cli sh-edraft Common Python library CLI
+cpl-cli sh-edraft Common Python library CLI
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Command Line Interface
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
 __title__ = 'cpl_cli._templates.new.library.source.name'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_cli/_templates/new/library/source/tests/__init__.py b/src/cpl_cli/_templates/new/library/source/tests/__init__.py
index 7e6c0506..cd64ce74 100644
--- a/src/cpl_cli/_templates/new/library/source/tests/__init__.py
+++ b/src/cpl_cli/_templates/new/library/source/tests/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-cli sh-edraft Common Python library CLI
+cpl-cli sh-edraft Common Python library CLI
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Command Line Interface
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
 __title__ = 'cpl_cli._templates.new.library.source.tests'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_cli/_templates/publish/__init__.py b/src/cpl_cli/_templates/publish/__init__.py
index fbf939fd..c1dc353c 100644
--- a/src/cpl_cli/_templates/publish/__init__.py
+++ b/src/cpl_cli/_templates/publish/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-cli sh-edraft Common Python library CLI
+cpl-cli sh-edraft Common Python library CLI
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Command Line Interface
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
 __title__ = 'cpl_cli._templates.publish'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_cli/command/__init__.py b/src/cpl_cli/command/__init__.py
index 79668f0e..e993d293 100644
--- a/src/cpl_cli/command/__init__.py
+++ b/src/cpl_cli/command/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-cli sh-edraft Common Python library CLI
+cpl-cli sh-edraft Common Python library CLI
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Command Line Interface
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,8 +14,8 @@ sh-edraft Common Python library Command Line Interface
 __title__ = 'cpl_cli.command'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .publish_service import PublishService
 from .version_service import VersionService
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_cli/command/generate_service.py b/src/cpl_cli/command/generate_service.py
index 193ec029..65715d79 100644
--- a/src/cpl_cli/command/generate_service.py
+++ b/src/cpl_cli/command/generate_service.py
@@ -1,7 +1,6 @@
 import os
 import sys
 import textwrap
-from collections import Callable
 
 from cpl_core.configuration.configuration_abc import ConfigurationABC
 from cpl_core.console.foreground_color_enum import ForegroundColorEnum
@@ -108,7 +107,7 @@ class GenerateService(CommandABC):
             template.write(value)
             template.close()
 
-    def _generate(self, schematic: str, name: str, template: Callable[TemplateFileABC]):
+    def _generate(self, schematic: str, name: str, template: TemplateFileABC):
         """
         Generates files by given schematic, name and template
         :param schematic:
diff --git a/src/cpl_cli/command_model.py b/src/cpl_cli/command_model.py
index 5fabea2a..fd9542d4 100644
--- a/src/cpl_cli/command_model.py
+++ b/src/cpl_cli/command_model.py
@@ -1,11 +1,9 @@
-from collections import Callable
-
 from cpl_cli.command_abc import CommandABC
 
 
 class CommandModel:
 
-    def __init__(self, name: str, aliases: list[str], command: Callable[CommandABC], is_workspace_needed: bool,
+    def __init__(self, name: str, aliases: list[str], command: CommandABC, is_workspace_needed: bool,
                  is_project_needed: bool, change_cwd: bool):
         self._name = name
         self._aliases = aliases
@@ -23,7 +21,7 @@ class CommandModel:
         return self._aliases
 
     @property
-    def command(self) -> Callable[CommandABC]:
+    def command(self) -> CommandABC:
         return self._command
     
     @property
diff --git a/src/cpl_cli/configuration/__init__.py b/src/cpl_cli/configuration/__init__.py
index 9401ccaa..b170c452 100644
--- a/src/cpl_cli/configuration/__init__.py
+++ b/src/cpl_cli/configuration/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-cli sh-edraft Common Python library CLI
+cpl-cli sh-edraft Common Python library CLI
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Command Line Interface
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,8 +14,8 @@ sh-edraft Common Python library Command Line Interface
 __title__ = 'cpl_cli.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
@@ -30,4 +30,4 @@ from .workspace_settings import WorkspaceSettings
 from .workspace_settings_name_enum import WorkspaceSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_cli/cpl_cli.json b/src/cpl_cli/cpl_cli.json
index 065cdece..9694bc91 100644
--- a/src/cpl_cli/cpl_cli.json
+++ b/src/cpl_cli/cpl_cli.json
@@ -1,24 +1,24 @@
 {
   "ProjectSettings": {
-    "Name": "sh_cpl-cli",
+    "Name": "cpl-cli",
     "Version": {
-      "Major": "2021",
-      "Minor": "11",
-      "Micro": "0.post5"
+      "Major": "2022",
+      "Minor": "6",
+      "Micro": "1"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
     "Description": "sh-edraft Common Python library CLI",
     "LongDescription": "sh-edraft Common Python library Command Line Interface",
     "URL": "https://www.sh-edraft.de",
-    "CopyrightDate": "2020 - 2021",
+    "CopyrightDate": "2020 - 2022",
     "CopyrightName": "sh-edraft.de",
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "sh_cpl-core>=2021.11.0.post5"
+      "cpl-core>=2022.6.1"
     ],
-    "PythonVersion": ">=3.8",
+    "PythonVersion": ">=3.10",
     "PythonPath": {},
     "Classifiers": []
   },
diff --git a/src/cpl_cli/live_server/__init__.py b/src/cpl_cli/live_server/__init__.py
index 31fbe7af..199a7712 100644
--- a/src/cpl_cli/live_server/__init__.py
+++ b/src/cpl_cli/live_server/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-cli sh-edraft Common Python library CLI
+cpl-cli sh-edraft Common Python library CLI
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Command Line Interface
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
 __title__ = 'cpl_cli.live_server'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_cli/publish/__init__.py b/src/cpl_cli/publish/__init__.py
index 78f4e7a8..0b194ade 100644
--- a/src/cpl_cli/publish/__init__.py
+++ b/src/cpl_cli/publish/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-cli sh-edraft Common Python library CLI
+cpl-cli sh-edraft Common Python library CLI
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Command Line Interface
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,8 +14,8 @@ sh-edraft Common Python library Command Line Interface
 __title__ = 'cpl_cli.publish'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .publisher_abc import PublisherABC
 from .publisher_service import PublisherService
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_cli/source_creator/__init__.py b/src/cpl_cli/source_creator/__init__.py
index 7ea2d2aa..1f86e0c5 100644
--- a/src/cpl_cli/source_creator/__init__.py
+++ b/src/cpl_cli/source_creator/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-cli sh-edraft Common Python library CLI
+cpl-cli sh-edraft Common Python library CLI
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Command Line Interface
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ sh-edraft Common Python library Command Line Interface
 __title__ = 'cpl_cli.source_creator'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_core/__init__.py b/src/cpl_core/__init__.py
index 31dd9180..744a4252 100644
--- a/src/cpl_core/__init__.py
+++ b/src/cpl_core/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-core sh-edraft Common Python library
+cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ sh-edraft Common Python library
 __title__ = 'cpl_core'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_core/application/__init__.py b/src/cpl_core/application/__init__.py
index c63aa58e..cab819c0 100644
--- a/src/cpl_core/application/__init__.py
+++ b/src/cpl_core/application/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-core sh-edraft Common Python library
+cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,8 +14,8 @@ sh-edraft Common Python library
 __title__ = 'cpl_core.application'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .application_builder_abc import ApplicationBuilderABC
 from .startup_abc import StartupABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl_core/configuration/__init__.py
index 1a134d76..0af264af 100644
--- a/src/cpl_core/configuration/__init__.py
+++ b/src/cpl_core/configuration/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-core sh-edraft Common Python library
+cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,8 +14,8 @@ sh-edraft Common Python library
 __title__ = 'cpl_core.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .configuration_variable_name_enum import ConfigurationVariableNameEnum
 from .console_argument import ConsoleArgument
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_core/configuration/configuration.py b/src/cpl_core/configuration/configuration.py
index 6844bf26..e11b5771 100644
--- a/src/cpl_core/configuration/configuration.py
+++ b/src/cpl_core/configuration/configuration.py
@@ -1,7 +1,7 @@
 import json
 import os
 import sys
-from collections import Callable
+from collections.abc import Callable
 from typing import Union, Type, Optional
 
 from cpl_core.configuration.configuration_abc import ConfigurationABC
@@ -379,7 +379,7 @@ class Configuration(ConfigurationABC):
         self._config[key_type] = value
 
     def get_configuration(self, search_type: Union[str, Type[ConfigurationModelABC]]) -> \
-            Union[str, Callable[ConfigurationModelABC]]:
+            Union[str, ConfigurationModelABC]:
         if type(search_type) is str:
             if search_type == ConfigurationVariableNameEnum.environment.value:
                 return self._application_environment.environment_name
diff --git a/src/cpl_core/configuration/configuration_abc.py b/src/cpl_core/configuration/configuration_abc.py
index 3d332f65..a2961cda 100644
--- a/src/cpl_core/configuration/configuration_abc.py
+++ b/src/cpl_core/configuration/configuration_abc.py
@@ -1,5 +1,5 @@
 from abc import abstractmethod, ABC
-from collections import Callable
+from collections.abc import Callable
 from typing import Type, Union, Optional
 
 from cpl_core.configuration.console_argument import ConsoleArgument
@@ -94,7 +94,7 @@ class ConfigurationABC(ABC):
         pass
 
     @abstractmethod
-    def get_configuration(self, search_type: Union[str, Type[ConfigurationModelABC]]) -> Union[str, Callable[ConfigurationModelABC]]:
+    def get_configuration(self, search_type: Union[str, Type[ConfigurationModelABC]]) -> Union[str, ConfigurationModelABC]:
         r"""Returns value from configuration by given type
 
         Parameter
@@ -104,6 +104,6 @@ class ConfigurationABC(ABC):
 
         Returns
         -------
-            Object of Union[:class:`str`, Callable[:class:`cpl_core.configuration.configuration_model_abc.ConfigurationModelABC`]]
+            Object of Union[:class:`str`, :class:`cpl_core.configuration.configuration_model_abc.ConfigurationModelABC`]
         """
         pass
diff --git a/src/cpl_core/console/__init__.py b/src/cpl_core/console/__init__.py
index 7af89e69..f5ca0e3c 100644
--- a/src/cpl_core/console/__init__.py
+++ b/src/cpl_core/console/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-core sh-edraft Common Python library
+cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,8 +14,8 @@ sh-edraft Common Python library
 __title__ = 'cpl_core.console'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .foreground_color_enum import ForegroundColorEnum
 from .spinner_thread import SpinnerThread
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_core/console/console.py b/src/cpl_core/console/console.py
index a0b0463d..f7a06291 100644
--- a/src/cpl_core/console/console.py
+++ b/src/cpl_core/console/console.py
@@ -1,7 +1,7 @@
 import os
 import sys
 import time
-from collections import Callable
+from collections.abc import Callable
 from typing import Union, Optional
 
 from art import text2art
diff --git a/src/cpl_core/console/console_call.py b/src/cpl_core/console/console_call.py
index 7680a880..950f6c64 100644
--- a/src/cpl_core/console/console_call.py
+++ b/src/cpl_core/console/console_call.py
@@ -1,4 +1,4 @@
-from collections import Callable
+from collections.abc import Callable
 
 
 class ConsoleCall:
diff --git a/src/cpl_core/cpl_core.json b/src/cpl_core/cpl_core.json
index b64852d1..aaff74a4 100644
--- a/src/cpl_core/cpl_core.json
+++ b/src/cpl_core/cpl_core.json
@@ -1,34 +1,34 @@
 {
   "ProjectSettings": {
-    "Name": "sh_cpl-core",
+    "Name": "cpl-core",
     "Version": {
-      "Major": "2021",
-      "Minor": "11",
-      "Micro": "0.post5"
+      "Major": "2022",
+      "Minor": "6",
+      "Micro": "1"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
     "Description": "sh-edraft Common Python library",
     "LongDescription": "sh-edraft Common Python library",
     "URL": "https://www.sh-edraft.de",
-    "CopyrightDate": "2020 - 2021",
+    "CopyrightDate": "2020 - 2022",
     "CopyrightName": "sh-edraft.de",
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "art==5.4",
+      "art==5.6",
       "colorama==0.4.4",
       "mysql-connector==2.2.9",
       "psutil==5.9.0",
       "packaging==21.3",
       "pynput==1.7.6",
-      "setuptools==60.5.0",
+      "setuptools==62.1.0",
       "tabulate==0.8.9",
       "termcolor==1.1.0",
-      "watchdog==2.1.6",
+      "watchdog==2.1.7",
       "wheel==0.37.1"
     ],
-    "PythonVersion": ">=3.8",
+    "PythonVersion": ">=3.10",
     "PythonPath": {},
     "Classifiers": []
   },
diff --git a/src/cpl_core/database/__init__.py b/src/cpl_core/database/__init__.py
index 87079739..e09cd083 100644
--- a/src/cpl_core/database/__init__.py
+++ b/src/cpl_core/database/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-core sh-edraft Common Python library
+cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,8 +14,8 @@ sh-edraft Common Python library
 __title__ = 'cpl_core.database'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .database_settings import DatabaseSettings
 from .table_abc import TableABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl_core/database/connection/__init__.py
index 58d6389f..7bef8077 100644
--- a/src/cpl_core/database/connection/__init__.py
+++ b/src/cpl_core/database/connection/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-core sh-edraft Common Python library
+cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,8 +14,8 @@ sh-edraft Common Python library
 __title__ = 'cpl_core.database.connection'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .database_connection import DatabaseConnection
 from .database_connection_abc import DatabaseConnectionABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl_core/database/context/__init__.py
index baa6509b..eab72301 100644
--- a/src/cpl_core/database/context/__init__.py
+++ b/src/cpl_core/database/context/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-core sh-edraft Common Python library
+cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,8 +14,8 @@ sh-edraft Common Python library
 __title__ = 'cpl_core.database.context'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .database_context import DatabaseContext
 from .database_context_abc import DatabaseContextABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl_core/dependency_injection/__init__.py
index 918cd14e..3a9c61f0 100644
--- a/src/cpl_core/dependency_injection/__init__.py
+++ b/src/cpl_core/dependency_injection/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-core sh-edraft Common Python library
+cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,8 +14,8 @@ sh-edraft Common Python library
 __title__ = 'cpl_core.dependency_injection'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .service_provider import ServiceProvider
 from .service_provider_abc import ServiceProviderABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_core/dependency_injection/service_collection_abc.py b/src/cpl_core/dependency_injection/service_collection_abc.py
index 7dcc5df5..2f69691a 100644
--- a/src/cpl_core/dependency_injection/service_collection_abc.py
+++ b/src/cpl_core/dependency_injection/service_collection_abc.py
@@ -1,5 +1,5 @@
 from abc import abstractmethod, ABC
-from collections import Callable
+from collections.abc import Callable
 from typing import Type
 
 from cpl_core.database.database_settings import DatabaseSettings
diff --git a/src/cpl_core/dependency_injection/service_provider.py b/src/cpl_core/dependency_injection/service_provider.py
index 04a19b57..a1535f98 100644
--- a/src/cpl_core/dependency_injection/service_provider.py
+++ b/src/cpl_core/dependency_injection/service_provider.py
@@ -1,4 +1,3 @@
-from collections import Callable
 import copy
 from inspect import signature, Parameter
 from typing import Optional
@@ -96,7 +95,7 @@ class ServiceProvider(ServiceProviderABC):
         sb = ScopeBuilder(ServiceProvider(copy.deepcopy(self._service_descriptors), self._configuration, self._database_context))
         return sb.build()
 
-    def get_service(self, service_type: type) -> Optional[Callable[object]]:
+    def get_service(self, service_type: type) -> Optional[object]:
         result = self._find_service(service_type)
 
         if result is None:
diff --git a/src/cpl_core/dependency_injection/service_provider_abc.py b/src/cpl_core/dependency_injection/service_provider_abc.py
index cc06e529..9ed6fd7f 100644
--- a/src/cpl_core/dependency_injection/service_provider_abc.py
+++ b/src/cpl_core/dependency_injection/service_provider_abc.py
@@ -1,5 +1,4 @@
 from abc import abstractmethod, ABC
-from collections import Callable
 from typing import Type, Optional
 
 from cpl_core.dependency_injection.scope_abc import ScopeABC
@@ -49,7 +48,7 @@ class ServiceProviderABC(ABC):
         pass
 
     @abstractmethod
-    def get_service(self, instance_type: Type) -> Optional[Callable[object]]:
+    def get_service(self, instance_type: Type) -> Optional[object]:
         r"""Returns instance of given type
 
         Parameter
diff --git a/src/cpl_core/environment/__init__.py b/src/cpl_core/environment/__init__.py
index 7a055818..737a7427 100644
--- a/src/cpl_core/environment/__init__.py
+++ b/src/cpl_core/environment/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-core sh-edraft Common Python library
+cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,8 +14,8 @@ sh-edraft Common Python library
 __title__ = 'cpl_core.environment'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .environment_name_enum import EnvironmentNameEnum
 from .application_environment import ApplicationEnvironment
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_core/logging/__init__.py b/src/cpl_core/logging/__init__.py
index 7f4a2ef6..a83095ee 100644
--- a/src/cpl_core/logging/__init__.py
+++ b/src/cpl_core/logging/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-core sh-edraft Common Python library
+cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,8 +14,8 @@ sh-edraft Common Python library
 __title__ = 'cpl_core.logging'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .logging_settings import LoggingSettings
 from .logging_settings_name_enum import LoggingSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl_core/mailing/__init__.py
index 9b828add..63847174 100644
--- a/src/cpl_core/mailing/__init__.py
+++ b/src/cpl_core/mailing/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-core sh-edraft Common Python library
+cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,8 +14,8 @@ sh-edraft Common Python library
 __title__ = 'cpl_core.mailing'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .email_client_settings import EMailClientSettings
 from .email_client_settings_name_enum import EMailClientSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_core/time/__init__.py b/src/cpl_core/time/__init__.py
index fc159217..793097bf 100644
--- a/src/cpl_core/time/__init__.py
+++ b/src/cpl_core/time/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-core sh-edraft Common Python library
+cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,8 +14,8 @@ sh-edraft Common Python library
 __title__ = 'cpl_core.time'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .time_format_settings import TimeFormatSettings
 from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_core/utils/__init__.py b/src/cpl_core/utils/__init__.py
index bae4be49..9ca3cc47 100644
--- a/src/cpl_core/utils/__init__.py
+++ b/src/cpl_core/utils/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-core sh-edraft Common Python library
+cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,8 +14,8 @@ sh-edraft Common Python library
 __title__ = 'cpl_core.utils'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post5'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .string import String
 from .pip import Pip
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post5')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_query/__init__.py b/src/cpl_query/__init__.py
index f35af1d7..a8a10c8c 100644
--- a/src/cpl_query/__init__.py
+++ b/src/cpl_query/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-query sh-edraft Common Python library Query
+cpl-query sh-edraft Common Python library Query
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Python integrated Queries
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ sh-edraft Common Python library Python integrated Queries
 __title__ = 'cpl_query'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post3'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
 # imports: 
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post3')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_query/_query/__init__.py b/src/cpl_query/_query/__init__.py
index 341c50f0..04bc20d1 100644
--- a/src/cpl_query/_query/__init__.py
+++ b/src/cpl_query/_query/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-query sh-edraft Common Python library Query
+cpl-query sh-edraft Common Python library Query
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Python integrated Queries
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,12 +14,12 @@ sh-edraft Common Python library Python integrated Queries
 __title__ = 'cpl_query._query'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post3'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post3')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_query/_query/all.py b/src/cpl_query/_query/all.py
index 76aa2fb0..de0571eb 100644
--- a/src/cpl_query/_query/all.py
+++ b/src/cpl_query/_query/all.py
@@ -1,4 +1,4 @@
-from collections import Callable
+from collections.abc import Callable
 
 from cpl_query._query.where import where_query
 from cpl_query.exceptions import ExceptionArgument, ArgumentNoneException
diff --git a/src/cpl_query/_query/any.py b/src/cpl_query/_query/any.py
index ab63c154..63a9bea5 100644
--- a/src/cpl_query/_query/any.py
+++ b/src/cpl_query/_query/any.py
@@ -1,4 +1,4 @@
-from collections import Callable
+from collections.abc import Callable
 
 from cpl_query._query.where import where_query
 from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument
diff --git a/src/cpl_query/_query/count.py b/src/cpl_query/_query/count.py
index a4a87096..94fab4a3 100644
--- a/src/cpl_query/_query/count.py
+++ b/src/cpl_query/_query/count.py
@@ -1,4 +1,4 @@
-from collections import Callable
+from collections.abc import Callable
 
 from cpl_query._query.where import where_query
 from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument
diff --git a/src/cpl_query/_query/distinct.py b/src/cpl_query/_query/distinct.py
index 791ef7c7..db28f9fb 100644
--- a/src/cpl_query/_query/distinct.py
+++ b/src/cpl_query/_query/distinct.py
@@ -1,4 +1,4 @@
-from collections import Callable
+from collections.abc import Callable
 
 from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument
 from cpl_query.extension.iterable_abc import IterableABC
diff --git a/src/cpl_query/_query/for_each.py b/src/cpl_query/_query/for_each.py
index 62411c4d..ca94a57a 100644
--- a/src/cpl_query/_query/for_each.py
+++ b/src/cpl_query/_query/for_each.py
@@ -1,4 +1,4 @@
-from collections import Callable
+from collections.abc import Callable
 
 from cpl_query.exceptions import ExceptionArgument, ArgumentNoneException
 from cpl_query.extension.iterable_abc import IterableABC
diff --git a/src/cpl_query/_query/max_min.py b/src/cpl_query/_query/max_min.py
index d9c2c6a5..88ab3db2 100644
--- a/src/cpl_query/_query/max_min.py
+++ b/src/cpl_query/_query/max_min.py
@@ -1,4 +1,4 @@
-from collections import Callable
+from collections.abc import Callable
 from typing import Union
 
 from cpl_query._helper import is_number
diff --git a/src/cpl_query/_query/order_by.py b/src/cpl_query/_query/order_by.py
index 11089ed9..9e418fc0 100644
--- a/src/cpl_query/_query/order_by.py
+++ b/src/cpl_query/_query/order_by.py
@@ -1,4 +1,4 @@
-from collections import Callable
+from collections.abc import Callable
 
 from cpl_query.exceptions import ExceptionArgument, ArgumentNoneException
 from cpl_query.extension.iterable_abc import IterableABC
diff --git a/src/cpl_query/_query/sum.py b/src/cpl_query/_query/sum.py
index f8829dad..3d1482bc 100644
--- a/src/cpl_query/_query/sum.py
+++ b/src/cpl_query/_query/sum.py
@@ -1,4 +1,4 @@
-from collections import Callable
+from collections.abc import Callable
 from typing import Union
 
 from cpl_query._helper import is_number
diff --git a/src/cpl_query/_query/where.py b/src/cpl_query/_query/where.py
index 81020f75..2890e90e 100644
--- a/src/cpl_query/_query/where.py
+++ b/src/cpl_query/_query/where.py
@@ -1,4 +1,4 @@
-from collections import Callable
+from collections.abc import Callable
 
 from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument
 from cpl_query.extension.iterable_abc import IterableABC
diff --git a/src/cpl_query/cpl_query.json b/src/cpl_query/cpl_query.json
index a8aa8239..c8f9fc1b 100644
--- a/src/cpl_query/cpl_query.json
+++ b/src/cpl_query/cpl_query.json
@@ -1,24 +1,24 @@
 {
   "ProjectSettings": {
-    "Name": "sh_cpl-query",
+    "Name": "cpl-query",
     "Version": {
-      "Major": "2021",
-      "Minor": "11",
-      "Micro": "0.post3"
+      "Major": "2022",
+      "Minor": "6",
+      "Micro": "1"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
     "Description": "sh-edraft Common Python library Query",
     "LongDescription": "sh-edraft Common Python library Python integrated Queries",
     "URL": "https://www.sh-edraft.de",
-    "CopyrightDate": "2020 - 2021",
+    "CopyrightDate": "2020 - 2022",
     "CopyrightName": "sh-edraft.de",
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "sh_cpl-core>=2021.11.0.post1"
+      "cpl-core>=2022.6.1"
     ],
-    "PythonVersion": ">=3.8",
+    "PythonVersion": ">=3.10",
     "PythonPath": {},
     "Classifiers": []
   },
diff --git a/src/cpl_query/extension/__init__.py b/src/cpl_query/extension/__init__.py
index ea93d326..ce0ee467 100644
--- a/src/cpl_query/extension/__init__.py
+++ b/src/cpl_query/extension/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl-query sh-edraft Common Python library Query
+cpl-query sh-edraft Common Python library Query
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library Python integrated Queries
 
-:copyright: (c) 2020 - 2021 sh-edraft.de
+:copyright: (c) 2020 - 2022 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
@@ -14,8 +14,8 @@ sh-edraft Common Python library Python integrated Queries
 __title__ = 'cpl_query.extension'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.11.0.post3'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6.1'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .ordered_iterable_abc import OrderedIterableABC
 from .ordered_iterable import OrderedIterable
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='11', micro='0.post3')
+version_info = VersionInfo(major='2022', minor='6', micro='1')
diff --git a/src/cpl_query/extension/ordered_iterable.py b/src/cpl_query/extension/ordered_iterable.py
index 11443ac0..3c374ead 100644
--- a/src/cpl_query/extension/ordered_iterable.py
+++ b/src/cpl_query/extension/ordered_iterable.py
@@ -1,4 +1,4 @@
-from collections import Callable
+from collections.abc import Callable
 
 from cpl_query._query.order_by import then_by_descending_query, then_by_query
 from cpl_query.extension.iterable import Iterable
diff --git a/src/cpl_query/extension/ordered_iterable_abc.py b/src/cpl_query/extension/ordered_iterable_abc.py
index 9a6c5bb1..bd10a917 100644
--- a/src/cpl_query/extension/ordered_iterable_abc.py
+++ b/src/cpl_query/extension/ordered_iterable_abc.py
@@ -1,5 +1,5 @@
 from abc import abstractmethod
-from collections import Callable
+from collections.abc import Callable
 
 from cpl_query.extension.iterable_abc import IterableABC