diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index c681290..f3edf8d 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -77,7 +77,7 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/risk-list');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response));
 
-        $risks = RiskMapper::getAll();
+        $risks = RiskMapper::getAll()->execute();
         $view->addData('risks', $risks);
 
         return $view;
@@ -101,7 +101,7 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/risk-single');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response));
 
-        $risk = RiskMapper::get((int) $request->getData('id'));
+        $risk = RiskMapper::get()->where('id', (int) $request->getData('id'))->execute();
         $view->addData('risk', $risk);
 
         return $view;
@@ -146,7 +146,7 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/cause-list');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response));
 
-        $causes = CauseMapper::getAll();
+        $causes = CauseMapper::getAll()->execute();
         $view->addData('causes', $causes);
 
         return $view;
@@ -170,7 +170,7 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/cause-single');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response));
 
-        $cause = CauseMapper::get((int) $request->getData('id'));
+        $cause = CauseMapper::get()->where('id', (int) $request->getData('id'))->execute();
         $view->addData('cause', $cause);
 
         return $view;
@@ -194,7 +194,7 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/solution-list');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response));
 
-        $solutions = SolutionMapper::getAll();
+        $solutions = SolutionMapper::getAll()->execute();
         $view->addData('solutions', $solutions);
 
         return $view;
@@ -218,7 +218,7 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/solution-single');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response));
 
-        $solution = SolutionMapper::get((int) $request->getData('id'));
+        $solution = SolutionMapper::get()->where('id', (int) $request->getData('id'))->execute();
         $view->addData('solution', $solution);
 
         return $view;
@@ -242,7 +242,7 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/unit-list');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response));
 
-        $units = UnitMapper::getAll();
+        $units = UnitMapper::getAll()->execute();
         $view->addData('units', $units);
 
         return $view;
@@ -266,7 +266,7 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/unit-single');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response));
 
-        $unit = UnitMapper::get((int) $request->getData('id'));
+        $unit = UnitMapper::get()->where('id', (int) $request->getData('id'))->execute();
         $view->addData('unit', $unit);
 
         return $view;
@@ -290,7 +290,7 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/department-list');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response));
 
-        $departments = DepartmentMapper::getAll();
+        $departments = DepartmentMapper::getAll()->execute();
         $view->addData('departments', $departments);
 
         return $view;
@@ -314,7 +314,7 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/department-single');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response));
 
-        $department = DepartmentMapper::get((int) $request->getData('id'));
+        $department = DepartmentMapper::get()->where('id', (int) $request->getData('id'))->execute();
         $view->addData('department', $department);
 
         return $view;
@@ -338,7 +338,7 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/category-list');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response));
 
-        $categories = CategoryMapper::getAll();
+        $categories = CategoryMapper::getAll()->execute();
         $view->addData('categories', $categories);
 
         return $view;
@@ -362,7 +362,7 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/category-single');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response));
 
-        $category = CategoryMapper::get((int) $request->getData('id'));
+        $category = CategoryMapper::get()->where('id', (int) $request->getData('id'))->execute();
         $view->addData('category', $category);
 
         return $view;
@@ -386,7 +386,7 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/project-list');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response));
 
-        $projects = ProjectMapper::getAll();
+        $projects = ProjectMapper::getAll()->execute();
         $view->addData('projects', $projects);
 
         return $view;
@@ -410,7 +410,7 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/project-single');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response));
 
-        $project = ProjectMapper::get((int) $request->getData('id'));
+        $project = ProjectMapper::get()->where('id', (int) $request->getData('id'))->execute();
         $view->addData('project', $project);
 
         return $view;
@@ -434,7 +434,7 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/process-list');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response));
 
-        $processes = ProcessMapper::getAll();
+        $processes = ProcessMapper::getAll()->execute();
         $view->addData('processes', $processes);
 
         return $view;
@@ -458,7 +458,7 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/process-single');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response));
 
-        $process = ProcessMapper::get((int) $request->getData('id'));
+        $process = ProcessMapper::get()->where('id', (int) $request->getData('id'))->execute();
         $view->addData('process', $process);
 
         return $view;
diff --git a/Models/CategoryMapper.php b/Models/CategoryMapper.php
index c9d0c6b..e4a3656 100755
--- a/Models/CategoryMapper.php
+++ b/Models/CategoryMapper.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\Models;
 
-use phpOMS\DataStorage\Database\DataMapperAbstract;
+use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
  * Risk category mapper class.
@@ -24,7 +24,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract;
  * @link    https://orange-management.org
  * @since   1.0.0
  */
-final class CategoryMapper extends DataMapperAbstract
+final class CategoryMapper extends DataMapperFactory
 {
     /**
      * Columns.
@@ -32,7 +32,7 @@ final class CategoryMapper 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 = [
         'riskmngmt_category_id'             => ['name' => 'riskmngmt_category_id',             'type' => 'int',    'internal' => 'id'],
         'riskmngmt_category_name'           => ['name' => 'riskmngmt_category_name',           'type' => 'string', 'internal' => 'title'],
         'riskmngmt_category_description'    => ['name' => 'riskmngmt_category_description',    'type' => 'string', 'internal' => 'description'],
@@ -48,7 +48,7 @@ final class CategoryMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $table = 'riskmngmt_category';
+    public const TABLE = 'riskmngmt_category';
 
     /**
      * Primary field name.
@@ -56,5 +56,5 @@ final class CategoryMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $primaryField = 'riskmngmt_category_id';
+    public const PRIMARYFIELD ='riskmngmt_category_id';
 }
diff --git a/Models/CauseMapper.php b/Models/CauseMapper.php
index 29950ce..8099af1 100755
--- a/Models/CauseMapper.php
+++ b/Models/CauseMapper.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\Models;
 
-use phpOMS\DataStorage\Database\DataMapperAbstract;
+use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
  * Risk cause mapper class.
@@ -24,7 +24,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract;
  * @link    https://orange-management.org
  * @since   1.0.0
  */
-final class CauseMapper extends DataMapperAbstract
+final class CauseMapper extends DataMapperFactory
 {
     /**
      * Columns.
@@ -32,7 +32,7 @@ final class CauseMapper 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 = [
         'riskmngmt_cause_id'             => ['name' => 'riskmngmt_cause_id',             'type' => 'int',    'internal' => 'id'],
         'riskmngmt_cause_name'           => ['name' => 'riskmngmt_cause_name',           'type' => 'string', 'internal' => 'title'],
         'riskmngmt_cause_description'    => ['name' => 'riskmngmt_cause_description',    'type' => 'string', 'internal' => 'description'],
@@ -49,7 +49,7 @@ final class CauseMapper extends DataMapperAbstract
      * @var array<string, array{mapper:string, external:string}>
      * @since 1.0.0
      */
-    protected static array $belongsTo = [
+    public const BELONGS_TO = [
         'risk'       => [
             'mapper'     => RiskMapper::class,
             'external'   => 'riskmngmt_cause_risk',
@@ -70,7 +70,7 @@ final class CauseMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $table = 'riskmngmt_cause';
+    public const TABLE = 'riskmngmt_cause';
 
     /**
      * Primary field name.
@@ -78,5 +78,5 @@ final class CauseMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $primaryField = 'riskmngmt_cause_id';
+    public const PRIMARYFIELD ='riskmngmt_cause_id';
 }
diff --git a/Models/DepartmentMapper.php b/Models/DepartmentMapper.php
index e9a2249..9b59ca5 100755
--- a/Models/DepartmentMapper.php
+++ b/Models/DepartmentMapper.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\Models;
 
-use phpOMS\DataStorage\Database\DataMapperAbstract;
+use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
  * Risk department mapper class.
@@ -24,7 +24,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract;
  * @link    https://orange-management.org
  * @since   1.0.0
  */
-final class DepartmentMapper extends DataMapperAbstract
+final class DepartmentMapper extends DataMapperFactory
 {
     /**
      * Columns.
@@ -32,7 +32,7 @@ final class DepartmentMapper 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 = [
         'riskmngmt_department_id'          => ['name' => 'riskmngmt_department_id',          'type' => 'int', 'internal' => 'id'],
         'riskmngmt_department_department'  => ['name' => 'riskmngmt_department_department',  'type' => 'int', 'internal' => 'department'],
         'riskmngmt_department_responsible' => ['name' => 'riskmngmt_department_responsible', 'type' => 'int', 'internal' => 'responsible'],
@@ -45,7 +45,7 @@ final class DepartmentMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $table = 'riskmngmt_department';
+    public const TABLE = 'riskmngmt_department';
 
     /**
      * Primary field name.
@@ -53,7 +53,7 @@ final class DepartmentMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $primaryField = 'riskmngmt_department_id';
+    public const PRIMARYFIELD ='riskmngmt_department_id';
 
     /**
      * Belongs to.
@@ -61,7 +61,7 @@ final class DepartmentMapper extends DataMapperAbstract
      * @var array<string, array{mapper:string, external:string}>
      * @since 1.0.0
      */
-    protected static array $belongsTo = [
+    public const BELONGS_TO = [
         'department' => [
             'mapper'     => \Modules\Organization\Models\DepartmentMapper::class,
             'external'   => 'riskmngmt_department_department',
diff --git a/Models/ProcessMapper.php b/Models/ProcessMapper.php
index 8f6c778..9254357 100755
--- a/Models/ProcessMapper.php
+++ b/Models/ProcessMapper.php
@@ -15,7 +15,7 @@ declare(strict_types=1);
 namespace Modules\RiskManagement\Models;
 
 use Modules\Organization\Models\UnitMapper;
-use phpOMS\DataStorage\Database\DataMapperAbstract;
+use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
  * Risk process mapper class.
@@ -25,7 +25,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract;
  * @link    https://orange-management.org
  * @since   1.0.0
  */
-final class ProcessMapper extends DataMapperAbstract
+final class ProcessMapper extends DataMapperFactory
 {
     /**
      * Columns.
@@ -33,7 +33,7 @@ final class ProcessMapper 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 = [
         'riskmngmt_process_id'             => ['name' => 'riskmngmt_process_id',             'type' => 'int',    'internal' => 'id'],
         'riskmngmt_process_name'           => ['name' => 'riskmngmt_process_name',           'type' => 'string', 'internal' => 'title'],
         'riskmngmt_process_description'    => ['name' => 'riskmngmt_process_description',    'type' => 'string', 'internal' => 'description'],
@@ -50,7 +50,7 @@ final class ProcessMapper extends DataMapperAbstract
      * @var array<string, array{mapper:string, external:string}>
      * @since 1.0.0
      */
-    protected static array $belongsTo = [
+    public const BELONGS_TO = [
         'unit'       => [
             'mapper'     => UnitMapper::class,
             'external'   => 'riskmngmt_process_unit',
@@ -67,7 +67,7 @@ final class ProcessMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $table = 'riskmngmt_process';
+    public const TABLE = 'riskmngmt_process';
 
     /**
      * Primary field name.
@@ -75,5 +75,5 @@ final class ProcessMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $primaryField = 'riskmngmt_process_id';
+    public const PRIMARYFIELD ='riskmngmt_process_id';
 }
diff --git a/Models/ProjectMapper.php b/Models/ProjectMapper.php
index 183622c..adde38e 100755
--- a/Models/ProjectMapper.php
+++ b/Models/ProjectMapper.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\Models;
 
-use phpOMS\DataStorage\Database\DataMapperAbstract;
+use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
  * Risk project mapper class.
@@ -24,7 +24,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract;
  * @link    https://orange-management.org
  * @since   1.0.0
  */
-final class ProjectMapper extends DataMapperAbstract
+final class ProjectMapper extends DataMapperFactory
 {
     /**
      * Columns.
@@ -32,7 +32,7 @@ final class ProjectMapper 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 = [
         'riskmngmt_project_id'          => ['name' => 'riskmngmt_project_id',          'type' => 'int', 'internal' => 'id'],
         'riskmngmt_project_project'     => ['name' => 'riskmngmt_project_project',     'type' => 'int', 'internal' => 'project'],
         'riskmngmt_project_responsible' => ['name' => 'riskmngmt_project_responsible', 'type' => 'int', 'internal' => 'responsible'],
@@ -45,7 +45,7 @@ final class ProjectMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $table = 'riskmngmt_project';
+    public const TABLE = 'riskmngmt_project';
 
     /**
      * Primary field name.
@@ -53,7 +53,7 @@ final class ProjectMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $primaryField = 'riskmngmt_project_id';
+    public const PRIMARYFIELD ='riskmngmt_project_id';
 
     /**
      * Belongs to.
@@ -61,7 +61,7 @@ final class ProjectMapper extends DataMapperAbstract
      * @var array<string, array{mapper:string, external:string}>
      * @since 1.0.0
      */
-    protected static array $belongsTo = [
+    public const BELONGS_TO = [
         'project' => [
             'mapper'     => \Modules\ProjectManagement\Models\ProjectMapper::class,
             'external'   => 'riskmngmt_project_project',
diff --git a/Models/RiskMapper.php b/Models/RiskMapper.php
index e3dcf10..6d222bb 100755
--- a/Models/RiskMapper.php
+++ b/Models/RiskMapper.php
@@ -17,7 +17,7 @@ namespace Modules\RiskManagement\Models;
 use Modules\Media\Models\MediaMapper;
 use Modules\Organization\Models\DepartmentMapper;
 use Modules\Organization\Models\UnitMapper;
-use phpOMS\DataStorage\Database\DataMapperAbstract;
+use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
  * Risk mapper class.
@@ -27,7 +27,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract;
  * @link    https://orange-management.org
  * @since   1.0.0
  */
-final class RiskMapper extends DataMapperAbstract
+final class RiskMapper extends DataMapperFactory
 {
     /**
      * Columns.
@@ -35,7 +35,7 @@ final class RiskMapper 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 = [
         'riskmngmt_risk_id'             => ['name' => 'riskmngmt_risk_id',             'type' => 'int',      'internal' => 'id'],
         'riskmngmt_risk_name'           => ['name' => 'riskmngmt_risk_name',           'type' => 'string',   'internal' => 'name'],
         'riskmngmt_risk_description'    => ['name' => 'riskmngmt_risk_description',    'type' => 'string',   'internal' => 'description'],
@@ -56,7 +56,7 @@ final class RiskMapper 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 = [
         'media'       => [
             'mapper'   => MediaMapper::class,
             'table'    => 'riskmngmt_risk_media',
@@ -89,7 +89,7 @@ final class RiskMapper extends DataMapperAbstract
      * @var array<string, array{mapper:string, external:string}>
      * @since 1.0.0
      */
-    protected static array $belongsTo = [
+    public const BELONGS_TO = [
         'project'    => [
             'mapper'     => ProjectMapper::class,
             'external'   => 'riskmngmt_risk_project',
@@ -118,7 +118,7 @@ final class RiskMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $table = 'riskmngmt_risk';
+    public const TABLE = 'riskmngmt_risk';
 
     /**
      * Primary field name.
@@ -126,5 +126,5 @@ final class RiskMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $primaryField = 'riskmngmt_risk_id';
+    public const PRIMARYFIELD ='riskmngmt_risk_id';
 }
diff --git a/Models/RiskObjectMapper.php b/Models/RiskObjectMapper.php
index b53eefb..11d09ad 100755
--- a/Models/RiskObjectMapper.php
+++ b/Models/RiskObjectMapper.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\Models;
 
-use phpOMS\DataStorage\Database\DataMapperAbstract;
+use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
  * Risk object mapper class.
@@ -24,7 +24,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract;
  * @link    https://orange-management.org
  * @since   1.0.0
  */
-final class RiskObjectMapper extends DataMapperAbstract
+final class RiskObjectMapper extends DataMapperFactory
 {
     /**
      * Columns.
@@ -32,7 +32,7 @@ final class RiskObjectMapper 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 = [
         'riskmngmt_risk_object_id'             => ['name' => 'riskmngmt_risk_object_id',             'type' => 'int',    'internal' => 'id'],
         'riskmngmt_risk_object_name'           => ['name' => 'riskmngmt_risk_object_name',           'type' => 'string', 'internal' => 'title'],
         'riskmngmt_risk_object_description'    => ['name' => 'riskmngmt_risk_object_description',    'type' => 'string', 'internal' => 'description'],
@@ -46,7 +46,7 @@ final class RiskObjectMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $table = 'riskmngmt_risk_object';
+    public const TABLE = 'riskmngmt_risk_object';
 
     /**
      * Primary field name.
@@ -54,5 +54,5 @@ final class RiskObjectMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $primaryField = 'riskmngmt_risk_object_id';
+    public const PRIMARYFIELD ='riskmngmt_risk_object_id';
 }
diff --git a/Models/SolutionMapper.php b/Models/SolutionMapper.php
index c9df301..a01e5d3 100755
--- a/Models/SolutionMapper.php
+++ b/Models/SolutionMapper.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\Models;
 
-use phpOMS\DataStorage\Database\DataMapperAbstract;
+use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
  * Risk solution mapper class.
@@ -24,7 +24,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract;
  * @link    https://orange-management.org
  * @since   1.0.0
  */
-final class SolutionMapper extends DataMapperAbstract
+final class SolutionMapper extends DataMapperFactory
 {
     /**
      * Columns.
@@ -32,7 +32,7 @@ final class SolutionMapper 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 = [
         'riskmngmt_solution_id'             => ['name' => 'riskmngmt_solution_id',             'type' => 'int',    'internal' => 'id'],
         'riskmngmt_solution_name'           => ['name' => 'riskmngmt_solution_name',           'type' => 'string', 'internal' => 'title'],
         'riskmngmt_solution_description'    => ['name' => 'riskmngmt_solution_description',    'type' => 'string', 'internal' => 'description'],
@@ -48,7 +48,7 @@ final class SolutionMapper extends DataMapperAbstract
      * @var array<string, array{mapper:string, external:string}>
      * @since 1.0.0
      */
-    protected static array $belongsTo = [
+    public const BELONGS_TO = [
         'risk'  => [
             'mapper'     => RiskMapper::class,
             'external'   => 'riskmngmt_solution_risk',
@@ -65,7 +65,7 @@ final class SolutionMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $table = 'riskmngmt_solution';
+    public const TABLE = 'riskmngmt_solution';
 
     /**
      * Primary field name.
@@ -73,5 +73,5 @@ final class SolutionMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static string $primaryField = 'riskmngmt_solution_id';
+    public const PRIMARYFIELD ='riskmngmt_solution_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/';
 
diff --git a/tests/Models/CategoryMapperTest.php b/tests/Models/CategoryMapperTest.php
index b5650e3..0fe3982 100755
--- a/tests/Models/CategoryMapperTest.php
+++ b/tests/Models/CategoryMapperTest.php
@@ -34,9 +34,9 @@ final class CategoryMapperTest extends \PHPUnit\Framework\TestCase
         $obj->responsible    = 1;
         $obj->deputy         = 1;
 
-        CategoryMapper::create($obj);
+        CategoryMapper::create()->execute($obj);
 
-        $objR = CategoryMapper::get($obj->getId());
+        $objR = CategoryMapper::get()->where('id', $obj->getId())->execute();
         self::assertEquals($obj->title, $objR->title);
         self::assertEquals($obj->descriptionRaw, $objR->descriptionRaw);
         self::assertEquals($obj->responsible, $objR->responsible);
diff --git a/tests/Models/CauseMapperTest.php b/tests/Models/CauseMapperTest.php
index cba84ce..f512034 100755
--- a/tests/Models/CauseMapperTest.php
+++ b/tests/Models/CauseMapperTest.php
@@ -51,10 +51,10 @@ final class CauseMapperTest extends \PHPUnit\Framework\TestCase
         $risk->unit = new NullUnit(1);
         $obj->risk  = $risk;
 
-        CauseMapper::create($obj);
+        CauseMapper::create()->execute($obj);
 
         /** @var Cause $objR */
-        $objR = CauseMapper::get($obj->getId());
+        $objR = CauseMapper::get()->with('risk')->with('category')->where('id', $obj->getId())->execute();
         self::assertEquals($obj->title, $objR->title);
         self::assertEquals($obj->descriptionRaw, $objR->descriptionRaw);
         //self::assertEquals($obj->getDepartment()->department->getId(), $objR->getDepartment()->department->getId());
diff --git a/tests/Models/DepartmentMapperTest.php b/tests/Models/DepartmentMapperTest.php
index a099e60..7a173c3 100755
--- a/tests/Models/DepartmentMapperTest.php
+++ b/tests/Models/DepartmentMapperTest.php
@@ -34,9 +34,9 @@ final class DepartmentMapperTest extends \PHPUnit\Framework\TestCase
         $obj->responsible = 1;
         $obj->deputy      = 1;
 
-        DepartmentMapper::create($obj);
+        DepartmentMapper::create()->execute($obj);
 
-        $objR = DepartmentMapper::get($obj->getId());
+        $objR = DepartmentMapper::get()->where('id', $obj->getId())->execute();
         self::assertEquals($obj->department->getId(), $objR->department->getId());
         self::assertEquals($obj->responsible, $objR->responsible);
         self::assertEquals($obj->deputy, $objR->deputy);
diff --git a/tests/Models/ProcessMapperTest.php b/tests/Models/ProcessMapperTest.php
index 88ae1bb..b9cd9e5 100755
--- a/tests/Models/ProcessMapperTest.php
+++ b/tests/Models/ProcessMapperTest.php
@@ -38,9 +38,9 @@ final class ProcessMapperTest extends \PHPUnit\Framework\TestCase
         $obj->deputy         = 1;
         $obj->unit           = new NullUnit(1);
 
-        ProcessMapper::create($obj);
+        ProcessMapper::create()->execute($obj);
 
-        $objR = ProcessMapper::get($obj->getId());
+        $objR = ProcessMapper::get()->where('id', $obj->getId())->execute();
         self::assertEquals($obj->title, $objR->title);
         self::assertEquals($obj->descriptionRaw, $objR->descriptionRaw);
         self::assertEquals($obj->responsible, $objR->responsible);
diff --git a/tests/Models/ProjectMapperTest.php b/tests/Models/ProjectMapperTest.php
index 42f7a87..79d855c 100755
--- a/tests/Models/ProjectMapperTest.php
+++ b/tests/Models/ProjectMapperTest.php
@@ -34,9 +34,9 @@ final class ProjectMapperTest extends \PHPUnit\Framework\TestCase
         $obj->responsible = 1;
         $obj->deputy      = 1;
 
-        ProjectMapper::create($obj);
+        ProjectMapper::create()->execute($obj);
 
-        $objR = ProjectMapper::get($obj->getId());
+        $objR = ProjectMapper::get()->where('id', $obj->getId())->execute();
         self::assertEquals($obj->project->getId(), $objR->project->getId());
         self::assertEquals($obj->responsible, $objR->responsible);
         self::assertEquals($obj->deputy, $objR->deputy);
diff --git a/tests/Models/RiskMapperTest.php b/tests/Models/RiskMapperTest.php
index 0381450..e799da1 100755
--- a/tests/Models/RiskMapperTest.php
+++ b/tests/Models/RiskMapperTest.php
@@ -82,9 +82,9 @@ final class RiskMapperTest extends \PHPUnit\Framework\TestCase
         $media->name      = 'Image';
         $obj->addMedia($media);
 
-        RiskMapper::create($obj);
+        RiskMapper::create()->execute($obj);
 
-        $objR = RiskMapper::get($obj->getId());
+        $objR = RiskMapper::get()->with('project')->with('project/project')->with('causes')->with('solutions')->with('riskObjects')->with('media')->where('id', $obj->getId())->execute();
         self::assertEquals($obj->name, $objR->name);
         self::assertEquals($obj->descriptionRaw, $objR->descriptionRaw);
         self::assertEquals($obj->unit->getId(), $objR->unit->getId());
diff --git a/tests/Models/RiskObjectMapperTest.php b/tests/Models/RiskObjectMapperTest.php
index f405648..1af78f9 100755
--- a/tests/Models/RiskObjectMapperTest.php
+++ b/tests/Models/RiskObjectMapperTest.php
@@ -33,9 +33,9 @@ final class RiskObjectMapperTest extends \PHPUnit\Framework\TestCase
         $obj->descriptionRaw = 'Description';
         $obj->risk           = 1;
 
-        RiskObjectMapper::create($obj);
+        RiskObjectMapper::create()->execute($obj);
 
-        $objR = RiskObjectMapper::get($obj->getId());
+        $objR = RiskObjectMapper::get()->where('id', $obj->getId())->execute();
         self::assertEquals($obj->title, $objR->title);
         self::assertEquals($obj->descriptionRaw, $objR->descriptionRaw);
         self::assertEquals($obj->risk, $objR->risk);
diff --git a/tests/Models/SolutionMapperTest.php b/tests/Models/SolutionMapperTest.php
index 2f1dfc0..175d337 100755
--- a/tests/Models/SolutionMapperTest.php
+++ b/tests/Models/SolutionMapperTest.php
@@ -38,9 +38,9 @@ final class SolutionMapperTest extends \PHPUnit\Framework\TestCase
         $obj->cause          = new NullCause(1);
         $obj->risk           = new NullRisk(1);
 
-        SolutionMapper::create($obj);
+        SolutionMapper::create()->execute($obj);
 
-        $objR = SolutionMapper::get($obj->getId());
+        $objR = SolutionMapper::get()->where('id', $obj->getId())->execute();
         self::assertEquals($obj->title, $objR->title);
         self::assertEquals($obj->descriptionRaw, $objR->descriptionRaw);
         self::assertEquals($obj->probability, $objR->probability);