diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 04aff94..b8ea927 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -60,7 +60,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/ClientManagement/Theme/Backend/attribute-type-list');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004801001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004801001, $request, $response);
 
         /** @var \Modules\Attribute\Models\AttributeType[] $attributes */
         $attributes = ClientAttributeTypeMapper::getAll()
@@ -68,7 +68,7 @@ final class BackendController extends Controller
             ->where('l11n/language', $response->header->l11n->language)
             ->execute();
 
-        $view->addData('attributes', $attributes);
+        $view->data['attributes'] = $attributes;
 
         return $view;
     }
@@ -89,7 +89,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/ClientManagement/Theme/Backend/attribute-value-list');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004801001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004801001, $request, $response);
 
         /** @var \Modules\Attribute\Models\AttributeValue[] $attributes */
         $attributes = ClientAttributeValueMapper::getAll()
@@ -97,7 +97,7 @@ final class BackendController extends Controller
             ->where('l11n/language', $response->header->l11n->language)
             ->execute();
 
-        $view->addData('attributes', $attributes);
+        $view->data['attributes'] = $attributes;
 
         return $view;
     }
@@ -118,7 +118,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/ClientManagement/Theme/Backend/attribute-type');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004801001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004801001, $request, $response);
 
         /** @var \Modules\Attribute\Models\AttributeType $attribute */
         $attribute = ClientAttributeTypeMapper::get()
@@ -131,8 +131,8 @@ final class BackendController extends Controller
             ->where('ref', $attribute->id)
             ->execute();
 
-        $view->addData('attribute', $attribute);
-        $view->addData('l11ns', $l11ns);
+        $view->data['attribute'] = $attribute;
+        $view->data['l11ns'] = $l11ns;
 
         return $view;
     }
@@ -153,7 +153,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/ClientManagement/Theme/Backend/client-list');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003102001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003102001, $request, $response);
 
         /** @var \Modules\ClientManagement\Models\Client $client */
         $client = ClientMapper::getAll()
@@ -162,7 +162,7 @@ final class BackendController extends Controller
             ->limit(25)
             ->execute();
 
-        $view->addData('client', $client);
+        $view->data['client'] = $client;
 
         return $view;
     }
@@ -183,7 +183,7 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/ClientManagement/Theme/Backend/client-create');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003102001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003102001, $request, $response);
 
         return $view;
     }
@@ -202,7 +202,7 @@ final class BackendController extends Controller
      */
     public function viewClientManagementClientProfile(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
     {
-        $head = $response->get('Content')->getData('head');
+        $head = $response->get('Content')->head;
         $head->addAsset(AssetType::CSS, 'Resources/chartjs/Chartjs/chart.css');
         $head->addAsset(AssetType::JSLATE, 'Resources/chartjs/Chartjs/chart.js');
         $head->addAsset(AssetType::JSLATE, 'Resources/OpenLayers/OpenLayers.js');
@@ -210,7 +210,7 @@ final class BackendController extends Controller
 
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/ClientManagement/Theme/Backend/client-profile');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003102001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003102001, $request, $response);
 
         /** @var \Modules\ClientManagement\Models\Client $client */
         $client = ClientMapper::get()
@@ -222,7 +222,7 @@ final class BackendController extends Controller
             ->where('id', (int) $request->getData('id'))
             ->execute();
 
-        $view->setData('client', $client);
+        $view->data['client'] = $client;
 
         // Get item profile image
         // It might not be part of the 5 newest item files from above
@@ -249,7 +249,7 @@ final class BackendController extends Controller
             ->limit(1)
             ->execute();
 
-        $view->addData('clientImage', $clientImage);
+        $view->data['clientImage'] = $clientImage;
 
         // stats
         if ($this->app->moduleManager->isActive('Billing')) {
@@ -277,12 +277,12 @@ final class BackendController extends Controller
             $items             = [];
         }
 
-        $view->addData('ytd', $ytd);
-        $view->addData('mtd', $mtd);
-        $view->addData('lastOrder', $lastOrder);
-        $view->addData('newestInvoices', $newestInvoices);
-        $view->addData('monthlySalesCosts', $monthlySalesCosts);
-        $view->addData('items', $items);
+        $view->data['ytd'] = $ytd;
+        $view->data['mtd'] = $mtd;
+        $view->data['lastOrder'] = $lastOrder;
+        $view->data['newestInvoices'] = $newestInvoices;
+        $view->data['monthlySalesCosts'] = $monthlySalesCosts;
+        $view->data['items'] = $items;
 
         return $view;
     }
@@ -320,14 +320,14 @@ final class BackendController extends Controller
      */
     public function viewClientAnalysis(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
     {
-        $head = $response->get('Content')->getData('head');
+        $head = $response->get('Content')->head;
         $head->addAsset(AssetType::CSS, 'Resources/chartjs/Chartjs/chart.css');
         $head->addAsset(AssetType::JSLATE, 'Resources/chartjs/Chartjs/chart.js');
         $head->addAsset(AssetType::JSLATE, 'Modules/ClientManagement/Controller.js', ['type' => 'module']);
 
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/ClientManagement/Theme/Backend/client-analysis');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001602001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001602001, $request, $response);
 
         $monthlySalesCosts = [];
         for ($i = 1; $i < 13; ++$i) {
@@ -339,7 +339,7 @@ final class BackendController extends Controller
             ];
         }
 
-        $view->addData('monthlySalesCosts', $monthlySalesCosts);
+        $view->data['monthlySalesCosts'] = $monthlySalesCosts;
 
         /////
         $monthlySalesCustomer = [];
@@ -352,7 +352,7 @@ final class BackendController extends Controller
             ];
         }
 
