diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php
index 57a4894..93f7558 100644
--- a/Admin/Routes/Web/Api.php
+++ b/Admin/Routes/Web/Api.php
@@ -23,6 +23,7 @@ return [
             'dest'       => '\Modules\InvestmentManagement\Controller\ApiController:apiInvestmentFind',
             'verb'       => RouteVerb::GET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -35,6 +36,7 @@ return [
             'dest'       => '\Modules\InvestmentManagement\Controller\ApiAttributeController:apiInvestmentAttributeCreate',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -45,6 +47,7 @@ return [
             'dest'       => '\Modules\InvestmentManagement\Controller\ApiAttributeController:apiInvestmentAttributeUpdate',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -57,6 +60,7 @@ return [
             'dest'       => '\Modules\InvestmentManagement\Controller\ApiAttributeController:apiInvestmentAttributeTypeCreate',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -67,6 +71,7 @@ return [
             'dest'       => '\Modules\InvestmentManagement\Controller\ApiAttributeController:apiInvestmentAttributeTypeUpdate',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -79,6 +84,7 @@ return [
             'dest'       => '\Modules\InvestmentManagement\Controller\ApiAttributeController:apiInvestmentAttributeTypeL11nCreate',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -89,6 +95,7 @@ return [
             'dest'       => '\Modules\InvestmentManagement\Controller\ApiAttributeController:apiInvestmentAttributeTypeL11nUpdate',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -101,6 +108,7 @@ return [
             'dest'       => '\Modules\InvestmentManagement\Controller\ApiAttributeController:apiInvestmentAttributeValueCreate',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -111,6 +119,7 @@ return [
             'dest'       => '\Modules\InvestmentManagement\Controller\ApiAttributeController:apiInvestmentAttributeValueUpdate',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -123,6 +132,7 @@ return [
             'dest'       => '\Modules\InvestmentManagement\Controller\ApiAttributeController:apiInvestmentAttributeValueL11nCreate',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -133,6 +143,7 @@ return [
             'dest'       => '\Modules\InvestmentManagement\Controller\ApiAttributeController:apiInvestmentAttributeValueL11nUpdate',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index 6b22e93..c0ec027 100755
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -10,6 +10,7 @@ return [
         [
             'dest'       => '\Modules\InvestmentManagement\Controller\BackendController:viewInvestmentList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
                 'type'   => PermissionType::READ,
@@ -21,6 +22,7 @@ return [
         [
             'dest'       => '\Modules\InvestmentManagement\Controller\BackendController:viewInvestmentView',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
                 'type'   => PermissionType::READ,
@@ -32,6 +34,7 @@ return [
         [
             'dest'       => '\Modules\InvestmentManagement\Controller\BackendController:viewInvestmentOptionCreate',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
                 'type'   => PermissionType::CREATE,
@@ -43,6 +46,7 @@ return [
         [
             'dest'       => '\Modules\InvestmentManagement\Controller\BackendController:viewInvestmentOptionView',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
                 'type'   => PermissionType::CREATE,
@@ -54,6 +58,7 @@ return [
         [
             'dest'       => '\Modules\InvestmentManagement\Controller\BackendController:viewInvestmentCreate',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
                 'type'   => PermissionType::CREATE,
@@ -66,6 +71,7 @@ return [
         [
             'dest'       => '\Modules\InvestmentManagement\Controller\BackendController:viewInvestmentPrivateList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
                 'type'   => PermissionType::READ,
@@ -77,6 +83,7 @@ return [
         [
             'dest'       => '\Modules\InvestmentManagement\Controller\BackendController:viewInvestmentPrivateCreate',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
                 'type'   => PermissionType::CREATE,
@@ -88,6 +95,7 @@ return [
         [
             'dest'       => '\Modules\InvestmentManagement\Controller\BackendController:viewInvestmentView',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
                 'type'   => PermissionType::READ,
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index afde7a8..4d3870b 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -949,7 +949,7 @@ final class ApiController extends Controller
     }
 
     /**
-     * Validate item note create request
+     * Validate note create request
      *
      * @param RequestAbstract $request Request
      *
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index b519372..c1b254d 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -241,7 +241,10 @@ final class BackendController extends Controller
             ->with('attributes/type')
             ->with('attributes/type/l11n')
             ->with('attributes/value')
+            ->with('attributes/value/l11n')
             ->where('id', (int) $request->getData('id'))
+            ->where('attributes/type/l11n/language', $response->header->l11n->language)
+            ->where('attributes/value/l11n/language', [$response->header->l11n->language, null])
             ->execute();
 
         $view->data['attributeView']                               = new \Modules\Attribute\Theme\Backend\Components\AttributeView($this->app->l11nManager, $request, $response);
diff --git a/Models/AmountGroupMapper.php b/Models/AmountGroupMapper.php
index b8407ee..3b7efcd 100644
--- a/Models/AmountGroupMapper.php
+++ b/Models/AmountGroupMapper.php
@@ -17,7 +17,7 @@ namespace Modules\InvestmentManagement\Models;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
- * Mapper class.
+ * AmountGroup mapper class.
  *
  * @package Modules\InvestmentManagement\Models
  * @license OMS License 2.0
diff --git a/Models/AmountMapper.php b/Models/AmountMapper.php
index f376dfd..5fcd7f7 100644
--- a/Models/AmountMapper.php
+++ b/Models/AmountMapper.php
@@ -17,7 +17,7 @@ namespace Modules\InvestmentManagement\Models;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
- * Mapper class.
+ * Amount mapper class.
  *
  * @package Modules\InvestmentManagement\Models
  * @license OMS License 2.0
diff --git a/Models/AmountTypeMapper.php b/Models/AmountTypeMapper.php
index 691c999..ba5e808 100644
--- a/Models/AmountTypeMapper.php
+++ b/Models/AmountTypeMapper.php
@@ -18,7 +18,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 use phpOMS\Localization\BaseStringL11nType;
 
 /**
- * Item mapper class.
+ * AmountType mapper class.
  *
  * @package Modules\InvestmentManagement\Models
  * @license OMS License 2.0
diff --git a/Models/InvestmentMapper.php b/Models/InvestmentMapper.php
index 8bfb91f..b7f69dc 100644
--- a/Models/InvestmentMapper.php
+++ b/Models/InvestmentMapper.php
@@ -20,7 +20,7 @@ use Modules\Media\Models\MediaMapper;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
- * Mapper class.
+ * Investment mapper class.
  *
  * @package Modules\InvestmentManagement\Models
  * @license OMS License 2.0
diff --git a/Models/InvestmentObjectMapper.php b/Models/InvestmentObjectMapper.php
index 81a6817..6d68386 100644
--- a/Models/InvestmentObjectMapper.php
+++ b/Models/InvestmentObjectMapper.php
@@ -22,7 +22,7 @@ use Modules\SupplierManagement\Models\SupplierMapper;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
- * Mapper class.
+ * InvestmentObject mapper class.
  *
  * @package Modules\InvestmentManagement\Models
  * @license OMS License 2.0
diff --git a/Models/InvestmentTypeMapper.php b/Models/InvestmentTypeMapper.php
index b690a99..926032b 100644
--- a/Models/InvestmentTypeMapper.php
+++ b/Models/InvestmentTypeMapper.php
@@ -18,7 +18,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 use phpOMS\Localization\BaseStringL11nType;
 
 /**
- * Item mapper class.
+ * InvestmentType mapper class.
  *
  * @package Modules\InvestmentManagement\Models
  * @license OMS License 2.0