diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 30d373f..04b44f1 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 2,
         "subtype": 1,
         "name": "TimeRecording",
-        "uri": "{/lang}/{/app}/humanresource/timerecording/dashboard?{?}",
+        "uri": "{/base}/humanresource/timerecording/dashboard?{?}",
         "target": "self",
         "icon": null,
         "order": 70,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Today",
-                "uri": "{/lang}/{/app}/humanresource/timerecording/dashboard?{?}",
+                "uri": "{/base}/humanresource/timerecording/dashboard?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -34,7 +34,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Stats",
-                "uri": "{/lang}/{/app}/humanresource/timerecording/stats?{?}",
+                "uri": "{/base}/humanresource/timerecording/stats?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -51,7 +51,7 @@
         "type": 2,
         "subtype": 1,
         "name": "TimeRecording",
-        "uri": "{/lang}/{/app}/private/timerecording/dashboard?{?}",
+        "uri": "{/base}/private/timerecording/dashboard?{?}",
         "target": "self",
         "icon": null,
         "order": 1,
diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index f7c67e3..2c2942a 100755
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\HumanResourceTimeRecording\Admin\Install
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Application\ApplicationAbstract;
  * Navigation class.
  *
  * @package Modules\HumanResourceTimeRecording\Admin\Install
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Admin/Installer.php b/Admin/Installer.php
index ad8e34a..ed00074 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\HumanResourceTimeRecording\Admin
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Module\InstallerAbstract;
  * Installer class.
  *
  * @package Modules\HumanResourceTimeRecording\Admin
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php
index 691b92e..6a49bfd 100755
--- a/Admin/Routes/Web/Api.php
+++ b/Admin/Routes/Web/Api.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index 3dd5038..c416f30 100755
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Admin/Status.php b/Admin/Status.php
index 0887276..d4125d3 100755
--- a/Admin/Status.php
+++ b/Admin/Status.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\HumanResourceTimeRecording\Admin
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Module\StatusAbstract;
  * Status class.
  *
  * @package Modules\HumanResourceTimeRecording\Admin
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Admin/Uninstaller.php b/Admin/Uninstaller.php
index 612912a..e0f7225 100755
--- a/Admin/Uninstaller.php
+++ b/Admin/Uninstaller.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\HumanResourceTimeRecording\Admin
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Module\UninstallerAbstract;
  * Uninstaller class.
  *
  * @package Modules\HumanResourceTimeRecording\Admin
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Admin/Updater.php b/Admin/Updater.php
index dc25f5e..aa2759b 100755
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\HumanResourceTimeRecording\Admin
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Module\UpdaterAbstract;
  * Updater class.
  *
  * @package Modules\HumanResourceTimeRecording\Admin
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Application/Timerecording/Application.php b/Application/Timerecording/Application.php
index d8b1fc1..84001d4 100755
--- a/Application/Timerecording/Application.php
+++ b/Application/Timerecording/Application.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\Timerecording
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -53,7 +53,7 @@ use Web\WebApplication;
  * Application class.
  *
  * @package Web\Timerecording
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  * @codeCoverageIgnore
@@ -104,7 +104,7 @@ final class Application
      */
     public function run(HttpRequest $request, HttpResponse $response) : void
     {
-        $this->app->l11nManager = new L11nManager($this->app->appName);
+        $this->app->l11nManager = new L11nManager();
 
         $pageView = new TimerecordingView($this->app->l11nManager, $request, $response);
         $head     = new Head();
@@ -149,8 +149,8 @@ final class Application
         }
 
         /* CSRF token OK? */
