diff --git a/Models/DepartmentMapper.php b/Models/DepartmentMapper.php
index c422da8..bb3ddef 100644
--- a/Models/DepartmentMapper.php
+++ b/Models/DepartmentMapper.php
@@ -38,6 +38,10 @@ class DepartmentMapper extends DataMapperAbstract
             'mapper'         => UnitMapper::class,
             'dest'            => 'organization_department_unit',
         ],
+        'parent' => [
+            'mapper'         => DepartmentMapper::class,
+            'dest'            => 'organization_department_parent',
+        ],
     ];
 
     /**
diff --git a/Models/NullDepartment.php b/Models/NullDepartment.php
new file mode 100644
index 0000000..f1a5008
--- /dev/null
+++ b/Models/NullDepartment.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Orange Management
+ *
+ * PHP Version 7.1
+ *
+ * @category   TBD
+ * @package    TBD
+ * @copyright  Dennis Eichhorn
+ * @license    OMS License 1.0
+ * @version    1.0.0
+ * @link       http://orange-management.com
+ */
+declare(strict_types=1);
+namespace Modules\Organization\Models;
+
+class NullDepartment extends Department
+{
+}
\ No newline at end of file
diff --git a/Models/NullPosition.php b/Models/NullPosition.php
new file mode 100644
index 0000000..515f827
--- /dev/null
+++ b/Models/NullPosition.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Orange Management
+ *
+ * PHP Version 7.1
+ *
+ * @category   TBD
+ * @package    TBD
+ * @copyright  Dennis Eichhorn
+ * @license    OMS License 1.0
+ * @version    1.0.0
+ * @link       http://orange-management.com
+ */
+declare(strict_types=1);
+namespace Modules\Organization\Models;
+
+class NullPosition extends Position
+{
+}
\ No newline at end of file
diff --git a/Models/NullUnit.php b/Models/NullUnit.php
new file mode 100644
index 0000000..3c43c3b
--- /dev/null
+++ b/Models/NullUnit.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Orange Management
+ *
+ * PHP Version 7.1
+ *
+ * @category   TBD
+ * @package    TBD
+ * @copyright  Dennis Eichhorn
+ * @license    OMS License 1.0
+ * @version    1.0.0
+ * @link       http://orange-management.com
+ */
+declare(strict_types=1);
+namespace Modules\Organization\Models;
+
+class NullUnit extends Unit
+{
+}
\ No newline at end of file
diff --git a/Models/Position.php b/Models/Position.php
index dcedf58..ffc0145 100644
--- a/Models/Position.php
+++ b/Models/Position.php
@@ -60,7 +60,7 @@ class Position implements ArrayableInterface, \JsonSerializable
         return $this->department;
     }
 
-    public function setDepartment(int $department)
+    public function setDepartment($department)
     {
         $this->department = $department;
     }
