diff --git a/Models/DepartmentMapper.php b/Models/DepartmentMapper.php
index d8d863b..f783584 100644
--- a/Models/DepartmentMapper.php
+++ b/Models/DepartmentMapper.php
@@ -33,13 +33,13 @@ final class DepartmentMapper extends DataMapperAbstract
      * @since 1.0.0
      */
     protected static array $columns = [
-        'organization_department_id'             => ['name' => 'organization_department_id', 'type' => 'int', 'internal' => 'id'],
-        'organization_department_name'           => ['name' => 'organization_department_name', 'type' => 'string', 'internal' => 'name'],
-        'organization_department_description'    => ['name' => 'organization_department_description', 'type' => 'string', 'internal' => 'description'],
+        'organization_department_id'             => ['name' => 'organization_department_id',             'type' => 'int',    'internal' => 'id'],
+        'organization_department_name'           => ['name' => 'organization_department_name',           'type' => 'string', 'internal' => 'name'],
+        'organization_department_description'    => ['name' => 'organization_department_description',    'type' => 'string', 'internal' => 'description'],
         'organization_department_descriptionraw' => ['name' => 'organization_department_descriptionraw', 'type' => 'string', 'internal' => 'descriptionRaw'],
-        'organization_department_parent'         => ['name' => 'organization_department_parent', 'type' => 'int', 'internal' => 'parent'],
-        'organization_department_status'         => ['name' => 'organization_department_status', 'type' => 'int', 'internal' => 'status'],
-        'organization_department_unit'           => ['name' => 'organization_department_unit', 'type' => 'int', 'internal' => 'unit'],
+        'organization_department_parent'         => ['name' => 'organization_department_parent',         'type' => 'int',    'internal' => 'parent'],
+        'organization_department_status'         => ['name' => 'organization_department_status',         'type' => 'int',    'internal' => 'status'],
+        'organization_department_unit'           => ['name' => 'organization_department_unit',           'type' => 'int',    'internal' => 'unit'],
     ];
 
     /**
diff --git a/Models/PositionMapper.php b/Models/PositionMapper.php
index 79fde1c..db7f2f9 100644
--- a/Models/PositionMapper.php
+++ b/Models/PositionMapper.php
@@ -34,13 +34,13 @@ final class PositionMapper extends DataMapperAbstract
      * @since 1.0.0
      */
     protected static array $columns = [
-        'organization_position_id'             => ['name' => 'organization_position_id', 'type' => 'int', 'internal' => 'id'],
-        'organization_position_name'           => ['name' => 'organization_position_name', 'type' => 'string', 'internal' => 'name'],
-        'organization_position_description'    => ['name' => 'organization_position_description', 'type' => 'string', 'internal' => 'description'],
+        'organization_position_id'             => ['name' => 'organization_position_id',             'type' => 'int',    'internal' => 'id'],
+        'organization_position_name'           => ['name' => 'organization_position_name',           'type' => 'string', 'internal' => 'name'],
+        'organization_position_description'    => ['name' => 'organization_position_description',    'type' => 'string', 'internal' => 'description'],
         'organization_position_descriptionraw' => ['name' => 'organization_position_descriptionraw', 'type' => 'string', 'internal' => 'descriptionRaw'],
-        'organization_position_parent'         => ['name' => 'organization_position_parent', 'type' => 'int', 'internal' => 'parent'],
-        'organization_position_department'     => ['name' => 'organization_position_department', 'type' => 'int', 'internal' => 'department'],
-        'organization_position_status'         => ['name' => 'organization_position_status', 'type' => 'int', 'internal' => 'status'],
+        'organization_position_parent'         => ['name' => 'organization_position_parent',         'type' => 'int',    'internal' => 'parent'],
+        'organization_position_department'     => ['name' => 'organization_position_department',     'type' => 'int',    'internal' => 'department'],
+        'organization_position_status'         => ['name' => 'organization_position_status',         'type' => 'int',    'internal' => 'status'],
     ];
 
     /**
diff --git a/Models/UnitMapper.php b/Models/UnitMapper.php
index bdcb40d..7a3b899 100644
--- a/Models/UnitMapper.php
+++ b/Models/UnitMapper.php
@@ -33,12 +33,12 @@ final class UnitMapper extends DataMapperAbstract
      * @since 1.0.0
      */
     protected static array $columns = [
-        'organization_unit_id'             => ['name' => 'organization_unit_id', 'type' => 'int', 'internal' => 'id'],
-        'organization_unit_name'           => ['name' => 'organization_unit_name', 'type' => 'string', 'internal' => 'name'],
-        'organization_unit_description'    => ['name' => 'organization_unit_description', 'type' => 'string', 'internal' => 'description'],
+        'organization_unit_id'             => ['name' => 'organization_unit_id',             'type' => 'int',    'internal' => 'id'],
+        'organization_unit_name'           => ['name' => 'organization_unit_name',           'type' => 'string', 'internal' => 'name'],
+        'organization_unit_description'    => ['name' => 'organization_unit_description',    'type' => 'string', 'internal' => 'description'],
         'organization_unit_descriptionraw' => ['name' => 'organization_unit_descriptionraw', 'type' => 'string', 'internal' => 'descriptionRaw'],
-        'organization_unit_parent'         => ['name' => 'organization_unit_parent', 'type' => 'int', 'internal' => 'parent'],
-        'organization_unit_status'         => ['name' => 'organization_unit_status', 'type' => 'int', 'internal' => 'status'],
+        'organization_unit_parent'         => ['name' => 'organization_unit_parent',         'type' => 'int',    'internal' => 'parent'],
+        'organization_unit_status'         => ['name' => 'organization_unit_status',         'type' => 'int',    'internal' => 'status'],
     ];
 
     /**