diff --git a/Controller/Controller.php b/Controller/Controller.php
index f8bac36..b2ef832 100644
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -66,7 +66,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string[]
      * @since 1.0.0
      */
-    protected static $providing = [];
+    protected static array $providing = [];
 
     /**
      * Dependencies.
@@ -74,7 +74,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string[]
      * @since 1.0.0
      */
-    protected static $dependencies = [
+    protected static array $dependencies = [
         'Media',
     ];
 }
diff --git a/Models/CategoryMapper.php b/Models/CategoryMapper.php
index ba6b382..cb87c68 100644
--- a/Models/CategoryMapper.php
+++ b/Models/CategoryMapper.php
@@ -24,7 +24,7 @@ final class CategoryMapper extends DataMapperAbstract
      * @var array<string, array<string, bool|string>>
      * @since 1.0.0
      */
-    protected static $columns = [
+    protected static array $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'],
@@ -40,7 +40,7 @@ final class CategoryMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static $table = 'riskmngmt_category';
+    protected static string $table = 'riskmngmt_category';
 
     /**
      * Primary field name.
@@ -48,5 +48,5 @@ final class CategoryMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static $primaryField = 'riskmngmt_category_id';
+    protected static string $primaryField = 'riskmngmt_category_id';
 }
diff --git a/Models/CauseMapper.php b/Models/CauseMapper.php
index 6b9220d..e60ba43 100644
--- a/Models/CauseMapper.php
+++ b/Models/CauseMapper.php
@@ -24,7 +24,7 @@ final class CauseMapper extends DataMapperAbstract
      * @var array<string, array<string, bool|string>>
      * @since 1.0.0
      */
-    protected static $columns = [
+    protected static array $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'],
@@ -41,7 +41,7 @@ final class CauseMapper extends DataMapperAbstract
      * @var array<string, array<string, string>>
      * @since 1.0.0
      */
-    protected static $belongsTo = [
+    protected static array $belongsTo = [
         'risk'       => [
             'mapper' => RiskMapper::class,
             'dest'   => 'riskmngmt_cause_risk',
@@ -62,7 +62,7 @@ final class CauseMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static $table = 'riskmngmt_cause';
+    protected static string $table = 'riskmngmt_cause';
 
     /**
      * Primary field name.
@@ -70,5 +70,5 @@ final class CauseMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static $primaryField = 'riskmngmt_cause_id';
+    protected static string $primaryField = 'riskmngmt_cause_id';
 }
diff --git a/Models/DepartmentMapper.php b/Models/DepartmentMapper.php
index 010d291..4a58f84 100644
--- a/Models/DepartmentMapper.php
+++ b/Models/DepartmentMapper.php
@@ -24,7 +24,7 @@ final class DepartmentMapper extends DataMapperAbstract
      * @var array<string, array<string, bool|string>>
      * @since 1.0.0
      */
-    protected static $columns = [
+    protected static array $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'],
@@ -37,7 +37,7 @@ final class DepartmentMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static $table = 'riskmngmt_department';
+    protected static string $table = 'riskmngmt_department';
 
     /**
      * Primary field name.
@@ -45,7 +45,7 @@ final class DepartmentMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static $primaryField = 'riskmngmt_department_id';
+    protected static string $primaryField = 'riskmngmt_department_id';
 
     /**
      * Has one relation.
@@ -58,7 +58,7 @@ final class DepartmentMapper extends DataMapperAbstract
      * @var array<string, array<string, string>>
      * @since 1.0.0
      */
-    protected static $belongsTo = [
+    protected static array $belongsTo = [
         'department' => [
             'mapper' => \Modules\Organization\Models\DepartmentMapper::class,
             'dest'   => 'riskmngmt_department_department',
diff --git a/Models/ProcessMapper.php b/Models/ProcessMapper.php
index 6e1e8ab..274f0c0 100644
--- a/Models/ProcessMapper.php
+++ b/Models/ProcessMapper.php
@@ -25,7 +25,7 @@ final class ProcessMapper extends DataMapperAbstract
      * @var array<string, array<string, bool|string>>
      * @since 1.0.0
      */
-    protected static $columns = [
+    protected static array $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'],
@@ -42,7 +42,7 @@ final class ProcessMapper extends DataMapperAbstract
      * @var array<string, array<string, string>>
      * @since 1.0.0
      */
-    protected static $belongsTo = [
+    protected static array $belongsTo = [
         'unit'       => [
             'mapper' => UnitMapper::class,
             'dest'   => 'riskmngmt_cause_risk',
@@ -59,7 +59,7 @@ final class ProcessMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static $table = 'riskmngmt_process';
+    protected static string $table = 'riskmngmt_process';
 
     /**
      * Primary field name.
@@ -67,5 +67,5 @@ final class ProcessMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static $primaryField = 'riskmngmt_process_id';
+    protected static string $primaryField = 'riskmngmt_process_id';
 }
diff --git a/Models/ProjectMapper.php b/Models/ProjectMapper.php
index c11b769..0e332f1 100644
--- a/Models/ProjectMapper.php
+++ b/Models/ProjectMapper.php
@@ -24,7 +24,7 @@ final class ProjectMapper extends DataMapperAbstract
      * @var array<string, array<string, bool|string>>
      * @since 1.0.0
      */
-    protected static $columns = [
+    protected static array $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'],
@@ -37,7 +37,7 @@ final class ProjectMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static $table = 'riskmngmt_project';
+    protected static string $table = 'riskmngmt_project';
 
     /**
      * Primary field name.
@@ -45,7 +45,7 @@ final class ProjectMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static $primaryField = 'riskmngmt_project_id';
+    protected static string $primaryField = 'riskmngmt_project_id';
 
     /**
      * Has one relation.
@@ -58,7 +58,7 @@ final class ProjectMapper extends DataMapperAbstract
      * @var array<string, array<string, string>>
      * @since 1.0.0
      */
-    protected static $belongsTo = [
+    protected static array $belongsTo = [
         'project' => [
             'mapper' => \Modules\ProjectManagement\Models\ProjectMapper::class,
             'dest'   => 'riskmngmt_project_project',
diff --git a/Models/RiskMapper.php b/Models/RiskMapper.php
index c0abb24..0ae5055 100644
--- a/Models/RiskMapper.php
+++ b/Models/RiskMapper.php
@@ -26,7 +26,7 @@ final class RiskMapper extends DataMapperAbstract
      * @var array<string, array<string, bool|string>>
      * @since 1.0.0
      */
-    protected static $columns = [
+    protected static array $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'],
@@ -47,7 +47,7 @@ final class RiskMapper extends DataMapperAbstract
      * @var array<string, array<string, null|string>>
      * @since 1.0.0
      */
-    protected static $hasMany = [
+    protected static array $hasMany = [
         'media'       => [
             'mapper' => MediaMapper::class,
             'table'  => 'riskmngmt_risk_media',
@@ -80,7 +80,7 @@ final class RiskMapper extends DataMapperAbstract
      * @var array<string, array<string, string>>
      * @since 1.0.0
      */
-    protected static $belongsTo = [
+    protected static array $belongsTo = [
         'project'    => [
             'mapper' => ProjectMapper::class,
             'dest'   => 'riskmngmt_risk_project',
@@ -109,7 +109,7 @@ final class RiskMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static $table = 'riskmngmt_risk';
+    protected static string $table = 'riskmngmt_risk';
 
     /**
      * Primary field name.
@@ -117,5 +117,5 @@ final class RiskMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static $primaryField = 'riskmngmt_risk_id';
+    protected static string $primaryField = 'riskmngmt_risk_id';
 }
diff --git a/Models/RiskObjectMapper.php b/Models/RiskObjectMapper.php
index d0925d1..8d1b7dd 100644
--- a/Models/RiskObjectMapper.php
+++ b/Models/RiskObjectMapper.php
@@ -24,7 +24,7 @@ final class RiskObjectMapper extends DataMapperAbstract
      * @var array<string, array<string, bool|string>>
      * @since 1.0.0
      */
-    protected static $columns = [
+    protected static array $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'],
@@ -38,7 +38,7 @@ final class RiskObjectMapper extends DataMapperAbstract
      * @var array<string, array<string, string>>
      * @since 1.0.0
      */
-    protected static $belongsTo = [
+    protected static array $belongsTo = [
         'unit' => [
             'mapper' => RiskMapper::class,
             'dest'   => 'riskmngmt_risk_object_risk',
@@ -51,7 +51,7 @@ final class RiskObjectMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static $table = 'riskmngmt_risk_object';
+    protected static string $table = 'riskmngmt_risk_object';
 
     /**
      * Primary field name.
@@ -59,5 +59,5 @@ final class RiskObjectMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static $primaryField = 'riskmngmt_risk_object_id';
+    protected static string $primaryField = 'riskmngmt_risk_object_id';
 }
diff --git a/Models/SolutionMapper.php b/Models/SolutionMapper.php
index ad130ba..8256f58 100644
--- a/Models/SolutionMapper.php
+++ b/Models/SolutionMapper.php
@@ -24,7 +24,7 @@ final class SolutionMapper extends DataMapperAbstract
      * @var array<string, array<string, bool|string>>
      * @since 1.0.0
      */
-    protected static $columns = [
+    protected static array $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'],
@@ -40,7 +40,7 @@ final class SolutionMapper extends DataMapperAbstract
      * @var array<string, array<string, string>>
      * @since 1.0.0
      */
-    protected static $belongsTo = [
+    protected static array $belongsTo = [
         'risk'  => [
             'mapper' => RiskMapper::class,
             'dest'   => 'riskmngmt_solution_risk',
@@ -57,7 +57,7 @@ final class SolutionMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static $table = 'riskmngmt_solution';
+    protected static string $table = 'riskmngmt_solution';
 
     /**
      * Primary field name.
@@ -65,5 +65,5 @@ final class SolutionMapper extends DataMapperAbstract
      * @var string
      * @since 1.0.0
      */
-    protected static $primaryField = 'riskmngmt_solution_id';
+    protected static string $primaryField = 'riskmngmt_solution_id';
 }