diff --git a/Models/PositionMapper.php b/Models/PositionMapper.php
index c3cf641..7ef856c 100644
--- a/Models/PositionMapper.php
+++ b/Models/PositionMapper.php
@@ -35,10 +35,14 @@ class PositionMapper extends DataMapperAbstract
     ];
 
     protected static $belongsTo = [
-        'account' => [
+        'parent' => [
             'mapper'         => PositionMapper::class,
             'dest'            => 'organization_position_parent',
         ],
+        'department' => [
+            'mapper'         => DepartmentMapper::class,
+            'dest'            => 'organization_position_department',
+        ],
     ];
 
     /**
diff --git a/Models/UnitMapper.php b/Models/UnitMapper.php
index 675294a..9dc7265 100644
--- a/Models/UnitMapper.php
+++ b/Models/UnitMapper.php
@@ -37,6 +37,10 @@ class UnitMapper extends DataMapperAbstract
             'mapper'         => UnitMapper::class,
             'dest'            => 'organization_uni_parent',
         ],
+        'parent' => [
+            'mapper'         => UnitMapper::class,
+            'dest'            => 'organization_unit_parent',
+        ],
     ];
 
     /**
diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php
index d3126e6..533e572 100644
--- a/Theme/Backend/department-list.tpl.php
+++ b/Theme/Backend/department-list.tpl.php
@@ -43,8 +43,8 @@ echo $this->getData('nav')->render(); ?>
                 <tr data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getId(), ENT_COMPAT, 'utf-8'); ?></a>
                     <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getName(), ENT_COMPAT, 'utf-8'); ?></a>
-                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getParent(), ENT_COMPAT, 'utf-8'); ?></a>
-                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getUnit(), ENT_COMPAT, 'utf-8'); ?></a>
+                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getParent()->getName(), ENT_COMPAT, 'utf-8'); ?></a>
+                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getUnit()->getName(), ENT_COMPAT, 'utf-8'); ?></a>
                         <?php endforeach; ?>
                 <?php if($c === 0) : ?>
                 <tr>
diff --git a/Theme/Backend/department-profile.tpl.php b/Theme/Backend/department-profile.tpl.php
index 7e6a416..7cebe11 100644
--- a/Theme/Backend/department-profile.tpl.php
+++ b/Theme/Backend/department-profile.tpl.php
@@ -29,7 +29,7 @@ echo $this->getData('nav')->render(); ?>
                         <tr><td><label for="iName"><?= $this->getHtml('Name') ?></label>
                         <tr><td><input type="text" name="name" id="iName" value="<?= htmlspecialchars($department->getName(), ENT_COMPAT, 'utf-8'); ?>">
                         <tr><td><label for="iParent"><?= $this->getHtml('Parent') ?></label>
-                        <tr><td><input type="text" name="parent" id="iParent" value="<?= htmlspecialchars($department->getParent(), ENT_COMPAT, 'utf-8'); ?>">
+                        <tr><td><input type="text" name="parent" id="iParent" value="<?= htmlspecialchars($department->getParent()->getName(), ENT_COMPAT, 'utf-8'); ?>">
                         <tr><td><label for="iStatus"><?= $this->getHtml('Status') ?></label>
                         <tr><td><select name="status" id="iStatus">
                                     <option><?= $this->getHtml('Active') ?>
diff --git a/Theme/Backend/position-list.tpl.php b/Theme/Backend/position-list.tpl.php
index 4593267..d7852c1 100644
--- a/Theme/Backend/position-list.tpl.php
+++ b/Theme/Backend/position-list.tpl.php
@@ -36,6 +36,7 @@ echo $this->getData('nav')->render(); ?>
                     <td><?= $this->getHtml('ID', 0, 0); ?>
                     <td class="wf-100"><?= $this->getHtml('Name') ?>
                     <td><?= $this->getHtml('Parent') ?>
+                    <td><?= $this->getHtml('Department') ?>
                         <tfoot>
                 <tr><td colspan="3"><?= $footerView->render(); ?>
                         <tbody>
@@ -44,7 +45,8 @@ echo $this->getData('nav')->render(); ?>
                 <tr data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getId(), ENT_COMPAT, 'utf-8'); ?></a>
                     <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getName(), ENT_COMPAT, 'utf-8'); ?></a>
-                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getParent(), ENT_COMPAT, 'utf-8'); ?></a>
+                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getParent()->getName(), ENT_COMPAT, 'utf-8'); ?></a>
+                    <td><a href="<?= $url; ?>"><?= 1//htmlspecialchars($value->getDepartment()->getName(), ENT_COMPAT, 'utf-8'); ?></a>
                         <?php endforeach; ?>
                         <?php if($count === 0) : ?>
                     <tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
diff --git a/Theme/Backend/position-profile.tpl.php b/Theme/Backend/position-profile.tpl.php
index ee2cf44..c0c8165 100644
--- a/Theme/Backend/position-profile.tpl.php
+++ b/Theme/Backend/position-profile.tpl.php
@@ -29,7 +29,7 @@ echo $this->getData('nav')->render(); ?>
                         <tr><td><label for="iName"><?= $this->getHtml('Name') ?></label>
                         <tr><td><input type="text" name="name" id="iName" value="<?= htmlspecialchars($position->getName(), ENT_COMPAT, 'utf-8'); ?>">
                         <tr><td><label for="iParent"><?= $this->getHtml('Parent') ?></label>
-                        <tr><td><input type="text" name="parent" id="iParent" value="<?= htmlspecialchars($position->getParent(), ENT_COMPAT, 'utf-8'); ?>">
+                        <tr><td><input type="text" name="parent" id="iParent" value="<?= htmlspecialchars($position->getParent()->getName(), ENT_COMPAT, 'utf-8'); ?>">
                         <tr><td><label for="iStatus"><?= $this->getHtml('Status') ?></label>
                         <tr><td><select name="status" id="iStatus">
                                     <option><?= $this->getHtml('Active') ?>
diff --git a/Theme/Backend/unit-list.tpl.php b/Theme/Backend/unit-list.tpl.php
index 2bbdc0d..d63a8c7 100644
--- a/Theme/Backend/unit-list.tpl.php
+++ b/Theme/Backend/unit-list.tpl.php
@@ -40,9 +40,9 @@ echo $this->getData('nav')->render(); ?>
                         <?php foreach ($this->getData('list:elements') as $key => $value) :
                         $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/organization/unit/profile?{?}&id=' . $value->getId()); ?>
                 <tr data-href="<?= $url; ?>">
-                    <td data-label="<?= $this->getHtml('ID', 0, 0); ?>"><a href="<?= $url; ?>"><?= htmlspecialchars($value->getId() ?></a>
+                    <td data-label="<?= $this->getHtml('ID', 0, 0); ?>"><a href="<?= $url; ?>"><?= htmlspecialchars($value->getId()); ?></a>
                     <td data-label="<?= $this->getHtml('Name') ?>"><a href="<?= $url; ?>"><?= htmlspecialchars($value->getName(), ENT_COMPAT, 'utf-8'); ?></a>
-                    <td data-label="<?= $this->getHtml('Parent') ?>"><a href="<?= $url; ?>"><?= htmlspecialchars($value->getParent(), ENT_COMPAT, 'utf-8'); ?></a>
+                    <td data-label="<?= $this->getHtml('Parent') ?>"><a href="<?= $url; ?>"><?= htmlspecialchars($value->getParent()->getName(), ENT_COMPAT, 'utf-8'); ?></a>
                         <?php endforeach; ?>
             </table>
         </div>
diff --git a/Theme/Backend/unit-profile.tpl.php b/Theme/Backend/unit-profile.tpl.php
index 4188461..476d1eb 100644
--- a/Theme/Backend/unit-profile.tpl.php
+++ b/Theme/Backend/unit-profile.tpl.php
@@ -29,7 +29,7 @@ echo $this->getData('nav')->render(); ?>
                         <tr><td><label for="iName"><?= $this->getHtml('Name') ?></label>
                         <tr><td><input type="text" name="name" id="iName" value="<?= htmlspecialchars($unit->getName(), ENT_COMPAT, 'utf-8'); ?>">
                         <tr><td><label for="iParent"><?= $this->getHtml('Parent') ?></label>
-                        <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" name="parent" id="iParent" value="<?= htmlspecialchars($unit->getParent(), ENT_COMPAT, 'utf-8'); ?>" required></span>
+                        <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" name="parent" id="iParent" value="<?= htmlspecialchars($unit->getParent()->getName(), ENT_COMPAT, 'utf-8'); ?>" required></span>
                         <tr><td><label for="iStatus"><?= $this->getHtml('Status') ?></label>
                         <tr><td><select name="status" id="iStatus">
                                     <option><?= $this->getHtml('Active') ?>