diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 7b6ccae..55a7ab5 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -54,7 +54,7 @@ final class ApiController extends Controller
     public function apiCommentListCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         $commentList = $this->createCommentList();
-        $this->createModel($request->getHeader()->getAccount(), $commentList, CommentListMapper::class, 'comment_list', $request->getOrigin());
+        $this->createModel($request->header->account, $commentList, CommentListMapper::class, 'comment_list', $request->getOrigin());
     }
 
     /**
@@ -89,13 +89,13 @@ final class ApiController extends Controller
     {
         if (!empty($val = $this->validateCommentCreate($request))) {
             $response->set('news_create', new FormValidation($val));
-            $response->getHeader()->setStatusCode(RequestStatusCode::R_400);
+            $response->header->status = RequestStatusCode::R_400;
 
             return;
         }
 
         $comment = $this->createCommentFromRequest($request);
-        $this->createModel($request->getHeader()->getAccount(), $comment, CommentMapper::class, 'comment', $request->getOrigin());
+        $this->createModel($request->header->account, $comment, CommentMapper::class, 'comment', $request->getOrigin());
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Comment', 'Comment successfully created', $comment);
     }
 
@@ -132,10 +132,10 @@ final class ApiController extends Controller
     private function createCommentFromRequest(RequestAbstract $request) : Comment
     {
         $comment = new Comment();
-        $comment->setCreatedBy(new NullAccount($request->getHeader()->getAccount()));
-        $comment->setTitle((string) ($request->getData('title') ?? ''));
-        $comment->setContentRaw($request->getData('plain') ?? '');
-        $comment->setContent(Markdown::parse((string) ($request->getData('plain') ?? '')));
+        $comment->createdBy = new NullAccount($request->header->account);
+        $comment->title = (string) ($request->getData('title') ?? '');
+        $comment->contentRaw = (string) ($request->getData('plain') ?? '');
+        $comment->content = Markdown::parse((string) ($request->getData('plain') ?? ''));
         $comment->setRef($request->getData('ref') !== null ? (int) $request->getData('ref') : null);
         $comment->setList((int) ($request->getData('list') ?? 0));
 
@@ -159,7 +159,7 @@ final class ApiController extends Controller
     {
         $old = clone CommentMapper::get((int) $request->getData('id'));
         $new = $this->updateCommentFromRequest($request);
-        $this->updateModel($request->getHeader()->getAccount(), $old, $new, CommentMapper::class, 'comment', $request->getOrigin());
+        $this->updateModel($request->header->account, $old, $new, CommentMapper::class, 'comment', $request->getOrigin());
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Comment', 'Comment successfully updated', $new);
     }
 
@@ -218,7 +218,7 @@ final class ApiController extends Controller
     public function apiCommentDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         $comment = CommentMapper::get((int) $request->getData('id'));
-        $this->deleteModel($request->getHeader()->getAccount(), $comment, CommentMapper::class, 'comment', $request->getOrigin());
+        $this->deleteModel($request->header->account, $comment, CommentMapper::class, 'comment', $request->getOrigin());
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Comment', 'Comment successfully deleted', $comment);
     }
 }
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index a66fcf2..7ebceff 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -134,7 +134,7 @@ final class BackendController extends Controller
     {
         if (!empty($val = $this->validateCommentCreate($request))) {
             $response->set('comment_create', new FormValidation($val));
-            $response->getHeader()->setStatusCode(RequestStatusCode::R_400);
+            $response->header->status = RequestStatusCode::R_400;
 
             return;
         }
diff --git a/Models/Comment.php b/Models/Comment.php
index 9448664..502ad12 100755
--- a/Models/Comment.php
+++ b/Models/Comment.php
@@ -41,7 +41,7 @@ class Comment
      * @var Account
      * @since 1.0.0
      */
-    private Account $createdBy;
+    public Account $createdBy;
 
     /**
      * Created at
@@ -49,7 +49,7 @@ class Comment
      * @var \DateTimeImmutable
      * @since 1.0.0
      */
-    private \DateTimeImmutable $createdAt;
+    public \DateTimeImmutable $createdAt;
 
     /**
      * Comment list this comment belongs to
@@ -65,7 +65,7 @@ class Comment
      * @var string
      * @since 1.0.0
      */
