diff --git a/src/FastyBird/Core/Application/composer.json b/src/FastyBird/Core/Application/composer.json
index 70058579c..92031049d 100644
--- a/src/FastyBird/Core/Application/composer.json
+++ b/src/FastyBird/Core/Application/composer.json
@@ -41,10 +41,10 @@
     "contributte/vite": "^0.2",
     "cweagans/composer-patches": "^1.7",
     "doctrine/orm": "2.15.*",
-    "fastybird/datetime-factory": "^0.7.1",
-    "fastybird/metadata-library": "dev-main",
     "fastybird/simple-auth": "^0.14",
+    "ipub/doctrine-crud": "^5.1",
     "ipub/doctrine-timestampable": "^2.0",
+    "ipub/slim-router": "^0.2",
     "nette/bootstrap": "^3.2",
     "nette/application": "^3.1",
     "nette/caching": "^3.3",
diff --git a/src/FastyBird/Core/Application/config/common.neon b/src/FastyBird/Core/Application/config/common.neon
index 31c316b4a..3a176c211 100644
--- a/src/FastyBird/Core/Application/config/common.neon
+++ b/src/FastyBird/Core/Application/config/common.neon
@@ -21,7 +21,6 @@ extensions:
     # contributteCacheDebug : Contributte\Cache\DI\DebugStorageExtension
     orisaiObjectMapper      : OriNette\ObjectMapper\DI\ObjectMapperExtension
     fbApplication           : FastyBird\Core\Application\DI\ApplicationExtension
-    fbDateTimeFactory       : FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension
 
 ##################################
 # Nette extensions configuration #
diff --git a/src/FastyBird/Core/Application/tests/common.neon b/src/FastyBird/Core/Application/tests/common.neon
index c86e6448f..b99a73360 100644
--- a/src/FastyBird/Core/Application/tests/common.neon
+++ b/src/FastyBird/Core/Application/tests/common.neon
@@ -23,7 +23,6 @@ extensions:
     nettrineOrmCache                    : Nettrine\ORM\DI\OrmCacheExtension
     ipubDoctrineCrud                    : IPub\DoctrineCrud\DI\DoctrineCrudExtension
     ipubDoctrineTimestampable           : IPub\DoctrineTimestampable\DI\DoctrineTimestampableExtension
-    ipubPhone                           : IPub\Phone\DI\PhoneExtension
     fbDateTimeFactory                   : FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension
     fbJsonApi                           : FastyBird\JsonApi\DI\JsonApiExtension
     fbSimpleAuth                        : FastyBird\SimpleAuth\DI\SimpleAuthExtension
diff --git a/src/FastyBird/Core/Exchange/tests/common.neon b/src/FastyBird/Core/Exchange/tests/common.neon
index 288be42a5..3bfad2167 100644
--- a/src/FastyBird/Core/Exchange/tests/common.neon
+++ b/src/FastyBird/Core/Exchange/tests/common.neon
@@ -14,7 +14,6 @@ php:
     date.timezone: Europe/Prague
 
 extensions:
-    ipubPhone           : IPub\Phone\DI\PhoneExtension
     fbTools             : FastyBird\Core\Tools\DI\ToolsExtension
 
 fbApplication:
diff --git a/src/FastyBird/Core/Tools/tests/common.neon b/src/FastyBird/Core/Tools/tests/common.neon
index 37529609c..ebff3a6af 100644
--- a/src/FastyBird/Core/Tools/tests/common.neon
+++ b/src/FastyBird/Core/Tools/tests/common.neon
@@ -14,4 +14,5 @@ php:
     date.timezone: Europe/Prague
 
 extensions:
-    fbDateTimeFactory   : FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension
+    ipubDoctrineTimestampable   : IPub\DoctrineTimestampable\DI\DoctrineTimestampableExtension
+    fbDateTimeFactory           : FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension
diff --git a/src/FastyBird/Module/Devices/src/Subscribers/StateEntities.php b/src/FastyBird/Module/Devices/src/Subscribers/StateEntities.php
index 243bbd4d7..9e3769d5f 100644
--- a/src/FastyBird/Module/Devices/src/Subscribers/StateEntities.php
+++ b/src/FastyBird/Module/Devices/src/Subscribers/StateEntities.php
@@ -28,7 +28,6 @@
 use FastyBird\Module\Devices\Events;
 use FastyBird\Module\Devices\Exceptions;
 use FastyBird\Module\Devices\States;
-use IPub\Phone\Exceptions as PhoneExceptions;
 use Nette;
 use Nette\Caching as NetteCaching;
 use Symfony\Component\EventDispatcher;
@@ -80,8 +79,6 @@ public static function getSubscribedEvents(): array
 	 * @throws ToolsExceptions\InvalidData
 	 * @throws ToolsExceptions\Logic
 	 * @throws ToolsExceptions\MalformedInput
-	 * @throws PhoneExceptions\NoValidCountryException
-	 * @throws PhoneExceptions\NoValidPhoneException
 	 */
 	public function stateCreated(
 		Events\ConnectorPropertyStateEntityCreated|Events\DevicePropertyStateEntityCreated|Events\ChannelPropertyStateEntityCreated $event,
@@ -104,8 +101,6 @@ public function stateCreated(
 	 * @throws ToolsExceptions\InvalidData
 	 * @throws ToolsExceptions\Logic
 	 * @throws ToolsExceptions\MalformedInput
-	 * @throws PhoneExceptions\NoValidCountryException
-	 * @throws PhoneExceptions\NoValidPhoneException
 	 */
 	public function stateUpdated(
 		Events\ConnectorPropertyStateEntityUpdated|Events\DevicePropertyStateEntityUpdated|Events\ChannelPropertyStateEntityUpdated $event,
@@ -139,8 +134,6 @@ private function cleanCache(
 	 * @throws ToolsExceptions\InvalidData
 	 * @throws ToolsExceptions\Logic
 	 * @throws ToolsExceptions\MalformedInput
-	 * @throws PhoneExceptions\NoValidCountryException
-	 * @throws PhoneExceptions\NoValidPhoneException
 	 */
 	private function publishDocument(
 		MetadataTypes\Sources\Source $source,
diff --git a/src/FastyBird/Module/Devices/tests/common.neon b/src/FastyBird/Module/Devices/tests/common.neon
index 26b64c2a0..f33cea1de 100644
--- a/src/FastyBird/Module/Devices/tests/common.neon
+++ b/src/FastyBird/Module/Devices/tests/common.neon
@@ -23,7 +23,6 @@ extensions:
     nettrineOrmCache                    : Nettrine\ORM\DI\OrmCacheExtension
     ipubDoctrineCrud                    : IPub\DoctrineCrud\DI\DoctrineCrudExtension
     ipubDoctrineTimestampable           : IPub\DoctrineTimestampable\DI\DoctrineTimestampableExtension
-    ipubPhone                           : IPub\Phone\DI\PhoneExtension
     fbDateTimeFactory                   : FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension
     fbJsonApi                           : FastyBird\JsonApi\DI\JsonApiExtension
     fbSimpleAuth                        : FastyBird\SimpleAuth\DI\SimpleAuthExtension