diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 478dbdb..206393e 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -90,7 +90,7 @@ final class ApiController extends Controller
             $response,
             NotificationLevel::OK,
             '',
-            $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SucessfulCreate'),
+            $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SucessfulCreate'),
             $vehicle
         );
     }
@@ -175,7 +175,7 @@ final class ApiController extends Controller
         $typeL11n      = new BaseStringL11n();
         $typeL11n->ref = $request->getDataInt('type') ?? 0;
         $typeL11n->setLanguage(
-            $request->getDataString('language') ?? $request->getLanguage()
+            $request->getDataString('language') ?? $request->header->l11n->language
         );
         $typeL11n->content = $request->getDataString('title') ?? '';
 
@@ -234,7 +234,7 @@ final class ApiController extends Controller
             $response,
             NotificationLevel::OK,
             '',
-            $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SucessfulCreate'),
+            $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SucessfulCreate'),
             $vehicle
         );
     }
@@ -319,7 +319,7 @@ final class ApiController extends Controller
         $typeL11n      = new BaseStringL11n();
         $typeL11n->ref = $request->getDataInt('type') ?? 0;
         $typeL11n->setLanguage(
-            $request->getDataString('language') ?? $request->getLanguage()
+            $request->getDataString('language') ?? $request->header->l11n->language
         );
         $typeL11n->content = $request->getDataString('title') ?? '';
 
@@ -384,7 +384,7 @@ final class ApiController extends Controller
             $response,
             NotificationLevel::OK,
             '',
-            $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SucessfulCreate'),
+            $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SucessfulCreate'),
             $vehicle
         );
     }
@@ -755,7 +755,7 @@ final class ApiController extends Controller
         $attrL11n      = new BaseStringL11n();
         $attrL11n->ref = $request->getDataInt('type') ?? 0;
         $attrL11n->setLanguage(
-            $request->getDataString('language') ?? $request->getLanguage()
+            $request->getDataString('language') ?? $request->header->l11n->language
         );
         $attrL11n->content = $request->getDataString('title') ?? '';
 
@@ -980,7 +980,7 @@ final class ApiController extends Controller
         $attrL11n      = new BaseStringL11n();
         $attrL11n->ref = $request->getDataInt('value') ?? 0;
         $attrL11n->setLanguage(
-            $request->getDataString('language') ?? $request->getLanguage()
+            $request->getDataString('language') ?? $request->header->l11n->language
         );
         $attrL11n->content = $request->getDataString('title') ?? '';
 
@@ -1211,7 +1211,7 @@ final class ApiController extends Controller
             $response,
             NotificationLevel::OK,
             '',
-            $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SucessfulCreate'),
+            $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SucessfulCreate'),
             $vehicle
         );
     }
@@ -1296,7 +1296,7 @@ final class ApiController extends Controller
         $typeL11n      = new BaseStringL11n();
         $typeL11n->ref = $request->getDataInt('type') ?? 0;
         $typeL11n->setLanguage(
-            $request->getDataString('language') ?? $request->getLanguage()
+            $request->getDataString('language') ?? $request->header->l11n->language
         );
         $typeL11n->content = $request->getDataString('title') ?? '';
 
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 33b2c0e..6ca2c85 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -58,7 +58,7 @@ final class BackendController extends Controller
         /** @var \Modules\Attribute\Models\AttributeType[] $attributes */
         $attributes = VehicleAttributeTypeMapper::getAll()
             ->with('l11n')
-            ->where('l11n/language', $response->getLanguage())
+            ->where('l11n/language', $response->header->l11n->language)
             ->execute();
 
         $view->addData('attributes', $attributes);
@@ -88,7 +88,7 @@ final class BackendController extends Controller
         $list = VehicleMapper::getAll()
             ->with('type')
             ->with('type/l11n')
-            ->where('type/l11n/language', $response->getLanguage())
+            ->where('type/l11n/language', $response->header->l11n->language)
             ->sort('id', 'DESC')
             ->execute();
 
@@ -119,7 +119,7 @@ final class BackendController extends Controller
         $attribute = VehicleAttributeTypeMapper::get()
             ->with('l11n')
             ->where('id', (int) $request->getData('id'))
-            ->where('l11n/language', $response->getLanguage())
+            ->where('l11n/language', $response->header->l11n->language)
             ->execute();
 
         $l11ns = VehicleAttributeTypeL11nMapper::getAll()
@@ -161,9 +161,9 @@ final class BackendController extends Controller
             ->with('fuelType')
             ->with('fuelType/l11n')
             ->where('id', (int) $request->getData('id'))
-            ->where('type/l11n/language', $response->getLanguage())
-            ->where('fuelType/l11n/language', $response->getLanguage())
-            ->where('attributes/type/l11n/language', $response->getLanguage())
+            ->where('type/l11n/language', $response->header->l11n->language)
+            ->where('fuelType/l11n/language', $response->header->l11n->language)
+            ->where('attributes/type/l11n/language', $response->header->l11n->language)
             ->execute();
 
         $view->setData('vehicle', $vehicle);
@@ -192,7 +192,7 @@ final class BackendController extends Controller
 
         $vehicleTypes = VehicleTypeMapper::getAll()
             ->with('l11n')
-            ->where('l11n/language', $response->getLanguage())
+            ->where('l11n/language', $response->header->l11n->language)
             ->execute();
 
         $view->addData('types', $vehicleTypes);