diff --git a/Admin/Install/Application/Shop/Application.php b/Admin/Install/Application/Shop/Application.php
index 8252002..65dc327 100755
--- a/Admin/Install/Application/Shop/Application.php
+++ b/Admin/Install/Application/Shop/Application.php
@@ -154,7 +154,7 @@ final class Application
         if ($account->id > 0) {
             $response->header->l11n = $account->l11n;
         } elseif ($this->app->sessionManager->get('language') !== null
-            && $response->header->l11n->getLanguage() !== $this->app->sessionManager->get('language')
+            && $response->header->l11n->language !== $this->app->sessionManager->get('language')
         ) {
             $response->header->l11n
                 ->loadFromLanguage(
@@ -165,7 +165,7 @@ final class Application
             $this->app->setResponseLanguage($request, $response, $this->config);
         }
 
-        if (!\in_array($response->getLanguage(), $this->config['language'])) {
+        if (!\in_array($response->header->l11n->language, $this->config['language'])) {
             $response->header->l11n->setLanguage($this->app->l11nServer->getLanguage());
         }
 
@@ -173,7 +173,7 @@ final class Application
         $head     = new Head();
 
         $pageView->setData('unitId', $this->app->unitId);
-        $pageView->setData('head', $head);
+        $pageView->data['head'] = $head;
         $response->set('Content', $pageView);
 
         /* App only allows GET */
@@ -190,14 +190,14 @@ final class Application
             return;
         }
 
-        UriFactory::setQuery('/lang', $response->getLanguage());
+        UriFactory::setQuery('/lang', $response->header->l11n->language);
 
         $this->loadLanguageFromPath(
-            $response->getLanguage(),
-            __DIR__ . '/lang/' . $response->getLanguage() . '.lang.php'
+            $response->header->l11n->language,
+            __DIR__ . '/lang/' . $response->header->l11n->language . '.lang.php'
         );
 
-        $response->header->set('content-language', $response->getLanguage(), true);
+        $response->header->set('content-language', $response->header->l11n->language, true);
 
         /* Create html head */
         $this->initResponseHead($head, $request, $response);
@@ -255,8 +255,8 @@ final class Application
         $response->header->status = RequestStatusCode::R_406;
         $pageView->setTemplate('/Web/{APPNAME}/Error/406');
         $this->loadLanguageFromPath(
-            $response->getLanguage(),
-            __DIR__ . '/Error/lang/' . $response->getLanguage() . '.lang.php'
+            $response->header->l11n->language,
+            __DIR__ . '/Error/lang/' . $response->header->l11n->language . '.lang.php'
         );
     }
 
@@ -275,8 +275,8 @@ final class Application
         $response->header->status = RequestStatusCode::R_503;
         $pageView->setTemplate('/Web/{APPNAME}/Error/503');
         $this->loadLanguageFromPath(
-            $response->getLanguage(),
-            __DIR__ . '/Error/lang/' . $response->getLanguage() . '.lang.php'
+            $response->header->l11n->language,
+            __DIR__ . '/Error/lang/' . $response->header->l11n->language . '.lang.php'
         );
     }
 
@@ -334,8 +334,8 @@ final class Application
         $response->header->status = RequestStatusCode::R_403;
         $pageView->setTemplate('/Web/{APPNAME}/Error/403');
         $this->loadLanguageFromPath(
-            $response->getLanguage(),
-            __DIR__ . '/Error/lang/' . $response->getLanguage() . '.lang.php'
+            $response->header->l11n->language,
+            __DIR__ . '/Error/lang/' . $response->header->l11n->language . '.lang.php'
         );
     }
 
diff --git a/Admin/Install/Application/Shop/index.tpl.php b/Admin/Install/Application/Shop/index.tpl.php
index 6e064d3..ffc3891 100755
--- a/Admin/Install/Application/Shop/index.tpl.php
+++ b/Admin/Install/Application/Shop/index.tpl.php
@@ -16,13 +16,13 @@ declare(strict_types=1);
 use phpOMS\Uri\UriFactory;
 
 /** @var phpOMS\Model\Html\Head $head */
-$head = $this->getData('head');
+$head = $this->head;
 
 /** @var array $dispatch */
 $dispatch = $this->getData('dispatch') ?? [];
 ?>
 <!DOCTYPE HTML>
-<html lang="<?= $this->printHtml($this->response->getLanguage()); ?>">
+<html lang="<?= $this->printHtml($this->response->header->l11n->language); ?>">
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 64aea2c..c8d4511 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -61,7 +61,7 @@ final class ApiController extends Controller
             ->where('id', $request->getDataInt('item'))
             ->execute();
 
-        $itemFiles = $item->getFiles();
+        $itemFiles = $item->files;
         foreach ($itemFiles as $file) {
             if ($file->id === $request->getDataInt('id')
                 && ($file->hasMediaTypeName('item_demo_download')
@@ -104,7 +104,7 @@ final class ApiController extends Controller
         }
 
         foreach ($items as $item) {
-            $files = $item->getFiles();
+            $files = $item->files;
 
             foreach ($files as $file) {
                 if ($file->id === $request->getDataInt('id')
@@ -236,7 +236,7 @@ final class ApiController extends Controller
             ->with('attributes/value')
             ->with('l11n/type')
             ->where('l11n/type/title', ['name1', 'name2', 'name3'], 'IN')
-            ->where('l11n/language', $bill->getLanguage());
+            ->where('l11n/language', $bill->language);
 
         /** @var \Modules\ItemManagement\Models\Item $item */
         $item = $itemMapper->execute();