-    private $title = '';
+    public string $title = '';
 
     /**
      * Comment status
@@ -81,7 +81,7 @@ class Comment
      * @var string
      * @since 1.0.0
      */
-    private $content = '';
+    public string $content = '';
 
     /**
      * Content raw
@@ -89,7 +89,7 @@ class Comment
      * @var string
      * @since 1.0.0
      */
-    private $contentRaw = '';
+    public string $contentRaw = '';
 
     /**
      * Comment this is refering to
@@ -200,122 +200,6 @@ class Comment
         return $this->list;
     }
 
-    /**
-     * Get the title
-     *
-     * @return string
-     *
-     * @since 1.0.0
-     */
-    public function getTitle() : string
-    {
-        return $this->title;
-    }
-
-    /**
-     * Set the title
-     *
-     * @param string $title Title
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setTitle(string $title) : void
-    {
-        $this->title = $title;
-    }
-
-    /**
-     * Get the content
-     *
-     * @return string
-     *
-     * @since 1.0.0
-     */
-    public function getContent() : string
-    {
-        return $this->content;
-    }
-
-    /**
-     * Get the content
-     *
-     * @param string $content Content
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setContent(string $content) : void
-    {
-        $this->content = $content;
-    }
-
-    /**
-     * Get the raw content
-     *
-     * @return string
-     *
-     * @since 1.0.0
-     */
-    public function getContentRaw() : string
-    {
-        return $this->contentRaw;
-    }
-
-    /**
-     * Set the raw content
-     *
-     * @param string $contentRaw Content
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setContentRaw(string $contentRaw) : void
-    {
-        $this->contentRaw = $contentRaw;
-    }
-
-    /**
-     * Get created by
-     *
-     * @return Account
-     *
-     * @since 1.0.0
-     */
-    public function getCreatedBy() : Account
-    {
-        return $this->createdBy;
-    }
-
-    /**
-     * Set the creator
-     *
-     * @param Account $createdBy Creator
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setCreatedBy(Account $createdBy) : void
-    {
-        $this->createdBy = $createdBy;
-    }
-
-    /**
-     * Get created at date time
-     *
-     * @return \DateTimeImmutable
-     *
-     * @since 1.0.0
-     */
-    public function getCreatedAt() : \DateTimeImmutable
-    {
-        return $this->createdAt;
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/tests/Models/CommentListMapperTest.php b/tests/Models/CommentListMapperTest.php
index 8d41463..c38df77 100755
--- a/tests/Models/CommentListMapperTest.php
+++ b/tests/Models/CommentListMapperTest.php
@@ -33,8 +33,8 @@ class CommentListMapperTest extends \PHPUnit\Framework\TestCase
         $list = new CommentList();
 
         $comment = new Comment();
-        $comment->setCreatedBy(new NullAccount(1));
-        $comment->setTitle('Test Comment');
+        $comment->createdBy = new NullAccount(1);
+        $comment->title = 'Test Comment';
 
         $list->addComment($comment);
 
@@ -46,6 +46,6 @@ class CommentListMapperTest extends \PHPUnit\Framework\TestCase
         self::assertEquals($id, $listR->getId());
 
         $actual = $listR->getComments();
-        self::assertEquals($comment->getTitle(), \reset($actual)->getTitle());
+        self::assertEquals($comment->title, \reset($actual)->title);
     }
 }
diff --git a/tests/Models/CommentListTest.php b/tests/Models/CommentListTest.php
index 77e04e0..8bee623 100755
--- a/tests/Models/CommentListTest.php
+++ b/tests/Models/CommentListTest.php
@@ -41,13 +41,13 @@ class CommentListTest extends \PHPUnit\Framework\TestCase
     {
         $list    = new CommentList();
         $comment = new Comment();
-        $comment->setTitle('Test Title');
-        $comment->setContentRaw('TestRaw');
-        $comment->setContent('Test Content');
+        $comment->title = 'Test Title';
+        $comment->contentRaw = 'TestRaw';
+        $comment->content = 'Test Content';
 
         $list->addComment($comment);
-        self::assertEquals('Test Title', $list->getComments()[0]->getTitle());
-        self::assertEquals('TestRaw', $list->getComments()[0]->getContentRaw());
-        self::assertEquals('Test Content', $list->getComments()[0]->getcontent());
+        self::assertEquals('Test Title', $list->getComments()[0]->title);
+        self::assertEquals('TestRaw', $list->getComments()[0]->contentRaw);
+        self::assertEquals('Test Content', $list->getComments()[0]->content);
     }
 }
