diff --git a/src/cpl_cli/.cpl/__init__.py b/src/cpl_cli/.cpl/__init__.py
index b89a974a..b6c6f5f8 100644
--- a/src/cpl_cli/.cpl/__init__.py
+++ b/src/cpl_cli/.cpl/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_cli"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_cli/__init__.py b/src/cpl_cli/__init__.py
index daff2148..d5bbcd37 100644
--- a/src/cpl_cli/__init__.py
+++ b/src/cpl_cli/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_cli"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .main import main
 from .startup import Startup
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_cli/_templates/__init__.py b/src/cpl_cli/_templates/__init__.py
index 7d78b8f1..b671d25b 100644
--- a/src/cpl_cli/_templates/__init__.py
+++ b/src/cpl_cli/_templates/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_cli._templates"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_cli/_templates/build/__init__.py b/src/cpl_cli/_templates/build/__init__.py
index 64f62b54..b0db4743 100644
--- a/src/cpl_cli/_templates/build/__init__.py
+++ b/src/cpl_cli/_templates/build/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_cli._templates.build"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_cli/_templates/publish/__init__.py b/src/cpl_cli/_templates/publish/__init__.py
index 4e2340d9..41a9788e 100644
--- a/src/cpl_cli/_templates/publish/__init__.py
+++ b/src/cpl_cli/_templates/publish/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_cli._templates.publish"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_cli/abc/__init__.py b/src/cpl_cli/abc/__init__.py
index 92f00d2f..6ff59c01 100644
--- a/src/cpl_cli/abc/__init__.py
+++ b/src/cpl_cli/abc/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_cli.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_cli/command/__init__.py b/src/cpl_cli/command/__init__.py
index 8a33ad19..eab08d85 100644
--- a/src/cpl_cli/command/__init__.py
+++ b/src/cpl_cli/command/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_cli.command"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -29,4 +29,4 @@ from .publish_service import PublishService
 from .version_service import VersionService
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_cli/command/update_service.py b/src/cpl_cli/command/update_service.py
index 607de0d3..290c51d6 100644
--- a/src/cpl_cli/command/update_service.py
+++ b/src/cpl_cli/command/update_service.py
@@ -154,6 +154,24 @@ class UpdateService(CommandABC):
             Console.write_line(f"\tUpdate with {Pip.get_executable()} -m pip install --upgrade <package>")
             Console.set_foreground_color(ForegroundColorEnum.default)
 
