diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 00d9519..70c894c 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -51,7 +51,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/Auditor/Theme/Backend/audit-list');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006201001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1006201001, $request, $response);
 
         $searchFieldData = $request->getLike('.*\-p\-.*');
         $searchField     = [];
@@ -84,7 +84,7 @@ final class BackendController extends Controller
         }
 
         $pageLimit = 25;
-        $view->addData('pageLimit', $pageLimit);
+        $view->data['pageLimit'] = $pageLimit;
 
         $mapper = AuditMapper::getAll()->with('createdBy');
 
@@ -102,7 +102,7 @@ final class BackendController extends Controller
             filters: $filterField
         );
 
-        $view->setData('audits', $list['data']);
+        $view->data['audits'] = $list['data'];
 
         /** @var \Model\Setting[] $exportTemplates */
         $exportTemplates = $this->app->appSettings->get(
@@ -132,7 +132,7 @@ final class BackendController extends Controller
         $tableView->setData('hasPrevious', $list['hasPrevious']);
         $tableView->setData('hasNext', $list['hasNext']);
 
-        $view->addData('tableView', $tableView);
+        $view->data['tableView'] = $tableView;
 
         return $view;
     }
@@ -153,7 +153,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/Auditor/Theme/Backend/audit-single');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006201001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1006201001, $request, $response);
 
         /** @var \Modules\Auditor\Models\Audit $audit */
         $audit = AuditMapper::get()
@@ -161,7 +161,7 @@ final class BackendController extends Controller
             ->where('id', (int) $request->getData('id'))
             ->execute();
 
-        $view->setData('audit', $audit);
+        $view->data['audit'] = $audit;
 
         return $view;
     }
diff --git a/Controller/CliController.php b/Controller/CliController.php
index 25def8f..b6e9004 100755
--- a/Controller/CliController.php
+++ b/Controller/CliController.php
@@ -118,7 +118,7 @@ final class CliController extends Controller
             }
         }
 
-        $view->setData('count', $count);
+        $view->data['count'] = $count;
 
         return $view;
     }
diff --git a/Theme/Backend/audit-list.tpl.php b/Theme/Backend/audit-list.tpl.php
index 9ee34dd..73374fe 100755
--- a/Theme/Backend/audit-list.tpl.php
+++ b/Theme/Backend/audit-list.tpl.php
@@ -18,9 +18,9 @@ use phpOMS\Uri\UriFactory;
  * @var \Web\Backend\Views\TableView  $this
  * @var \Modules\Audit\Models\Audit[] $audits
  */
-$audits = $this->getData('audits') ?? [];
+$audits = $this->data['audits'] ?? [];
 
-$tableView            = $this->getData('tableView');
+$tableView            = $this->data['tableView'];
 $tableView->id        = 'auditList';
 $tableView->baseUri   = '{/base}/admin/audit/list';
 $tableView->exportUri = '{/api}auditor/list/export';
@@ -37,7 +37,7 @@ $next = $tableView->getNextLink(
     $this->getData('hasNext') ?? false
 );
 
-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>
 
 <div class="row">
     <div class="col-xs-12">
diff --git a/Theme/Backend/audit-single.tpl.php b/Theme/Backend/audit-single.tpl.php
index 0d9e290..8e9e48f 100755
--- a/Theme/Backend/audit-single.tpl.php
+++ b/Theme/Backend/audit-single.tpl.php
@@ -19,11 +19,11 @@ use phpOMS\Views\ViewAbstract;
 /** @var \phpOMS\Views\View $this */
 
 /** @var \Modules\Auditor\Models\Audit $audit */
-$audit   = $this->getData('audit');
+$audit   = $this->data['audit'];
 $headers = HttpHeader::getAllHeaders();
 
 /** @var \phpOMS\Views\View $this */
-echo $this->getData('nav')->render();
+echo $this->data['nav']->render();
 ?>
 
 <?php if (isset($headers['Referer'])) : ?>