-        $view->addData('monthlySalesCustomer', $monthlySalesCustomer);
+        $view->data['monthlySalesCustomer'] = $monthlySalesCustomer;
 
         $annualSalesCustomer = [];
         for ($i = 1; $i < 11; ++$i) {
@@ -363,7 +363,7 @@ final class BackendController extends Controller
             ];
         }
 
-        $view->addData('annualSalesCustomer', $annualSalesCustomer);
+        $view->data['annualSalesCustomer'] = $annualSalesCustomer;
 
         /////
         $monthlyCustomerRetention = [];
@@ -374,7 +374,7 @@ final class BackendController extends Controller
             ];
         }
 
-        $view->addData('monthlyCustomerRetention', $monthlyCustomerRetention);
+        $view->data['monthlyCustomerRetention'] = $monthlyCustomerRetention;
 
         /////
         $currentCustomerRegion = [
@@ -386,7 +386,7 @@ final class BackendController extends Controller
             'Other'   => (int) (\mt_rand(200, 400) / 4),
         ];
 
-        $view->addData('currentCustomerRegion', $currentCustomerRegion);
+        $view->data['currentCustomerRegion'] = $currentCustomerRegion;
 
         $annualCustomerRegion = [];
         for ($i = 1; $i < 11; ++$i) {
@@ -402,7 +402,7 @@ final class BackendController extends Controller
             ];
         }
 
-        $view->addData('annualCustomerRegion', $annualCustomerRegion);
+        $view->data['annualCustomerRegion'] = $annualCustomerRegion;
 
         /////
         $currentCustomersRep = [];
@@ -416,7 +416,7 @@ final class BackendController extends Controller
             return $b['customers'] <=> $a['customers'];
         });
 
-        $view->addData('currentCustomersRep', $currentCustomersRep);
+        $view->data['currentCustomersRep'] = $currentCustomersRep;
 
         $annualCustomersRep = [];
         for ($i = 1; $i < 13; ++$i) {
@@ -430,7 +430,7 @@ final class BackendController extends Controller
             }
         }
 
-        $view->addData('annualCustomersRep', $annualCustomersRep);
+        $view->data['annualCustomersRep'] = $annualCustomersRep;
 
         /////
         $currentCustomersCountry = [];
@@ -445,7 +445,7 @@ final class BackendController extends Controller
             return $b['customers'] <=> $a['customers'];
         });
 
-        $view->addData('currentCustomersCountry', $currentCustomersCountry);
+        $view->data['currentCustomersCountry'] = $currentCustomersCountry;
 
         $annualCustomersCountry = [];
         for ($i = 1; $i < 51; ++$i) {
@@ -463,7 +463,7 @@ final class BackendController extends Controller
             }
         }
 
