diff --git a/Admin/Settings/Theme/Backend/modules-nav-list.tpl.php b/Admin/Settings/Theme/Backend/modules-nav-list.tpl.php
index 65ec478..ba55321 100755
--- a/Admin/Settings/Theme/Backend/modules-nav-list.tpl.php
+++ b/Admin/Settings/Theme/Backend/modules-nav-list.tpl.php
@@ -15,10 +15,10 @@ declare(strict_types=1);
 /**
  * @var \phpOMS\Views\View $this
  */
-$navs = $this->getData('navs') ?? [];
-$apps = $this->getData('apps') ?? [];
+$navs = $this->data['navs'] ?? [];
+$apps = $this->data['apps'] ?? [];
 
-echo $this->getData('nav')->render();
+echo $this->data['nav']->render();
 ?>
 
 <div class="row">
diff --git a/Admin/Settings/Theme/Backend/settings-nav.tpl.php b/Admin/Settings/Theme/Backend/settings-nav.tpl.php
index 598d021..81262a1 100755
--- a/Admin/Settings/Theme/Backend/settings-nav.tpl.php
+++ b/Admin/Settings/Theme/Backend/settings-nav.tpl.php
@@ -15,12 +15,12 @@ declare(strict_types=1);
 use phpOMS\Uri\UriFactory;
 
 $nav    = $this->getData('nav-element');
-$routes = $this->getData('routes') ?? [];
+$routes = $this->data['routes'] ?? [];
 
 /**
  * @var \phpOMS\Views\View $this
  */
-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>
 
 <div class="row">
     <div class="col-xs-12">
diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php
index 99e57fd..83d85af 100755
--- a/Admin/Settings/Theme/Backend/settings.tpl.php
+++ b/Admin/Settings/Theme/Backend/settings.tpl.php
@@ -18,12 +18,12 @@ use phpOMS\Uri\UriFactory;
  * @var \phpOMS\Views\View                      $this
  * @var \Modules\Navigation\Models\NavElement[] $navs
  */
-$navs = $this->getData('navigation') ?? [];
+$navs = $this->data['navigation'] ?? [];
 
 $previous = empty($navs) ? 'admin/nav/list' : '{/base}/admin/nav/list?{?}&id=' . \reset($navs)->id . '&ptype=p';
 $next     = empty($navs) ? 'admin/nav/list' : '{/base}/admin/nav/list?{?}&id=' . \end($navs)->id . '&ptype=n';
 
-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>
 
 <div class="row">
     <div class="col-xs-12">
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 98c3cfe..b2f1ece 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -48,7 +48,7 @@ final class ApiController extends Controller
     public function apiNavElementCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
         if (!empty($val = $this->validateNavElementCreate($request))) {
-            $response->set('nav_element_create', new FormValidation($val));
+            $response->data['nav_element_create'] = new FormValidation($val);
             $response->header->status = RequestStatusCode::R_400;
 
             return;
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 3d60485..6037425 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -113,7 +113,7 @@ final class BackendController extends Controller
     public function loadLanguage(RequestAbstract $request, ResponseAbstract $response) : void
     {
         $languages = $this->app->moduleManager->getLanguageFiles($request);
-        $langCode  = $response->getLanguage();
+        $langCode  = $response->header->l11n->language;
 
         // Add application navigation
         $languages[] = '/Web/' . ($this->app->appName) . '/lang/Navigation';
@@ -175,17 +175,17 @@ final class BackendController extends Controller
     public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
     {
         $view = new View($this->app->l11nManager, $request, $response);
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response);
 
         $id = $request->getDataString('id') ?? '';
 
         $settings = SettingMapper::getAll()->where('module', $id)->execute();
         if ($settings->id > 0) {
-            $view->setData('settings', !\is_array($settings) ? [$settings] : $settings);
+            $view->data['settings'] = !\is_array($settings) ? [$settings] : $settings;
         }
 
         $navigation = NavElementMapper::getAll()->execute();
-        $view->setData('navigation', $navigation);
+        $view->data['navigation'] = $navigation;
 
         $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings');
 
@@ -207,9 +207,9 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings-nav');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response);
 
-        $view->addData('nav-element', NavElementMapper::get()->where('id', (int) $request->getData('nav'))->execute());
+        $view->data['nav-element'] = NavElementMapper::get()->where('id', (int) $request->getData('nav'))->execute();
 
         return $view;
     }
@@ -229,10 +229,10 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/Navigation/Admin/Settings/Theme/Backend/modules-nav-list');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response);
 
         $module = $request->getDataString('id') ?? '';
-        $view->setData('module', $module);
+        $view->data['module'] = $module;
 
         $query = NavElementMapper::getAll()
             ->where('from', $module);
@@ -242,10 +242,10 @@ final class BackendController extends Controller
         }
 
         $activeNavElements = $query->execute();
