diff --git a/Admin/Installer.php b/Admin/Installer.php
index 11f0127..377d7ec 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -110,7 +110,7 @@ final class Installer extends InstallerAbstract
         $navElement->permissionType    = $data['permission']['type'] ?? null;
         $navElement->permissionElement = $data['permission']['element'] ?? null;
 
-        NavElementMapper::create($navElement);
+        NavElementMapper::create()->execute($navElement);
 
         foreach ($data['children'] as $link) {
             self::installLink($dbPool, $link);
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 39031fd..c1a3311 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -176,12 +176,12 @@ final class BackendController extends Controller
 
         $id = $request->getData('id') ?? '';
 
-        $settings = SettingMapper::getFor($id, 'module');
+        $settings = SettingMapper::getAll()->where('module', $id)->execute();
         if (!($settings instanceof NullSetting)) {
             $view->setData('settings', !\is_array($settings) ? [$settings] : $settings);
         }
 
-        $navigation = NavElementMapper::getAll();
+        $navigation = NavElementMapper::getAll()->execute();
         $view->setData('navigation', $navigation);
 
         if (\is_file(__DIR__ . '/../Admin/Settings/Theme/Backend/settings.tpl.php')) {
@@ -210,7 +210,7 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings-nav');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response));
 
-        $view->addData('nav-element', NavElementMapper::get((int) $request->getData('nav')));
+        $view->addData('nav-element', NavElementMapper::get()->where('id', (int) $request->getData('nav')))->execute();
 
         return $view;
     }
diff --git a/Controller/SearchController.php b/Controller/SearchController.php
index 8bbde1f..91a92ed 100755
--- a/Controller/SearchController.php
+++ b/Controller/SearchController.php
@@ -51,7 +51,7 @@ final class SearchController extends Controller
         $this->loadLanguage($request, $response, $request->getData('app'));
 
         /** @var \Modules\Navigation\Models\NavElement[] $elements */
-        $elements = NavElementMapper::getAll();
+        $elements = NavElementMapper::getAll()->execute();
 
         $searchIdStartPos = \stripos($request->getData('search'), ':');
         $patternStartPos  = $searchIdStartPos === false ? -1 : \stripos(
diff --git a/Models/NavElementMapper.php b/Models/NavElementMapper.php
index 6766eca..5564a1d 100755
--- a/Models/NavElementMapper.php
+++ b/Models/NavElementMapper.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Navigation\Models;
 
-use phpOMS\DataStorage\Database\DataMapperAbstract;
+use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
  * Mapper class.
@@ -24,7 +24,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract;
  * @link    https://orange-management.org
  * @since   1.0.0
  */
-final class NavElementMapper extends DataMapperAbstract
+final class NavElementMapper extends DataMapperFactory
 {
     /**
      * Columns.
@@ -32,7 +32,7 @@ final class NavElementMapper extends DataMapperAbstract
      * @var array<string, array{name:string, type:string, internal:string, autocomplete?:bool, readonly?:bool, writeonly?:bool, annotations?:array}>
      * @since 1.0.0
      */
-    protected static array $columns = [
+    public const COLUMNS = [
         'nav_id'                        => ['name' => 'nav_id',                    'type' => 'int',    'internal' => 'id'],
         'nav_app'                       => ['name' => 'nav_app',                    'type' => 'int',    'internal' => 'app'],
         'nav_pid'                       => ['name' => 'nav_pid',                   'type' => 'string', 'internal' => 'pid'],
@@ -59,7 +59,7 @@ final class NavElementMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $model = NavElement::class;
+    public const MODEL = NavElement::class;
 
     /**
      * Primary table.
@@ -67,7 +67,7 @@ final class NavElementMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $table = 'nav';
+    public const TABLE = 'nav';
 
     /**
      * Primary field name.
@@ -75,7 +75,7 @@ final class NavElementMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $primaryField = 'nav_id';
+    public const PRIMARYFIELD ='nav_id';
 
     /**
      * Autoincrement primary field.
@@ -83,5 +83,5 @@ final class NavElementMapper extends DataMapperAbstract
      * @var bool
      * @since 1.0.0
      */
-    protected static bool $autoincrement = false;
+    public const AUTOINCREMENT = false;
 }
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index f5fc99c..252a62f 100755
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -12,7 +12,7 @@ require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/Autoloader.php';
 
 use phpOMS\DataStorage\Database\DatabasePool;
-use phpOMS\DataStorage\Database\DataMapperAbstract;
+use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 use phpOMS\DataStorage\Session\HttpSession;
 
 $CONFIG = [
@@ -329,7 +329,7 @@ $GLOBALS['dbpool']->create('delete', $CONFIG['db']['core']['masters']['delete'])
 $GLOBALS['dbpool']->create('insert', $CONFIG['db']['core']['masters']['insert']);
 $GLOBALS['dbpool']->create('schema', $CONFIG['db']['core']['masters']['schema']);
 
-DataMapperAbstract::setConnection($GLOBALS['dbpool']->get());
+DataMapperFactory::db($GLOBALS['dbpool']->get());
 
 $GLOBALS['frameworkpath'] = '/phpOMS/';