diff --git a/Models/Comment.php b/Models/Comment.php
index 27cb365..baf7507 100644
--- a/Models/Comment.php
+++ b/Models/Comment.php
@@ -34,8 +34,12 @@ class Comment
 
     private $title = '';
 
+    private $status = 0;
+
     private $content = '';
 
+    private $contentRaw = '';
+
     private $ref = null;
 
     public function __construct()
@@ -88,6 +92,16 @@ class Comment
         $this->content = $content;
     }
 
+    public function getContentRaw() : string
+    {
+        return $this->contentRaw;
+    }
+
+    public function setContentRaw(string $contentRaw)
+    {
+        $this->contentRaw = $contentRaw;
+    }
+
     public function getCreatedBy()
     {
         return $this->createdBy;
diff --git a/Models/CommentMapper.php b/Models/CommentMapper.php
index ac9fe0a..558dead 100644
--- a/Models/CommentMapper.php
+++ b/Models/CommentMapper.php
@@ -34,13 +34,15 @@ final class CommentMapper extends DataMapperAbstract
      * @since 1.0.0
      */
     protected static $columns = [
-        'comments_comment_id'         => ['name' => 'comments_comment_id', 'type' => 'int', 'internal' => 'id'],
-        'comments_comment_title'      => ['name' => 'comments_comment_title', 'type' => 'string', 'internal' => 'title'],
-        'comments_comment_content'    => ['name' => 'comments_comment_content', 'type' => 'string', 'internal' => 'content'],
-        'comments_comment_list'       => ['name' => 'comments_comment_list', 'type' => 'int', 'internal' => 'list'],
-        'comments_comment_ref'        => ['name' => 'comments_comment_ref', 'type' => 'int', 'internal' => 'ref'],
-        'comments_comment_created_by' => ['name' => 'comments_comment_created_by', 'type' => 'int', 'internal' => 'createdBy'],
-        'comments_comment_created_at' => ['name' => 'comments_comment_created_at', 'type' => 'DateTime', 'internal' => 'createdAt'],
+        'comments_comment_id'          => ['name' => 'comments_comment_id', 'type' => 'int', 'internal' => 'id'],
+        'comments_comment_title'       => ['name' => 'comments_comment_title', 'type' => 'string', 'internal' => 'title'],
+        'comments_comment_status'      => ['name' => 'comments_comment_status', 'type' => 'string', 'internal' => 'status'],
+        'comments_comment_content'     => ['name' => 'comments_comment_content', 'type' => 'string', 'internal' => 'content'],
+        'comments_comment_content_raw' => ['name' => 'comments_comment_content_raw', 'type' => 'string', 'internal' => 'contentRaw'],
+        'comments_comment_list'        => ['name' => 'comments_comment_list', 'type' => 'int', 'internal' => 'list'],
+        'comments_comment_ref'         => ['name' => 'comments_comment_ref', 'type' => 'int', 'internal' => 'ref'],
+        'comments_comment_created_by'  => ['name' => 'comments_comment_created_by', 'type' => 'int', 'internal' => 'createdBy'],
+        'comments_comment_created_at'  => ['name' => 'comments_comment_created_at', 'type' => 'DateTime', 'internal' => 'createdAt'],
     ];
 
     /**