-        $view->addData('annualCustomersCountry', $annualCustomersCountry);
+        $view->data['annualCustomersCountry'] = $annualCustomersCountry;
 
         /////
         $customerGroups = [];
@@ -473,7 +473,7 @@ final class BackendController extends Controller
             ];
         }
 
-        $view->addData('customerGroups', $customerGroups);
+        $view->data['customerGroups'] = $customerGroups;
 
         return $view;
     }
diff --git a/Theme/Backend/attribute-type-list.tpl.php b/Theme/Backend/attribute-type-list.tpl.php
index 5b3edd4..10c8697 100644
--- a/Theme/Backend/attribute-type-list.tpl.php
+++ b/Theme/Backend/attribute-type-list.tpl.php
@@ -15,9 +15,9 @@ declare(strict_types=1);
 use phpOMS\Uri\UriFactory;
 
 /** @var \phpOMS\Views\View $this */
-$attributes = $this->getData('attributes');
+$attributes = $this->data['attributes'];
 
-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>
 
 <div class="row">
     <div class="col-xs-12">
diff --git a/Theme/Backend/attribute-type.tpl.php b/Theme/Backend/attribute-type.tpl.php
index bed6997..ab560c4 100755
--- a/Theme/Backend/attribute-type.tpl.php
+++ b/Theme/Backend/attribute-type.tpl.php
@@ -17,10 +17,10 @@ use phpOMS\Localization\ISO639Enum;
 
 $types = AttributeValueType::getConstants();
 
-$attribute = $this->getData('attribute');
-$l11ns     = $this->getData('l11ns');
+$attribute = $this->data['attribute'];
+$l11ns     = $this->data['l11ns'];
 
-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>
 
 <div class="row">
     <div class="col-md-6 col-xs-12">
diff --git a/Theme/Backend/client-analysis.tpl.php b/Theme/Backend/client-analysis.tpl.php
index a401f17..41d6e5b 100755
--- a/Theme/Backend/client-analysis.tpl.php
+++ b/Theme/Backend/client-analysis.tpl.php
@@ -21,7 +21,7 @@ use phpOMS\Utils\RnG\Name;
 /**
  * @var \phpOMS\Views\View $this
  */
-echo $this->getData('nav')->render();
+echo $this->data['nav']->render();
 ?>
 
 <div class="tabview tab-2">
@@ -103,7 +103,7 @@ echo $this->getData('nav')->render();
                             Sales / Customers - Monthly
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $saleCustomer = $this->getData('monthlySaleCustomer'); ?>
+                        <?php $saleCustomer = $this->data['monthlySaleCustomer']; ?>
                         <div class="portlet-body">
                             <canvas id="sales-region" data-chart='{
                                             "type": "bar",
@@ -227,7 +227,7 @@ echo $this->getData('nav')->render();
                             Sales / Customers - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $saleCustomer = $this->getData('annualSaleCustomer'); ?>
+                        <?php $saleCustomer = $this->data['annualSaleCustomer']; ?>
                         <div class="portlet-body">
                             <canvas id="sales-customer-annual" data-chart='{
                                             "type": "bar",
@@ -343,7 +343,7 @@ echo $this->getData('nav')->render();
                             Customers per Region - Current
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customerRegion = $this->getData('currentCustomerRegion'); ?>
+                        <?php $customerRegion = $this->data['currentCustomerRegion']; ?>
                         <div class="portlet-body">
                             <canvas id="sales-region" data-chart='{
                                         "type": "pie",
@@ -414,7 +414,7 @@ echo $this->getData('nav')->render();
                             Customers per Region - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customerRegion = $this->getData('annualCustomerRegion'); ?>
+                        <?php $customerRegion = $this->data['annualCustomerRegion']; ?>
                         <div class="portlet-body">
                             <canvas id="sales-region" data-chart='{
                                             "type": "line",