+    def _save_formatted_package_name_to_deps_collection(self, deps: [str], old_package: str, new_package: str):
+        if old_package not in deps:
+            return
+
+        initial_package = new_package
+
+        if "/" in new_package:
+            new_package = new_package.split("/")[0]
+
+        if "\r" in new_package:
+            new_package = new_package.replace("\r", "")
+
+        if new_package == old_package:
+            return
+
+        index = deps.index(old_package)
+        deps[index] = new_package
+
     def _project_json_update_dependency(self, old_package: str, new_package: str):
         """
         Writes new package version to project.json
@@ -164,15 +182,12 @@ class UpdateService(CommandABC):
         if self._is_simulation:
             return
 
-        if old_package in self._project_settings.dependencies:
-            index = self._project_settings.dependencies.index(old_package)
-            if "/" in new_package:
-                new_package = new_package.split("/")[0]
-
-            if "\r" in new_package:
-                new_package = new_package.replace("\r", "")
-
-            self._project_settings.dependencies[index] = new_package
+        self._save_formatted_package_name_to_deps_collection(
+            self._project_settings.dependencies, old_package, new_package
+        )
+        self._save_formatted_package_name_to_deps_collection(
+            self._project_settings.dev_dependencies, old_package, new_package
+        )
 
         config = {
             ProjectSettings.__name__: SettingsHelper.get_project_settings_dict(self._project_settings),
diff --git a/src/cpl_cli/configuration/__init__.py b/src/cpl_cli/configuration/__init__.py
index facabf20..86097d9c 100644
--- a/src/cpl_cli/configuration/__init__.py
+++ b/src/cpl_cli/configuration/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_cli.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -31,4 +31,4 @@ from .workspace_settings import WorkspaceSettings
 from .workspace_settings_name_enum import WorkspaceSettingsNameEnum
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_cli/cpl-cli.json b/src/cpl_cli/cpl-cli.json
index fedc4378..c3047753 100644
--- a/src/cpl_cli/cpl-cli.json
+++ b/src/cpl_cli/cpl-cli.json
@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2023",
       "Minor": "4",
-      "Micro": "0"
+      "Micro": "0.post3"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
diff --git a/src/cpl_cli/helper/__init__.py b/src/cpl_cli/helper/__init__.py
index 78ac4c3f..b62b948f 100644
--- a/src/cpl_cli/helper/__init__.py
+++ b/src/cpl_cli/helper/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_cli.helper"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_cli/live_server/__init__.py b/src/cpl_cli/live_server/__init__.py
index ed81df4a..d7b99eac 100644
--- a/src/cpl_cli/live_server/__init__.py
+++ b/src/cpl_cli/live_server/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_cli.live_server"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_cli/migrations/__init__.py b/src/cpl_cli/migrations/__init__.py
index f93b3ce8..e73ea308 100644
--- a/src/cpl_cli/migrations/__init__.py
+++ b/src/cpl_cli/migrations/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_cli.migrations"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_cli/migrations/base/__init__.py b/src/cpl_cli/migrations/base/__init__.py
index 98ed351b..ce731b48 100644
--- a/src/cpl_cli/migrations/base/__init__.py
+++ b/src/cpl_cli/migrations/base/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_cli.migrations.base"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_cli/migrations/service/__init__.py b/src/cpl_cli/migrations/service/__init__.py
index 7c0e2c76..5f1d228c 100644
--- a/src/cpl_cli/migrations/service/__init__.py
+++ b/src/cpl_cli/migrations/service/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_cli.migrations.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_cli/publish/__init__.py b/src/cpl_cli/publish/__init__.py
index e27216bb..65d31499 100644
--- a/src/cpl_cli/publish/__init__.py
+++ b/src/cpl_cli/publish/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_cli.publish"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .publisher_abc import PublisherABC
 from .publisher_service import PublisherService
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_cli/source_creator/__init__.py b/src/cpl_cli/source_creator/__init__.py
index 4a700c0c..e9f5393b 100644
--- a/src/cpl_cli/source_creator/__init__.py
+++ b/src/cpl_cli/source_creator/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_cli.source_creator"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_cli/validators/__init__.py b/src/cpl_cli/validators/__init__.py
index 0d420638..93f62649 100644
--- a/src/cpl_cli/validators/__init__.py
+++ b/src/cpl_cli/validators/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_cli.validators"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_core/__init__.py b/src/cpl_core/__init__.py
index 33f82aae..33ce0454 100644
--- a/src/cpl_core/__init__.py
+++ b/src/cpl_core/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_core"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post5"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
diff --git a/src/cpl_core/application/__init__.py b/src/cpl_core/application/__init__.py
index 3a87cd69..5fcf7174 100644
--- a/src/cpl_core/application/__init__.py
+++ b/src/cpl_core/application/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_core.application"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post5"
 
 from collections import namedtuple
 
@@ -29,4 +29,4 @@ from .startup_abc import StartupABC
 from .startup_extension_abc import StartupExtensionABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl_core/configuration/__init__.py
index 1c84582e..781834b2 100644
--- a/src/cpl_core/configuration/__init__.py
+++ b/src/cpl_core/configuration/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_core.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post5"
 
 from collections import namedtuple
 
@@ -35,4 +35,4 @@ from .validator_abc import ValidatorABC
 from .variable_argument import VariableArgument
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
diff --git a/src/cpl_core/configuration/configuration.py b/src/cpl_core/configuration/configuration.py
index aa3eab53..c3627cf5 100644
--- a/src/cpl_core/configuration/configuration.py
+++ b/src/cpl_core/configuration/configuration.py
@@ -278,21 +278,23 @@ class Configuration(ConfigurationABC):
         config_from_file = self._load_json_file(file_path, output)
         for sub in ConfigurationModelABC.__subclasses__():
             for key, value in config_from_file.items():
-                if sub.__name__ == key or sub.__name__.replace("Settings", "") == key:
-                    configuration = sub()
-                    from_dict = getattr(configuration, "from_dict", None)
+                if sub.__name__ != key and sub.__name__.replace("Settings", "") != key:
+                    continue
 
-                    if from_dict is not None and not hasattr(from_dict, "is_base_func"):
-                        Console.set_foreground_color(ForegroundColorEnum.yellow)
-                        Console.write_line(
-                            f"{sub.__name__}.from_dict is deprecated. Instead, set attributes as typed arguments in __init__. They can be None by default!"
-                        )
-                        Console.color_reset()
-                        configuration.from_dict(value)
-                    else:
-                        configuration = JSONProcessor.process(sub, value)
+                configuration = sub()
+                from_dict = getattr(configuration, "from_dict", None)
 
-                    self.add_configuration(sub, configuration)
+                if from_dict is not None and not hasattr(from_dict, "is_base_func"):
+                    Console.set_foreground_color(ForegroundColorEnum.yellow)
+                    Console.write_line(
+                        f"{sub.__name__}.from_dict is deprecated. Instead, set attributes as typed arguments in __init__. They can be None by default!"
+                    )
+                    Console.color_reset()
+                    configuration.from_dict(value)
+                else:
+                    configuration = JSONProcessor.process(sub, value)
+
+                self.add_configuration(sub, configuration)
 
     def add_configuration(self, key_type: Type[T], value: any):
         self._config[key_type] = value
diff --git a/src/cpl_core/console/__init__.py b/src/cpl_core/console/__init__.py
index 1f85043b..f6199039 100644
--- a/src/cpl_core/console/__init__.py
+++ b/src/cpl_core/console/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_core.console"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post5"
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .foreground_color_enum import ForegroundColorEnum
 from .spinner_thread import SpinnerThread
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
diff --git a/src/cpl_core/cpl-core.json b/src/cpl_core/cpl-core.json
index eccc2894..c0971a86 100644
--- a/src/cpl_core/cpl-core.json
+++ b/src/cpl_core/cpl-core.json
@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2023",
       "Minor": "4",
-      "Micro": "0.post1"
+      "Micro": "0.post5"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
diff --git a/src/cpl_core/database/__init__.py b/src/cpl_core/database/__init__.py
index 2ddbf2ce..5006ae8d 100644
--- a/src/cpl_core/database/__init__.py
+++ b/src/cpl_core/database/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_core.database"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post5"
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .database_settings import DatabaseSettings
 from .table_abc import TableABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl_core/database/connection/__init__.py
index 5354b745..a8df7d2b 100644
--- a/src/cpl_core/database/connection/__init__.py
+++ b/src/cpl_core/database/connection/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_core.database.connection"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post5"
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .database_connection import DatabaseConnection
 from .database_connection_abc import DatabaseConnectionABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl_core/database/context/__init__.py
index 7b72b757..62c55f1c 100644
--- a/src/cpl_core/database/context/__init__.py
+++ b/src/cpl_core/database/context/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_core.database.context"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post5"
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .database_context import DatabaseContext
 from .database_context_abc import DatabaseContextABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
diff --git a/src/cpl_core/database/database_settings.py b/src/cpl_core/database/database_settings.py
index c8ee032f..d6bac435 100644
--- a/src/cpl_core/database/database_settings.py
+++ b/src/cpl_core/database/database_settings.py
@@ -9,7 +9,7 @@ class DatabaseSettings(ConfigurationModelABC):
     def __init__(
         self,
         host: str = None,
-        port: int = None,
+        port: int = 3306,
         user: str = None,
         password: str = None,
         database: str = None,
diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl_core/dependency_injection/__init__.py
index b5474ba1..14dbe033 100644
--- a/src/cpl_core/dependency_injection/__init__.py
+++ b/src/cpl_core/dependency_injection/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_core.dependency_injection"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post5"
 
 from collections import namedtuple
 
@@ -31,4 +31,4 @@ from .service_provider import ServiceProvider
 from .service_provider_abc import ServiceProviderABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
diff --git a/src/cpl_core/environment/__init__.py b/src/cpl_core/environment/__init__.py
index 2e0a30cb..27d4f3fc 100644
--- a/src/cpl_core/environment/__init__.py
+++ b/src/cpl_core/environment/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_core.environment"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post5"
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .environment_name_enum import EnvironmentNameEnum
 from .application_environment import ApplicationEnvironment
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
diff --git a/src/cpl_core/logging/__init__.py b/src/cpl_core/logging/__init__.py
index 5c812d5a..ba80edce 100644
--- a/src/cpl_core/logging/__init__.py
+++ b/src/cpl_core/logging/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_core.logging"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post5"
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .logging_settings import LoggingSettings
 from .logging_settings_name_enum import LoggingSettingsNameEnum
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl_core/mailing/__init__.py
index 2ae416dd..398e7dde 100644
--- a/src/cpl_core/mailing/__init__.py
+++ b/src/cpl_core/mailing/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_core.mailing"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post5"
 
 from collections import namedtuple
 
@@ -28,4 +28,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="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
diff --git a/src/cpl_core/pipes/__init__.py b/src/cpl_core/pipes/__init__.py
index 956b2267..ed79ae71 100644
--- a/src/cpl_core/pipes/__init__.py
+++ b/src/cpl_core/pipes/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_core.pipes"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post5"
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .ip_address_pipe import IPAddressPipe
 from .pipe_abc import PipeABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
diff --git a/src/cpl_core/time/__init__.py b/src/cpl_core/time/__init__.py
index 100defe5..514eeaea 100644
--- a/src/cpl_core/time/__init__.py
+++ b/src/cpl_core/time/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_core.time"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post5"
 
 from collections import namedtuple
 
@@ -25,4 +25,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="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
diff --git a/src/cpl_core/utils/__init__.py b/src/cpl_core/utils/__init__.py
index 27e32634..19743778 100644
--- a/src/cpl_core/utils/__init__.py
+++ b/src/cpl_core/utils/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_core.utils"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post5"
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .string import String
 from .pip import Pip
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
diff --git a/src/cpl_core/utils/json_processor.py b/src/cpl_core/utils/json_processor.py
index 1269263e..a01245a0 100644
--- a/src/cpl_core/utils/json_processor.py
+++ b/src/cpl_core/utils/json_processor.py
@@ -8,6 +8,7 @@ class JSONProcessor:
     @staticmethod
     def process(_t: type, values: dict) -> object:
         args = []
+        kwargs = {}
 
         sig = signature(_t.__init__)
         for param in sig.parameters.items():
@@ -21,10 +22,13 @@ class JSONProcessor:
                 value = ""
                 if name in values:
                     value = values[name]
+                    values.pop(name)
                 elif name_first_lower in values:
                     value = values[name_first_lower]
+                    values.pop(name_first_lower)
                 else:
                     value = values[name.upper()]
+                    values.pop(name.upper())
 
                 if isinstance(value, dict) and not issubclass(parameter.annotation, dict):
                     value = JSONProcessor.process(parameter.annotation, value)
@@ -37,10 +41,13 @@ class JSONProcessor:
 
                 args.append(value)
 
+            elif parameter.name == "kwargs" and parameter.annotation == dict:
+                kwargs = values
+
             elif parameter.default != Parameter.empty:
                 args.append(parameter.default)
 
             else:
                 args.append(None)
 
-        return _t(*args)
+        return _t(*args, **kwargs)
diff --git a/src/cpl_discord/.cpl/__init__.py b/src/cpl_discord/.cpl/__init__.py
index 3c5411c5..3d6efdb0 100644
--- a/src/cpl_discord/.cpl/__init__.py
+++ b/src/cpl_discord/.cpl/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_discord/__init__.py b/src/cpl_discord/__init__.py
index c1a6b138..6683f441 100644
--- a/src/cpl_discord/__init__.py
+++ b/src/cpl_discord/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -59,4 +59,4 @@ def get_discord_collection(services: "ServiceCollectionABC") -> "DiscordCollecti
 # build-ignore-end
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_discord/application/__init__.py b/src/cpl_discord/application/__init__.py
index 70e4c531..58f27536 100644
--- a/src/cpl_discord/application/__init__.py
+++ b/src/cpl_discord/application/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_discord.application"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from collections import namedtuple
 from .discord_bot_application_abc import DiscordBotApplicationABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_discord/command/__init__.py b/src/cpl_discord/command/__init__.py
index 7b0adcc2..70bc2380 100644
--- a/src/cpl_discord/command/__init__.py
+++ b/src/cpl_discord/command/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_discord.command"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .discord_command_abc import DiscordCommandABC
 from .discord_commands_meta import DiscordCogMeta
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_discord/configuration/__init__.py b/src/cpl_discord/configuration/__init__.py
index 30a98b85..9cdc0334 100644
--- a/src/cpl_discord/configuration/__init__.py
+++ b/src/cpl_discord/configuration/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_discord.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from collections import namedtuple
 from .discord_bot_settings import DiscordBotSettings
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_discord/container/__init__.py b/src/cpl_discord/container/__init__.py
index 7372d5ba..a2e9c715 100644
--- a/src/cpl_discord/container/__init__.py
+++ b/src/cpl_discord/container/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_discord.container"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -31,4 +31,4 @@ from .thread import Thread
 from .voice_channel import VoiceChannel
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_discord/container/category_channel.py b/src/cpl_discord/container/category_channel.py
index 1454535b..058a6792 100644
--- a/src/cpl_discord/container/category_channel.py
+++ b/src/cpl_discord/container/category_channel.py
@@ -4,7 +4,7 @@ from cpl_discord.container.container import Container
 from cpl_discord.container.text_channel import TextChannel
 from cpl_discord.container.voice_channel import VoiceChannel
 from cpl_discord.helper.to_containers_converter import ToContainersConverter
-from cpl_query.extension import List
+from cpl_query.extension.list import List
 
 
 class CategoryChannel(discord.CategoryChannel, Container):
diff --git a/src/cpl_discord/container/guild.py b/src/cpl_discord/container/guild.py
index 063ad1a1..91740f79 100644
--- a/src/cpl_discord/container/guild.py
+++ b/src/cpl_discord/container/guild.py
@@ -7,7 +7,7 @@ from cpl_discord.container.role import Role
 from cpl_discord.container.text_channel import TextChannel
 from cpl_discord.container.voice_channel import VoiceChannel
 from cpl_discord.helper.to_containers_converter import ToContainersConverter
-from cpl_query.extension import List
+from cpl_query.extension.list import List
 
 
 class Guild(Container, discord.Guild):
diff --git a/src/cpl_discord/container/text_channel.py b/src/cpl_discord/container/text_channel.py
index 9e158cc2..d6ae2782 100644
--- a/src/cpl_discord/container/text_channel.py
+++ b/src/cpl_discord/container/text_channel.py
@@ -4,7 +4,7 @@ from cpl_discord.container.container import Container
 from cpl_discord.container.member import Member
 from cpl_discord.container.thread import Thread
 from cpl_discord.helper.to_containers_converter import ToContainersConverter
-from cpl_query.extension import List
+from cpl_query.extension.list import List
 
 
 class TextChannel(discord.TextChannel, Container):
diff --git a/src/cpl_discord/container/thread.py b/src/cpl_discord/container/thread.py
index 62c1269f..66ecd49d 100644
--- a/src/cpl_discord/container/thread.py
+++ b/src/cpl_discord/container/thread.py
@@ -3,7 +3,7 @@ import discord
 from cpl_discord.container.container import Container
 from cpl_discord.container.member import Member
 from cpl_discord.helper.to_containers_converter import ToContainersConverter
-from cpl_query.extension import List
+from cpl_query.extension.list import List
 
 
 class Thread(discord.Thread, Container):
diff --git a/src/cpl_discord/container/voice_channel.py b/src/cpl_discord/container/voice_channel.py
index 20eb3edb..c273d036 100644
--- a/src/cpl_discord/container/voice_channel.py
+++ b/src/cpl_discord/container/voice_channel.py
@@ -3,7 +3,7 @@ import discord
 from cpl_discord.container.container import Container
 from cpl_discord.container.member import Member
 from cpl_discord.helper.to_containers_converter import ToContainersConverter
-from cpl_query.extension import List
+from cpl_query.extension.list import List
 
 
 class VoiceChannel(discord.VoiceChannel, Container):
diff --git a/src/cpl_discord/cpl-discord.json b/src/cpl_discord/cpl-discord.json
index 93e06e10..25b40374 100644
--- a/src/cpl_discord/cpl-discord.json
+++ b/src/cpl_discord/cpl-discord.json
@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2023",
       "Minor": "4",
-      "Micro": "0"
+      "Micro": "0.post3"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -16,12 +16,12 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core>=2023.4.0",
-      "discord.py>=2.2.2",
-      "cpl-query>=2023.4.0"
+      "cpl-core>=2023.4.0.post2",
+      "discord.py>=2.3.0",
+      "cpl-query>=2023.4.0.post1"
     ],
     "DevDependencies": [
-      "cpl-cli>=2023.4.0"
+      "cpl-cli>=2023.4.0.post3"
     ],
     "PythonVersion": ">=3.10",
     "PythonPath": {},
diff --git a/src/cpl_discord/events/__init__.py b/src/cpl_discord/events/__init__.py
index ac4a3700..87de598f 100644
--- a/src/cpl_discord/events/__init__.py
+++ b/src/cpl_discord/events/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_discord.events"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -69,4 +69,4 @@ from .on_voice_state_update_abc import OnVoiceStateUpdateABC
 from .on_webhooks_update_abc import OnWebhooksUpdateABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_discord/helper/__init__.py b/src/cpl_discord/helper/__init__.py
index 4c310fe5..06523b11 100644
--- a/src/cpl_discord/helper/__init__.py
+++ b/src/cpl_discord/helper/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_discord.helper"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from collections import namedtuple
 from .to_containers_converter import ToContainersConverter
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_discord/service/__init__.py b/src/cpl_discord/service/__init__.py
index b8ea43f0..ea5539fc 100644
--- a/src/cpl_discord/service/__init__.py
+++ b/src/cpl_discord/service/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_discord.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -29,4 +29,4 @@ from .discord_service import DiscordService
 from .discord_service_abc import DiscordServiceABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")
diff --git a/src/cpl_discord/service/discord_bot_service.py b/src/cpl_discord/service/discord_bot_service.py
index 07873a11..4213eabd 100644
--- a/src/cpl_discord/service/discord_bot_service.py
+++ b/src/cpl_discord/service/discord_bot_service.py
@@ -56,14 +56,13 @@ class DiscordBotService(DiscordBotServiceABC):
         env_token = self._config.get_configuration("TOKEN")
         env_prefix = self._config.get_configuration("PREFIX")
 
-        new_settings.from_dict(
-            {
-                "Token": env_token if token is None or token == "" else token,
-                "Prefix": ("! " if self._is_string_invalid(env_prefix) else env_prefix)
-                if self._is_string_invalid(prefix)
-                else prefix,
-            }
+        new_settings = DiscordBotSettings(
+            env_token if token is None or token == "" else token,
+            ("! " if self._is_string_invalid(env_prefix) else env_prefix)
+            if self._is_string_invalid(prefix)
+            else prefix,
         )
+
         if new_settings.token is None or new_settings.token == "":
             raise Exception("You have to configure discord token by appsettings or environment variables")
         return new_settings
diff --git a/src/cpl_discord/service/discord_collection.py b/src/cpl_discord/service/discord_collection.py
index e93806ec..a5b052da 100644
--- a/src/cpl_discord/service/discord_collection.py
+++ b/src/cpl_discord/service/discord_collection.py
@@ -5,7 +5,7 @@ from cpl_discord.command.discord_command_abc import DiscordCommandABC
 from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum
 from cpl_discord.service.command_error_handler_service import CommandErrorHandlerService
 from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
-from cpl_query.extension import List
+from cpl_query.extension.list import List
 
 
 class DiscordCollection(DiscordCollectionABC):
diff --git a/src/cpl_discord/service/discord_collection_abc.py b/src/cpl_discord/service/discord_collection_abc.py
index f6982806..bb444f6d 100644
--- a/src/cpl_discord/service/discord_collection_abc.py
+++ b/src/cpl_discord/service/discord_collection_abc.py
@@ -2,7 +2,7 @@ from abc import ABC, abstractmethod
 from typing import Type
 
 from cpl_discord.command import DiscordCommandABC
-from cpl_query.extension import List
+from cpl_query.extension.list import List
 
 
 class DiscordCollectionABC(ABC):
diff --git a/src/cpl_query/__init__.py b/src/cpl_query/__init__.py
index 67c9bb4a..bb13759e 100644
--- a/src/cpl_query/__init__.py
+++ b/src/cpl_query/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_query"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post1"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
diff --git a/src/cpl_query/base/__init__.py b/src/cpl_query/base/__init__.py
index 7418aff7..2b10c00e 100644
--- a/src/cpl_query/base/__init__.py
+++ b/src/cpl_query/base/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_query.base"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post1"
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .queryable_abc import QueryableABC
 from .sequence import Sequence
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
diff --git a/src/cpl_query/base/ordered_queryable.py b/src/cpl_query/base/ordered_queryable.py
index d865979f..9f0f7b56 100644
--- a/src/cpl_query/base/ordered_queryable.py
+++ b/src/cpl_query/base/ordered_queryable.py
@@ -1,14 +1,14 @@
 from collections.abc import Callable
 
+from cpl_query.base.queryable_abc import QueryableABC
 from cpl_query.base.ordered_queryable_abc import OrderedQueryableABC
 from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument
-from cpl_query.iterable.iterable import Iterable
 
 
 class OrderedQueryable(OrderedQueryableABC):
     r"""Implementation of :class: `cpl_query.base.ordered_queryable_abc.OrderedQueryableABC`"""
 
-    def __init__(self, _t: type, _values: Iterable = None, _func: Callable = None):
+    def __init__(self, _t: type, _values: QueryableABC = None, _func: Callable = None):
         OrderedQueryableABC.__init__(self, _t, _values, _func)
 
     def then_by(self, _func: Callable) -> OrderedQueryableABC:
diff --git a/src/cpl_query/cpl-query.json b/src/cpl_query/cpl-query.json
index 6585103a..3524aee1 100644
--- a/src/cpl_query/cpl-query.json
+++ b/src/cpl_query/cpl-query.json
@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2023",
       "Minor": "4",
-      "Micro": "0"
+      "Micro": "0.post1"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
diff --git a/src/cpl_query/enumerable/__init__.py b/src/cpl_query/enumerable/__init__.py
index 39a07797..5d995c29 100644
--- a/src/cpl_query/enumerable/__init__.py
+++ b/src/cpl_query/enumerable/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_query.enumerable"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post1"
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .enumerable import Enumerable
 from .enumerable_abc import EnumerableABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
diff --git a/src/cpl_query/extension/__init__.py b/src/cpl_query/extension/__init__.py
index 6943b963..1f6b54c1 100644
--- a/src/cpl_query/extension/__init__.py
+++ b/src/cpl_query/extension/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_query.extension"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post1"
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from collections import namedtuple
 from .list import List
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
diff --git a/src/cpl_query/iterable/__init__.py b/src/cpl_query/iterable/__init__.py
index c1b5035a..20a51161 100644
--- a/src/cpl_query/iterable/__init__.py
+++ b/src/cpl_query/iterable/__init__.py
@@ -15,7 +15,7 @@ __title__ = "cpl_query.iterable"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post1"
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .iterable_abc import IterableABC
 from .iterable import Iterable
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
diff --git a/src/cpl_translation/__init__.py b/src/cpl_translation/__init__.py
index 1a7cbe5d..7dcc71b7 100644
--- a/src/cpl_translation/__init__.py
+++ b/src/cpl_translation/__init__.py
@@ -11,11 +11,11 @@ CPL translation extension
 
 """
 
