diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index ad901d0..05ad14e 100644
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -38,7 +38,7 @@ class Navigation
      */
     public static function install(string $path = null, DatabasePool $dbPool = null) : void
     {
-        $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);
+        $navData = \json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);
 
         $class = '\\Modules\\Navigation\\Admin\\Installer';
         /** @var $class \Modules\Navigation\Admin\Installer */
diff --git a/Controller.php b/Controller.php
index 492b17a..2e6f180 100644
--- a/Controller.php
+++ b/Controller.php
@@ -254,7 +254,7 @@ final class Controller extends ModuleAbstract implements WebInterface
      *
      * @param RequestAbstract $request Request
      *
-     * @return array
+     * @return array<string, bool>
      *
      * @since  1.0.0
      */
@@ -436,7 +436,7 @@ final class Controller extends ModuleAbstract implements WebInterface
      *
      * @param RequestAbstract $request Request
      *
-     * @return array
+     * @return array<string, bool>
      *
      * @since  1.0.0
      */
diff --git a/Models/Task.php b/Models/Task.php
index 317aee0..118b2d4 100644
--- a/Models/Task.php
+++ b/Models/Task.php
@@ -179,7 +179,7 @@ class Task implements \JsonSerializable
      *
      * @param bool $closable Is closable
      *
-     * @return int
+     * @return void
      *
      * @since  1.0.0
      */
@@ -223,7 +223,7 @@ class Task implements \JsonSerializable
     /**
      * Get all media
      *
-     * @return array
+     * @return array<int|\Modules\Media\Models\Media>
      *
      * @since  1.0.0
      */
diff --git a/Models/TaskElementMapper.php b/Models/TaskElementMapper.php
index 4b27147..fea9159 100644
--- a/Models/TaskElementMapper.php
+++ b/Models/TaskElementMapper.php
@@ -33,7 +33,7 @@ class TaskElementMapper extends DataMapperAbstract
     /**
      * Columns.
      *
-     * @var array
+     * @var array<string, array<string, string>>
      * @since 1.0.0
      */
     protected static $columns = [
@@ -51,7 +51,7 @@ class TaskElementMapper extends DataMapperAbstract
     /**
      * Has many relation.
      *
-     * @var array
+     * @var array<string, array<string, string|null>>
      * @since 1.0.0
      */
     protected static $hasMany = [
diff --git a/Models/TaskMapper.php b/Models/TaskMapper.php
index 3411fbb..3b0bd25 100644
--- a/Models/TaskMapper.php
+++ b/Models/TaskMapper.php
@@ -37,7 +37,7 @@ class TaskMapper extends DataMapperAbstract
     /**
      * Columns.
      *
-     * @var array
+     * @var array<string, array<string, string>>
      * @since 1.0.0
      */
     protected static $columns = [
@@ -60,7 +60,7 @@ class TaskMapper extends DataMapperAbstract
     /**
      * Has many relation.
      *
-     * @var array
+     * @var array<string, array<string, string|null>>
      * @since 1.0.0
      */
     protected static $hasMany = [
@@ -94,7 +94,7 @@ class TaskMapper extends DataMapperAbstract
     /**
      * Has one relation.
      *
-     * @var array
+     * @var array<string, array<string, string>>
      * @since 1.0.0
      */
     protected static $ownsOne = [