diff --git a/Controller.php b/Controller.php
index 8af72f3..651196e 100644
--- a/Controller.php
+++ b/Controller.php
@@ -21,14 +21,12 @@ use Modules\Tasks\Models\TaskElement;
 use Modules\Tasks\Models\TaskMapper;
 use Modules\Tasks\Models\TaskStatus;
 use Modules\Tasks\Models\TaskType;
-use phpOMS\Contract\RenderableInterface;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\Module\ModuleAbstract;
 use phpOMS\Module\WebInterface;
 use phpOMS\Uri\UriFactory;
 use phpOMS\Views\View;
-use phpOMS\Views\ViewLayout;
 
 /**
  * Task class.
@@ -90,7 +88,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @param ResponseAbstract $response Response
      * @param mixed            $data     Generic data
      *
-     * @return RenderableInterface
+     * @return \Serializable
      *
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
@@ -101,8 +99,7 @@ class Controller extends ModuleAbstract implements WebInterface
         $view->setTemplate('/Modules/Tasks/Theme/Backend/task-dashboard');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response));
 
-        $taskMapper = new TaskMapper($this->app->dbPool->get());
-        $tasks      = $taskMapper->getNewest(25);
+        $tasks = TaskMapper::getNewest(25);
         $view->addData('tasks', $tasks);
 
         return $view;
@@ -113,7 +110,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @param ResponseAbstract $response Response
      * @param mixed            $data     Generic data
      *
-     * @return RenderableInterface
+     * @return \Serializable
      *
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
@@ -124,8 +121,7 @@ class Controller extends ModuleAbstract implements WebInterface
         $view->setTemplate('/Modules/Tasks/Theme/Backend/task-single');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response));
 
-        $taskMapper = new TaskMapper($this->app->dbPool->get());
-        $task       = $taskMapper->get((int) $request->getData('id'));
+        $task = TaskMapper::get((int) $request->getData('id'));
         $view->addData('task', $task);
 
         return $view;
@@ -136,7 +132,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @param ResponseAbstract $response Response
      * @param mixed            $data     Generic data
      *
-     * @return RenderableInterface
+     * @return \Serializable
      *
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
@@ -155,7 +151,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @param ResponseAbstract $response Response
      * @param mixed            $data     Generic data
      *
-     * @return RenderableInterface
+     * @return \Serializable
      *
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
@@ -171,8 +167,6 @@ class Controller extends ModuleAbstract implements WebInterface
 
     public function apiTaskCreate(RequestAbstract $request, ResponseAbstract $response, $data = null)
     {
-        $taskMapper = new TaskMapper($this->app->dbPool->get());
-
         $task = new Task();
         $task->setTitle($request->getData('title') ?? '');
         $task->setDescription($request->getData('description') ?? '');
@@ -191,7 +185,7 @@ class Controller extends ModuleAbstract implements WebInterface
 
         $task->addElement($element);
 
-        $taskMapper->create($task);
+        TaskMapper::create($task);
         $response->set($request->__toString(), new Redirect(UriFactory::build('http://127.0.0.1/{/lang}/backend/task/single?id=' . $task->getId())));
     }
 
diff --git a/Models/TaskElementMapper.php b/Models/TaskElementMapper.php
index eb7d99e..5d8323f 100644
--- a/Models/TaskElementMapper.php
+++ b/Models/TaskElementMapper.php
@@ -82,10 +82,10 @@ class TaskElementMapper extends DataMapperAbstract
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function create($obj)
+    public static function create($obj, bool $relations = true)
     {
         try {
-            $objId = parent::create($obj);
+            $objId = parent::create($obj, $relations);
         } catch (\Exception $e) {
             var_dump($e->getMessage());
 
diff --git a/Models/TaskMapper.php b/Models/TaskMapper.php
index e8f3cb9..36c88fb 100644
--- a/Models/TaskMapper.php
+++ b/Models/TaskMapper.php
@@ -117,13 +117,13 @@ class TaskMapper extends DataMapperAbstract
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function create($obj)
+    public static function create($obj, bool $relations = true)
     {
         try {
-            $objId = parent::create($obj);
-            $query = new Builder($this->db);
+            $objId = parent::create($obj, $relations);
+            $query = new Builder(self::$db);
 
-            $query->prefix($this->db->getPrefix())
+            $query->prefix(self::$db->getPrefix())
                   ->insert(
                       'account_permission_account',
                       'account_permission_from',
@@ -139,7 +139,7 @@ class TaskMapper extends DataMapperAbstract
                   ->into('account_permission')
                   ->values($obj->getCreatedBy(), 'task', 'task', 1, $objId, 1, 1, 1, 1, 1);
 
-            $this->db->con->prepare($query->toSql())->execute();
+            self::$db->con->prepare($query->toSql())->execute();
         } catch (\Exception $e) {
             var_dump($e->getMessage());
 
@@ -159,7 +159,7 @@ class TaskMapper extends DataMapperAbstract
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function find(...$columns) : Builder
+    public static function find(...$columns) : Builder
     {
         return parent::find(...$columns)->from('account_permission')
                      ->where('account_permission.account_permission_for', '=', 'task')