diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e9b4371..4bbb819 100755
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,7 +16,7 @@ Generally, the development philosophy is result orientated. This means that anyo
 
 Developers  are encouraged to pick open tasks with high priorities according to their own skill level. Senior developers may  directly assign tasks to developers based on their importance. New  developers may find it easier to start with a task that has a low  priority as they often also have a lower difficulty.
 
-Open tasks can be found in the project overview: [PROJECT.md](../Project/PROJECT.md)
+Open tasks can be found in the project overview: [PROJECT.md](https://github.com/Karaka-Management/Organization-Guide/blob/master/Project/PROJECT.md)
 
 Tasks  currently in development are prefixed in the priority column with an  asterisk `*` and a name tag in the task description of the developer who is working on the task.
 
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 07bac6c..92cafea 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -60,7 +60,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiCommentListCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
+    public function apiCommentListCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
         $commentList = $this->createCommentList();
         $this->createModel($request->header->account, $commentList, CommentListMapper::class, 'comment_list', $request->getOrigin());
@@ -94,7 +94,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiCommentListUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
+    public function apiCommentListUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
         /** @var \Modules\Comments\Models\CommentList $old */
         $old = clone CommentListMapper::get()->where('id', (int) $request->getData('id'))->execute();
@@ -137,7 +137,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiCommentCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
+    public function apiCommentCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
         if (!empty($val = $this->validateCommentCreate($request))) {
             $response->set('comment_create', new FormValidation($val));
@@ -316,7 +316,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiCommentUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
+    public function apiCommentUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
         /** @var \Modules\Comments\Models\Comment $old */
         $old = clone CommentMapper::get()->where('id', (int) $request->getData('id'))->execute();
@@ -338,9 +338,9 @@ final class ApiController extends Controller
     {
         /** @var \Modules\Comments\Models\Comment $comment */
         $comment             = CommentMapper::get()->where('id', (int) $request->getData('id'))->execute();
-        $comment->title      = $request->getData('title') ?? $comment->getTitle();
-        $comment->contentRaw = $request->getData('plain') ?? $comment->getContentRaw();
-        $comment->content    = Markdown::parse((string) ($request->getData('plain') ?? $comment->getPlain()));
+        $comment->title      = $request->getData('title') ?? $comment->title;
+        $comment->contentRaw = $request->getData('plain') ?? $comment->contentRaw;
+        $comment->content    = Markdown::parse((string) ($request->getData('plain') ?? $comment->contentRaw));
         $comment->ref        = $request->getData('ref') ?? $comment->ref;
 
         return $comment;
@@ -359,7 +359,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiCommentGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
+    public function apiCommentGet(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
         /** @var \Modules\Comments\Models\Comment $comment */
         $comment = CommentMapper::get()->where('id', (int) $request->getData('id'))->execute();
@@ -379,7 +379,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiCommentDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
+    public function apiCommentDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
         /** @var \Modules\Comments\Models\Comment $comment */
         $comment = CommentMapper::get()->where('id', (int) $request->getData('id'))->execute();
@@ -400,7 +400,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiChangeCommentVote(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
+    public function apiChangeCommentVote(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
         if (!empty($val = $this->validateCommentVote($request))) {
             $response->set('qa_answer_vote', new FormValidation($val));
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 1a2bd7d..5759b84 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -49,7 +49,7 @@ final class BackendController extends Controller
      * @since 1.0.0
      * @codeCoverageIgnore
      */
-    public function setUpCommentEditor(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
+    public function setUpCommentEditor(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
         $head = $response->get('Content')->getData('head');
         $head->addAsset(AssetType::JS, '/Modules/Editor/Controller.js', ['type' => 'module']);
@@ -67,7 +67,7 @@ final class BackendController extends Controller
      * @since 1.0.0
      * @codeCoverageIgnore
      */
-    public function viewCommentCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewCommentCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/Comments/Theme/Backend/comment-create');
@@ -88,7 +88,7 @@ final class BackendController extends Controller
      * @since 1.0.0
      * @codeCoverageIgnore
      */
-    public function viewCommentList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewCommentList(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/Comments/Theme/Backend/comment-list');
@@ -131,7 +131,7 @@ final class BackendController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiCommentCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
+    public function apiCommentCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
         if (!empty($val = $this->validateCommentCreate($request))) {
             $response->set('comment_create', new FormValidation($val));
diff --git a/Models/CommentMapper.php b/Models/CommentMapper.php
index 4d4f941..9898d8b 100755
--- a/Models/CommentMapper.php
+++ b/Models/CommentMapper.php
@@ -49,7 +49,7 @@ final class CommentMapper extends DataMapperFactory
     /**
      * Belongs to.
      *
-     * @var array<string, array{mapper:string, external:string}>
+     * @var array<string, array{mapper:string, external:string, column?:string, by?:string}>
      * @since 1.0.0
      */
     public const BELONGS_TO = [