diff --git a/Admin/Install/db.json b/Admin/Install/db.json
index e8c6acb..f3889fa 100755
--- a/Admin/Install/db.json
+++ b/Admin/Install/db.json
@@ -248,6 +248,11 @@
                 "type": "TINYINT(1)",
                 "null": false
             },
+            "contractmgmt_attr_type_internal": {
+                "name": "contractmgmt_attr_type_internal",
+                "type": "TINYINT(1)",
+                "null": false
+            },
             "contractmgmt_attr_type_required": {
                 "description": "Every contract must have this attribute type if set to true.",
                 "name": "contractmgmt_attr_type_required",
diff --git a/Admin/Installer.php b/Admin/Installer.php
index 324a179..3833b70 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -20,7 +20,6 @@ use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Module\InstallerAbstract;
 use phpOMS\Module\ModuleInfo;
-use phpOMS\Uri\HttpUri;
 
 /**
  * Installer class.
@@ -81,7 +80,7 @@ final class Installer extends InstallerAbstract
 
         foreach ($types as $type) {
             $response = new HttpResponse();
-            $request  = new HttpRequest(new HttpUri(''));
+            $request  = new HttpRequest();
 
             $request->header->account = 1;
             $request->setData('name', $type['name'] ?? '');
@@ -109,7 +108,7 @@ final class Installer extends InstallerAbstract
                 }
 
                 $response = new HttpResponse();
-                $request  = new HttpRequest(new HttpUri(''));
+                $request  = new HttpRequest();
 
                 $request->header->account = 1;
                 $request->setData('title', $l11n);
diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php
index 05a5bea..f13d2e8 100644
--- a/Admin/Routes/Web/Api.php
+++ b/Admin/Routes/Web/Api.php
@@ -18,7 +18,7 @@ use phpOMS\Account\PermissionType;
 use phpOMS\Router\RouteVerb;
 
 return [
-    '^.*/contract/type.*$' => [
+    '^.*/contract/type(\?.*$|$)' => [
         [
             'dest'       => '\Modules\ContractManagement\Controller\ApiContractTypeController:apiContractTypeCreate',
             'verb'       => RouteVerb::PUT,
@@ -60,7 +60,7 @@ return [
         ],
     ],
 
-    '^.*/contract/attribute.*$' => [
+    '^.*/contract/attribute(\?.*$|$)' => [
         [
             'dest'       => '\Modules\ContractManagement\Controller\ApiAttributeController:apiContractAttributeCreate',
             'verb'       => RouteVerb::PUT,
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index 6b375b8..9daecd9 100755
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -18,7 +18,7 @@ use phpOMS\Account\PermissionType;
 use phpOMS\Router\RouteVerb;
 
 return [
-    '^.*/contract/list.*$' => [
+    '^.*/contract/list(\?.*$|$)' => [
         [
             'dest'       => '\Modules\ContractManagement\Controller\BackendController:viewContractList',
             'verb'       => RouteVerb::GET,
@@ -29,7 +29,7 @@ return [
             ],
         ],
     ],
-    '^.*/contract/single.*$' => [
+    '^.*/contract/view(\?.*$|$)' => [
         [
             'dest'       => '\Modules\ContractManagement\Controller\BackendController:viewContract',
             'verb'       => RouteVerb::GET,
@@ -40,7 +40,7 @@ return [
             ],
         ],
     ],
-    '^.*/contract/type/list.*$' => [
+    '^.*/contract/type/list(\?.*$|$)' => [
         [
             'dest'       => '\Modules\ContractManagement\Controller\BackendController:viewContractTypeList',
             'verb'       => RouteVerb::GET,
@@ -51,7 +51,7 @@ return [
             ],
         ],
     ],
-    '^.*/contract/type/profile.*$' => [
+    '^.*/contract/type/view(\?.*$|$)' => [
         [
             'dest'       => '\Modules\ContractManagement\Controller\BackendController:viewContractType',
             'verb'       => RouteVerb::GET,
diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php
index 2d8a1bf..8697438 100644
--- a/Controller/ApiAttributeController.php
+++ b/Controller/ApiAttributeController.php
@@ -148,13 +148,20 @@ final class ApiAttributeController extends Controller
             ->where('id', $request->getDataInt('type') ?? 0)
             ->execute();
 
+        if ($type->isInternal) {
+            $response->header->status = RequestStatusCode::R_403;
+            $this->createInvalidCreateResponse($request, $response, $val);
+
+            return;
+        }
+
         $attrValue = $this->createAttributeValueFromRequest($request, $type);
         $this->createModel($request->header->account, $attrValue, ContractAttributeValueMapper::class, 'attr_value', $request->getOrigin());
 
         if ($attrValue->isDefault) {
             $this->createModelRelation(
                 $request->header->account,
-                (int) $request->getData('type'),
+                $type->id,
                 $attrValue->id,
                 ContractAttributeTypeMapper::class, 'defaults', '', $request->getOrigin()
             );
diff --git a/Controller/ApiContractTypeController.php b/Controller/ApiContractTypeController.php
index 858917e..b8b8e02 100644
--- a/Controller/ApiContractTypeController.php
+++ b/Controller/ApiContractTypeController.php
@@ -73,7 +73,10 @@ final class ApiContractTypeController extends Controller
     private function createContractTypeFromRequest(RequestAbstract $request) : BaseStringL11nType
     {
         $contractType = new BaseStringL11nType();
-        $contractType->setL11n($request->getDataString('title') ?? '', $request->getDataString('language') ?? ISO639x1Enum::_EN);
+        $contractType->setL11n(
+            $request->getDataString('title') ?? '',
+            ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN
+        );
         $contractType->title = $request->getDataString('name') ?? '';
 
         return $contractType;
@@ -137,12 +140,10 @@ final class ApiContractTypeController extends Controller
      */
     private function createContractTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n
     {
-        $contractTypeL11n      = new BaseStringL11n();
-        $contractTypeL11n->ref = $request->getDataInt('type') ?? 0;
-        $contractTypeL11n->setLanguage(
-            $request->getDataString('language') ?? $request->header->l11n->language
-        );
-        $contractTypeL11n->content = $request->getDataString('title') ?? '';
+        $contractTypeL11n           = new BaseStringL11n();
+        $contractTypeL11n->ref      = $request->getDataInt('type') ?? 0;
+        $contractTypeL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language;
+        $contractTypeL11n->content  = $request->getDataString('title') ?? '';
 
         return $contractTypeL11n;
     }
@@ -327,10 +328,8 @@ final class ApiContractTypeController extends Controller
      */
     public function updateContractTypeL11nFromRequest(RequestAbstract $request, BaseStringL11n $new) : BaseStringL11n
     {
-        $new->setLanguage(
-            $request->getDataString('language') ?? $new->language
-        );
-        $new->content = $request->getDataString('title') ?? $new->content;
+        $new->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $new->language;
+        $new->content  = $request->getDataString('title') ?? $new->content;
 
         return $new;
     }
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 43c2f74..c80d92e 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -150,7 +150,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
 
-        $view->setTemplate('/Modules/ContractManagement/Theme/Backend/contract-single');
+        $view->setTemplate('/Modules/ContractManagement/Theme/Backend/contract-view');
         $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1007901001, $request, $response);
 
         $contract = ContractMapper::get()
diff --git a/Models/Attribute/ContractAttributeMapper.php b/Models/Attribute/ContractAttributeMapper.php
index 92dae95..75c7281 100644
--- a/Models/Attribute/ContractAttributeMapper.php
+++ b/Models/Attribute/ContractAttributeMapper.php
@@ -37,10 +37,10 @@ final class ContractAttributeMapper extends DataMapperFactory
      * @since 1.0.0
      */
     public const COLUMNS = [
-        'contractmgmt_contract_attr_id'        => ['name' => 'contractmgmt_contract_attr_id',    'type' => 'int', 'internal' => 'id'],
-        'contractmgmt_contract_attr_contract'  => ['name' => 'contractmgmt_contract_attr_contract',  'type' => 'int', 'internal' => 'ref'],
-        'contractmgmt_contract_attr_type'      => ['name' => 'contractmgmt_contract_attr_type',  'type' => 'int', 'internal' => 'type'],
-        'contractmgmt_contract_attr_value'     => ['name' => 'contractmgmt_contract_attr_value', 'type' => 'int', 'internal' => 'value'],
+        'contractmgmt_contract_attr_id'       => ['name' => 'contractmgmt_contract_attr_id',    'type' => 'int', 'internal' => 'id'],
+        'contractmgmt_contract_attr_contract' => ['name' => 'contractmgmt_contract_attr_contract',  'type' => 'int', 'internal' => 'ref'],
+        'contractmgmt_contract_attr_type'     => ['name' => 'contractmgmt_contract_attr_type',  'type' => 'int', 'internal' => 'type'],
+        'contractmgmt_contract_attr_value'    => ['name' => 'contractmgmt_contract_attr_value', 'type' => 'int', 'internal' => 'value'],
     ];
 
     /**
diff --git a/Models/Attribute/ContractAttributeTypeMapper.php b/Models/Attribute/ContractAttributeTypeMapper.php
index ebe1841..f1943d5 100644
--- a/Models/Attribute/ContractAttributeTypeMapper.php
+++ b/Models/Attribute/ContractAttributeTypeMapper.php
@@ -42,7 +42,8 @@ final class ContractAttributeTypeMapper extends DataMapperFactory
         'contractmgmt_attr_type_datatype'   => ['name' => 'contractmgmt_attr_type_datatype',   'type' => 'int',    'internal' => 'datatype'],
         'contractmgmt_attr_type_fields'     => ['name' => 'contractmgmt_attr_type_fields',   'type' => 'int',    'internal' => 'fields'],
         'contractmgmt_attr_type_custom'     => ['name' => 'contractmgmt_attr_type_custom',   'type' => 'bool',   'internal' => 'custom'],
-        'contractmgmt_attr_type_repeatable'     => ['name' => 'contractmgmt_attr_type_repeatable',   'type' => 'bool',   'internal' => 'repeatable'],
+        'contractmgmt_attr_type_repeatable' => ['name' => 'contractmgmt_attr_type_repeatable',   'type' => 'bool',   'internal' => 'repeatable'],
+        'contractmgmt_attr_type_internal'   => ['name' => 'contractmgmt_attr_type_internal',   'type' => 'bool',   'internal' => 'isInternal'],
         'contractmgmt_attr_type_pattern'    => ['name' => 'contractmgmt_attr_type_pattern',  'type' => 'string', 'internal' => 'validationPattern'],
         'contractmgmt_attr_type_required'   => ['name' => 'contractmgmt_attr_type_required', 'type' => 'bool',   'internal' => 'isRequired'],
     ];
diff --git a/Models/Attribute/ContractAttributeValueL11nMapper.php b/Models/Attribute/ContractAttributeValueL11nMapper.php
index 3fa0660..4688ff9 100644
--- a/Models/Attribute/ContractAttributeValueL11nMapper.php
+++ b/Models/Attribute/ContractAttributeValueL11nMapper.php
@@ -37,10 +37,10 @@ final class ContractAttributeValueL11nMapper extends DataMapperFactory
      * @since 1.0.0
      */
     public const COLUMNS = [
-        'contractmgmt_attr_value_l11n_id'     => ['name' => 'contractmgmt_attr_value_l11n_id',    'type' => 'int',    'internal' => 'id'],
-        'contractmgmt_attr_value_l11n_title'  => ['name' => 'contractmgmt_attr_value_l11n_title', 'type' => 'string', 'internal' => 'content', 'autocomplete' => true],
-        'contractmgmt_attr_value_l11n_value'  => ['name' => 'contractmgmt_attr_value_l11n_value',  'type' => 'int',    'internal' => 'ref'],
-        'contractmgmt_attr_value_l11n_lang'   => ['name' => 'contractmgmt_attr_value_l11n_lang',  'type' => 'string', 'internal' => 'language'],
+        'contractmgmt_attr_value_l11n_id'    => ['name' => 'contractmgmt_attr_value_l11n_id',    'type' => 'int',    'internal' => 'id'],
+        'contractmgmt_attr_value_l11n_title' => ['name' => 'contractmgmt_attr_value_l11n_title', 'type' => 'string', 'internal' => 'content', 'autocomplete' => true],
+        'contractmgmt_attr_value_l11n_value' => ['name' => 'contractmgmt_attr_value_l11n_value',  'type' => 'int',    'internal' => 'ref'],
+        'contractmgmt_attr_value_l11n_lang'  => ['name' => 'contractmgmt_attr_value_l11n_lang',  'type' => 'string', 'internal' => 'language'],
     ];
 
     /**
diff --git a/Models/Attribute/ContractAttributeValueMapper.php b/Models/Attribute/ContractAttributeValueMapper.php
index 1d345ee..e17729f 100644
--- a/Models/Attribute/ContractAttributeValueMapper.php
+++ b/Models/Attribute/ContractAttributeValueMapper.php
@@ -37,15 +37,15 @@ final class ContractAttributeValueMapper extends DataMapperFactory
      * @since 1.0.0
      */
     public const COLUMNS = [
-        'contractmgmt_attr_value_id'                => ['name' => 'contractmgmt_attr_value_id',       'type' => 'int',      'internal' => 'id'],
-        'contractmgmt_attr_value_default'           => ['name' => 'contractmgmt_attr_value_default',  'type' => 'bool',     'internal' => 'isDefault'],
-        'contractmgmt_attr_value_valueStr'          => ['name' => 'contractmgmt_attr_value_valueStr', 'type' => 'string',   'internal' => 'valueStr'],
-        'contractmgmt_attr_value_valueInt'          => ['name' => 'contractmgmt_attr_value_valueInt', 'type' => 'int',      'internal' => 'valueInt'],
-        'contractmgmt_attr_value_valueDec'          => ['name' => 'contractmgmt_attr_value_valueDec', 'type' => 'float',    'internal' => 'valueDec'],
-        'contractmgmt_attr_value_valueDat'          => ['name' => 'contractmgmt_attr_value_valueDat', 'type' => 'DateTime', 'internal' => 'valueDat'],
-        'contractmgmt_attr_value_unit'              => ['name' => 'contractmgmt_attr_value_unit', 'type' => 'string', 'internal' => 'unit'],
-        'contractmgmt_attr_value_deptype'           => ['name' => 'contractmgmt_attr_value_deptype', 'type' => 'int', 'internal' => 'dependingAttributeType'],
-        'contractmgmt_attr_value_depvalue'          => ['name' => 'contractmgmt_attr_value_depvalue', 'type' => 'int', 'internal' => 'dependingAttributeValue'],
+        'contractmgmt_attr_value_id'       => ['name' => 'contractmgmt_attr_value_id',       'type' => 'int',      'internal' => 'id'],
+        'contractmgmt_attr_value_default'  => ['name' => 'contractmgmt_attr_value_default',  'type' => 'bool',     'internal' => 'isDefault'],
+        'contractmgmt_attr_value_valueStr' => ['name' => 'contractmgmt_attr_value_valueStr', 'type' => 'string',   'internal' => 'valueStr'],
+        'contractmgmt_attr_value_valueInt' => ['name' => 'contractmgmt_attr_value_valueInt', 'type' => 'int',      'internal' => 'valueInt'],
+        'contractmgmt_attr_value_valueDec' => ['name' => 'contractmgmt_attr_value_valueDec', 'type' => 'float',    'internal' => 'valueDec'],
+        'contractmgmt_attr_value_valueDat' => ['name' => 'contractmgmt_attr_value_valueDat', 'type' => 'DateTime', 'internal' => 'valueDat'],
+        'contractmgmt_attr_value_unit'     => ['name' => 'contractmgmt_attr_value_unit', 'type' => 'string', 'internal' => 'unit'],
+        'contractmgmt_attr_value_deptype'  => ['name' => 'contractmgmt_attr_value_deptype', 'type' => 'int', 'internal' => 'dependingAttributeType'],
+        'contractmgmt_attr_value_depvalue' => ['name' => 'contractmgmt_attr_value_depvalue', 'type' => 'int', 'internal' => 'dependingAttributeValue'],
     ];
 
     /**
diff --git a/Models/ContractMapper.php b/Models/ContractMapper.php
index f81668b..3599bbb 100755
--- a/Models/ContractMapper.php
+++ b/Models/ContractMapper.php
@@ -42,24 +42,24 @@ final class ContractMapper extends DataMapperFactory
      * @since 1.0.0
      */
     public const COLUMNS = [
-        'contractmgmt_contract_id'                        => ['name' => 'contractmgmt_contract_id',          'type' => 'int',               'internal' => 'id'],
-        'contractmgmt_contract_parent'                    => ['name' => 'contractmgmt_contract_parent',          'type' => 'int',               'internal' => 'parent'],
-        'contractmgmt_contract_template'                  => ['name' => 'contractmgmt_contract_template',          'type' => 'bool',               'internal' => 'isTemplate'],
-        'contractmgmt_contract_title'                     => ['name' => 'contractmgmt_contract_title',       'type' => 'string',            'internal' => 'title', 'autocomplete' => true],
-        'contractmgmt_contract_description'               => ['name' => 'contractmgmt_contract_description', 'type' => 'string',            'internal' => 'description'],
-        'contractmgmt_contract_account'                   => ['name' => 'contractmgmt_contract_account',     'type' => 'int',               'internal' => 'account'],
-        'contractmgmt_contract_costs'                     => ['name' => 'contractmgmt_contract_costs',       'type' => 'Serializable',      'internal' => 'costs'],
-        'contractmgmt_contract_renewal'                   => ['name' => 'contractmgmt_contract_renewal',     'type' => 'int',               'internal' => 'renewal'],
-        'contractmgmt_contract_autorenewal'               => ['name' => 'contractmgmt_contract_autorenewal', 'type' => 'bool',              'internal' => 'autoRenewal'],
-        'contractmgmt_contract_duration'                  => ['name' => 'contractmgmt_contract_duration',    'type' => 'int',               'internal' => 'duration'],
-        'contractmgmt_contract_warning'                   => ['name' => 'contractmgmt_contract_warning',     'type' => 'int',               'internal' => 'warning'],
-        'contractmgmt_contract_startoriginal'             => ['name' => 'contractmgmt_contract_startoriginal',       'type' => 'DateTime',          'internal' => 'originalStart'],
-        'contractmgmt_contract_start'                     => ['name' => 'contractmgmt_contract_start',       'type' => 'DateTime',          'internal' => 'start'],
-        'contractmgmt_contract_end'                       => ['name' => 'contractmgmt_contract_end',         'type' => 'DateTime',          'internal' => 'end'],
-        'contractmgmt_contract_responsible'               => ['name' => 'contractmgmt_contract_responsible', 'type' => 'int',               'internal' => 'responsible'],
-        'contractmgmt_contract_unit'                      => ['name' => 'contractmgmt_contract_unit',        'type' => 'int',               'internal' => 'unit'],
-        'contractmgmt_contract_type'                      => ['name' => 'contractmgmt_contract_type',        'type' => 'int',               'internal' => 'type'],
-        'contractmgmt_contract_created_at'                => ['name' => 'contractmgmt_contract_created_at',  'type' => 'DateTimeImmutable', 'internal' => 'createdAt'],
+        'contractmgmt_contract_id'            => ['name' => 'contractmgmt_contract_id',          'type' => 'int',               'internal' => 'id'],
+        'contractmgmt_contract_parent'        => ['name' => 'contractmgmt_contract_parent',          'type' => 'int',               'internal' => 'parent'],
+        'contractmgmt_contract_template'      => ['name' => 'contractmgmt_contract_template',          'type' => 'bool',               'internal' => 'isTemplate'],
+        'contractmgmt_contract_title'         => ['name' => 'contractmgmt_contract_title',       'type' => 'string',            'internal' => 'title', 'autocomplete' => true],
+        'contractmgmt_contract_description'   => ['name' => 'contractmgmt_contract_description', 'type' => 'string',            'internal' => 'description'],
+        'contractmgmt_contract_account'       => ['name' => 'contractmgmt_contract_account',     'type' => 'int',               'internal' => 'account'],
+        'contractmgmt_contract_costs'         => ['name' => 'contractmgmt_contract_costs',       'type' => 'Serializable',      'internal' => 'costs'],
+        'contractmgmt_contract_renewal'       => ['name' => 'contractmgmt_contract_renewal',     'type' => 'int',               'internal' => 'renewal'],
+        'contractmgmt_contract_autorenewal'   => ['name' => 'contractmgmt_contract_autorenewal', 'type' => 'bool',              'internal' => 'autoRenewal'],
+        'contractmgmt_contract_duration'      => ['name' => 'contractmgmt_contract_duration',    'type' => 'int',               'internal' => 'duration'],
+        'contractmgmt_contract_warning'       => ['name' => 'contractmgmt_contract_warning',     'type' => 'int',               'internal' => 'warning'],
+        'contractmgmt_contract_startoriginal' => ['name' => 'contractmgmt_contract_startoriginal',       'type' => 'DateTime',          'internal' => 'originalStart'],
+        'contractmgmt_contract_start'         => ['name' => 'contractmgmt_contract_start',       'type' => 'DateTime',          'internal' => 'start'],
+        'contractmgmt_contract_end'           => ['name' => 'contractmgmt_contract_end',         'type' => 'DateTime',          'internal' => 'end'],
+        'contractmgmt_contract_responsible'   => ['name' => 'contractmgmt_contract_responsible', 'type' => 'int',               'internal' => 'responsible'],
+        'contractmgmt_contract_unit'          => ['name' => 'contractmgmt_contract_unit',        'type' => 'int',               'internal' => 'unit'],
+        'contractmgmt_contract_type'          => ['name' => 'contractmgmt_contract_type',        'type' => 'int',               'internal' => 'type'],
+        'contractmgmt_contract_created_at'    => ['name' => 'contractmgmt_contract_created_at',  'type' => 'DateTimeImmutable', 'internal' => 'createdAt'],
     ];
 
     /**
diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php
index ff03ed3..bb651ec 100755
--- a/Theme/Backend/Lang/ar.lang.php
+++ b/Theme/Backend/Lang/ar.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => '',
-    'AutoRenewal'   => '',
-    'Contract'      => 'اتفافية',
-    'Contracts'     => 'انكماش',
-    'Costs'         => '',
-    'Description'   => '',
-    'End'           => '',
-    'Files'         => '',
-    'Name'          => '',
-    'Overview'      => '',
-    'Parties'       => '',
-    'Start'         => '',
-    'Termination'   => '',
-    'Title'         => 'عنوان',
-    'Type'          => '',
-    'Unit'          => '',
-    'With'          => '',
+    'Account'     => '',
+    'AutoRenewal' => '',
+    'Contract'    => 'اتفافية',
+    'Contracts'   => 'انكماش',
+    'Costs'       => '',
+    'Description' => '',
+    'End'         => '',
+    'Files'       => '',
+    'Name'        => '',
+    'Overview'    => '',
+    'Parties'     => '',
+    'Start'       => '',
+    'Termination' => '',
+    'Title'       => 'عنوان',
+    'Type'        => '',
+    'Unit'        => '',
+    'With'        => '',
 ]];
diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php
index 04825bc..56f5e25 100755
--- a/Theme/Backend/Lang/cs.lang.php
+++ b/Theme/Backend/Lang/cs.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => '',
-    'AutoRenewal'   => '',
-    'Contract'      => 'Smlouva',
-    'Contracts'     => 'Smlouvy',
-    'Costs'         => '',
-    'Description'   => '',
-    'End'           => '',
-    'Files'         => '',
-    'Name'          => '',
-    'Overview'      => '',
-    'Parties'       => '',
-    'Start'         => '',
-    'Termination'   => '',
-    'Title'         => 'Titul',
-    'Type'          => '',
-    'Unit'          => '',
-    'With'          => '',
+    'Account'     => '',
+    'AutoRenewal' => '',
+    'Contract'    => 'Smlouva',
+    'Contracts'   => 'Smlouvy',
+    'Costs'       => '',
+    'Description' => '',
+    'End'         => '',
+    'Files'       => '',
+    'Name'        => '',
+    'Overview'    => '',
+    'Parties'     => '',
+    'Start'       => '',
+    'Termination' => '',
+    'Title'       => 'Titul',
+    'Type'        => '',
+    'Unit'        => '',
+    'With'        => '',
 ]];
diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php
index 4533bdc..1bde1a9 100755
--- a/Theme/Backend/Lang/da.lang.php
+++ b/Theme/Backend/Lang/da.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => '',
-    'AutoRenewal'   => '',
-    'Contract'      => 'Kontrakt',
-    'Contracts'     => 'Kontrakter',
-    'Costs'         => '',
-    'Description'   => '',
-    'End'           => '',
-    'Files'         => '',
-    'Name'          => '',
-    'Overview'      => '',
-    'Parties'       => '',
-    'Start'         => '',
-    'Termination'   => '',
-    'Title'         => 'Titel',
-    'Type'          => '',
-    'Unit'          => '',
-    'With'          => '',
+    'Account'     => '',
+    'AutoRenewal' => '',
+    'Contract'    => 'Kontrakt',
+    'Contracts'   => 'Kontrakter',
+    'Costs'       => '',
+    'Description' => '',
+    'End'         => '',
+    'Files'       => '',
+    'Name'        => '',
+    'Overview'    => '',
+    'Parties'     => '',
+    'Start'       => '',
+    'Termination' => '',
+    'Title'       => 'Titel',
+    'Type'        => '',
+    'Unit'        => '',
+    'With'        => '',
 ]];
diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php
index b494c44..5ac037d 100755
--- a/Theme/Backend/Lang/de.lang.php
+++ b/Theme/Backend/Lang/de.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => 'Account',
-    'AutoRenewal'   => 'Automatische Verlängerung',
-    'Contract'      => 'Vertrag',
-    'Contracts'     => 'Verträge',
-    'Costs'         => 'Kosten',
-    'Description'   => 'Beschreibung',
-    'End'           => 'Ende',
-    'Files'         => 'Dateien',
-    'Name'          => 'Name',
-    'Overview'      => 'Übersicht',
-    'Parties'       => 'Parteien',
-    'Start'         => 'Start',
-    'Termination'   => 'Beendigung',
-    'Title'         => 'Titel',
-    'Type'          => 'Typ',
-    'Unit'          => 'Unit',
-    'With'          => 'Mit',
+    'Account'     => 'Account',
+    'AutoRenewal' => 'Automatische Verlängerung',
+    'Contract'    => 'Vertrag',
+    'Contracts'   => 'Verträge',
+    'Costs'       => 'Kosten',
+    'Description' => 'Beschreibung',
+    'End'         => 'Ende',
+    'Files'       => 'Dateien',
+    'Name'        => 'Name',
+    'Overview'    => 'Übersicht',
+    'Parties'     => 'Parteien',
+    'Start'       => 'Start',
+    'Termination' => 'Beendigung',
+    'Title'       => 'Titel',
+    'Type'        => 'Typ',
+    'Unit'        => 'Unit',
+    'With'        => 'Mit',
 ]];
diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php
index f17de8a..321c54e 100755
--- a/Theme/Backend/Lang/el.lang.php
+++ b/Theme/Backend/Lang/el.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => '',
-    'AutoRenewal'   => '',
-    'Contract'      => 'Σύμβαση',
-    'Contracts'     => 'Συμβάσεις',
-    'Costs'         => '',
-    'Description'   => '',
-    'End'           => '',
-    'Files'         => '',
-    'Name'          => '',
-    'Overview'      => '',
-    'Parties'       => '',
-    'Start'         => '',
-    'Termination'   => '',
-    'Title'         => 'Τίτλος',
-    'Type'          => '',
-    'Unit'          => '',
-    'With'          => '',
+    'Account'     => '',
+    'AutoRenewal' => '',
+    'Contract'    => 'Σύμβαση',
+    'Contracts'   => 'Συμβάσεις',
+    'Costs'       => '',
+    'Description' => '',
+    'End'         => '',
+    'Files'       => '',
+    'Name'        => '',
+    'Overview'    => '',
+    'Parties'     => '',
+    'Start'       => '',
+    'Termination' => '',
+    'Title'       => 'Τίτλος',
+    'Type'        => '',
+    'Unit'        => '',
+    'With'        => '',
 ]];
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index e357016..a2c7cb2 100755
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => 'Account',
-    'AutoRenewal'   => 'Auto Renewal',
-    'Contract'      => 'Contract',
-    'Contracts'     => 'Contracts',
-    'Costs'         => 'Costs',
-    'Description'   => 'Description',
-    'End'           => 'End',
-    'Files'         => 'Files',
-    'Name'          => '',
-    'Overview'      => 'Overview',
-    'Parties'       => 'Parties',
-    'Start'         => 'Start',
-    'Termination'   => 'Termination',
-    'Title'         => 'Title',
-    'Type'          => 'Type',
-    'Unit'          => 'Unit',
-    'With'          => 'With',
+    'Account'     => 'Account',
+    'AutoRenewal' => 'Auto Renewal',
+    'Contract'    => 'Contract',
+    'Contracts'   => 'Contracts',
+    'Costs'       => 'Costs',
+    'Description' => 'Description',
+    'End'         => 'End',
+    'Files'       => 'Files',
+    'Name'        => '',
+    'Overview'    => 'Overview',
+    'Parties'     => 'Parties',
+    'Start'       => 'Start',
+    'Termination' => 'Termination',
+    'Title'       => 'Title',
+    'Type'        => 'Type',
+    'Unit'        => 'Unit',
+    'With'        => 'With',
 ]];
diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php
index 56a5b4f..2270c40 100755
--- a/Theme/Backend/Lang/es.lang.php
+++ b/Theme/Backend/Lang/es.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => '',
-    'AutoRenewal'   => '',
-    'Contract'      => 'Contrato',
-    'Contracts'     => 'Contrato',
-    'Costs'         => '',
-    'Description'   => '',
-    'End'           => '',
-    'Files'         => '',
-    'Name'          => '',
-    'Overview'      => '',
-    'Parties'       => '',
-    'Start'         => '',
-    'Termination'   => '',
-    'Title'         => 'Título',
-    'Type'          => '',
-    'Unit'          => '',
-    'With'          => '',
+    'Account'     => '',
+    'AutoRenewal' => '',
+    'Contract'    => 'Contrato',
+    'Contracts'   => 'Contrato',
+    'Costs'       => '',
+    'Description' => '',
+    'End'         => '',
+    'Files'       => '',
+    'Name'        => '',
+    'Overview'    => '',
+    'Parties'     => '',
+    'Start'       => '',
+    'Termination' => '',
+    'Title'       => 'Título',
+    'Type'        => '',
+    'Unit'        => '',
+    'With'        => '',
 ]];
diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php
index 7a0192d..46d5332 100755
--- a/Theme/Backend/Lang/fi.lang.php
+++ b/Theme/Backend/Lang/fi.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => '',
-    'AutoRenewal'   => '',
-    'Contract'      => 'Sopimus',
-    'Contracts'     => 'Sopimukset',
-    'Costs'         => '',
-    'Description'   => '',
-    'End'           => '',
-    'Files'         => '',
-    'Name'          => '',
-    'Overview'      => '',
-    'Parties'       => '',
-    'Start'         => '',
-    'Termination'   => '',
-    'Title'         => 'Otsikko',
-    'Type'          => '',
-    'Unit'          => '',
-    'With'          => '',
+    'Account'     => '',
+    'AutoRenewal' => '',
+    'Contract'    => 'Sopimus',
+    'Contracts'   => 'Sopimukset',
+    'Costs'       => '',
+    'Description' => '',
+    'End'         => '',
+    'Files'       => '',
+    'Name'        => '',
+    'Overview'    => '',
+    'Parties'     => '',
+    'Start'       => '',
+    'Termination' => '',
+    'Title'       => 'Otsikko',
+    'Type'        => '',
+    'Unit'        => '',
+    'With'        => '',
 ]];
diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php
index 06faf06..daaa874 100755
--- a/Theme/Backend/Lang/fr.lang.php
+++ b/Theme/Backend/Lang/fr.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => '',
-    'AutoRenewal'   => '',
-    'Contract'      => 'Contracter',
-    'Contracts'     => 'Contrats',
-    'Costs'         => '',
-    'Description'   => '',
-    'End'           => '',
-    'Files'         => '',
-    'Name'          => '',
-    'Overview'      => '',
-    'Parties'       => '',
-    'Start'         => '',
-    'Termination'   => '',
-    'Title'         => 'Titre',
-    'Type'          => '',
-    'Unit'          => '',
-    'With'          => '',
+    'Account'     => '',
+    'AutoRenewal' => '',
+    'Contract'    => 'Contracter',
+    'Contracts'   => 'Contrats',
+    'Costs'       => '',
+    'Description' => '',
+    'End'         => '',
+    'Files'       => '',
+    'Name'        => '',
+    'Overview'    => '',
+    'Parties'     => '',
+    'Start'       => '',
+    'Termination' => '',
+    'Title'       => 'Titre',
+    'Type'        => '',
+    'Unit'        => '',
+    'With'        => '',
 ]];
diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php
index 0960eec..615e56b 100755
--- a/Theme/Backend/Lang/hu.lang.php
+++ b/Theme/Backend/Lang/hu.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => '',
-    'AutoRenewal'   => '',
-    'Contract'      => 'Szerződés',
-    'Contracts'     => 'Szerződések',
-    'Costs'         => '',
-    'Description'   => '',
-    'End'           => '',
-    'Files'         => '',
-    'Name'          => '',
-    'Overview'      => '',
-    'Parties'       => '',
-    'Start'         => '',
-    'Termination'   => '',
-    'Title'         => 'Cím',
-    'Type'          => '',
-    'Unit'          => '',
-    'With'          => '',
+    'Account'     => '',
+    'AutoRenewal' => '',
+    'Contract'    => 'Szerződés',
+    'Contracts'   => 'Szerződések',
+    'Costs'       => '',
+    'Description' => '',
+    'End'         => '',
+    'Files'       => '',
+    'Name'        => '',
+    'Overview'    => '',
+    'Parties'     => '',
+    'Start'       => '',
+    'Termination' => '',
+    'Title'       => 'Cím',
+    'Type'        => '',
+    'Unit'        => '',
+    'With'        => '',
 ]];
diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php
index f0b19fb..acf193e 100755
--- a/Theme/Backend/Lang/it.lang.php
+++ b/Theme/Backend/Lang/it.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => '',
-    'AutoRenewal'   => '',
-    'Contract'      => 'Contrarre',
-    'Contracts'     => 'Contratti',
-    'Costs'         => '',
-    'Description'   => '',
-    'End'           => '',
-    'Files'         => '',
-    'Name'          => '',
-    'Overview'      => '',
-    'Parties'       => '',
-    'Start'         => '',
-    'Termination'   => '',
-    'Title'         => 'Titolo',
-    'Type'          => '',
-    'Unit'          => '',
-    'With'          => '',
+    'Account'     => '',
+    'AutoRenewal' => '',
+    'Contract'    => 'Contrarre',
+    'Contracts'   => 'Contratti',
+    'Costs'       => '',
+    'Description' => '',
+    'End'         => '',
+    'Files'       => '',
+    'Name'        => '',
+    'Overview'    => '',
+    'Parties'     => '',
+    'Start'       => '',
+    'Termination' => '',
+    'Title'       => 'Titolo',
+    'Type'        => '',
+    'Unit'        => '',
+    'With'        => '',
 ]];
diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php
index 2c67e33..fb61626 100755
--- a/Theme/Backend/Lang/ja.lang.php
+++ b/Theme/Backend/Lang/ja.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => '',
-    'AutoRenewal'   => '',
-    'Contract'      => '契約',
-    'Contracts'     => '契約',
-    'Costs'         => '',
-    'Description'   => '',
-    'End'           => '',
-    'Files'         => '',
-    'Name'          => '',
-    'Overview'      => '',
-    'Parties'       => '',
-    'Start'         => '',
-    'Termination'   => '',
-    'Title'         => 'タイトル',
-    'Type'          => '',
-    'Unit'          => '',
-    'With'          => '',
+    'Account'     => '',
+    'AutoRenewal' => '',
+    'Contract'    => '契約',
+    'Contracts'   => '契約',
+    'Costs'       => '',
+    'Description' => '',
+    'End'         => '',
+    'Files'       => '',
+    'Name'        => '',
+    'Overview'    => '',
+    'Parties'     => '',
+    'Start'       => '',
+    'Termination' => '',
+    'Title'       => 'タイトル',
+    'Type'        => '',
+    'Unit'        => '',
+    'With'        => '',
 ]];
diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php
index 6f26c69..620a6b5 100755
--- a/Theme/Backend/Lang/ko.lang.php
+++ b/Theme/Backend/Lang/ko.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => '',
-    'AutoRenewal'   => '',
-    'Contract'      => '계약',
-    'Contracts'     => '계약서',
-    'Costs'         => '',
-    'Description'   => '',
-    'End'           => '',
-    'Files'         => '',
-    'Name'          => '',
-    'Overview'      => '',
-    'Parties'       => '',
-    'Start'         => '',
-    'Termination'   => '',
-    'Title'         => '제목',
-    'Type'          => '',
-    'Unit'          => '',
-    'With'          => '',
+    'Account'     => '',
+    'AutoRenewal' => '',
+    'Contract'    => '계약',
+    'Contracts'   => '계약서',
+    'Costs'       => '',
+    'Description' => '',
+    'End'         => '',
+    'Files'       => '',
+    'Name'        => '',
+    'Overview'    => '',
+    'Parties'     => '',
+    'Start'       => '',
+    'Termination' => '',
+    'Title'       => '제목',
+    'Type'        => '',
+    'Unit'        => '',
+    'With'        => '',
 ]];
diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php
index 5f395bf..652c208 100755
--- a/Theme/Backend/Lang/no.lang.php
+++ b/Theme/Backend/Lang/no.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => '',
-    'AutoRenewal'   => '',
-    'Contract'      => 'Kontrakt',
-    'Contracts'     => 'Kontrakter',
-    'Costs'         => '',
-    'Description'   => '',
-    'End'           => '',
-    'Files'         => '',
-    'Name'          => '',
-    'Overview'      => '',
-    'Parties'       => '',
-    'Start'         => '',
-    'Termination'   => '',
-    'Title'         => 'Tittel',
-    'Type'          => '',
-    'Unit'          => '',
-    'With'          => '',
+    'Account'     => '',
+    'AutoRenewal' => '',
+    'Contract'    => 'Kontrakt',
+    'Contracts'   => 'Kontrakter',
+    'Costs'       => '',
+    'Description' => '',
+    'End'         => '',
+    'Files'       => '',
+    'Name'        => '',
+    'Overview'    => '',
+    'Parties'     => '',
+    'Start'       => '',
+    'Termination' => '',
+    'Title'       => 'Tittel',
+    'Type'        => '',
+    'Unit'        => '',
+    'With'        => '',
 ]];
diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php
index 16cdcd6..042761e 100755
--- a/Theme/Backend/Lang/pl.lang.php
+++ b/Theme/Backend/Lang/pl.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => '',
-    'AutoRenewal'   => '',
-    'Contract'      => 'Kontrakt',
-    'Contracts'     => 'Kontrakty',
-    'Costs'         => '',
-    'Description'   => '',
-    'End'           => '',
-    'Files'         => '',
-    'Name'          => '',
-    'Overview'      => '',
-    'Parties'       => '',
-    'Start'         => '',
-    'Termination'   => '',
-    'Title'         => 'Tytuł',
-    'Type'          => '',
-    'Unit'          => '',
-    'With'          => '',
+    'Account'     => '',
+    'AutoRenewal' => '',
+    'Contract'    => 'Kontrakt',
+    'Contracts'   => 'Kontrakty',
+    'Costs'       => '',
+    'Description' => '',
+    'End'         => '',
+    'Files'       => '',
+    'Name'        => '',
+    'Overview'    => '',
+    'Parties'     => '',
+    'Start'       => '',
+    'Termination' => '',
+    'Title'       => 'Tytuł',
+    'Type'        => '',
+    'Unit'        => '',
+    'With'        => '',
 ]];
diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php
index 3080423..8ed0967 100755
--- a/Theme/Backend/Lang/pt.lang.php
+++ b/Theme/Backend/Lang/pt.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => '',
-    'AutoRenewal'   => '',
-    'Contract'      => 'Contrato',
-    'Contracts'     => 'Contratos',
-    'Costs'         => '',
-    'Description'   => '',
-    'End'           => '',
-    'Files'         => '',
-    'Name'          => '',
-    'Overview'      => '',
-    'Parties'       => '',
-    'Start'         => '',
-    'Termination'   => '',
-    'Title'         => 'Título',
-    'Type'          => '',
-    'Unit'          => '',
-    'With'          => '',
+    'Account'     => '',
+    'AutoRenewal' => '',
+    'Contract'    => 'Contrato',
+    'Contracts'   => 'Contratos',
+    'Costs'       => '',
+    'Description' => '',
+    'End'         => '',
+    'Files'       => '',
+    'Name'        => '',
+    'Overview'    => '',
+    'Parties'     => '',
+    'Start'       => '',
+    'Termination' => '',
+    'Title'       => 'Título',
+    'Type'        => '',
+    'Unit'        => '',
+    'With'        => '',
 ]];
diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php
index 902059a..c6a256d 100755
--- a/Theme/Backend/Lang/ru.lang.php
+++ b/Theme/Backend/Lang/ru.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => '',
-    'AutoRenewal'   => '',
-    'Contract'      => 'Договор',
-    'Contracts'     => 'Контракты',
-    'Costs'         => '',
-    'Description'   => '',
-    'End'           => '',
-    'Files'         => '',
-    'Name'          => '',
-    'Overview'      => '',
-    'Parties'       => '',
-    'Start'         => '',
-    'Termination'   => '',
-    'Title'         => 'Заголовок',
-    'Type'          => '',
-    'Unit'          => '',
-    'With'          => '',
+    'Account'     => '',
+    'AutoRenewal' => '',
+    'Contract'    => 'Договор',
+    'Contracts'   => 'Контракты',
+    'Costs'       => '',
+    'Description' => '',
+    'End'         => '',
+    'Files'       => '',
+    'Name'        => '',
+    'Overview'    => '',
+    'Parties'     => '',
+    'Start'       => '',
+    'Termination' => '',
+    'Title'       => 'Заголовок',
+    'Type'        => '',
+    'Unit'        => '',
+    'With'        => '',
 ]];
diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php
index 9a9b2c5..a1e655f 100755
--- a/Theme/Backend/Lang/sv.lang.php
+++ b/Theme/Backend/Lang/sv.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => '',
-    'AutoRenewal'   => '',
-    'Contract'      => 'Avtal',
-    'Contracts'     => 'Kontrakt',
-    'Costs'         => '',
-    'Description'   => '',
-    'End'           => '',
-    'Files'         => '',
-    'Name'          => '',
-    'Overview'      => '',
-    'Parties'       => '',
-    'Start'         => '',
-    'Termination'   => '',
-    'Title'         => 'Titel',
-    'Type'          => '',
-    'Unit'          => '',
-    'With'          => '',
+    'Account'     => '',
+    'AutoRenewal' => '',
+    'Contract'    => 'Avtal',
+    'Contracts'   => 'Kontrakt',
+    'Costs'       => '',
+    'Description' => '',
+    'End'         => '',
+    'Files'       => '',
+    'Name'        => '',
+    'Overview'    => '',
+    'Parties'     => '',
+    'Start'       => '',
+    'Termination' => '',
+    'Title'       => 'Titel',
+    'Type'        => '',
+    'Unit'        => '',
+    'With'        => '',
 ]];
diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php
index 48436e3..c1a4e50 100755
--- a/Theme/Backend/Lang/th.lang.php
+++ b/Theme/Backend/Lang/th.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => '',
-    'AutoRenewal'   => '',
-    'Contract'      => 'สัญญา',
-    'Contracts'     => 'สัญญา',
-    'Costs'         => '',
-    'Description'   => '',
-    'End'           => '',
-    'Files'         => '',
-    'Name'          => '',
-    'Overview'      => '',
-    'Parties'       => '',
-    'Start'         => '',
-    'Termination'   => '',
-    'Title'         => 'ชื่อ',
-    'Type'          => '',
-    'Unit'          => '',
-    'With'          => '',
+    'Account'     => '',
+    'AutoRenewal' => '',
+    'Contract'    => 'สัญญา',
+    'Contracts'   => 'สัญญา',
+    'Costs'       => '',
+    'Description' => '',
+    'End'         => '',
+    'Files'       => '',
+    'Name'        => '',
+    'Overview'    => '',
+    'Parties'     => '',
+    'Start'       => '',
+    'Termination' => '',
+    'Title'       => 'ชื่อ',
+    'Type'        => '',
+    'Unit'        => '',
+    'With'        => '',
 ]];
diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php
index 5f481ca..820985c 100755
--- a/Theme/Backend/Lang/tr.lang.php
+++ b/Theme/Backend/Lang/tr.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => '',
-    'AutoRenewal'   => '',
-    'Contract'      => 'Sözleşme',
-    'Contracts'     => 'Sözleşme',
-    'Costs'         => '',
-    'Description'   => '',
-    'End'           => '',
-    'Files'         => '',
-    'Name'          => '',
-    'Overview'      => '',
-    'Parties'       => '',
-    'Start'         => '',
-    'Termination'   => '',
-    'Title'         => 'Başlık',
-    'Type'          => '',
-    'Unit'          => '',
-    'With'          => '',
+    'Account'     => '',
+    'AutoRenewal' => '',
+    'Contract'    => 'Sözleşme',
+    'Contracts'   => 'Sözleşme',
+    'Costs'       => '',
+    'Description' => '',
+    'End'         => '',
+    'Files'       => '',
+    'Name'        => '',
+    'Overview'    => '',
+    'Parties'     => '',
+    'Start'       => '',
+    'Termination' => '',
+    'Title'       => 'Başlık',
+    'Type'        => '',
+    'Unit'        => '',
+    'With'        => '',
 ]];
diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php
index 3169d00..73cee62 100755
--- a/Theme/Backend/Lang/uk.lang.php
+++ b/Theme/Backend/Lang/uk.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => '',
-    'AutoRenewal'   => '',
-    'Contract'      => 'Договір',
-    'Contracts'     => 'Контракти',
-    'Costs'         => '',
-    'Description'   => '',
-    'End'           => '',
-    'Files'         => '',
-    'Name'          => '',
-    'Overview'      => '',
-    'Parties'       => '',
-    'Start'         => '',
-    'Termination'   => '',
-    'Title'         => 'Заголовок',
-    'Type'          => '',
-    'Unit'          => '',
-    'With'          => '',
+    'Account'     => '',
+    'AutoRenewal' => '',
+    'Contract'    => 'Договір',
+    'Contracts'   => 'Контракти',
+    'Costs'       => '',
+    'Description' => '',
+    'End'         => '',
+    'Files'       => '',
+    'Name'        => '',
+    'Overview'    => '',
+    'Parties'     => '',
+    'Start'       => '',
+    'Termination' => '',
+    'Title'       => 'Заголовок',
+    'Type'        => '',
+    'Unit'        => '',
+    'With'        => '',
 ]];
diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php
index aea761b..8d407a0 100755
--- a/Theme/Backend/Lang/zh.lang.php
+++ b/Theme/Backend/Lang/zh.lang.php
@@ -13,21 +13,21 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'       => '',
-    'AutoRenewal'   => '',
-    'Contract'      => '合同',
-    'Contracts'     => '合同',
-    'Costs'         => '',
-    'Description'   => '',
-    'End'           => '',
-    'Files'         => '',
-    'Name'          => '',
-    'Overview'      => '',
-    'Parties'       => '',
-    'Start'         => '',
-    'Termination'   => '',
-    'Title'         => '标题',
-    'Type'          => '',
-    'Unit'          => '',
-    'With'          => '',
+    'Account'     => '',
+    'AutoRenewal' => '',
+    'Contract'    => '合同',
+    'Contracts'   => '合同',
+    'Costs'       => '',
+    'Description' => '',
+    'End'         => '',
+    'Files'       => '',
+    'Name'        => '',
+    'Overview'    => '',
+    'Parties'     => '',
+    'Start'       => '',
+    'Termination' => '',
+    'Title'       => '标题',
+    'Type'        => '',
+    'Unit'        => '',
+    'With'        => '',
 ]];
diff --git a/Theme/Backend/contract-list.tpl.php b/Theme/Backend/contract-list.tpl.php
index 8063d9b..4019cc0 100755
--- a/Theme/Backend/contract-list.tpl.php
+++ b/Theme/Backend/contract-list.tpl.php
@@ -73,7 +73,7 @@ echo $this->data['nav']->render(); ?>
                         </label>
                 <tbody>
                 <?php foreach ($contracts as $key => $value) :
-                    $url = UriFactory::build('{/base}/contract/single?{?}&id=' . $value->id);
+                    $url = UriFactory::build('{/base}/contract/view?{?}&id=' . $value->id);
 
                     $type = 'ok';
                     if (($value->end->getTimestamp() < $now->getTimestamp() && $value->end->getTimestamp() + 7776000 > $now->getTimestamp())
@@ -88,7 +88,7 @@ echo $this->data['nav']->render(); ?>
                 ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td data-label="<?= $this->getHtml('Title'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->title); ?></a>
-                    <td data-label="<?= $this->getHtml('Account'); ?>"><a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $value->account->id); ?>"><?= $this->printHtml($value->account->name1); ?> <?= $this->printHtml($value->account->name2); ?></a>
+                    <td data-label="<?= $this->getHtml('Account'); ?>"><a class="content" href="<?= UriFactory::build('{/base}/profile/view?{?}&for=' . $value->account->id); ?>"><?= $this->printHtml($value->account->name1); ?> <?= $this->printHtml($value->account->name2); ?></a>
                     <td data-label="<?= $this->getHtml('End'); ?>"><a href="<?= $url; ?>"><span class="tag <?= $type;  ?>"><?= $value->end !== null ? $value->end->format('Y-m-d') : ''; ?></span></a>
                 <?php endforeach; ?>
             </table>
diff --git a/Theme/Backend/contract-type-list.tpl.php b/Theme/Backend/contract-type-list.tpl.php
index e657e79..37e4711 100644
--- a/Theme/Backend/contract-type-list.tpl.php
+++ b/Theme/Backend/contract-type-list.tpl.php
@@ -55,7 +55,7 @@ echo $this->data['nav']->render(); ?>
                 <?php
                 $count = 0;
                 foreach ($types as $key => $value) : ++$count;
-                    $url = UriFactory::build('{/base}/contract/type/profile?{?}&id=' . $value->id);
+                    $url = UriFactory::build('{/base}/contract/type/view?{?}&id=' . $value->id);
                 ?>
                 <tr data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= $value->id; ?></a>
diff --git a/Theme/Backend/contract-single.tpl.php b/Theme/Backend/contract-view.tpl.php
old mode 100755
new mode 100644
similarity index 100%
rename from Theme/Backend/contract-single.tpl.php
rename to Theme/Backend/contract-view.tpl.php
diff --git a/tests/Autoloader.php b/tests/Autoloader.php
index 6c24d51..01eeb9f 100644
--- a/tests/Autoloader.php
+++ b/tests/Autoloader.php
@@ -75,8 +75,8 @@ final class Autoloader
      */
     public static function defaultAutoloader(string $class) : void
     {
-        $class  = \ltrim($class, '\\');
-        $class  = \strtr($class, '_\\', '//');
+        $class = \ltrim($class, '\\');
+        $class = \strtr($class, '_\\', '//');
 
         if (\stripos($class, 'Web/Backend') !== false || \stripos($class, 'Web/Api') !== false) {
             $class = \is_dir(__DIR__ . '/Web') ? $class : \str_replace('Web/', 'MainRepository/Web/', $class);
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index ddc049d..714e8b0 100644
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -1,4 +1,15 @@
 <?php
+/**
+ * Jingga
+ *
+ * PHP Version 8.1
+ *
+ * @package   Modules\ContractManagement\tests
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 2.0
+ * @version   1.0.0
+ * @link      https://jingga.app
+ */
 declare(strict_types=1);
 
 \ini_set('memory_limit', '2048M');
@@ -67,10 +78,10 @@ $GLOBALS['is_github'] = $IS_GITHUB;
 $tmp = FileLogger::getInstance(__DIR__ . '/../Logs');
 
 $CONFIG = [
-    'db'       => [
+    'db' => [
         'core' => [
             'masters' => [
-                'admin'  => [
+                'admin' => [
                     'db'             => 'mysql', /* db type */
                     'host'           => '127.0.0.1', /* db host address */
                     'port'           => '3306', /* db host port */
@@ -80,7 +91,7 @@ $CONFIG = [
                     'weight'         => 1000, /* db table prefix */
                     'datetimeformat' => 'Y-m-d H:i:s',
                 ],
-                'insert'  => [
+                'insert' => [
                     'db'             => 'mysql', /* db type */
                     'host'           => '127.0.0.1', /* db host address */
                     'port'           => '3306', /* db host port */
@@ -90,7 +101,7 @@ $CONFIG = [
                     'weight'         => 1000, /* db table prefix */
                     'datetimeformat' => 'Y-m-d H:i:s',
                 ],
-                'select'  => [
+                'select' => [
                     'db'             => 'mysql', /* db type */
                     'host'           => '127.0.0.1', /* db host address */
                     'port'           => '3306', /* db host port */
@@ -100,7 +111,7 @@ $CONFIG = [
                     'weight'         => 1000, /* db table prefix */
                     'datetimeformat' => 'Y-m-d H:i:s',
                 ],
-                'update'  => [
+                'update' => [
                     'db'             => 'mysql', /* db type */
                     'host'           => '127.0.0.1', /* db host address */
                     'port'           => '3306', /* db host port */
@@ -110,7 +121,7 @@ $CONFIG = [
                     'weight'         => 1000, /* db table prefix */
                     'datetimeformat' => 'Y-m-d H:i:s',
                 ],
-                'delete'  => [
+                'delete' => [
                     'db'             => 'mysql', /* db type */
                     'host'           => '127.0.0.1', /* db host address */
                     'port'           => '3306', /* db host port */
@@ -120,7 +131,7 @@ $CONFIG = [
                     'weight'         => 1000, /* db table prefix */
                     'datetimeformat' => 'Y-m-d H:i:s',
                 ],
-                'schema'  => [
+                'schema' => [
                     'db'             => 'mysql', /* db type */
                     'host'           => '127.0.0.1', /* db host address */
                     'port'           => '3306', /* db host port */
@@ -132,7 +143,7 @@ $CONFIG = [
                 ],
             ],
             'postgresql' => [
-                'admin'  => [
+                'admin' => [
                     'db'             => 'pgsql', /* db type */
                     'host'           => '127.0.0.1', /* db host address */
                     'port'           => '5432', /* db host port */
@@ -142,7 +153,7 @@ $CONFIG = [
                     'weight'         => 1000, /* db table prefix */
                     'datetimeformat' => 'Y-m-d H:i:s',
                 ],
-                'insert'  => [
+                'insert' => [
                     'db'             => 'pgsql', /* db type */
                     'host'           => '127.0.0.1', /* db host address */
                     'port'           => '5432', /* db host port */
@@ -152,7 +163,7 @@ $CONFIG = [
                     'weight'         => 1000, /* db table prefix */
                     'datetimeformat' => 'Y-m-d H:i:s',
                 ],
-                'select'  => [
+                'select' => [
                     'db'             => 'pgsql', /* db type */
                     'host'           => '127.0.0.1', /* db host address */
                     'port'           => '5432', /* db host port */
@@ -162,7 +173,7 @@ $CONFIG = [
                     'weight'         => 1000, /* db table prefix */
                     'datetimeformat' => 'Y-m-d H:i:s',
                 ],
-                'update'  => [
+                'update' => [
                     'db'             => 'pgsql', /* db type */
                     'host'           => '127.0.0.1', /* db host address */
                     'port'           => '5432', /* db host port */
@@ -172,7 +183,7 @@ $CONFIG = [
                     'weight'         => 1000, /* db table prefix */
                     'datetimeformat' => 'Y-m-d H:i:s',
                 ],
-                'delete'  => [
+                'delete' => [
                     'db'             => 'pgsql', /* db type */
                     'host'           => '127.0.0.1', /* db host address */
                     'port'           => '5432', /* db host port */
@@ -182,7 +193,7 @@ $CONFIG = [
                     'weight'         => 1000, /* db table prefix */
                     'datetimeformat' => 'Y-m-d H:i:s',
                 ],
-                'schema'  => [
+                'schema' => [
                     'db'             => 'pgsql', /* db type */
                     'host'           => '127.0.0.1', /* db host address */
                     'port'           => '5432', /* db host port */
@@ -194,37 +205,37 @@ $CONFIG = [
                 ],
             ],
             'sqlite' => [
-                'admin'  => [
+                'admin' => [
                     'db'             => 'sqlite', /* db type */
                     'database'       => __DIR__ . '/../Karaka/phpOMS/Localization/Defaults/localization.sqlite', /* db name */
                     'weight'         => 1000, /* db table prefix */
                     'datetimeformat' => 'Y-m-d H:i:s',
                 ],
-                'insert'  => [
+                'insert' => [
                     'db'             => 'sqlite', /* db type */
                     'database'       => __DIR__ . '/../Karaka/phpOMS/Localization/Defaults/localization.sqlite', /* db name */
                     'weight'         => 1000, /* db table prefix */
                     'datetimeformat' => 'Y-m-d H:i:s',
                 ],
-                'select'  => [
+                'select' => [
                     'db'             => 'sqlite', /* db type */
                     'database'       => __DIR__ . '/../Karaka/phpOMS/Localization/Defaults/localization.sqlite', /* db name */
                     'weight'         => 1000, /* db table prefix */
                     'datetimeformat' => 'Y-m-d H:i:s',
                 ],
-                'update'  => [
+                'update' => [
                     'db'             => 'sqlite', /* db type */
                     'database'       => __DIR__ . '/../Karaka/phpOMS/Localization/Defaults/localization.sqlite', /* db name */
                     'weight'         => 1000, /* db table prefix */
                     'datetimeformat' => 'Y-m-d H:i:s',
                 ],
-                'delete'  => [
+                'delete' => [
                     'db'             => 'sqlite', /* db type */
                     'database'       => __DIR__ . '/../Karaka/phpOMS/Localization/Defaults/localization.sqlite', /* db name */
                     'weight'         => 1000, /* db table prefix */
                     'datetimeformat' => 'Y-m-d H:i:s',
                 ],
-                'schema'  => [
+                'schema' => [
                     'db'             => 'sqlite', /* db type */
                     'database'       => __DIR__ . '/../Karaka/phpOMS/Localization/Defaults/localization.sqlite', /* db name */
                     'weight'         => 1000, /* db table prefix */
@@ -232,7 +243,7 @@ $CONFIG = [
                 ],
             ],
             'mssql' => [
-                'admin'  => [
+                'admin' => [
                     'db'             => 'mssql', /* db type */
                     'host'           => '127.0.0.1', /* db host address */
                     'port'           => '1433', /* db host port */
@@ -242,7 +253,7 @@ $CONFIG = [
                     'weight'         => 1000, /* db table prefix */
                     'datetimeformat' => 'Y-m-d H:i:s',
                 ],
-                'insert'  => [
+                'insert' => [
                     'db'             => 'mssql', /* db type */
                     'host'           => '127.0.0.1', /* db host address */
                     'port'           => '1433', /* db host port */
@@ -252,7 +263,7 @@ $CONFIG = [
                     'weight'         => 1000, /* db table prefix */
                     'datetimeformat' => 'Y-m-d H:i:s',
                 ],
-                'select'  => [
+                'select' => [
                     'db'             => 'mssql', /* db type */
                     'host'           => '127.0.0.1', /* db host address */
                     'port'           => '1433', /* db host port */
@@ -262,7 +273,7 @@ $CONFIG = [
                     'weight'         => 1000, /* db table prefix */
                     'datetimeformat' => 'Y-m-d H:i:s',
                 ],
-                'update'  => [
+                'update' => [
                     'db'             => 'mssql', /* db type */
                     'host'           => '127.0.0.1', /* db host address */
                     'port'           => '1433', /* db host port */
@@ -272,7 +283,7 @@ $CONFIG = [
                     'weight'         => 1000, /* db table prefix */
                     'datetimeformat' => 'Y-m-d H:i:s',
                 ],
-                'delete'  => [
+                'delete' => [
                     'db'             => 'mssql', /* db type */
                     'host'           => '127.0.0.1', /* db host address */
                     'port'           => '1433', /* db host port */
@@ -282,7 +293,7 @@ $CONFIG = [
                     'weight'         => 1000, /* db table prefix */
                     'datetimeformat' => 'Y-m-d H:i:s',
                 ],
-                'schema'  => [
+                'schema' => [
                     'db'             => 'mssql', /* db type */
                     'host'           => '127.0.0.1', /* db host address */
                     'port'           => '1433', /* db host port */
@@ -322,16 +333,16 @@ $CONFIG = [
             'password' => '123456',
         ],
     ],
-    'log'      => [
+    'log' => [
         'file' => [
             'path' => __DIR__ . '/Logs',
         ],
     ],
-    'page'     => [
+    'page' => [
         'root'  => '/',
         'https' => false,
     ],
-    'app'      => [
+    'app' => [
         'path'    => __DIR__,
         'default' => [
             'app'   => 'Backend',
@@ -350,7 +361,7 @@ $CONFIG = [
             ],
         ],
     ],
-    'socket'   => [
+    'socket' => [
         'master' => [
             'host'  => '127.0.0.1',
             'limit' => 300,
@@ -360,7 +371,7 @@ $CONFIG = [
     'language' => [
         'en',
     ],
-    'apis'     => [
+    'apis' => [
     ],
 ];
 
diff --git a/tests/Controller/Api/ApiControllerAttributeTrait.php b/tests/Controller/Api/ApiControllerAttributeTrait.php
index af49e8f..638c28e 100644
--- a/tests/Controller/Api/ApiControllerAttributeTrait.php
+++ b/tests/Controller/Api/ApiControllerAttributeTrait.php
@@ -19,7 +19,6 @@ use phpOMS\Localization\ISO639x1Enum;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Message\Http\RequestStatusCode;
-use phpOMS\Uri\HttpUri;
 
 trait ApiControllerAttributeTrait
 {
@@ -30,7 +29,7 @@ trait ApiControllerAttributeTrait
     public function testApiContractAttributeTypeCreate() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('title', 'EN:1');
@@ -48,7 +47,7 @@ trait ApiControllerAttributeTrait
     public function testApiContractAttributeTypeL11nCreate() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('title', 'DE:2');
@@ -66,7 +65,7 @@ trait ApiControllerAttributeTrait
     public function testApiContractAttributeValueIntCreate() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('default', '1');
@@ -86,7 +85,7 @@ trait ApiControllerAttributeTrait
     public function testApiContractAttributeValueStrCreate() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('value', '1');
@@ -105,7 +104,7 @@ trait ApiControllerAttributeTrait
     public function testApiContractAttributeValueFloatCreate() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('value', '1.1');
@@ -124,7 +123,7 @@ trait ApiControllerAttributeTrait
     public function testApiContractAttributeValueDatCreate() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('value', '2020-08-02');
@@ -143,7 +142,7 @@ trait ApiControllerAttributeTrait
     public function testApiContractAttributeCreate() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('ref', '1');
@@ -161,7 +160,7 @@ trait ApiControllerAttributeTrait
     public function testApiContractAttributeValueCreateInvalidData() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('invalid', '1');
@@ -177,7 +176,7 @@ trait ApiControllerAttributeTrait
     public function testApiContractAttributeTypeCreateInvalidData() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('invalid', '1');
@@ -193,7 +192,7 @@ trait ApiControllerAttributeTrait
     public function testApiContractAttributeTypeL11nCreateInvalidData() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('invalid', '1');
@@ -209,7 +208,7 @@ trait ApiControllerAttributeTrait
     public function testApiContractAttributeCreateInvalidData() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('invalid', '1');
diff --git a/tests/Controller/Api/ApiControllerContractTrait.php b/tests/Controller/Api/ApiControllerContractTrait.php
index f60cb3e..c0fc142 100644
--- a/tests/Controller/Api/ApiControllerContractTrait.php
+++ b/tests/Controller/Api/ApiControllerContractTrait.php
@@ -17,7 +17,6 @@ namespace Modules\ContractManagement\tests\Controller\Api;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Message\Http\RequestStatusCode;
-use phpOMS\Uri\HttpUri;
 use phpOMS\Utils\TestUtils;
 
 trait ApiControllerContractTrait
@@ -29,7 +28,7 @@ trait ApiControllerContractTrait
     public function testApiContractCreate() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('title', 'Title');
@@ -49,7 +48,7 @@ trait ApiControllerContractTrait
     public function testApiContractCreateInvalidData() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('invalid', '1');
@@ -65,7 +64,7 @@ trait ApiControllerContractTrait
     public function testApiContractDocCreate() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         if (!\is_file(__DIR__ . '/test_tmp.pdf')) {
             \copy(__DIR__ . '/test.pdf', __DIR__ . '/test_tmp.pdf');
@@ -96,7 +95,7 @@ trait ApiControllerContractTrait
     public function testApiContractDocCreateInvalidData() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('invalid', '1');
diff --git a/tests/Controller/Api/ApiControllerContractTypeTrait.php b/tests/Controller/Api/ApiControllerContractTypeTrait.php
index 2c916af..eb3053d 100644
--- a/tests/Controller/Api/ApiControllerContractTypeTrait.php
+++ b/tests/Controller/Api/ApiControllerContractTypeTrait.php
@@ -18,7 +18,6 @@ use phpOMS\Localization\ISO639x1Enum;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Message\Http\RequestStatusCode;
-use phpOMS\Uri\HttpUri;
 
 trait ApiControllerContractTypeTrait
 {
@@ -29,7 +28,7 @@ trait ApiControllerContractTypeTrait
     public function testApiContractTypeCreate() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('title', 'Test');
@@ -46,7 +45,7 @@ trait ApiControllerContractTypeTrait
     public function testApiContractTypeCreateInvalidData() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('invalid', '1');
@@ -62,7 +61,7 @@ trait ApiControllerContractTypeTrait
     public function testApiContractTypeL11nCreate() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('title', 'Test');
@@ -80,7 +79,7 @@ trait ApiControllerContractTypeTrait
     public function testApiContractTypeL11nCreateInvalidData() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('invalid', '1');
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index 82df497..88f6a2f 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -60,13 +60,13 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
             protected string $appName = 'Api';
         };
 
-        $this->app->dbPool          = $GLOBALS['dbpool'];
-        $this->app->unitId          = 1;
-        $this->app->accountManager  = new AccountManager($GLOBALS['session']);
-        $this->app->appSettings     = new CoreSettings();
-        $this->app->moduleManager   = new ModuleManager($this->app, __DIR__ . '/../../../../Modules/');
-        $this->app->dispatcher      = new Dispatcher($this->app);
-        $this->app->eventManager    = new EventManager($this->app->dispatcher);
+        $this->app->dbPool         = $GLOBALS['dbpool'];
+        $this->app->unitId         = 1;
+        $this->app->accountManager = new AccountManager($GLOBALS['session']);
+        $this->app->appSettings    = new CoreSettings();
+        $this->app->moduleManager  = new ModuleManager($this->app, __DIR__ . '/../../../../Modules/');
+        $this->app->dispatcher     = new Dispatcher($this->app);
+        $this->app->eventManager   = new EventManager($this->app->dispatcher);
         $this->app->eventManager->importFromFile(__DIR__ . '/../../../../Web/Api/Hooks.php');
         $this->app->sessionManager = new HttpSession(36000);
         $this->app->l11nManager    = new L11nManager();
diff --git a/tests/Models/ContractTest.php b/tests/Models/ContractTest.php
index d474373..9a75697 100755
--- a/tests/Models/ContractTest.php
+++ b/tests/Models/ContractTest.php
@@ -57,16 +57,16 @@ final class ContractTest extends \PHPUnit\Framework\TestCase
 
         self::assertEquals(
             [
-                'id'             => 0,
-                'title'          => 'Title',
-                'description'    => 'Description',
-                'start'          => null,
-                'end'            => null,
-                'duration'       => 123,
-                'warning'        => 2,
-                'responsible'    => null,
-                'costs'          => null,
-                'type'           => null,
+                'id'          => 0,
+                'title'       => 'Title',
+                'description' => 'Description',
+                'start'       => null,
+                'end'         => null,
+                'duration'    => 123,
+                'warning'     => 2,
+                'responsible' => null,
+                'costs'       => null,
+                'type'        => null,
             ],
             $serialized
         );