diff --git a/tests/Models/CommentMapperTest.php b/tests/Models/CommentMapperTest.php
index 50241fc..a0fa207 100755
--- a/tests/Models/CommentMapperTest.php
+++ b/tests/Models/CommentMapperTest.php
@@ -31,9 +31,9 @@ class CommentMapperTest extends \PHPUnit\Framework\TestCase
     public function testCRUD() : void
     {
         $comment = new Comment();
-        $comment->setCreatedBy(new NullAccount(1));
-        $comment->setTitle('Test Title');
-        $comment->setContent('Test Content');
+        $comment->createdBy = new NullAccount(1);
+        $comment->title = 'Test Title';
+        $comment->content = 'Test Content';
         $comment->setRef(null);
         $comment->setList(new CommentList());
 
@@ -43,9 +43,9 @@ class CommentMapperTest extends \PHPUnit\Framework\TestCase
 
         $commentR = CommentMapper::get($comment->getId());
         self::assertEquals($id, $commentR->getId());
-        self::assertEquals($comment->getCreatedBy()->getId(), $commentR->getCreatedBy()->getId());
-        self::assertEquals($comment->getTitle(), $commentR->getTitle());
-        self::assertEquals($comment->getContent(), $commentR->getContent());
+        self::assertEquals($comment->createdBy->getId(), $commentR->createdBy->getId());
+        self::assertEquals($comment->title, $commentR->title);
+        self::assertEquals($comment->content, $commentR->content);
         self::assertEquals($comment->getRef(), $commentR->getRef());
         self::assertEquals($comment->getList()->getId(), $commentR->getList()->getId());
     }
diff --git a/tests/Models/CommentTest.php b/tests/Models/CommentTest.php
index 7ba7ab7..ba940c2 100755
--- a/tests/Models/CommentTest.php
+++ b/tests/Models/CommentTest.php
@@ -33,12 +33,12 @@ class CommentTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(0, $comment->getId());
 
         $date = new \DateTime('now');
-        self::assertEquals($date->format('Y-m-d'), $comment->getCreatedAt()->format('Y-m-d'));
-        self::assertEquals(0, $comment->getCreatedBy()->getId());
+        self::assertEquals($date->format('Y-m-d'), $comment->createdAt->format('Y-m-d'));
+        self::assertEquals(0, $comment->createdBy->getId());
         self::assertEquals(0, $comment->getList());
         self::assertEquals(0, $comment->getRef());
-        self::assertEquals('', $comment->getTitle());
-        self::assertEquals('', $comment->getContent());
+        self::assertEquals('', $comment->title);
+        self::assertEquals('', $comment->content);
     }
 
     /**
@@ -49,8 +49,8 @@ class CommentTest extends \PHPUnit\Framework\TestCase
     {
         $comment = new Comment();
 
-        $comment->setCreatedBy(new NullAccount(1));
-        self::assertEquals(1, $comment->getCreatedBy()->getId());
+        $comment->createdBy = new NullAccount(1);
+        self::assertEquals(1, $comment->createdBy->getId());
 
         $comment->setList(2);
         self::assertEquals(2, $comment->getList());
@@ -58,10 +58,10 @@ class CommentTest extends \PHPUnit\Framework\TestCase
         $comment->setRef(new NullComment(3));
         self::assertEquals(3, $comment->getRef()->getId());
 
-        $comment->setTitle('Test Title');
-        self::assertEquals('Test Title', $comment->getTitle());
+        $comment->title = 'Test Title';
+        self::assertEquals('Test Title', $comment->title);
 
-        $comment->setContent('Test Content');
-        self::assertEquals('Test Content', $comment->getContent());
+        $comment->content = 'Test Content';
+        self::assertEquals('Test Content', $comment->content);
     }
 }