diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index c682b26..b30e0e0 100644
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -10,6 +10,7 @@ return [
         [
             'dest'       => '\Modules\Labeling\Controller\BackendController:viewItemList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
                 'type'   => PermissionType::READ,
@@ -21,6 +22,7 @@ return [
         [
             'dest'       => '\Modules\Labeling\Controller\BackendController:viewItem',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
                 'type'   => PermissionType::READ,
@@ -32,6 +34,7 @@ return [
         [
             'dest'       => '\Modules\Labeling\Controller\BackendController:viewLayout',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
                 'type'   => PermissionType::READ,
@@ -43,6 +46,7 @@ return [
         [
             'dest'       => '\Modules\Labeling\Controller\BackendController:viewItemLabelList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
                 'type'   => PermissionType::READ,
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 63b6bbd..d34fd17 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -83,7 +83,7 @@ final class ApiController extends Controller
     }
 
     /**
-     * Method to create item attribute from request.
+     * Method to create LabelLayout from request.
      *
      * @param RequestAbstract $request Request
      *
@@ -142,7 +142,7 @@ final class ApiController extends Controller
     }
 
     /**
-     * Api method to create item attribute l11n
+     * Api method to create LabelLayout l11n
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
@@ -169,7 +169,7 @@ final class ApiController extends Controller
     }
 
     /**
-     * Method to create item attribute l11n from request.
+     * Method to create LabelLayout l11n from request.
      *
      * @param RequestAbstract $request Request
      *
@@ -188,7 +188,7 @@ final class ApiController extends Controller
     }
 
     /**
-     * Validate item attribute l11n create request
+     * Validate LabelLayout l11n create request
      *
      * @param RequestAbstract $request Request
      *
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 07383a8..f5e060e 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -125,11 +125,15 @@ final class BackendController extends Controller
             ->with('l11n/type')
             ->with('attributes')
             ->with('attributes/type')
+            ->with('attributes/type/l11n')
             ->with('attributes/value')
+            ->with('attributes/value/l11n')
             ->where('id', (int) $request->getData('id'))
             ->where('l11n/language', $response->header->l11n->language)
             ->where('l11n/type/title', ['name1', 'name2'], 'IN')
             ->where('attributes/type/name', ['gtin', 'eu_medical_device_class', 'fda_medical_regulatory_class', 'country_of_origin'], 'IN')
+            ->where('attributes/type/l11n/language', $response->header->l11n->language)
+            ->where('attributes/value/l11n/language', [$response->header->l11n->language, null])
             ->execute();
 
         $view->data['unit'] = UnitMapper::get()