diff --git a/Admin/Activate.php b/Admin/Activate.php
index 0ff903f..874c6f2 100644
--- a/Admin/Activate.php
+++ b/Admin/Activate.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,7 @@
 namespace Modules\ProjectManagement\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\ActivateAbstract;
 use phpOMS\Module\InfoManager;
 
@@ -37,7 +37,7 @@ class Activate extends ActivateAbstract
     /**
      * {@inheritdoc}
      */
-    public static function activate(Pool $dbPool, InfoManager $info)
+    public static function activate(DatabasePool $dbPool, InfoManager $info)
     {
         parent::activate($dbPool, $info);
     }
diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php
index 99c8e4c..913301d 100644
--- a/Admin/Deactivate.php
+++ b/Admin/Deactivate.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,7 @@
 namespace Modules\ProjectManagement\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\DeactivateAbstract;
 use phpOMS\Module\InfoManager;
 
@@ -37,7 +37,7 @@ class Deactivate extends DeactivateAbstract
     /**
      * {@inheritdoc}
      */
-    public static function deactivate(Pool $dbPool, InfoManager $info)
+    public static function deactivate(DatabasePool $dbPool, InfoManager $info)
     {
         parent::deactivate($dbPool, $info);
     }
diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index 1288bf3..d98559b 100644
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -14,7 +14,7 @@
  * @link       http://orange-management.com
  */
 namespace Modules\ProjectManagement\Admin\Install;
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 
 /**
  * Navigation class.
@@ -29,7 +29,7 @@ use phpOMS\DataStorage\Database\Pool;
  */
 class Navigation
 {
-    public static function install(Pool $dbPool)
+    public static function install(string $path, DatabasePool $dbPool)
     {
         $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);
 
diff --git a/Admin/Installer.php b/Admin/Installer.php
index 04c5ba6..92d4f83 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,7 @@
 namespace Modules\ProjectManagement\Admin;
 
 use phpOMS\DataStorage\Database\DatabaseType;
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\InfoManager;
 use phpOMS\Module\InstallerAbstract;
 
@@ -37,9 +37,9 @@ class Installer extends InstallerAbstract
     /**
      * {@inheritdoc}
      */
-    public static function install(Pool $dbPool, InfoManager $info)
+    public static function install(string $path, DatabasePool $dbPool, InfoManager $info)
     {
-        parent::install($dbPool, $info);
+        parent::install($path, $dbPool, $info);
 
         switch ($dbPool->get('core')->getType()) {
             case DatabaseType::MYSQL:
diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php
index 0ab77f5..2b2f480 100644
--- a/Admin/Uninstall.php
+++ b/Admin/Uninstall.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,7 @@
 namespace Modules\ProjectManagement\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\UninstallAbstract;
 
 /**
@@ -36,7 +36,7 @@ class Uninstall extends UninstallAbstract
     /**
      * {@inheritdoc}
      */
-    public static function uninstall(Pool $dbPool, InfoManager $info)
+    public static function uninstall(DatabasePool $dbPool, InfoManager $info)
     {
         parent::uninstall($dbPool, $info);
     }
diff --git a/Admin/Update.php b/Admin/Update.php
index bd46a25..40dc967 100644
--- a/Admin/Update.php
+++ b/Admin/Update.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,7 @@
 namespace Modules\ProjectManagement\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\UpdateAbstract;
 use phpOMS\System\File\Directory;
 
@@ -37,7 +37,7 @@ class Update extends UpdateAbstract
     /**
      * {@inheritdoc}
      */
-    public static function update(Pool $dbPool, array $info)
+    public static function update(DatabasePool $dbPool, array $info)
     {
         Directory::deletePath(__DIR__ . '/Update');
         mkdir('Update');
diff --git a/Controller.php b/Controller.php
index c0cee20..aaf0e4d 100644
--- a/Controller.php
+++ b/Controller.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -45,7 +45,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    const MODULE_PATH = __DIR__;
+    /* public */ const MODULE_PATH = __DIR__;
 
     /**
      * Module version.
@@ -53,7 +53,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    const MODULE_VERSION = '1.0.0';
+    /* public */ const MODULE_VERSION = '1.0.0';
 
     /**
      * Module name.
@@ -61,7 +61,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    const MODULE_NAME = 'ProjectManagement';
+    /* public */ const MODULE_NAME = 'ProjectManagement';
 
     /**
      * Providing.
diff --git a/Models/Project.php b/Models/Project.php
index 8e0ed0f..6cb168f 100644
--- a/Models/Project.php
+++ b/Models/Project.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Models/ProjectMapper.php b/Models/ProjectMapper.php
index 440ae8f..f534f71 100644
--- a/Models/ProjectMapper.php
+++ b/Models/ProjectMapper.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,6 @@
 namespace Modules\ProjectManagement\Models;
 
 use Modules\Calendar\Models\CalendarMapper;
-use Modules\Tasks\Models\TaskMapper;
 use phpOMS\DataStorage\Database\DataMapperAbstract;
 use phpOMS\DataStorage\Database\Query\Builder;
 use phpOMS\DataStorage\Database\Query\Column;
@@ -39,28 +38,28 @@ class ProjectMapper extends DataMapperAbstract
     /**
      * Columns.
      *
-     * @var array<string, array>
+     * @var array
      * @since 1.0.0
      */
     protected static $columns = [
         'projectmanagement_project_id'          => ['name' => 'projectmanagement_project_id', 'type' => 'int', 'internal' => 'id'],
-        'projectmanagement_project_name'          => ['name' => 'projectmanagement_project_name', 'type' => 'string', 'internal' => 'name'],
-        'projectmanagement_project_description'          => ['name' => 'projectmanagement_project_description', 'type' => 'string', 'internal' => 'description'],
-        'projectmanagement_project_calendar'          => ['name' => 'projectmanagement_project_calendar', 'type' => 'int', 'internal' => 'calendar'],
-        'projectmanagement_project_costs'          => ['name' => 'projectmanagement_project_costs', 'type' => 'Serializable', 'internal' => 'costs'],
-        'projectmanagement_project_budget'          => ['name' => 'projectmanagement_project_budget', 'type' => 'Serializable', 'internal' => 'budget'],
-        'projectmanagement_project_earnings'          => ['name' => 'projectmanagement_project_earnings', 'type' => 'Serializable', 'internal' => 'earnings'],
-        'projectmanagement_project_start'          => ['name' => 'projectmanagement_project_start', 'type' => 'DateTime', 'internal' => 'start'],
-        'projectmanagement_project_end'          => ['name' => 'projectmanagement_project_end', 'type' => 'DateTime', 'internal' => 'end'],
+        'projectmanagement_project_name'        => ['name' => 'projectmanagement_project_name', 'type' => 'string', 'internal' => 'name'],
+        'projectmanagement_project_description' => ['name' => 'projectmanagement_project_description', 'type' => 'string', 'internal' => 'description'],
+        'projectmanagement_project_calendar'    => ['name' => 'projectmanagement_project_calendar', 'type' => 'int', 'internal' => 'calendar'],
+        'projectmanagement_project_costs'       => ['name' => 'projectmanagement_project_costs', 'type' => 'Serializable', 'internal' => 'costs'],
+        'projectmanagement_project_budget'      => ['name' => 'projectmanagement_project_budget', 'type' => 'Serializable', 'internal' => 'budget'],
+        'projectmanagement_project_earnings'    => ['name' => 'projectmanagement_project_earnings', 'type' => 'Serializable', 'internal' => 'earnings'],
+        'projectmanagement_project_start'       => ['name' => 'projectmanagement_project_start', 'type' => 'DateTime', 'internal' => 'start'],
+        'projectmanagement_project_end'         => ['name' => 'projectmanagement_project_end', 'type' => 'DateTime', 'internal' => 'end'],
     ];
 
     /**
      * Has one relation.
      *
-     * @var array<string, array>
+     * @var array
      * @since 1.0.0
      */
-    protected static $hasOne = [
+    protected static $ownsOne = [
         'calendar' => [
             'mapper' => CalendarMapper::class,
             'src'    => 'projectmanagement_project_calendar',
@@ -70,7 +69,7 @@ class ProjectMapper extends DataMapperAbstract
     /**
      * Has many relation.
      *
-     * @var array<string, array>
+     * @var array
      * @since 1.0.0
      */
     protected static $hasMany = [
@@ -109,20 +108,20 @@ class ProjectMapper extends DataMapperAbstract
             $objId = parent::create($obj, $relations);
             $query = new Builder(self::$db);
             $query->prefix(self::$db->getPrefix())
-                  ->insert(
-                      'account_permission_account',
-                      'account_permission_from',
-                      'account_permission_for',
-                      'account_permission_id1',
-                      'account_permission_id2',
-                      'account_permission_r',
-                      'account_permission_w',
-                      'account_permission_m',
-                      'account_permission_d',
-                      'account_permission_p'
-                  )
-                  ->into('account_permission')
-                  ->values($obj->getCreatedBy(), 'calendar_project', 'calendar_project', 1, $objId, 1, 1, 1, 1, 1);
+                ->insert(
+                    'account_permission_account',
+                    'account_permission_from',
+                    'account_permission_for',
+                    'account_permission_id1',
+                    'account_permission_id2',
+                    'account_permission_r',
+                    'account_permission_w',
+                    'account_permission_m',
+                    'account_permission_d',
+                    'account_permission_p'
+                )
+                ->into('account_permission')
+                ->values($obj->getCreatedBy(), 'calendar_project', 'calendar_project', 1, $objId, 1, 1, 1, 1, 1);
 
             self::$db->con->prepare($query->toSql())->execute();
         } catch (\Exception $e) {
@@ -147,9 +146,9 @@ class ProjectMapper extends DataMapperAbstract
     public static function find(...$columns) : Builder
     {
         return parent::find(...$columns)->from('account_permission')
-                     ->where('account_permission.account_permission_for', '=', 'calendar_project')
-                     ->where('account_permission.account_permission_id1', '=', 1)
-                     ->where('calendar_project.calendar_project_id', '=', new Column('account_permission.account_permission_id2'))
-                     ->where('account_permission.account_permission_r', '=', 1);
+            ->where('account_permission.account_permission_for', '=', 'calendar_project')
+            ->where('account_permission.account_permission_id1', '=', 1)
+            ->where('calendar_project.calendar_project_id', '=', new Column('account_permission.account_permission_id2'))
+            ->where('account_permission.account_permission_r', '=', 1);
     }
 }
diff --git a/Models/ProjectResponsibility.php b/Models/ProjectResponsibility.php
index 9c5f32d..1a933db 100644
--- a/Models/ProjectResponsibility.php
+++ b/Models/ProjectResponsibility.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -30,6 +30,6 @@ use phpOMS\Datatypes\Enum;
  */
 abstract class ProjectResponsibility extends Enum
 {
-    const MANAGER = 0;
-    const OTHER   = 1;
+    /* public */ const MANAGER = 0;
+    /* public */ const OTHER   = 1;
 }
diff --git a/Models/ProjectStatus.php b/Models/ProjectStatus.php
index 5b6ef0d..a874a3a 100644
--- a/Models/ProjectStatus.php
+++ b/Models/ProjectStatus.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -30,9 +30,9 @@ use phpOMS\Datatypes\Enum;
  */
 abstract class ProjectStatus extends Enum
 {
-    const ACTIVE   = 0;
-    const INACTIVE = 1;
-    const HOLD     = 2;
-    const CANCELED = 3;
-    const FINISHED = 4;
+    /* public */ const ACTIVE   = 0;
+    /* public */ const INACTIVE = 1;
+    /* public */ const HOLD     = 2;
+    /* public */ const CANCELED = 3;
+    /* public */ const FINISHED = 4;
 }
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index d7fcd55..9bda592 100644
--- a/Theme/Backend/Lang/Navigation.en.lang.php
+++ b/Theme/Backend/Lang/Navigation.en.lang.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/Lang/api.en.lang.php b/Theme/Backend/Lang/api.en.lang.php
index 4f9f946..afe845f 100644
--- a/Theme/Backend/Lang/api.en.lang.php
+++ b/Theme/Backend/Lang/api.en.lang.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index b32af8c..b8555df 100644
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/projectmanagement-create.tpl.php b/Theme/Backend/projectmanagement-create.tpl.php
index 0877207..8b0f4bb 100644
--- a/Theme/Backend/projectmanagement-create.tpl.php
+++ b/Theme/Backend/projectmanagement-create.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/projectmanagement-list.tpl.php b/Theme/Backend/projectmanagement-list.tpl.php
index 2bad7c0..b64849a 100644
--- a/Theme/Backend/projectmanagement-list.tpl.php
+++ b/Theme/Backend/projectmanagement-list.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/projectmanagement-profile.tpl.php b/Theme/Backend/projectmanagement-profile.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/Backend/projectmanagement-profile.tpl.php
+++ b/Theme/Backend/projectmanagement-profile.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/Lang/Navigation.en.lang.php b/Theme/backend/Lang/Navigation.en.lang.php
index d7fcd55..9bda592 100644
--- a/Theme/backend/Lang/Navigation.en.lang.php
+++ b/Theme/backend/Lang/Navigation.en.lang.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/Lang/api.en.lang.php b/Theme/backend/Lang/api.en.lang.php
index 4f9f946..afe845f 100644
--- a/Theme/backend/Lang/api.en.lang.php
+++ b/Theme/backend/Lang/api.en.lang.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/Lang/en.lang.php b/Theme/backend/Lang/en.lang.php
index b32af8c..b8555df 100644
--- a/Theme/backend/Lang/en.lang.php
+++ b/Theme/backend/Lang/en.lang.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD