diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 58b3043..966149b 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -24,7 +24,6 @@ use Modules\Comments\Models\CommentListMapper;
 use Modules\Comments\Models\CommentMapper;
 use Modules\Comments\Models\CommentVote;
 use Modules\Comments\Models\CommentVoteMapper;
-use Modules\Comments\Models\NullCommentVote;
 use Modules\Media\Models\CollectionMapper;
 use Modules\Media\Models\MediaMapper;
 use Modules\Media\Models\NullMedia;
@@ -191,22 +190,22 @@ final class ApiController extends Controller
             foreach ($uploaded as $media) {
                 $this->createModelRelation(
                     $request->header->account,
-                    $comment->getId(),
-                    $media->getId(),
+                    $comment->id,
+                    $media->id,
                     CommentMapper::class,
                     'media',
                     '',
                     $request->getOrigin()
                 );
 
-                $accountPath = '/Accounts/' . $account->getId() . ' ' . $account->login
+                $accountPath = '/Accounts/' . $account->id . ' ' . $account->login
                     . '/Comments/'
                     . $comment->createdAt->format('Y') . '/' . $comment->createdAt->format('m')
-                    . '/' . $comment->getId();
+                    . '/' . $comment->id;
 
                 $ref            = new Reference();
                 $ref->name      = $media->name;
-                $ref->source    = new NullMedia($media->getId());
+                $ref->source    = new NullMedia($media->id);
                 $ref->createdBy = new NullAccount($request->header->account);
                 $ref->setVirtualPath($accountPath);
 
@@ -216,14 +215,14 @@ final class ApiController extends Controller
                     $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
                         $accountPath,
                         $request->header->account,
-                        __DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->getId() . '/Comments/' . $comment->createdAt->format('Y') . '/' . $comment->createdAt->format('m') . '/' . $comment->getId()
+                        __DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->id . '/Comments/' . $comment->createdAt->format('Y') . '/' . $comment->createdAt->format('m') . '/' . $comment->id
                     );
                 }
 
                 $this->createModelRelation(
                     $request->header->account,
-                    $collection->getId(),
-                    $ref->getId(),
+                    $collection->id,
+                    $ref->id,
                     CollectionMapper::class,
                     'sources',
                     '',
@@ -240,8 +239,8 @@ final class ApiController extends Controller
                 $media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute();
                 $this->createModelRelation(
                     $request->header->account,
-                    $comment->getId(),
-                    $media->getId(),
+                    $comment->id,
+                    $media->id,
                     CommentMapper::class,
                     'media',
                     '',
@@ -250,7 +249,7 @@ final class ApiController extends Controller
 
                 $ref            = new Reference();
                 $ref->name      = $media->name;
-                $ref->source    = new NullMedia($media->getId());
+                $ref->source    = new NullMedia($media->id);
                 $ref->createdBy = new NullAccount($request->header->account);
                 $ref->setVirtualPath($path);
 
@@ -266,8 +265,8 @@ final class ApiController extends Controller
 
                 $this->createModelRelation(
                     $request->header->account,
-                    $collection->getId(),
-                    $ref->getId(),
+                    $collection->id,
+                    $ref->id,
                     CollectionMapper::class,
                     'sources',
                     '',
@@ -292,7 +291,7 @@ final class ApiController extends Controller
             . $comment->createdAt->format('Y') . '/'
             . $comment->createdAt->format('m') . '/'
             . $comment->createdAt->format('d') . '/'
-            . $comment->getId();
+            . $comment->id;
     }
 
     /**
@@ -448,7 +447,7 @@ final class ApiController extends Controller
         /** @var \Modules\Comments\Models\CommentVote $vote */
         $vote = CommentVoteMapper::findVote((int) $request->getData('id'), $request->header->account);
 
-        if ($vote instanceof NullCommentVote) {
+        if ($vote->id === 0) {
             $new            = new CommentVote();
             $new->score     = (int) $request->getData('type');
             $new->comment   = (int) $request->getData('id');
diff --git a/Models/Comment.php b/Models/Comment.php
index 9ede7d8..8affe81 100755
--- a/Models/Comment.php
+++ b/Models/Comment.php
@@ -34,7 +34,7 @@ class Comment implements \JsonSerializable
      * @var int
      * @since 1.0.0
      */
-    protected int $id = 0;
+    public int $id = 0;
 
     /**
      * Account.
@@ -74,7 +74,7 @@ class Comment implements \JsonSerializable
      * @var int
      * @since 1.0.0
      */
-    private int $status = CommentStatus::VISIBLE;
+    public int $status = CommentStatus::VISIBLE;
 
     /**
      * Content
diff --git a/Models/CommentList.php b/Models/CommentList.php
index 0e9ea6e..769b7be 100755
--- a/Models/CommentList.php
+++ b/Models/CommentList.php
@@ -30,7 +30,7 @@ class CommentList
      * @var int
      * @since 1.0.0
      */
-    protected int $id = 0;
+    public int $id = 0;
 
     /**
      * Comments
diff --git a/Models/CommentVote.php b/Models/CommentVote.php
index e95625c..11735ca 100755
--- a/Models/CommentVote.php
+++ b/Models/CommentVote.php
@@ -32,7 +32,7 @@ class CommentVote
      * @var int
      * @since 1.0.0
      */
-    protected int $id = 0;
+    public int $id = 0;
 
     /**
      * Account.
diff --git a/Theme/Backend/Components/Comment/list.tpl.php b/Theme/Backend/Components/Comment/list.tpl.php
index d8d6cb0..9796d44 100755
--- a/Theme/Backend/Components/Comment/list.tpl.php
+++ b/Theme/Backend/Components/Comment/list.tpl.php
@@ -23,7 +23,7 @@ $comments = $this->commentList->getComments();
     <div class="col-xs-12">
         <section class="portlet">
             <div class="portlet-body">
-                <form id="iComentListSettings" method="POST" action="<?= UriFactory::build('{/api}comment/list?id=' . $this->commentList->getId() . '{?}&csrf={$CSRF}'); ?>">
+                <form id="iComentListSettings" method="POST" action="<?= UriFactory::build('{/api}comment/list?id=' . $this->commentList->id . '{?}&csrf={$CSRF}'); ?>">
                         <div class="form-group">
                             <div class="input-control">
                                 <select name="commentlist_status">
@@ -73,7 +73,7 @@ foreach ($comments as $comment) : ?>
                 </div>
                 <div class="portlet-foot">
                     <?php $files = $comment->getMedia(); foreach ($files as $file) : ?>
-                         <span><a class="content" href="<?= UriFactory::build('{/base}/media/single?id=' . $file->getId());?>"><?= $file->name; ?></a></span>
+                         <span><a class="content" href="<?= UriFactory::build('{/base}/media/single?id=' . $file->id);?>"><?= $file->name; ?></a></span>
                     <?php endforeach; ?>
 
                     <?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$comment->createdBy->name1, $comment->createdBy->name2, $comment->createdBy->name3, $comment->createdBy->login ?? ''])); ?>
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index 003f961..8d1807b 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -105,7 +105,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $request->header->account = 1;
 
         $this->module->apiCommentListCreate($request, $response);
-        self::assertGreaterThan(0, $lId = $response->get('')['response']->getId());
+        self::assertGreaterThan(0, $lId = $response->get('')['response']->id);
 
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
@@ -137,7 +137,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $request->header->account = 1;
 
         $this->module->apiCommentListCreate($request, $response);
-        self::assertGreaterThan(0, $lId = $response->get('')['response']->getId());
+        self::assertGreaterThan(0, $lId = $response->get('')['response']->id);
 
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
@@ -163,7 +163,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $request->setData('media', \json_encode([1]));
 
         $this->module->apiCommentCreate($request, $response);
-        self::assertGreaterThan(0, $cId = $response->get('')['response']->getId());
+        self::assertGreaterThan(0, $cId = $response->get('')['response']->id);
 
         //read
         $response = new HttpResponse();
@@ -236,7 +236,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $request->setData('type', '1');
 
         $this->module->apiChangeCommentVote($request, $response);
-        self::assertGreaterThan(0, $vId = $response->get('')['response']->getId());
+        self::assertGreaterThan(0, $vId = $response->get('')['response']->id);
 
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
@@ -246,6 +246,6 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $request->setData('type', '-1');
 
         $this->module->apiChangeCommentVote($request, $response);
-        self::assertEquals($vId, $response->get('')['response']->getId());
+        self::assertEquals($vId, $response->get('')['response']->id);
     }
 }
diff --git a/tests/Models/CommentListMapperTest.php b/tests/Models/CommentListMapperTest.php
index dd7b018..7171685 100755
--- a/tests/Models/CommentListMapperTest.php
+++ b/tests/Models/CommentListMapperTest.php
@@ -39,11 +39,11 @@ final class CommentListMapperTest extends \PHPUnit\Framework\TestCase
         $list->addComment($comment);
 
         $id = CommentListMapper::create()->execute($list);
-        self::assertGreaterThan(0, $list->getId());
-        self::assertEquals($id, $list->getId());
+        self::assertGreaterThan(0, $list->id);
+        self::assertEquals($id, $list->id);
 
-        $listR = CommentListMapper::get()->with('comments')->where('id', $list->getId())->execute();
-        self::assertEquals($id, $listR->getId());
+        $listR = CommentListMapper::get()->with('comments')->where('id', $list->id)->execute();
+        self::assertEquals($id, $listR->id);
 
         $actual = $listR->getComments();
         self::assertEquals($comment->title, \reset($actual)->title);
diff --git a/tests/Models/CommentListTest.php b/tests/Models/CommentListTest.php
index 0632783..87d60a8 100755
--- a/tests/Models/CommentListTest.php
+++ b/tests/Models/CommentListTest.php
@@ -38,7 +38,7 @@ final class CommentListTest extends \PHPUnit\Framework\TestCase
      */
     public function testDefault() : void
     {
-        self::assertEquals(0, $this->list->getId());
+        self::assertEquals(0, $this->list->id);
         self::assertEquals([], $this->list->getComments());
     }
 
diff --git a/tests/Models/CommentMapperTest.php b/tests/Models/CommentMapperTest.php
index 356f2d9..1d8ce6a 100755
--- a/tests/Models/CommentMapperTest.php
+++ b/tests/Models/CommentMapperTest.php
@@ -38,15 +38,15 @@ final class CommentMapperTest extends \PHPUnit\Framework\TestCase
         $comment->list      = new CommentList();
 
         $id = CommentMapper::create()->execute($comment);
-        self::assertGreaterThan(0, $comment->getId());
-        self::assertEquals($id, $comment->getId());
+        self::assertGreaterThan(0, $comment->id);
+        self::assertEquals($id, $comment->id);
 
-        $commentR = CommentMapper::get()->where('id', $comment->getId())->execute();
-        self::assertEquals($id, $commentR->getId());
-        self::assertEquals($comment->createdBy->getId(), $commentR->createdBy->getId());
+        $commentR = CommentMapper::get()->where('id', $comment->id)->execute();
+        self::assertEquals($id, $commentR->id);
+        self::assertEquals($comment->createdBy->id, $commentR->createdBy->id);
         self::assertEquals($comment->title, $commentR->title);
         self::assertEquals($comment->content, $commentR->content);
         self::assertEquals($comment->ref, $commentR->ref);
-        self::assertEquals($comment->list->getId(), $commentR->list->getId());
+        self::assertEquals($comment->list->id, $commentR->list->id);
     }
 }
diff --git a/tests/Models/CommentTest.php b/tests/Models/CommentTest.php
index 2f7314a..c6b3b53 100755
--- a/tests/Models/CommentTest.php
+++ b/tests/Models/CommentTest.php
@@ -41,11 +41,11 @@ final class CommentTest extends \PHPUnit\Framework\TestCase
      */
     public function testDefault() : void
     {
-        self::assertEquals(0, $this->comment->getId());
+        self::assertEquals(0, $this->comment->id);
 
         $date = new \DateTime('now');
         self::assertEquals($date->format('Y-m-d'), $this->comment->createdAt->format('Y-m-d'));
-        self::assertEquals(0, $this->comment->createdBy->getId());
+        self::assertEquals(0, $this->comment->createdBy->id);
         self::assertEquals(0, $this->comment->list);
         self::assertEquals(0, $this->comment->ref);
         self::assertEquals('', $this->comment->title);
@@ -60,7 +60,7 @@ final class CommentTest extends \PHPUnit\Framework\TestCase
     public function testCreatedByInputOutput() : void
     {
         $this->comment->createdBy = new NullAccount(1);
-        self::assertEquals(1, $this->comment->createdBy->getId());
+        self::assertEquals(1, $this->comment->createdBy->id);
     }
 
     /**
@@ -83,7 +83,7 @@ final class CommentTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(2, $this->comment->ref);
 
         $this->comment->ref = new NullComment(3);
-        self::assertEquals(3, $this->comment->ref->getId());
+        self::assertEquals(3, $this->comment->ref->id);
     }
 
     /**
diff --git a/tests/Models/CommentVoteTest.php b/tests/Models/CommentVoteTest.php
index f6e3ba8..6c4bd81 100755
--- a/tests/Models/CommentVoteTest.php
+++ b/tests/Models/CommentVoteTest.php
@@ -37,7 +37,7 @@ final class CommentVoteTest extends \PHPUnit\Framework\TestCase
      */
     public function testDefault() : void
     {
-        self::assertEquals(0, $this->vote->getId());
+        self::assertEquals(0, $this->vote->id);
         self::assertEquals(0, $this->vote->score);
         self::assertEquals(0, $this->vote->comment);
         self::assertEquals(0, $this->vote->createdBy);
diff --git a/tests/Models/NullCommentListTest.php b/tests/Models/NullCommentListTest.php
index f57d89f..a311622 100755
--- a/tests/Models/NullCommentListTest.php
+++ b/tests/Models/NullCommentListTest.php
@@ -37,6 +37,6 @@ final class NullCommentListTest extends \PHPUnit\Framework\TestCase
     public function testId() : void
     {
         $null = new NullCommentList(2);
-        self::assertEquals(2, $null->getId());
+        self::assertEquals(2, $null->id);
     }
 }
diff --git a/tests/Models/NullCommentTest.php b/tests/Models/NullCommentTest.php
index 1a8be45..965897e 100755
--- a/tests/Models/NullCommentTest.php
+++ b/tests/Models/NullCommentTest.php
@@ -37,6 +37,6 @@ final class NullCommentTest extends \PHPUnit\Framework\TestCase
     public function testId() : void
     {
         $null = new NullComment(2);
-        self::assertEquals(2, $null->getId());
+        self::assertEquals(2, $null->id);
     }
 }
diff --git a/tests/Models/NullCommentVoteTest.php b/tests/Models/NullCommentVoteTest.php
index f7cac5b..0fb0539 100755
--- a/tests/Models/NullCommentVoteTest.php
+++ b/tests/Models/NullCommentVoteTest.php
@@ -37,6 +37,6 @@ final class NullCommentVoteTest extends \PHPUnit\Framework\TestCase
     public function testId() : void
     {
         $null = new NullCommentVote(2);
-        self::assertEquals(2, $null->getId());
+        self::assertEquals(2, $null->id);
     }
 }