@@ -611,7 +611,7 @@ echo $this->getData('nav')->render();
                             Customers per Rep - Current
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customersRep = $this->getData('currentCustomersRep'); ?>
+                        <?php $customersRep = $this->data['currentCustomersRep']; ?>
                         <div class="portlet-body">
                             <canvas id="sales-region" data-chart='{
                                             "type": "horizontalBar",
@@ -689,7 +689,7 @@ echo $this->getData('nav')->render();
                             Customers per Rep - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customersRep = $this->getData('annualCustomersRep'); ?>
+                        <?php $customersRep = $this->data['annualCustomersRep']; ?>
                                 <table class="default">
                                     <thead>
                                         <tr>
@@ -723,7 +723,7 @@ echo $this->getData('nav')->render();
                             Customers per Country - Current
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customersCountry = $this->getData('currentCustomersCountry'); ?>
+                        <?php $customersCountry = $this->data['currentCustomersCountry']; ?>
                         <div class="portlet-body">
                             <canvas height="400px" id="sales-region" data-chart='{
                                             "type": "horizontalBar",
@@ -801,7 +801,7 @@ echo $this->getData('nav')->render();
                             Customers per Country - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customersCountry = $this->getData('annualCustomersCountry'); ?>
+                        <?php $customersCountry = $this->data['annualCustomersCountry']; ?>
                                 <table class="default">
                                     <thead>
                                         <tr>
@@ -837,7 +837,7 @@ echo $this->getData('nav')->render();
                             Customer per Attribute - Current
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customerGroups = $this->getData('customerGroups'); ?>
+                        <?php $customerGroups = $this->data['customerGroups']; ?>
                         <div class="portlet-body">
                             <div class="form-group">
                                 <label for="iOname"><?= $this->getHtml('Attribute'); ?></label>
@@ -924,7 +924,7 @@ echo $this->getData('nav')->render();
                             Customer per Attribute - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customerRegion = $this->getData('annualCustomerRegion'); ?>
+                        <?php $customerRegion = $this->data['annualCustomerRegion']; ?>
                         <div class="portlet-body">
                             <div class="form-group">
                                 <label for="iOname"><?= $this->getHtml('Attribute'); ?></label>
@@ -1130,7 +1130,7 @@ echo $this->getData('nav')->render();
                             Customer Retention - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customerRetention = $this->getData('monthlyCustomerRetention'); ?>
+                        <?php $customerRetention = $this->data['monthlyCustomerRetention']; ?>
                         <div class="portlet-body">
                             <canvas id="sales-region" data-chart='{
                                             "type": "bar",
@@ -1225,7 +1225,7 @@ echo $this->getData('nav')->render();
                             Sales / New Customers - Monthly
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $saleCustomer = $this->getData('monthlySaleCustomer'); ?>
+                        <?php $saleCustomer = $this->data['monthlySaleCustomer']; ?>
                         <div class="portlet-body">
                             <canvas id="sales-region" data-chart='{
                                             "type": "bar",
@@ -1349,7 +1349,7 @@ echo $this->getData('nav')->render();
                             Sales / New Customers - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $saleCustomer = $this->getData('annualSaleCustomer'); ?>
+                        <?php $saleCustomer = $this->data['annualSaleCustomer']; ?>
                         <div class="portlet-body">
                             <canvas id="sales-customer-annual" data-chart='{
                                             "type": "bar",
@@ -1465,7 +1465,7 @@ echo $this->getData('nav')->render();
                             New Customers per Region - Current
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customerRegion = $this->getData('currentCustomerRegion'); ?>
+                        <?php $customerRegion = $this->data['currentCustomerRegion']; ?>
                         <div class="portlet-body">
                             <canvas id="sales-region" data-chart='{
                                         "type": "pie",
@@ -1536,7 +1536,7 @@ echo $this->getData('nav')->render();
                             New Customers per Region - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customerRegion = $this->getData('annualCustomerRegion'); ?>
+                        <?php $customerRegion = $this->data['annualCustomerRegion']; ?>
                         <div class="portlet-body">
                             <canvas id="sales-region" data-chart='{
                                             "type": "line",
@@ -1733,7 +1733,7 @@ echo $this->getData('nav')->render();
                             New Customers per Rep - Current
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customersRep = $this->getData('currentCustomersRep'); ?>
+                        <?php $customersRep = $this->data['currentCustomersRep']; ?>
                         <div class="portlet-body">
                             <canvas id="sales-region" data-chart='{
                                             "type": "horizontalBar",
@@ -1811,7 +1811,7 @@ echo $this->getData('nav')->render();
                             New Customers per Rep - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customersRep = $this->getData('annualCustomersRep'); ?>
+                        <?php $customersRep = $this->data['annualCustomersRep']; ?>
                                 <table class="default">
                                     <thead>
                                         <tr>
@@ -1845,7 +1845,7 @@ echo $this->getData('nav')->render();
                             New Customers per Country - Current
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customersCountry = $this->getData('currentCustomersCountry'); ?>
+                        <?php $customersCountry = $this->data['currentCustomersCountry']; ?>
                         <div class="portlet-body">
                             <canvas height="400px" id="sales-region" data-chart='{
                                             "type": "horizontalBar",
@@ -1923,7 +1923,7 @@ echo $this->getData('nav')->render();
                             New Customers per Country - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customersCountry = $this->getData('annualCustomersCountry'); ?>
+                        <?php $customersCountry = $this->data['annualCustomersCountry']; ?>
                                 <table class="default">
                                     <thead>
                                         <tr>
@@ -1959,7 +1959,7 @@ echo $this->getData('nav')->render();
                             New Customer per Attribute - Current
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customerGroups = $this->getData('customerGroups'); ?>
+                        <?php $customerGroups = $this->data['customerGroups']; ?>
                         <div class="portlet-body">
                             <div class="form-group">
                                 <label for="iOname"><?= $this->getHtml('Attribute'); ?></label>
@@ -2046,7 +2046,7 @@ echo $this->getData('nav')->render();
                             New Customer per Attribute - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customerRegion = $this->getData('annualCustomerRegion'); ?>
+                        <?php $customerRegion = $this->data['annualCustomerRegion']; ?>
                         <div class="portlet-body">
                             <div class="form-group">
                                 <label for="iOname"><?= $this->getHtml('Attribute'); ?></label>
@@ -2290,7 +2290,7 @@ echo $this->getData('nav')->render();
                             Sales / Lost Customers - Monthly
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $saleCustomer = $this->getData('monthlySaleCustomer'); ?>
+                        <?php $saleCustomer = $this->data['monthlySaleCustomer']; ?>
                         <div class="portlet-body">
                             <canvas id="sales-region" data-chart='{
                                             "type": "bar",
@@ -2414,7 +2414,7 @@ echo $this->getData('nav')->render();
                             Sales / Sales Customers - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $saleCustomer = $this->getData('annualSaleCustomer'); ?>
+                        <?php $saleCustomer = $this->data['annualSaleCustomer']; ?>
                         <div class="portlet-body">
                             <canvas id="sales-customer-annual" data-chart='{
                                             "type": "bar",
@@ -2530,7 +2530,7 @@ echo $this->getData('nav')->render();
                             Lost Customers per Region - Current
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customerRegion = $this->getData('currentCustomerRegion'); ?>
+                        <?php $customerRegion = $this->data['currentCustomerRegion']; ?>
                         <div class="portlet-body">
                             <canvas id="sales-region" data-chart='{
                                         "type": "pie",
@@ -2601,7 +2601,7 @@ echo $this->getData('nav')->render();
                             Lost Customers per Region - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customerRegion = $this->getData('annualCustomerRegion'); ?>
+                        <?php $customerRegion = $this->data['annualCustomerRegion']; ?>
                         <div class="portlet-body">
                             <canvas id="sales-region" data-chart='{
                                             "type": "line",
@@ -2798,7 +2798,7 @@ echo $this->getData('nav')->render();
                             Lost Customers per Rep - Current
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customersRep = $this->getData('currentCustomersRep'); ?>
+                        <?php $customersRep = $this->data['currentCustomersRep']; ?>
                         <div class="portlet-body">
                             <canvas id="sales-region" data-chart='{
                                             "type": "horizontalBar",
@@ -2876,7 +2876,7 @@ echo $this->getData('nav')->render();
                             Lost Customers per Rep - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customersRep = $this->getData('annualCustomersRep'); ?>
+                        <?php $customersRep = $this->data['annualCustomersRep']; ?>
                                 <table class="default">
                                     <thead>
                                         <tr>
@@ -2910,7 +2910,7 @@ echo $this->getData('nav')->render();
                             Lost Customers per Country - Current
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customersCountry = $this->getData('currentCustomersCountry'); ?>
+                        <?php $customersCountry = $this->data['currentCustomersCountry']; ?>
                         <div class="portlet-body">
                             <canvas height="400px" id="sales-region" data-chart='{
                                             "type": "horizontalBar",
@@ -2988,7 +2988,7 @@ echo $this->getData('nav')->render();
                             Lost Customers per Country - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customersCountry = $this->getData('annualCustomersCountry'); ?>
+                        <?php $customersCountry = $this->data['annualCustomersCountry']; ?>
                                 <table class="default">
                                     <thead>
                                         <tr>
@@ -3024,7 +3024,7 @@ echo $this->getData('nav')->render();
                             Lost Customer per Attribute - Current
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customerGroups = $this->getData('customerGroups'); ?>
+                        <?php $customerGroups = $this->data['customerGroups']; ?>
                         <div class="portlet-body">
                             <div class="form-group">
                                 <label for="iOname"><?= $this->getHtml('Attribute'); ?></label>
@@ -3111,7 +3111,7 @@ echo $this->getData('nav')->render();
                             Lost Customer per Attribute - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customerRegion = $this->getData('annualCustomerRegion'); ?>
+                        <?php $customerRegion = $this->data['annualCustomerRegion']; ?>
                         <div class="portlet-body">
                             <div class="form-group">
                                 <label for="iOname"><?= $this->getHtml('Attribute'); ?></label>
@@ -3371,7 +3371,7 @@ echo $this->getData('nav')->render();
                             Sales / Profit - Monthly
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $saleCustomer = $this->getData('monthlySaleCustomer'); ?>
+                        <?php $saleCustomer = $this->data['monthlySaleCustomer']; ?>
                         <div class="portlet-body">
                             <canvas id="sales-region" data-chart='{
                                             "type": "bar",
@@ -3498,7 +3498,7 @@ echo $this->getData('nav')->render();
                             Sales / Profit - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $saleCustomer = $this->getData('annualSaleCustomer'); ?>
+                        <?php $saleCustomer = $this->data['annualSaleCustomer']; ?>
                         <div class="portlet-body">
                             <canvas id="sales-customer-annual" data-chart='{
                                             "type": "bar",
@@ -3616,7 +3616,7 @@ echo $this->getData('nav')->render();
                             Sales per Attribute - Current
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customerGroups = $this->getData('customerGroups'); ?>
+                        <?php $customerGroups = $this->data['customerGroups']; ?>
                         <div class="portlet-body">
                             <div class="form-group">
                                 <label for="iOname"><?= $this->getHtml('Attribute'); ?></label>
@@ -3703,7 +3703,7 @@ echo $this->getData('nav')->render();
                             Sales per Attribute - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customerRegion = $this->getData('annualCustomerRegion'); ?>
+                        <?php $customerRegion = $this->data['annualCustomerRegion']; ?>
                         <div class="portlet-body">
                             <div class="form-group">
                                 <label for="iOname"><?= $this->getHtml('Attribute'); ?></label>
@@ -3909,7 +3909,7 @@ echo $this->getData('nav')->render();
                             Profit per Attribute - Current
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customerGroups = $this->getData('customerGroups'); ?>
+                        <?php $customerGroups = $this->data['customerGroups']; ?>
                         <div class="portlet-body">
                             <div class="form-group">
                                 <label for="iOname"><?= $this->getHtml('Attribute'); ?></label>
@@ -3996,7 +3996,7 @@ echo $this->getData('nav')->render();
                             Profit per Attribute - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $customerRegion = $this->getData('annualCustomerRegion'); ?>
+                        <?php $customerRegion = $this->data['annualCustomerRegion']; ?>
                         <div class="portlet-body">
                             <div class="form-group">
                                 <label for="iOname"><?= $this->getHtml('Attribute'); ?></label>
@@ -4202,7 +4202,7 @@ echo $this->getData('nav')->render();
                             Invoices / Articles - Monthly
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $saleCustomer = $this->getData('monthlySaleCustomer'); ?>
+                        <?php $saleCustomer = $this->data['monthlySaleCustomer']; ?>
                         <div class="portlet-body">
                             <canvas id="sales-region" data-chart='{
                                             "type": "bar",
@@ -4328,7 +4328,7 @@ echo $this->getData('nav')->render();
                             Invoices / Articles - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $saleCustomer = $this->getData('annualSaleCustomer'); ?>
+                        <?php $saleCustomer = $this->data['annualSaleCustomer']; ?>
                         <div class="portlet-body">
                             <canvas id="sales-customer-annual" data-chart='{
                                             "type": "bar",
diff --git a/Theme/Backend/client-create.tpl.php b/Theme/Backend/client-create.tpl.php
index 62d4c00..868169a 100755
--- a/Theme/Backend/client-create.tpl.php
+++ b/Theme/Backend/client-create.tpl.php
@@ -15,7 +15,7 @@ declare(strict_types=1);
 /**
  * @var \phpOMS\Views\View $this
  */
-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>
 
 <div class="tabview tab-2">
     <div class="box">
diff --git a/Theme/Backend/client-list.tpl.php b/Theme/Backend/client-list.tpl.php
index 5d470a8..de9d982 100755
--- a/Theme/Backend/client-list.tpl.php
+++ b/Theme/Backend/client-list.tpl.php
@@ -16,9 +16,9 @@ declare(strict_types=1);
 use phpOMS\Uri\UriFactory;
 
 /** @var \phpOMS\Views\View $this */
-$clients = $this->getData('client');
+$clients = $this->data['client'];
 
-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <section class="portlet">
diff --git a/Theme/Backend/client-profile-bills.tpl.php b/Theme/Backend/client-profile-bills.tpl.php
index a1e026d..b60d608 100755
--- a/Theme/Backend/client-profile-bills.tpl.php
+++ b/Theme/Backend/client-profile-bills.tpl.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 use phpOMS\Uri\UriFactory;
 
-$bills = $this->getData('newestInvoices') ?? [];
+$bills = $this->data['newestInvoices'] ?? [];
 
 ?>
 
diff --git a/Theme/Backend/client-profile-items.tpl.php b/Theme/Backend/client-profile-items.tpl.php
index 145168b..7aa5473 100755
--- a/Theme/Backend/client-profile-items.tpl.php
+++ b/Theme/Backend/client-profile-items.tpl.php
@@ -15,7 +15,7 @@ declare(strict_types=1);
 use phpOMS\Uri\UriFactory;
 
 /** @var \phpOMS\Views\View $this */
-$items = $this->getData('items') ?? [];
+$items = $this->data['items'] ?? [];
 
 ?>
 
diff --git a/Theme/Backend/client-profile.tpl.php b/Theme/Backend/client-profile.tpl.php
index 3b76126..1350f8e 100755
--- a/Theme/Backend/client-profile.tpl.php
+++ b/Theme/Backend/client-profile.tpl.php
@@ -22,19 +22,19 @@ $countries    = \phpOMS\Localization\ISO3166NameEnum::getConstants();
 /**
  * @var \Modules\ClientManagement\Models\Client $client
  */
-$client = $this->getData('client');
+$client = $this->data['client'];
 $notes  = $client->getNotes();
 $files  = $client->files;
 
 $clientImage = $this->getData('clientImage') ?? new NullMedia();
 
-$newestInvoices    = $this->getData('newestInvoices') ?? [];
-$monthlySalesCosts = $this->getData('monthlySalesCosts') ?? [];
+$newestInvoices    = $this->data['newestInvoices'] ?? [];
+$monthlySalesCosts = $this->data['monthlySalesCosts'] ?? [];
 
 /**
  * @var \phpOMS\Views\View $this
  */
-echo $this->getData('nav')->render();
+echo $this->data['nav']->render();
 ?>
 <div class="tabview tab-2">
     <div class="box">