-__title__ = "cpl_translation"
-__author__ = "Sven Heidemann"
-__license__ = "MIT"
-__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__title__ = 'cpl_translation'
+__author__ = 'Sven Heidemann'
+__license__ = 'MIT'
+__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de'
+__version__ = '2023.4.0.post1'
 
 from collections import namedtuple
 
@@ -25,7 +25,6 @@ from .translate_pipe import TranslatePipe
 from .translation_service import TranslationService
 from .translation_service_abc import TranslationServiceABC
 from .translation_settings import TranslationSettings
-
 # build-ignore
 
 
@@ -52,5 +51,5 @@ def init():
 init()
 # build-ignore-end
 
-VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+VersionInfo = namedtuple('VersionInfo', 'major minor micro')
+version_info = VersionInfo(major='2023', minor='4', micro='0.post1')
diff --git a/src/cpl_translation/cpl-translation.json b/src/cpl_translation/cpl-translation.json
index f5eb9b0d..f64ae4a7 100644
--- a/src/cpl_translation/cpl-translation.json
+++ b/src/cpl_translation/cpl-translation.json
@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2023",
       "Minor": "4",
-      "Micro": "0"
+      "Micro": "0.post1"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
diff --git a/src/cpl_translation/translation_settings.py b/src/cpl_translation/translation_settings.py
index f4902513..2549cc3d 100644
--- a/src/cpl_translation/translation_settings.py
+++ b/src/cpl_translation/translation_settings.py
@@ -5,12 +5,12 @@ class TranslationSettings(ConfigurationModelABC):
     def __init__(
         self,
         languages: list = None,
-        default_lang: str = None,
+        default_language: str = None,
     ):
         ConfigurationModelABC.__init__(self)
 
         self._languages = [] if languages is None else languages
-        self._default_lang = default_lang
+        self._default_lang = default_language
 
     @property
     def languages(self) -> list[str]: