diff --git a/Admin/Activate.php b/Admin/Activate.php
index 0aba9a6..95fac52 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\HumanResourceManagement\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 13f33df..0355621 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\HumanResourceManagement\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 efd712c..c82c4c3 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\HumanResourceManagement\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 f4e8341..38ff9bc 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\HumanResourceManagement\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 cbe16c7..eb10804 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\HumanResourceManagement\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\DataStorage\Database\Schema\Builder;
 use phpOMS\Module\UninstallAbstract;
 
@@ -37,7 +37,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 79c5a97..6367a4f 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\HumanResourceManagement\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 d278e68..6984556 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
@@ -42,7 +42,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    const MODULE_PATH = __DIR__;
+    /* public */ const MODULE_PATH = __DIR__;
 
     /**
      * Module version.
@@ -50,7 +50,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.
@@ -58,7 +58,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    const MODULE_NAME = 'HumanResourceManagement';
+    /* public */ const MODULE_NAME = 'HumanResourceManagement';
 
     /**
      * Providing.
diff --git a/Models/Employee.php b/Models/Employee.php
index a6936a5..b966432 100644
--- a/Models/Employee.php
+++ b/Models/Employee.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Models/EmployeeHistory.php b/Models/EmployeeHistory.php
index 9c1c467..b32ca30 100644
--- a/Models/EmployeeHistory.php
+++ b/Models/EmployeeHistory.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Models/EmployeeHistoryMapper.php b/Models/EmployeeHistoryMapper.php
index 13a91f4..8c3b2c1 100644
--- a/Models/EmployeeHistoryMapper.php
+++ b/Models/EmployeeHistoryMapper.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Models/EmployeeMapper.php b/Models/EmployeeMapper.php
index 206e9bc..5ba5f7a 100644
--- a/Models/EmployeeMapper.php
+++ b/Models/EmployeeMapper.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -24,7 +24,7 @@ class EmployeeMapper extends DataMapperAbstract
     /**
      * Columns.
      *
-     * @var array<string, array>
+     * @var array
      * @since 1.0.0
      */
     protected static $columns = [
@@ -35,13 +35,10 @@ class EmployeeMapper extends DataMapperAbstract
     protected static $ownsOne = [
         'account' => [
             'mapper'         => AccountMapper::class,
-            'src'            => 'hr_staff',
+            'src'            => 'hr_staff_account',
         ],
     ];
 
-    protected static $hasMany = [
-    ];
-
     /**
      * Primary table.
      *
diff --git a/Models/PositionType.php b/Models/PositionType.php
index 36baf05..cd2bdeb 100644
--- a/Models/PositionType.php
+++ b/Models/PositionType.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -30,19 +30,19 @@ use phpOMS\Datatypes\Enum;
  */
 abstract class PositionType extends Enum
 {
-    const INTERN = 0;
+    /* public */ const INTERN = 0;
 
-    const APPRENTICE = 1;
+    /* public */ const APPRENTICE = 1;
 
-    const JUNIOR = 2;
+    /* public */ const JUNIOR = 2;
 
-    const REGULAR = 3;
+    /* public */ const REGULAR = 3;
 
-    const SENIOR = 4;
+    /* public */ const SENIOR = 4;
 
-    const ASSISTANT = 5;
+    /* public */ const ASSISTANT = 5;
 
-    const TEAMLEADER = 6;
+    /* public */ const TEAMLEADER = 6;
 
-    const HEAD = 7;
+    /* public */ const HEAD = 7;
 }
diff --git a/Models/StaffList.php b/Models/StaffList.php
index 920c5b0..c3611dd 100644
--- a/Models/StaffList.php
+++ b/Models/StaffList.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -42,7 +42,7 @@ class StaffList
     /**
      * Constructor.
      *
-     * @param \phpOMS\DataStorage\Database\Pool $dbPool Database pool instance
+     * @param \phpOMS\DataStorage\Database\DatabasePool $dbPool Database pool instance
      *
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index 2481b0d..7bb11c7 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/en.lang.php b/Theme/Backend/Lang/en.lang.php
index 6914ce8..81ff0c6 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/department-list.tpl.php b/Theme/Backend/department-list.tpl.php
index 022e4c9..65bc4f7 100644
--- a/Theme/Backend/department-list.tpl.php
+++ b/Theme/Backend/department-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/staff-create.tpl.php b/Theme/Backend/staff-create.tpl.php
index e5a232b..7e0b03e 100644
--- a/Theme/Backend/staff-create.tpl.php
+++ b/Theme/Backend/staff-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/staff-single.tpl.php b/Theme/Backend/staff-single.tpl.php
index c22603b..07b7fe6 100644
--- a/Theme/Backend/staff-single.tpl.php
+++ b/Theme/Backend/staff-single.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 2481b0d..7bb11c7 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/en.lang.php b/Theme/backend/Lang/en.lang.php
index 6914ce8..81ff0c6 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/department-list.tpl.php b/Theme/backend/department-list.tpl.php
index 022e4c9..65bc4f7 100644
--- a/Theme/backend/department-list.tpl.php
+++ b/Theme/backend/department-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/staff-list.tpl.php b/Theme/backend/staff-list.tpl.php
index d175ec3..8e760c9 100644
--- a/Theme/backend/staff-list.tpl.php
+++ b/Theme/backend/staff-list.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD