diff --git a/Admin/Install/Interfaces/DatabaseExchanger/import.tpl.php b/Admin/Install/Interfaces/DatabaseExchanger/import.tpl.php
index 74e76dd..693e67a 100755
--- a/Admin/Install/Interfaces/DatabaseExchanger/import.tpl.php
+++ b/Admin/Install/Interfaces/DatabaseExchanger/import.tpl.php
@@ -20,13 +20,13 @@ use phpOMS\DataStorage\Database\DatabaseType;
 use phpOMS\DataStorage\Database\SchemaMapper;
 use phpOMS\Uri\UriFactory;
 
-$lang = $this->getData('lang') ?? [];
+$lang = $this->data['lang'] ?? [];
 
 // @todo define offset fields
 // @todo define create job button
 // @todo show job reference
 
-$interface = $this->getData('interface');
+$interface = $this->data['interface'];
 $settings  = $interface->getSettings();
 
 $currentSetting = $settings[(int) ($this->request->getData('setting') ?? 0)] ?? new NullExchangeSetting();
@@ -42,7 +42,7 @@ $currentExportTableFields = [];
 
 if (!empty($settingData)) {
     $importConnection = ($settingData['import']['db']['self'] ?? true)
-        ? $this->getData('db') ?? new NullConnection()
+        ? $this->data['db'] ?? new NullConnection()
         : ConnectionFactory::create([
             'db'       => $settingData['import']['db']['db'],
             'host'     => $settingData['import']['db']['host'],
@@ -52,7 +52,7 @@ if (!empty($settingData)) {
             'password' => $settingData['import']['db']['password'],
         ]);
     $exportConnection = ($settingData['export']['db']['self'] ?? true)
-        ? $this->getData('db') ?? new NullConnection()
+        ? $this->data['db'] ?? new NullConnection()
         : ConnectionFactory::create([
             'db'       => $settingData['export']['db']['db'],
             'host'     => $settingData['export']['db']['host'],
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 86d0233..b5c12d4 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -77,7 +77,7 @@ final class ApiController extends Controller
             ];
         }
 
-        $importer = $this->getImporter((int) $request->getData('id'), $dbData);
+        $importer = $this->getImporter($request->getDataInt('id') ?? 0, $dbData);
         $import   = $importer === null ? [] : $importer->importFromRequest($request, $response);
 
         if (isset($import['logs'])) {
@@ -270,7 +270,7 @@ final class ApiController extends Controller
      */
     public function apiExchangeExport(RequestAbstract $request, HttpResponse $response, mixed $data = null) : void
     {
-        $exporter = $this->getExporter((int) $request->getData('id'));
+        $exporter = $this->getExporter($request->getDataInt('id') ?? 0);
         $export   = $exporter === null ? [] : $exporter->exportFromRequest($request, $response);
 
         if (!isset($export['type'], $export['logs'])) {
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index cbf14e9..190091b 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -82,7 +82,7 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-log');
         $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1007001001, $request, $response);
 
-        $log               = ExchangeLogMapper::get()->where('id', (int) $request->getData('id'))->execute();
+        $log               = ExchangeLogMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
         $view->data['log'] = $log;
 
         return $view;
@@ -175,7 +175,7 @@ final class BackendController extends Controller
             ->with('source')
             ->with('source/sources')
             ->with('settings')
-            ->where('id', (int) $request->getData('id'))
+            ->where('id', $request->getDataInt('id') ?? 0)
             ->execute();
 
         if ($interface->id === 0) {
@@ -221,7 +221,7 @@ final class BackendController extends Controller
             ->with('source')
             ->with('source/sources')
             ->with('settings')
-            ->where('id', (int) $request->getData('id'))
+            ->where('id', $request->getDataInt('id') ?? 0)
             ->execute();
 
         if ($interface->id === 0) {
diff --git a/tests/Interfaces/OMS/Exporter.php b/tests/Interfaces/OMS/Exporter.php
index 6002c92..3912a6e 100755
--- a/tests/Interfaces/OMS/Exporter.php
+++ b/tests/Interfaces/OMS/Exporter.php
@@ -87,7 +87,7 @@ final class Exporter extends ExporterAbstract
             $log->type      = ExchangeType::EXPORT;
             $log->message   = $this->l11n->getText($request->header->l11n->language, 'Exchange', '', 'LangFileExported');
             $log->subtype   = 'language';
-            $log->exchange  = new NullInterfaceManager((int) $request->getData('id'));
+            $log->exchange  = new NullInterfaceManager($request->getDataInt('id') ?? 0);
 
             $result['logs'][] = $log;
         }
diff --git a/tests/Interfaces/OMS/Importer.php b/tests/Interfaces/OMS/Importer.php
index 27d825a..e9a9ba2 100755
--- a/tests/Interfaces/OMS/Importer.php
+++ b/tests/Interfaces/OMS/Importer.php
@@ -107,7 +107,7 @@ final class Importer extends ImporterAbstract
             $log->type      = ExchangeType::IMPORT;
             $log->message   = $this->l11n->getText($request->header->l11n->language, 'Exchange', '', 'LangFileImported');
             $log->subtype   = 'language';
-            $log->exchange  = new NullInterfaceManager((int) $request->getData('id'));
+            $log->exchange  = new NullInterfaceManager($request->getDataInt('id') ?? 0);
 
             $result['logs'][] = $log;
         }
diff --git a/tests/Interfaces/OMS/export.tpl.php b/tests/Interfaces/OMS/export.tpl.php
index 2c045d8..23f3678 100755
--- a/tests/Interfaces/OMS/export.tpl.php
+++ b/tests/Interfaces/OMS/export.tpl.php
@@ -12,7 +12,7 @@
  */
 declare(strict_types=1);
 
-$lang = $this->getData('lang');
+$lang = $this->data['lang'];
 ?>
 <div class="row">
     <div class="col-xs-12 col-md-6">
diff --git a/tests/Interfaces/OMS/import.tpl.php b/tests/Interfaces/OMS/import.tpl.php
index 9809dc7..15266aa 100755
--- a/tests/Interfaces/OMS/import.tpl.php
+++ b/tests/Interfaces/OMS/import.tpl.php
@@ -12,7 +12,7 @@
  */
 declare(strict_types=1);
 
-$lang = $this->getData('lang');
+$lang = $this->data['lang'];
 ?>
 <div class="row">
     <div class="col-xs-12 col-md-6">