diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php
index e53396e..ad1769d 100755
--- a/Admin/Settings/Theme/Backend/settings.tpl.php
+++ b/Admin/Settings/Theme/Backend/settings.tpl.php
@@ -18,9 +18,9 @@ use phpOMS\Uri\UriFactory;
  * @var \phpOMS\Views\View                $this
  * @var \Modules\Media\Models\MediaType[] $types
  */
-$types = $this->getData('types') ?? [];
+$types = $this->data['types'] ?? [];
 
-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 c2be5c0..a2d85ff 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -1132,7 +1132,7 @@ final class ApiController extends Controller
 
         $this->setMediaResponseHeader($media, $request, $response);
         $view = $this->createView($media, $request, $response);
-        $view->setData('path', __DIR__ . '/../../../');
+        $view->data['path'] = __DIR__ . '/../../../';
 
         $response->set('export', $view);
     }
@@ -1183,7 +1183,7 @@ final class ApiController extends Controller
     public function createView(Media $media, RequestAbstract $request, ResponseAbstract $response) : View
     {
         $view = new View($this->app->l11nManager, $request, $response);
-        $view->setData('media', $media);
+        $view->data['media'] = $media;
 
         if (!\headers_sent()) {
             $response->endAllOutputBuffering(); // for large files
@@ -1202,7 +1202,7 @@ final class ApiController extends Controller
             $head->setStyle('core', $css ?? '');
 
             $head->addAsset(AssetType::CSS, 'cssOMS/styles.css?v=1.0.0');
-            $view->setData('head', $head);
+            $view->data['head'] = $head;
 
             switch (\strtolower($media->extension)) {
                 case 'xls':
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 5ba0624..5eaa5bf 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -183,9 +183,9 @@ final class BackendController extends Controller
             $media = \array_merge($media, $unIndexedFiles);
         }
 
-        $view->addData('media', $media);
-        $view->addData('path', $path);
-        $view->addData('account', $this->app->accountManager->get($request->header->account));
+        $view->data['media'] = $media;
+        $view->data['path'] = $path;
+        $view->data['account'] = $this->app->accountManager->get($request->header->account);
 
         return $view;
     }
@@ -206,7 +206,7 @@ final class BackendController extends Controller
     {
         $view = new MediaView($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/Media/Theme/Backend/media-single');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000401001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000401001, $request, $response);
 
         $id = $request->getDataInt('id');
         if ($id === 0) {
@@ -222,7 +222,7 @@ final class BackendController extends Controller
                 $media->setPath('/Modules/Media/Files/' . \ltrim($path, '\\/'));
                 $media->isAbsolute = false;
 
-                $view->addData('view', $this->createMediaView($media, $request, $response));
+                $view->data['view'] = $this->createMediaView($media, $request, $response);
             }
         } else {
             /** @var \Modules\Media\Models\Media $media */
@@ -245,7 +245,7 @@ final class BackendController extends Controller
                 $collection = CollectionMapper::get()->where('id', $id)->execute();
                 $media      = \array_merge($files, $collection->getSources());
 
-                $view->addData('path', $collection->getVirtualPath() . '/' . $collection->name);
+                $view->data['path'] = $collection->getVirtualPath() . '/' . $collection->name;
                 $view->setTemplate('/Modules/Media/Theme/Backend/media-list');
             } else {
                 $sub = $request->getDataString('sub') ?? '';
@@ -254,7 +254,7 @@ final class BackendController extends Controller
                 ) {
                     $listView = new ListView($this->app->l11nManager, $request, $response);
                     $listView->setTemplate('/modules/Media/Theme/Backend/Components/Media/list');
-                    $view->addData('view', $listView);
+                    $view->data['view'] = $listView;
                 } else {
                     if ($media->class === MediaClass::REFERENCE) {
                         /** @var \Modules\Media\Models\Media $media */
@@ -267,16 +267,16 @@ final class BackendController extends Controller
                             ->where('tags/title/language', $request->header->l11n->language)
                             ->execute();
 
-                        $view->addData('view', $this->createMediaView($media->source, $request, $response));
+                        $view->data['view'] = $this->createMediaView($media->source, $request, $response);
                     } else {
-                        $view->addData('view', $this->createMediaView($media, $request, $response));
+                        $view->data['view'] = $this->createMediaView($media, $request, $response);
                     }
                 }
             }
         }
 
-        $view->addData('account', $this->app->accountManager->get($request->header->account));
-        $view->addData('media', $media);
+        $view->data['account'] = $this->app->accountManager->get($request->header->account);
+        $view->data['media'] = $media;
 
         return $view;
     }
@@ -391,15 +391,15 @@ 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();
-        $view->setData('settings', $settings);
+        $view->data['settings'] = $settings;
 
         $types = MediaTypeMapper::getAll()->with('title')->where('title/language', $response->header->l11n->language)->execute();
-        $view->setData('types', $types);
+        $view->data['types'] = $types;
 
         $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings');
 
@@ -430,11 +430,11 @@ final class BackendController extends Controller
             ->where('id', (int) $request->getData('id'))
             ->execute();
 
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1007501001, $request, $response));
-        $view->addData('type', $type);
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1007501001, $request, $response);
+        $view->data['type'] = $type;
 
         $l11n = MediaTypeL11nMapper::getAll()->where('type', $type->id)->execute();
