diff --git a/Admin/Installer.php b/Admin/Installer.php
index aa085af..7ff476b 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -47,6 +47,6 @@ final class Installer extends InstallerAbstract
         parent::install($dbPool, $info, $cfgHandler);
 
         $board = new DashboardBoard();
-        DashboardBoardMapper::create($board);
+        DashboardBoardMapper::create()->execute($board);
     }
 }
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index fa5da71..0bdf5a2 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -51,10 +51,10 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/Dashboard/Theme/Backend/dashboard');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000301001, $request, $response));
 
-        $board = DashboardBoardMapper::getFor($request->header->account, 'account');
+        $board = DashboardBoardMapper::get()->where('account', $request->header->account)->execute();
 
         if ($board instanceof NullDashboardBoard) {
-            $board = DashboardBoardMapper::get(1);
+            $board = DashboardBoardMapper::get()->where('id', 1)->execute();
         }
 
         $panels          = [];
diff --git a/Models/DashboardBoardMapper.php b/Models/DashboardBoardMapper.php
index 870486d..2c8a4bf 100755
--- a/Models/DashboardBoardMapper.php
+++ b/Models/DashboardBoardMapper.php
@@ -15,7 +15,7 @@ declare(strict_types=1);
 namespace Modules\Dashboard\Models;
 
 use Modules\Admin\Models\AccountMapper;
-use phpOMS\DataStorage\Database\DataMapperAbstract;
+use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
  * Mapper class.
@@ -25,7 +25,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract;
  * @link    https://orange-management.org
  * @since   1.0.0
  */
-final class DashboardBoardMapper extends DataMapperAbstract
+final class DashboardBoardMapper extends DataMapperFactory
 {
     /**
      * Columns.
@@ -33,7 +33,7 @@ final class DashboardBoardMapper 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 = [
         'dashboard_board_id'      => ['name' => 'dashboard_board_id',      'type' => 'int',    'internal' => 'id'],
         'dashboard_board_title'   => ['name' => 'dashboard_board_title',   'type' => 'string', 'internal' => 'title'],
         'dashboard_board_status'  => ['name' => 'dashboard_board_status',  'type' => 'int',    'internal' => 'status'],
@@ -46,7 +46,7 @@ final class DashboardBoardMapper extends DataMapperAbstract
      * @var array<string, array{mapper:string, table:string, self?:?string, external?:?string, column?:string}>
      * @since 1.0.0
      */
-    protected static array $hasMany = [
+    public const HAS_MANY = [
         'components' => [
             'mapper'       => DashboardComponentMapper::class,
             'table'        => 'dashboard_component',
@@ -61,7 +61,7 @@ final class DashboardBoardMapper extends DataMapperAbstract
      * @var array<string, array{mapper:string, external:string}>
      * @since 1.0.0
      */
-    protected static array $belongsTo = [
+    public const BELONGS_TO = [
         'account' => [
             'mapper'     => AccountMapper::class,
             'external'   => 'dashboard_board_account',
@@ -74,7 +74,7 @@ final class DashboardBoardMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $table = 'dashboard_board';
+    public const TABLE = 'dashboard_board';
 
     /**
      * Primary field name.
@@ -82,5 +82,5 @@ final class DashboardBoardMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $primaryField = 'dashboard_board_id';
+    public const PRIMARYFIELD ='dashboard_board_id';
 }
diff --git a/Models/DashboardComponentMapper.php b/Models/DashboardComponentMapper.php
index f4bb8bb..8681d0a 100755
--- a/Models/DashboardComponentMapper.php
+++ b/Models/DashboardComponentMapper.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Dashboard\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 DashboardComponentMapper extends DataMapperAbstract
+final class DashboardComponentMapper extends DataMapperFactory
 {
     /**
      * Columns.
@@ -32,7 +32,7 @@ final class DashboardComponentMapper 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 = [
         'dashboard_component_id'        => ['name' => 'dashboard_component_id',        'type' => 'int',    'internal' => 'id'],
         'dashboard_component_order'     => ['name' => 'dashboard_component_order',     'type' => 'int',    'internal' => 'order'],
         'dashboard_component_module'    => ['name' => 'dashboard_component_module',    'type' => 'string', 'internal' => 'module'],
@@ -46,7 +46,7 @@ final class DashboardComponentMapper extends DataMapperAbstract
      * @var array<string, array{mapper:string, external:string}>
      * @since 1.0.0
      */
-    protected static array $belongsTo = [
+    public const BELONGS_TO = [
         'board' => [
             'mapper'     => DashboardBoardMapper::class,
             'external'   => 'dashboard_component_board',
@@ -59,7 +59,7 @@ final class DashboardComponentMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $table = 'dashboard_component';
+    public const TABLE = 'dashboard_component';
 
     /**
      * Primary field name.
@@ -67,5 +67,5 @@ final class DashboardComponentMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $primaryField = 'dashboard_component_id';
+    public const PRIMARYFIELD ='dashboard_component_id';
 }
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/';