diff --git a/app/controllers/ModuleBase.php b/app/controllers/ModuleBase.php
index 6a073f6..e9ddb15 100644
--- a/app/controllers/ModuleBase.php
+++ b/app/controllers/ModuleBase.php
@@ -40,7 +40,7 @@ abstract class ModuleBase implements ModuleInterface
      */
     protected array $orders = [];
 
-    public function __construct(protected $db = null, protected $language = null)
+    public function __construct(protected ?\Aurora\Core\DB $db = null, protected ?\Aurora\Core\Language $language = null)
     {
         $this->db = $db;
         $this->language = $language;
diff --git a/core/DB.php b/core/DB.php
index f423cbd..0a463fc 100755
--- a/core/DB.php
+++ b/core/DB.php
@@ -2,7 +2,7 @@
 
 namespace Aurora\Core;
 
-final class DB
+class DB
 {
     public const DEFAULT_OPTIONS = [
         \PDO::ATTR_DEFAULT_FETCH_MODE => \PDO::FETCH_ASSOC,
diff --git a/core/Language.php b/core/Language.php
index 10d6f89..9663cf6 100644
--- a/core/Language.php
+++ b/core/Language.php
@@ -2,7 +2,7 @@
 
 namespace Aurora\Core;
 
-final class Language
+class Language
 {
     /**
      * Current language code