-        $view->setData('navs', $activeNavElements);
+        $view->data['navs'] = $activeNavElements;
 
         $apps = AppMapper::getAll()->execute();
-        $view->setData('apps', $apps);
+        $view->data['apps'] = $apps;
 
         return $view;
     }
diff --git a/Controller/SearchController.php b/Controller/SearchController.php
index 09fecda..022fe5c 100755
--- a/Controller/SearchController.php
+++ b/Controller/SearchController.php
@@ -72,7 +72,7 @@ final class SearchController extends Controller
             }
 
             $name = \mb_strtolower($this->app->l11nManager->getText(
-                $response->getLanguage(),
+                $response->header->l11n->language,
                 'Navigation', '0',
                 $element->name,
             ));
@@ -109,7 +109,7 @@ final class SearchController extends Controller
     private function loadLanguage(RequestAbstract $request, ResponseAbstract $response, string $app) : void
     {
         $languages = $this->app->moduleManager->getLanguageFiles($request, $app);
-        $langCode  = $response->getLanguage();
+        $langCode  = $response->header->l11n->language;
 
         foreach ($languages as $path) {
             $path = __DIR__ . '/../../..' . $path . '.' . $langCode . '.lang.php';
diff --git a/Controller/TimerecordingController.php b/Controller/TimerecordingController.php
index 95e5b21..3c2024f 100755
--- a/Controller/TimerecordingController.php
+++ b/Controller/TimerecordingController.php
@@ -106,7 +106,7 @@ final class TimerecordingController extends Controller
     public function loadLanguage(RequestAbstract $request, ResponseAbstract $response) : void
     {
         $languages = $this->app->moduleManager->getLanguageFiles($request);
-        $langCode  = $response->getLanguage();
+        $langCode  = $response->header->l11n->language;
 
         foreach ($languages as $path) {
             $path = __DIR__ . '/../../..' . $path . '.' . $langCode . '.lang.php';
diff --git a/Theme/Backend/top.tpl.php b/Theme/Backend/top.tpl.php
index 99ecb9c..01b2e28 100755
--- a/Theme/Backend/top.tpl.php
+++ b/Theme/Backend/top.tpl.php
@@ -19,7 +19,7 @@ use Modules\Navigation\Models\NavigationType;
  */
 if (isset($this->nav[NavigationType::TOP])) : ?>
     <ul id="t-nav" role="navigation">
-        <?php $unread = $this->getData('unread');
+        <?php $unread = $this->data['unread'];
         foreach ($this->nav[NavigationType::TOP] as $key => $parent) :
         foreach ($parent as $id => $link) : ?>
         <li><a id="link-<?= $id; ?>" target="<?= $link['nav_target']; ?>" href="<?= \phpOMS\Uri\UriFactory::build($link['nav_uri']); ?>"<?= $link['nav_action'] !== null ? ' data-action=\'' . $link['nav_action'] . '\'' : ''; ?>>