diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index 62566b8..c86f951 100644
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -10,6 +10,7 @@ return [
         [
             'dest'       => '\Modules\AssetManagement\Controller\BackendController:viewAssetManagementAttributeTypeList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -21,6 +22,7 @@ return [
         [
             'dest'       => '\Modules\AssetManagement\Controller\BackendController:viewAssetManagementAttributeType',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -33,6 +35,7 @@ return [
         [
             'dest'       => '\Modules\AssetManagement\Controller\BackendController:viewAssetManagementList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
                 'type'   => PermissionType::READ,
@@ -44,6 +47,7 @@ return [
         [
             'dest'       => '\Modules\AssetManagement\Controller\BackendController:viewAssetManagementView',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
                 'type'   => PermissionType::READ,
@@ -55,6 +59,7 @@ return [
         [
             'dest'       => '\Modules\AssetManagement\Controller\BackendController:viewAssetManagementEntryList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
                 'type'   => PermissionType::READ,
@@ -66,6 +71,7 @@ return [
         [
             'dest'       => '\Modules\AssetManagement\Controller\BackendController:viewAssetManagementEntryView',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
                 'type'   => PermissionType::READ,
@@ -77,6 +83,7 @@ return [
         [
             'dest'       => '\Modules\AssetManagement\Controller\BackendController:viewAssetManagementCreate',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
                 'type'   => PermissionType::CREATE,
@@ -88,6 +95,7 @@ return [
         [
             'dest'       => '\Modules\AssetManagement\Controller\BackendController:viewAssetManagementAssetTable',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
                 'type'   => PermissionType::READ,
diff --git a/Controller/ApiAssetAttributeController.php b/Controller/ApiAssetAttributeController.php
index 8d70d7e..6a99222 100644
--- a/Controller/ApiAssetAttributeController.php
+++ b/Controller/ApiAssetAttributeController.php
@@ -40,7 +40,7 @@ final class ApiAssetAttributeController extends Controller
     use \Modules\Attribute\Controller\ApiAttributeTraitController;
 
     /**
-     * Api method to create item attribute
+     * Api method to create Attribute
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
diff --git a/Controller/ApiAssetTypeController.php b/Controller/ApiAssetTypeController.php
index f04dfc8..12758f5 100644
--- a/Controller/ApiAssetTypeController.php
+++ b/Controller/ApiAssetTypeController.php
@@ -36,7 +36,7 @@ use phpOMS\Message\ResponseAbstract;
 final class ApiAssetTypeController extends Controller
 {
     /**
-     * Api method to create item attribute type
+     * Api method to create AssetType
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
@@ -63,7 +63,7 @@ final class ApiAssetTypeController extends Controller
     }
 
     /**
-     * Method to create item attribute from request.
+     * Method to create AssetType from request.
      *
      * @param RequestAbstract $request Request
      *
@@ -85,7 +85,7 @@ final class ApiAssetTypeController extends Controller
     }
 
     /**
-     * Validate item attribute create request
+     * Validate AssetType create request
      *
      * @param RequestAbstract $request Request
      *
@@ -105,7 +105,7 @@ final class ApiAssetTypeController extends Controller
     }
 
     /**
-     * Api method to create item attribute l11n
+     * Api method to create AssetType l11n
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
@@ -132,7 +132,7 @@ final class ApiAssetTypeController extends Controller
     }
 
     /**
-     * Method to create item attribute l11n from request.
+     * Method to create AssetType l11n from request.
      *
      * @param RequestAbstract $request Request
      *
@@ -151,7 +151,7 @@ final class ApiAssetTypeController extends Controller
     }
 
     /**
-     * Validate item attribute l11n create request
+     * Validate AssetType l11n create request
      *
      * @param RequestAbstract $request Request
      *
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index e4a9e13..5517cac 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -414,7 +414,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 3be8cb0..2a3fdff 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -155,7 +155,7 @@ final class BackendController extends Controller
             ->with('attributes/type')
             ->with('attributes/value')
             ->with('attributes/type/l11n')
-            //->with('attributes/value/l11n')
+            ->with('attributes/value/l11n')
             ->with('files')
             ->with('files/types')
             ->with('type')
@@ -163,7 +163,7 @@ final class BackendController extends Controller
             ->where('id', (int) $request->getData('id'))
             ->where('type/l11n/language', $response->header->l11n->language)
             ->where('attributes/type/l11n/language', $response->header->l11n->language)
-            //->where('attributes/value/l11n/language', $response->header->l11n->language)
+            ->where('attributes/value/l11n/language', [$response->header->l11n->language, null])
             ->execute();
 
         $view->data['asset'] = $asset;
diff --git a/Models/AssetMapper.php b/Models/AssetMapper.php
index 5546e24..799e5b0 100644
--- a/Models/AssetMapper.php
+++ b/Models/AssetMapper.php
@@ -20,7 +20,7 @@ use Modules\Media\Models\MediaMapper;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
- * Mapper class.
+ * Asset mapper class.
  *
  * @package Modules\AssetManagement\Models
  * @license OMS License 2.0
diff --git a/Models/AssetTypeMapper.php b/Models/AssetTypeMapper.php
index 998a302..123d433 100644
--- a/Models/AssetTypeMapper.php
+++ b/Models/AssetTypeMapper.php
@@ -17,7 +17,7 @@ namespace Modules\AssetManagement\Models;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
- * Item mapper class.
+ * AssetType mapper class.
  *
  * @package Modules\AssetManagement\Models
  * @license OMS License 2.0