diff --git a/Models/Category.php b/Models/Category.php
index e106d51..29ddf82 100755
--- a/Models/Category.php
+++ b/Models/Category.php
@@ -14,6 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\Models;
 
+use Modules\Admin\Models\Account;
+
 /**
  * Risk Management class.
  *
@@ -64,9 +66,21 @@ class Category
      */
     private $parent = null;
 
-    private $responsible = null;
+    /**
+     * Responsible person
+     *
+     * @var null|Account
+     * @since 1.0.0
+     */
+    private ?Account $responsible = null;
 
-    private $deputy = null;
+    /**
+     * Responsible person
+     *
+     * @var null|Account
+     * @since 1.0.0
+     */
+    private ?Account $deputy = null;
 
     /**
      * Get id.
diff --git a/Models/CauseMapper.php b/Models/CauseMapper.php
index 5431b7b..69cc63a 100755
--- a/Models/CauseMapper.php
+++ b/Models/CauseMapper.php
@@ -46,7 +46,7 @@ final class CauseMapper extends DataMapperAbstract
     /**
      * Belongs to.
      *
-     * @var array<string, array{mapper:string, self:string}>
+     * @var array<string, array{mapper:string, external:string}>
      * @since 1.0.0
      */
     protected static array $belongsTo = [
diff --git a/Models/DepartmentMapper.php b/Models/DepartmentMapper.php
index 56e64fe..b6a1375 100755
--- a/Models/DepartmentMapper.php
+++ b/Models/DepartmentMapper.php
@@ -58,7 +58,7 @@ final class DepartmentMapper extends DataMapperAbstract
     /**
      * Belongs to.
      *
-     * @var array<string, array{mapper:string, self:string}>
+     * @var array<string, array{mapper:string, external:string}>
      * @since 1.0.0
      */
     protected static array $belongsTo = [
diff --git a/Models/ProcessMapper.php b/Models/ProcessMapper.php
index e74b6ea..083175f 100755
--- a/Models/ProcessMapper.php
+++ b/Models/ProcessMapper.php
@@ -47,7 +47,7 @@ final class ProcessMapper extends DataMapperAbstract
     /**
      * Belongs to.
      *
-     * @var array<string, array{mapper:string, self:string}>
+     * @var array<string, array{mapper:string, external:string}>
      * @since 1.0.0
      */
     protected static array $belongsTo = [
diff --git a/Models/ProjectMapper.php b/Models/ProjectMapper.php
index 560efc8..bf025b1 100755
--- a/Models/ProjectMapper.php
+++ b/Models/ProjectMapper.php
@@ -58,7 +58,7 @@ final class ProjectMapper extends DataMapperAbstract
     /**
      * Belongs to.
      *
-     * @var array<string, array{mapper:string, self:string}>
+     * @var array<string, array{mapper:string, external:string}>
      * @since 1.0.0
      */
     protected static array $belongsTo = [
diff --git a/Models/RiskMapper.php b/Models/RiskMapper.php
index 2ba1b85..5bd3ef5 100755
--- a/Models/RiskMapper.php
+++ b/Models/RiskMapper.php
@@ -85,7 +85,7 @@ final class RiskMapper extends DataMapperAbstract
     /**
      * Belongs to.
      *
-     * @var array<string, array{mapper:string, self:string}>
+     * @var array<string, array{mapper:string, external:string}>
      * @since 1.0.0
      */
     protected static array $belongsTo = [
diff --git a/Models/SolutionMapper.php b/Models/SolutionMapper.php
index b01a520..908f198 100755
--- a/Models/SolutionMapper.php
+++ b/Models/SolutionMapper.php
@@ -45,7 +45,7 @@ final class SolutionMapper extends DataMapperAbstract
     /**
      * Belongs to.
      *
-     * @var array<string, array{mapper:string, self:string}>
+     * @var array<string, array{mapper:string, external:string}>
      * @since 1.0.0
      */
     protected static array $belongsTo = [