diff --git a/src/cpl_discord/.cpl/__init__.py b/src/cpl_discord/.cpl/__init__.py
index 3c5411c5..817f9eb0 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.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_discord/__init__.py b/src/cpl_discord/__init__.py
index c1a6b138..f0ac26db 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.post1"
 
 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.post1")
diff --git a/src/cpl_discord/application/__init__.py b/src/cpl_discord/application/__init__.py
index 70e4c531..46c925d3 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.post1"
 
 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.post1")
diff --git a/src/cpl_discord/command/__init__.py b/src/cpl_discord/command/__init__.py
index 7b0adcc2..51e90f17 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.post1"
 
 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.post1")
diff --git a/src/cpl_discord/configuration/__init__.py b/src/cpl_discord/configuration/__init__.py
index 30a98b85..1c64d289 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.post1"
 
 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.post1")
diff --git a/src/cpl_discord/container/__init__.py b/src/cpl_discord/container/__init__.py
index 7372d5ba..45e09573 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.post1"
 
 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.post1")
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..86c78c8a 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.post1"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
diff --git a/src/cpl_discord/events/__init__.py b/src/cpl_discord/events/__init__.py
index ac4a3700..1f1c5131 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.post1"
 
 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.post1")
diff --git a/src/cpl_discord/helper/__init__.py b/src/cpl_discord/helper/__init__.py
index 4c310fe5..153af02f 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.post1"
 
 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.post1")
diff --git a/src/cpl_discord/service/__init__.py b/src/cpl_discord/service/__init__.py
index b8ea43f0..79acd9ab 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.post1"
 
 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.post1")
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")