-        $view->addData('l11n', $l11n);
+        $view->data['l11n'] = $l11n;
 
         return $view;
     }
@@ -477,7 +477,7 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/Media/Theme/Backend/media-file-create');
 
         $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
-        $view->addData('editor', $editor);
+        $view->data['editor'] = $editor;
 
         return $view;
     }
diff --git a/Controller/FileUploaderTrait.php b/Controller/FileUploaderTrait.php
index ef32c6f..d4d5afa 100644
--- a/Controller/FileUploaderTrait.php
+++ b/Controller/FileUploaderTrait.php
@@ -42,7 +42,7 @@ trait FileUploaderTrait
      */
     public static function setUpFileUploaderTrait(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
-        $head = $response->get('Content')->getData('head');
+        $head = $response->get('Content')->head;
         $head->addAsset(AssetType::JS, '/Modules/Media/Controller.js', ['type' => 'module']);
     }
 }
diff --git a/Theme/Api/spreadsheetAsCsv.tpl.php b/Theme/Api/spreadsheetAsCsv.tpl.php
index 8d5c3f0..df5e17e 100755
--- a/Theme/Api/spreadsheetAsCsv.tpl.php
+++ b/Theme/Api/spreadsheetAsCsv.tpl.php
@@ -18,7 +18,7 @@ use phpOMS\Autoloader;
 
 Autoloader::addPath(__DIR__ . '/../../../../Resources/');
 
-$media = $this->getData('media');
+$media = $this->data['media'];
 
 $reader = IOFactory::createReaderforFile(($media->isAbsolute ? '' : __DIR__ . '/../../../../') . $media->getPath());
 $reader->setReadDataOnly(true);
diff --git a/Theme/Api/spreadsheetAsHtml.tpl.php b/Theme/Api/spreadsheetAsHtml.tpl.php
index d765091..209d599 100755
--- a/Theme/Api/spreadsheetAsHtml.tpl.php
+++ b/Theme/Api/spreadsheetAsHtml.tpl.php
@@ -17,6 +17,6 @@ use phpOMS\Utils\Parser\Spreadsheet\SpreadsheetParser;
 
 Autoloader::addPath(__DIR__ . '/../../../../Resources/');
 
-$media = $this->getData('media');
+$media = $this->data['media'];
 
 echo SpreadsheetParser::parseSpreadsheet(($media->isAbsolute ? '' : __DIR__ . '/../../../../') . $media->getPath(), 'html');
diff --git a/Theme/Api/wordAsHtml.tpl.php b/Theme/Api/wordAsHtml.tpl.php
index 5a43073..17d4a6b 100755
--- a/Theme/Api/wordAsHtml.tpl.php
+++ b/Theme/Api/wordAsHtml.tpl.php
@@ -18,7 +18,7 @@ use phpOMS\Autoloader;
 
 Autoloader::addPath(__DIR__ . '/../../../../Resources/');
 
-$media = $this->getData('media');
+$media = $this->data['media'];
 
 $reader = IOFactory::createReader('Word2007');
 $doc    = $reader->load(($media->isAbsolute ? '' : __DIR__ . '/../../../../') . $media->getPath());
diff --git a/Theme/Backend/media-list.tpl.php b/Theme/Backend/media-list.tpl.php
index b37d485..73656ec 100755
--- a/Theme/Backend/media-list.tpl.php
+++ b/Theme/Backend/media-list.tpl.php
@@ -24,10 +24,10 @@ include __DIR__ . '/template-functions.php';
 $mediaPath = \urldecode($this->getData('path') ?? '/');
 
 /** @var \Modules\Media\Models\Media[] $media */
-$media = $this->getData('media') ?? [];
+$media = $this->data['media'] ?? [];
 
 /** @var \Modules\Admin\Models\Account $account */
-$account    = $this->getData('account');
+$account    = $this->data['account'];
 $accountDir = $account->id . ' ' . $account->login;
 
 $previous = empty($media) ? '{/base}/media/list' : '{/base}/media/list?{?}&id=' . \reset($media)->id . '&ptype=p';
diff --git a/Theme/Backend/media-single.tpl.php b/Theme/Backend/media-single.tpl.php
index 34f5677..3a4e5cd 100755
--- a/Theme/Backend/media-single.tpl.php
+++ b/Theme/Backend/media-single.tpl.php
@@ -20,21 +20,21 @@ include __DIR__ . '/template-functions.php';
 
 /** @var \Modules\Media\Views\MediaView $this */
 /** @var \Modules\Media\Models\Media $media */
-$media = $this->getData('media');
-$view  = $this->getData('view');
+$media = $this->data['media'];
+$view  = $this->data['view'];
 
 /** @var \Modules\Tag\Models\Tag[] $tag */
 $tags = $media->getTags();
 
 /** @var \Modules\Admin\Models\Account $account */
-$account    = $this->getData('account');
+$account    = $this->data['account'];
 $accountDir = $account->id . ' ' . $account->login;
 
 $mediaPath = \urldecode($media->getVirtualPath() ?? '/');
 
 /** @var \phpOMS\Message\Http\HttpRequest $this->request */
 
-echo $this->getData('nav')->render();
+echo $this->data['nav']->render();
 ?>
 <div class="row">
     <div class="col-xs-12">