-        if ($request->getData('CSRF') !== null
-            && !\hash_equals($this->app->sessionManager->get('CSRF'), $request->getData('CSRF'))
+        if ($request->hasData('CSRF')
+            && !\hash_equals($this->app->sessionManager->get('CSRF'), $request->getDataString('CSRF'))
         ) {
             $response->header->status = RequestStatusCode::R_403;
 
@@ -224,7 +224,7 @@ final class Application
         $dispatched = $this->app->dispatcher->dispatch(
             $this->app->router->route(
                 $request->uri->getRoute(),
-                $request->getData('CSRF'),
+                $request->getDataString('CSRF'),
                 $request->getRouteVerb(),
                 $this->app->appName,
                 $this->app->unitId,
diff --git a/Application/Timerecording/TimerecordingView.php b/Application/Timerecording/TimerecordingView.php
index b438549..b884b7e 100755
--- a/Application/Timerecording/TimerecordingView.php
+++ b/Application/Timerecording/TimerecordingView.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\Timerecording
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -23,7 +23,7 @@ use phpOMS\Views\View;
  * Main view.
  *
  * @package Web\Timerecording
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  * @codeCoverageIgnore
diff --git a/Application/Timerecording/index.tpl.php b/Application/Timerecording/index.tpl.php
index 8ac6055..c1a0724 100755
--- a/Application/Timerecording/index.tpl.php
+++ b/Application/Timerecording/index.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\Timerecording
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Application/Timerecording/lang/en.lang.php b/Application/Timerecording/lang/en.lang.php
index cdbb020..ee46963 100755
--- a/Application/Timerecording/lang/en.lang.php
+++ b/Application/Timerecording/lang/en.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\Timerecording
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Application/Timerecording/login.tpl.php b/Application/Timerecording/login.tpl.php
index 51f57f2..56770e7 100755
--- a/Application/Timerecording/login.tpl.php
+++ b/Application/Timerecording/login.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Template
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -19,7 +19,7 @@ declare(strict_types=1);
  *
  * @package   Web\Timerecording
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 7e78118..3cc9fac 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\HumanResourceTimeRecording
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -35,7 +35,7 @@ use phpOMS\Model\Message\FormValidation;
  * HumanResourceTimeRecording controller class.
  *
  * @package Modules\HumanResourceTimeRecording
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
@@ -56,7 +56,7 @@ final class ApiController extends Controller
      */
     public function apiSessionCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
-        if ($request->getData('account') !== null && !$this->app->accountManager->get($request->header->account)->hasPermission(
+        if ($request->hasData('account') && !$this->app->accountManager->get($request->header->account)->hasPermission(
             PermissionType::CREATE, $this->app->unitId, $this->app->appName, self::NAME, PermissionCategory::SESSION_FOREIGN
         )) {
             $response->header->status = RequestStatusCode::R_403;
@@ -88,7 +88,7 @@ final class ApiController extends Controller
      */
     private function createSessionFromRequest(RequestAbstract $request) : ?Session
     {
-        $account = (int) ($request->getData('account') ?? $request->header->account);
+        $account = $request->getDataInt('account') ?? $request->header->account;
 
         $employee = EmployeeMapper::get()
             ->with('profile')
@@ -97,8 +97,8 @@ final class ApiController extends Controller
             ->limit(1)
             ->execute();
 
-        $type   = (int) ($request->getData('type') ?? ClockingType::OFFICE);
-        $status = (int) ($request->getData('status') ?? ClockingStatus::START);
+        $type   = $request->getDataInt('type') ?? ClockingType::OFFICE;
+        $status = $request->getDataInt('status') ?? ClockingStatus::START;
 
         if ($employee instanceof NullEmployee) {
             return null;
@@ -109,10 +109,9 @@ final class ApiController extends Controller
 
         if (ClockingStatus::isValidValue($status)) {
             // a custom datetime can only be set if the user is allowed to create a session for a foreign account or if the session is a vacation
-            $dt = $request->getData('datetime') !== null
-                && ($request->getData('account') !== null
-                    || $type === ClockingType::VACATION
-                ) ? new \DateTime($request->getData('datetime')) : new \DateTime('now');
+            $dt = $request->hasData('account') || $type === ClockingType::VACATION
+                ? ($request->getDataDateTime('datetime') ?? new \DateTime('now'))
+                : new \DateTime('now');
 
             $element = new SessionElement($session, $dt);
             $element->setStatus($status);
@@ -138,7 +137,7 @@ final class ApiController extends Controller
      */
     public function apiSessionElementCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
-        if ((int) ($request->getData('status') ?? -1) === ClockingStatus::START) {
+        if (($request->getDataInt('status') ?? -1) === ClockingStatus::START) {
             $this->apiSessionCreate($request, $response);
 
             return;
@@ -151,7 +150,7 @@ final class ApiController extends Controller
             return;
         }
 
-        if ($request->getData('account') !== null && ((int) $request->getData('account')) !== $request->header->account
+        if ($request->hasData('account') && ((int) $request->getData('account')) !== $request->header->account
         ) {
             if (!$this->app->accountManager->get($request->header->account)->hasPermission(
                 PermissionType::CREATE, $this->app->unitId, $this->app->appName, self::NAME, PermissionCategory::SESSION_ELEMENT_FOREIGN
@@ -214,7 +213,7 @@ final class ApiController extends Controller
      */
     private function createSessionElementFromRequest(RequestAbstract $request) : ?SessionElement
     {
-        $account = (int) ($request->getData('account') ?? $request->header->account);
+        $account = $request->getDataInt('account') ?? $request->header->account;
 
         /** @var Session $session */
         $session = SessionMapper::get()->where('id', (int) $request->getData('session'))->execute();
@@ -224,13 +223,12 @@ final class ApiController extends Controller
             return null;
         }
 
-        $status = (int) ($request->getData('status') ?? -1);
+        $status = $request->getDataInt('status') ?? -1;
 
         // a custom datetime can only be set if the user is allowed to create a session for a foreign account or if the session is a vacation
-        $dt = $request->getData('datetime') !== null
-                && ($request->getData('account') !== null
-                    || $session->getType() === ClockingType::VACATION
-                ) ? new \DateTime($request->getData('datetime')) : new \DateTime('now');
+        $dt = $request->hasData('account') || $session->getType() === ClockingType::VACATION
+            ? ($request->getDataDateTime('datetime') ?? new \DateTime('now'))
+            : new \DateTime('now');
 
         $element = new SessionElement($session, $dt);
         $element->setStatus(ClockingStatus::isValidValue($status) ? $status : ClockingStatus::END);
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index c0cd93c..e56346e 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\HumanResourceTimeRecording
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -29,7 +29,7 @@ use phpOMS\Views\View;
  * TimeRecording controller class.
  *
  * @package Modules\HumanResourceTimeRecording
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  * @codeCoverageIgnore
diff --git a/Controller/Controller.php b/Controller/Controller.php
index a34d062..c53e1c9 100755
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\HumanResourceTimeRecording
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Module\ModuleAbstract;
  * Database controller class.
  *
  * @package Modules\HumanResourceTimeRecording
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Controller/TimerecordingController.php b/Controller/TimerecordingController.php
index 22317c5..62aa46a 100755
--- a/Controller/TimerecordingController.php
+++ b/Controller/TimerecordingController.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\HumanResourceTimeRecording
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -25,7 +25,7 @@ use phpOMS\Views\View;
  * TimeRecording controller class.
  *
  * @package Modules\HumanResourceTimeRecording
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/ClockingStatus.php b/Models/ClockingStatus.php
index d06083f..9743adc 100755
--- a/Models/ClockingStatus.php
+++ b/Models/ClockingStatus.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\HumanResourceTimeRecording\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum;
  * ClockingStatus enum.
  *
  * @package Modules\HumanResourceTimeRecording\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/ClockingType.php b/Models/ClockingType.php
index ef43e38..1904e63 100755
--- a/Models/ClockingType.php
+++ b/Models/ClockingType.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\HumanResourceTimeRecording\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum;
  * ClockingType enum.
  *
  * @package Modules\HumanResourceTimeRecording\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NullSession.php b/Models/NullSession.php
index b7c09db..46f3086 100755
--- a/Models/NullSession.php
+++ b/Models/NullSession.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\HumanResourceTimeRecording\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\HumanResourceTimeRecording\Models;
  * Null model
  *
  * @package Modules\HumanResourceTimeRecording\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NullSessionElement.php b/Models/NullSessionElement.php
index 95aee59..e3b4275 100755
--- a/Models/NullSessionElement.php
+++ b/Models/NullSessionElement.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\HumanResourceTimeRecording\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\HumanResourceTimeRecording\Models;
  * Null model
  *
  * @package Modules\HumanResourceTimeRecording\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/PermissionCategory.php b/Models/PermissionCategory.php
index 2156a24..70dc812 100755
--- a/Models/PermissionCategory.php
+++ b/Models/PermissionCategory.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\HumanResourceTimeRecording\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum;
  * Permision state enum.
  *
  * @package Modules\HumanResourceTimeRecording\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/Session.php b/Models/Session.php
index ef36e5f..e47f1fa 100755
--- a/Models/Session.php
+++ b/Models/Session.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\HumanResourceTimeRecording\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -21,7 +21,7 @@ use Modules\HumanResourceManagement\Models\NullEmployee;
  * Session model
  *
  * @package Modules\HumanResourceTimeRecording\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/SessionElement.php b/Models/SessionElement.php
index e06ec30..44ab266 100755
--- a/Models/SessionElement.php
+++ b/Models/SessionElement.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\HumanResourceTimeRecording\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\HumanResourceTimeRecording\Models;
  * Session element model
  *
  * @package Modules\HumanResourceTimeRecording\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/SessionElementMapper.php b/Models/SessionElementMapper.php
index fd52881..bb315fa 100755
--- a/Models/SessionElementMapper.php
+++ b/Models/SessionElementMapper.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\HumanResourceTimeRecording\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * Mapper class.
  *
  * @package Modules\HumanResourceTimeRecording\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/SessionMapper.php b/Models/SessionMapper.php
index b440d73..28af2a1 100755
--- a/Models/SessionMapper.php
+++ b/Models/SessionMapper.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\HumanResourceTimeRecording\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -23,7 +23,7 @@ use phpOMS\Stdlib\Base\SmartDateTime;
  * Mapper class.
  *
  * @package Modules\HumanResourceTimeRecording\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Theme/Backend/Lang/Navigation.ar.lang.php b/Theme/Backend/Lang/Navigation.ar.lang.php
index 288f623..bb41584 100755
--- a/Theme/Backend/Lang/Navigation.ar.lang.php
+++ b/Theme/Backend/Lang/Navigation.ar.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.cs.lang.php b/Theme/Backend/Lang/Navigation.cs.lang.php
index 9798214..2248dee 100755
--- a/Theme/Backend/Lang/Navigation.cs.lang.php
+++ b/Theme/Backend/Lang/Navigation.cs.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.da.lang.php b/Theme/Backend/Lang/Navigation.da.lang.php
index b8d7e0c..6d02061 100755
--- a/Theme/Backend/Lang/Navigation.da.lang.php
+++ b/Theme/Backend/Lang/Navigation.da.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php
index febf3ae..0d19c93 100755
--- a/Theme/Backend/Lang/Navigation.de.lang.php
+++ b/Theme/Backend/Lang/Navigation.de.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.el.lang.php b/Theme/Backend/Lang/Navigation.el.lang.php
index bf10c4f..eb09c75 100755
--- a/Theme/Backend/Lang/Navigation.el.lang.php
+++ b/Theme/Backend/Lang/Navigation.el.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index 70a846c..4cf16dc 100755
--- a/Theme/Backend/Lang/Navigation.en.lang.php
+++ b/Theme/Backend/Lang/Navigation.en.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.es.lang.php b/Theme/Backend/Lang/Navigation.es.lang.php
index 7258025..7339732 100755
--- a/Theme/Backend/Lang/Navigation.es.lang.php
+++ b/Theme/Backend/Lang/Navigation.es.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.fi.lang.php b/Theme/Backend/Lang/Navigation.fi.lang.php
index 54c6044..887f4d0 100755
--- a/Theme/Backend/Lang/Navigation.fi.lang.php
+++ b/Theme/Backend/Lang/Navigation.fi.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.fr.lang.php b/Theme/Backend/Lang/Navigation.fr.lang.php
index 06bcc21..0ae00a8 100755
--- a/Theme/Backend/Lang/Navigation.fr.lang.php
+++ b/Theme/Backend/Lang/Navigation.fr.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.hu.lang.php b/Theme/Backend/Lang/Navigation.hu.lang.php
index 3b81d62..2fcf190 100755
--- a/Theme/Backend/Lang/Navigation.hu.lang.php
+++ b/Theme/Backend/Lang/Navigation.hu.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.it.lang.php b/Theme/Backend/Lang/Navigation.it.lang.php
index 1cb1845..70d97d1 100755
--- a/Theme/Backend/Lang/Navigation.it.lang.php
+++ b/Theme/Backend/Lang/Navigation.it.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.ja.lang.php b/Theme/Backend/Lang/Navigation.ja.lang.php
index 75d8dc1..90e7a3e 100755
--- a/Theme/Backend/Lang/Navigation.ja.lang.php
+++ b/Theme/Backend/Lang/Navigation.ja.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.ko.lang.php b/Theme/Backend/Lang/Navigation.ko.lang.php
index abd5c20..0e8c259 100755
--- a/Theme/Backend/Lang/Navigation.ko.lang.php
+++ b/Theme/Backend/Lang/Navigation.ko.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.no.lang.php b/Theme/Backend/Lang/Navigation.no.lang.php
index a59cf70..4313520 100755
--- a/Theme/Backend/Lang/Navigation.no.lang.php
+++ b/Theme/Backend/Lang/Navigation.no.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.pl.lang.php b/Theme/Backend/Lang/Navigation.pl.lang.php
index c04dbc3..7671410 100755
--- a/Theme/Backend/Lang/Navigation.pl.lang.php
+++ b/Theme/Backend/Lang/Navigation.pl.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.pt.lang.php b/Theme/Backend/Lang/Navigation.pt.lang.php
index ac095b8..e5709de 100755
--- a/Theme/Backend/Lang/Navigation.pt.lang.php
+++ b/Theme/Backend/Lang/Navigation.pt.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.ru.lang.php b/Theme/Backend/Lang/Navigation.ru.lang.php
index 4dd9f32..4813a8e 100755
--- a/Theme/Backend/Lang/Navigation.ru.lang.php
+++ b/Theme/Backend/Lang/Navigation.ru.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.sv.lang.php b/Theme/Backend/Lang/Navigation.sv.lang.php
index f6d7a8c..667984c 100755
--- a/Theme/Backend/Lang/Navigation.sv.lang.php
+++ b/Theme/Backend/Lang/Navigation.sv.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.th.lang.php b/Theme/Backend/Lang/Navigation.th.lang.php
index d43c512..ed07f82 100755
--- a/Theme/Backend/Lang/Navigation.th.lang.php
+++ b/Theme/Backend/Lang/Navigation.th.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.tr.lang.php b/Theme/Backend/Lang/Navigation.tr.lang.php
index 17b406a..34e6a83 100755
--- a/Theme/Backend/Lang/Navigation.tr.lang.php
+++ b/Theme/Backend/Lang/Navigation.tr.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.uk.lang.php b/Theme/Backend/Lang/Navigation.uk.lang.php
index 181d93c..bf180be 100755
--- a/Theme/Backend/Lang/Navigation.uk.lang.php
+++ b/Theme/Backend/Lang/Navigation.uk.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.zh.lang.php b/Theme/Backend/Lang/Navigation.zh.lang.php
index 0f2e0e8..034b9ab 100755
--- a/Theme/Backend/Lang/Navigation.zh.lang.php
+++ b/Theme/Backend/Lang/Navigation.zh.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php
index cf19398..35a6559 100755
--- a/Theme/Backend/Lang/ar.lang.php
+++ b/Theme/Backend/Lang/ar.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php
index 314ebe0..a0b9112 100755
--- a/Theme/Backend/Lang/cs.lang.php
+++ b/Theme/Backend/Lang/cs.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php
index f9f3a7c..877741e 100755
--- a/Theme/Backend/Lang/da.lang.php
+++ b/Theme/Backend/Lang/da.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php
index 32ececd..b41f455 100755
--- a/Theme/Backend/Lang/de.lang.php
+++ b/Theme/Backend/Lang/de.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php
index 2c1425c..0693a7d 100755
--- a/Theme/Backend/Lang/el.lang.php
+++ b/Theme/Backend/Lang/el.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index 3c301b4..8ee3f66 100755
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php
index 3575a14..1426d1e 100755
--- a/Theme/Backend/Lang/es.lang.php
+++ b/Theme/Backend/Lang/es.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php
index 81960bf..b58bf4f 100755
--- a/Theme/Backend/Lang/fi.lang.php
+++ b/Theme/Backend/Lang/fi.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php
index 6af5ebd..034409d 100755
--- a/Theme/Backend/Lang/fr.lang.php
+++ b/Theme/Backend/Lang/fr.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php
index ccaa5ad..0963ba3 100755
--- a/Theme/Backend/Lang/hu.lang.php
+++ b/Theme/Backend/Lang/hu.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php
index 45ccab5..7c848d8 100755
--- a/Theme/Backend/Lang/it.lang.php
+++ b/Theme/Backend/Lang/it.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php
index 1cf3def..92c4863 100755
--- a/Theme/Backend/Lang/ja.lang.php
+++ b/Theme/Backend/Lang/ja.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php
index 4b863e0..48bb9cd 100755
--- a/Theme/Backend/Lang/ko.lang.php
+++ b/Theme/Backend/Lang/ko.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php
index 9cde12d..2c6100f 100755
--- a/Theme/Backend/Lang/no.lang.php
+++ b/Theme/Backend/Lang/no.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php
index a068172..e691ce5 100755
--- a/Theme/Backend/Lang/pl.lang.php
+++ b/Theme/Backend/Lang/pl.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php
index 400d2a6..1b1fa39 100755
--- a/Theme/Backend/Lang/pt.lang.php
+++ b/Theme/Backend/Lang/pt.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php
index cb9aae7..5ded8cf 100755
--- a/Theme/Backend/Lang/ru.lang.php
+++ b/Theme/Backend/Lang/ru.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php
index 48d3274..9508664 100755
--- a/Theme/Backend/Lang/sv.lang.php
+++ b/Theme/Backend/Lang/sv.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php
index 450d021..d11cb63 100755
--- a/Theme/Backend/Lang/th.lang.php
+++ b/Theme/Backend/Lang/th.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php
index 80160ae..250106e 100755
--- a/Theme/Backend/Lang/tr.lang.php
+++ b/Theme/Backend/Lang/tr.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php
index 7078f3f..831fec5 100755
--- a/Theme/Backend/Lang/uk.lang.php
+++ b/Theme/Backend/Lang/uk.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php
index 54b9fc2..27b040f 100755
--- a/Theme/Backend/Lang/zh.lang.php
+++ b/Theme/Backend/Lang/zh.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/dashboard.tpl.php b/Theme/Backend/dashboard.tpl.php
index b5f3448..39372fd 100755
--- a/Theme/Backend/dashboard.tpl.php
+++ b/Theme/Backend/dashboard.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   HumanResourceTimeRecording
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/private-dashboard.tpl.php b/Theme/Backend/private-dashboard.tpl.php
index 608d6fa..f64676c 100755
--- a/Theme/Backend/private-dashboard.tpl.php
+++ b/Theme/Backend/private-dashboard.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   HumanResourceTimeRecording
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -204,7 +204,7 @@ echo $this->getData('nav')->render(); ?>
                 <?php
                     $count = 0;
                     foreach ($sessions as $session) : ++$count;
-                    $url   = UriFactory::build('{/lang}/{/app}/private/timerecording/session?{?}&id=' . $session->getId());
+                    $url   = UriFactory::build('{/base}/private/timerecording/session?{?}&id=' . $session->getId());
                 ?>
                 <tr data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>">
diff --git a/Theme/Backend/private-session.tpl.php b/Theme/Backend/private-session.tpl.php
index a6c6e99..ca495ff 100755
--- a/Theme/Backend/private-session.tpl.php
+++ b/Theme/Backend/private-session.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   HumanResourceTimeRecording
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/Navigation.en.lang.php b/Theme/Timeterminal/Lang/Navigation.en.lang.php
index e8ed98f..aab999f 100755
--- a/Theme/Timeterminal/Lang/Navigation.en.lang.php
+++ b/Theme/Timeterminal/Lang/Navigation.en.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\HumanResourceTimeRecording
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/ar.lang.php b/Theme/Timeterminal/Lang/ar.lang.php
index 0a4525f..44ac7d7 100755
--- a/Theme/Timeterminal/Lang/ar.lang.php
+++ b/Theme/Timeterminal/Lang/ar.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/cs.lang.php b/Theme/Timeterminal/Lang/cs.lang.php
index fec656a..ca54c05 100755
--- a/Theme/Timeterminal/Lang/cs.lang.php
+++ b/Theme/Timeterminal/Lang/cs.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/da.lang.php b/Theme/Timeterminal/Lang/da.lang.php
index c7ee369..0d04501 100755
--- a/Theme/Timeterminal/Lang/da.lang.php
+++ b/Theme/Timeterminal/Lang/da.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/de.lang.php b/Theme/Timeterminal/Lang/de.lang.php
index b012955..8e6690b 100755
--- a/Theme/Timeterminal/Lang/de.lang.php
+++ b/Theme/Timeterminal/Lang/de.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/el.lang.php b/Theme/Timeterminal/Lang/el.lang.php
index 3f35c87..e22fb78 100755
--- a/Theme/Timeterminal/Lang/el.lang.php
+++ b/Theme/Timeterminal/Lang/el.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/en.lang.php b/Theme/Timeterminal/Lang/en.lang.php
index 2f210dd..fc6ed03 100755
--- a/Theme/Timeterminal/Lang/en.lang.php
+++ b/Theme/Timeterminal/Lang/en.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/es.lang.php b/Theme/Timeterminal/Lang/es.lang.php
index f137fff..6dea01b 100755
--- a/Theme/Timeterminal/Lang/es.lang.php
+++ b/Theme/Timeterminal/Lang/es.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/fi.lang.php b/Theme/Timeterminal/Lang/fi.lang.php
index 09d898b..9d6a994 100755
--- a/Theme/Timeterminal/Lang/fi.lang.php
+++ b/Theme/Timeterminal/Lang/fi.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/fr.lang.php b/Theme/Timeterminal/Lang/fr.lang.php
index 84d9e87..4acefab 100755
--- a/Theme/Timeterminal/Lang/fr.lang.php
+++ b/Theme/Timeterminal/Lang/fr.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/hu.lang.php b/Theme/Timeterminal/Lang/hu.lang.php
index 2e734d7..ff036bf 100755
--- a/Theme/Timeterminal/Lang/hu.lang.php
+++ b/Theme/Timeterminal/Lang/hu.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/it.lang.php b/Theme/Timeterminal/Lang/it.lang.php
index 42685dc..27147de 100755
--- a/Theme/Timeterminal/Lang/it.lang.php
+++ b/Theme/Timeterminal/Lang/it.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/ja.lang.php b/Theme/Timeterminal/Lang/ja.lang.php
index dd0f5f0..38e10aa 100755
--- a/Theme/Timeterminal/Lang/ja.lang.php
+++ b/Theme/Timeterminal/Lang/ja.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/ko.lang.php b/Theme/Timeterminal/Lang/ko.lang.php
index bd1cfa7..242fcde 100755
--- a/Theme/Timeterminal/Lang/ko.lang.php
+++ b/Theme/Timeterminal/Lang/ko.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/no.lang.php b/Theme/Timeterminal/Lang/no.lang.php
index e6cbc15..7d236fa 100755
--- a/Theme/Timeterminal/Lang/no.lang.php
+++ b/Theme/Timeterminal/Lang/no.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/pl.lang.php b/Theme/Timeterminal/Lang/pl.lang.php
index 46de8bf..86e7dbd 100755
--- a/Theme/Timeterminal/Lang/pl.lang.php
+++ b/Theme/Timeterminal/Lang/pl.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/pt.lang.php b/Theme/Timeterminal/Lang/pt.lang.php
index 715eb9c..1a930e6 100755
--- a/Theme/Timeterminal/Lang/pt.lang.php
+++ b/Theme/Timeterminal/Lang/pt.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/ru.lang.php b/Theme/Timeterminal/Lang/ru.lang.php
index c83f82d..3b188e2 100755
--- a/Theme/Timeterminal/Lang/ru.lang.php
+++ b/Theme/Timeterminal/Lang/ru.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/sv.lang.php b/Theme/Timeterminal/Lang/sv.lang.php
index 7839b7e..e21fb3f 100755
--- a/Theme/Timeterminal/Lang/sv.lang.php
+++ b/Theme/Timeterminal/Lang/sv.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/th.lang.php b/Theme/Timeterminal/Lang/th.lang.php
index 51b990a..7a51f24 100755
--- a/Theme/Timeterminal/Lang/th.lang.php
+++ b/Theme/Timeterminal/Lang/th.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/tr.lang.php b/Theme/Timeterminal/Lang/tr.lang.php
index fb7384b..0d472c4 100755
--- a/Theme/Timeterminal/Lang/tr.lang.php
+++ b/Theme/Timeterminal/Lang/tr.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/uk.lang.php b/Theme/Timeterminal/Lang/uk.lang.php
index 17e6eca..09be2d1 100755
--- a/Theme/Timeterminal/Lang/uk.lang.php
+++ b/Theme/Timeterminal/Lang/uk.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/Lang/zh.lang.php b/Theme/Timeterminal/Lang/zh.lang.php
index b0e2f09..40baa20 100755
--- a/Theme/Timeterminal/Lang/zh.lang.php
+++ b/Theme/Timeterminal/Lang/zh.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Timeterminal/overview.tpl.php b/Theme/Timeterminal/overview.tpl.php
index 6f204a8..73fb1b2 100755
--- a/Theme/Timeterminal/overview.tpl.php
+++ b/Theme/Timeterminal/overview.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   HumanResourceTimeRecording
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php
index a986f7c..da22581 100755
--- a/tests/Admin/AdminTest.php
+++ b/tests/Admin/AdminTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Autoloader.php b/tests/Autoloader.php
index d032623..d08f1b7 100755
--- a/tests/Autoloader.php
+++ b/tests/Autoloader.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules/tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ namespace tests;
  * Autoloader class.
  *
  * @package tests
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index 1f3bf3c..3fc9845 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/NullSessionElementTest.php b/tests/Models/NullSessionElementTest.php
index 8ab552b..bf8593f 100755
--- a/tests/Models/NullSessionElementTest.php
+++ b/tests/Models/NullSessionElementTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/NullSessionTest.php b/tests/Models/NullSessionTest.php
index 4215cd8..8444712 100755
--- a/tests/Models/NullSessionTest.php
+++ b/tests/Models/NullSessionTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/SessionElementMapperTest.php b/tests/Models/SessionElementMapperTest.php
index bf8e7e4..21b18f1 100755
--- a/tests/Models/SessionElementMapperTest.php
+++ b/tests/Models/SessionElementMapperTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/SessionElementTest.php b/tests/Models/SessionElementTest.php
index 9625c57..2139d66 100755
--- a/tests/Models/SessionElementTest.php
+++ b/tests/Models/SessionElementTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/SessionMapperTest.php b/tests/Models/SessionMapperTest.php
index 463f5b0..5c9ff62 100755
--- a/tests/Models/SessionMapperTest.php
+++ b/tests/Models/SessionMapperTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/SessionTest.php b/tests/Models/SessionTest.php
index 9317f10..d5bfffb 100755
--- a/tests/Models/SessionTest.php
+++ b/tests/Models/SessionTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */