diff --git a/src/Tenant/Views/Comments.php b/src/Tenant/Views/Comments.php
deleted file mode 100644
index a17e297..0000000
--- a/src/Tenant/Views/Comments.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/*
- * This file is part of Pluf Framework, a simple PHP Application Framework.
- * Copyright (C) 2010-2020 Phoinex Scholars Co. (http://dpq.co.ir)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * Comments view
- *
- * Manage Comments in system
- *
- * @author maso<mostafa.barmshory@dpq.co.ir>
- */
-class Tenant_Views_Comments
-{
-
-    /**
-     * Get a comment
-     *
-     * @param Pluf_HTTP_Request $request
-     * @param array $match
-     */
-    public function get($request, $match)
-    {}
-
-    /**
-     * Create a new comment
-     *
-     * @param Pluf_HTTP_Request $request
-     * @param array $match
-     */
-    public function create($request, $match)
-    {}
-
-    /**
-     * Delete a comment
-     *
-     * @param Pluf_HTTP_Request $request
-     * @param array $match
-     */
-    public function delete($request, $match)
-    {}
-
-    /**
-     * Update a comment
-     *
-     * @param Pluf_HTTP_Request $request
-     * @param array $match
-     */
-    public function update($request, $match)
-    {}
-}
\ No newline at end of file
diff --git a/src/Tenant/Views/Invoices.php b/src/Tenant/Views/Invoices.php
index ef10175..607ae79 100644
--- a/src/Tenant/Views/Invoices.php
+++ b/src/Tenant/Views/Invoices.php
@@ -25,4 +25,5 @@
  */
 class Tenant_Views_Invoices
 {
+    // TODO: maso, 2017: adding payment
 }
\ No newline at end of file
diff --git a/src/Tenant/Views/Tickets.php b/src/Tenant/Views/Tickets.php
deleted file mode 100644
index 5113cc1..0000000
--- a/src/Tenant/Views/Tickets.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of Pluf Framework, a simple PHP Application Framework.
- * Copyright (C) 2010-2020 Phoinex Scholars Co. (http://dpq.co.ir)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * Comments view
- *
- * @author maso<mostafa.barmshory@dpq.co.ir>
- */
-class Tenant_Views_Tickets
-{
-}
\ No newline at end of file
diff --git a/src/Tenant/urls.php b/src/Tenant/urls.php
index 7d7c83b..09aa8bc 100644
--- a/src/Tenant/urls.php
+++ b/src/Tenant/urls.php
@@ -133,48 +133,94 @@
      * Comments of ticket
      */
     array(
-        'regex' => '#^/current/ticket/(?P<tecket_id>\d+)/comment/find$#',
-        'model' => 'Tenant_Views_Ticket',
-        'method' => 'findComments',
+        'regex' => '#^/current/ticket/(?P<parentId>\d+)/comment/find$#',
+        'model' => 'Pluf_Views',
+        'method' => 'findManyToOne',
         'http-method' => 'GET',
         'precond' => array(
             'Pluf_Precondition::ownerRequired'
+        ),
+        'params' => array(
+            'model' => 'Tenant_Comment',
+            'parent' => 'Tenant_Ticket',
+            'parentKey' => 'ticket',
+            'listFilters' => array(
+                'status',
+                'type',
+                'requester'
+            ),
+            'listDisplay' => array(),
+            'searchFields' => array(
+                'subject',
+                'description'
+            ),
+            'sortFields' => array(
+                'id',
+                'status',
+                'type',
+                'modif_dtime',
+                'creation_dtime'
+            ),
+            'sortOrder' => array(
+                'id',
+                'DESC'
+            )
         )
     ),
     array(
-        'regex' => '#^/current/ticket/(?P<tecket_id>\d+)/comment/new$#',
-        'model' => 'Tenant_Views_Ticket',
-        'method' => 'createComments',
+        'regex' => '#^/current/ticket/(?P<parentId>\d+)/comment/new$#',
+        'model' => 'Pluf_Views',
+        'method' => 'createManyToOne',
         'http-method' => 'POST',
         'precond' => array(
             'Pluf_Precondition::ownerRequired'
+        ),
+        'params' => array(
+            'model' => 'Tenant_Comment',
+            'parent' => 'Tenant_Ticket',
+            'parentKey' => 'ticket'
         )
     ),
     array(
-        'regex' => '#^/current/ticket/(?P<tecket_id>\d+)/comment/(?P<comment_id>\d+)$#',
-        'model' => 'Tenant_Views_Ticket',
-        'method' => 'get',
+        'regex' => '#^/current/ticket/(?P<parentId>\d+)/comment/(?P<modelId>\d+)$#',
+        'model' => 'Pluf_Views',
+        'method' => 'getManyToOne',
         'http-method' => 'GET',
         'precond' => array(
             'Pluf_Precondition::ownerRequired'
+        ),
+        'params' => array(
+            'model' => 'Tenant_Comment',
+            'parent' => 'Tenant_Ticket',
+            'parentKey' => 'ticket'
         )
     ),
     array(
-        'regex' => '#^/current/ticket/(?P<tecket_id>\d+)/comment/(?P<comment_id>\d+)$#',
-        'model' => 'Tenant_Views_Ticket',
-        'method' => 'get',
+        'regex' => '#^/current/ticket/(?P<parentId>\d+)/comment/(?P<modelId>\d+)$#',
+        'model' => 'Pluf_Views',
+        'method' => 'updateManyToOne',
         'http-method' => 'POST',
         'precond' => array(
             'Pluf_Precondition::ownerRequired'
+        ),
+        'params' => array(
+            'model' => 'Tenant_Comment',
+            'parent' => 'Tenant_Ticket',
+            'parentKey' => 'ticket'
         )
     ),
     array(
-        'regex' => '#^/current/ticket/(?P<tecket_id>\d+)/comment/(?P<comment_id>\d+)$#',
-        'model' => 'Tenant_Views_Ticket',
-        'method' => 'get',
+        'regex' => '#^/current/ticket/(?P<parentId>\d+)/comment/(?P<modelId>\d+)$#',
+        'model' => 'Pluf_Views',
+        'method' => 'deleteManyToOne',
         'http-method' => 'DELETE',
         'precond' => array(
             'Pluf_Precondition::ownerRequired'
+        ),
+        'params' => array(
+            'model' => 'Tenant_Comment',
+            'parent' => 'Tenant_Ticket',
+            'parentKey' => 'ticket'
         )
     ),
     
diff --git a/tests/Tenant_REST/TicketCommentTest.php b/tests/Tenant_REST/TicketCommentTest.php
new file mode 100644
index 0000000..322ba79
--- /dev/null
+++ b/tests/Tenant_REST/TicketCommentTest.php
@@ -0,0 +1,448 @@
+<?php
+/*
+ * This file is part of Pluf Framework, a simple PHP Application Framework.
+ * Copyright (C) 2010-2020 Phoinex Scholars Co. (http://dpq.co.ir)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+use PHPUnit\Framework\TestCase;
+require_once 'Pluf.php';
+
+/**
+ * @backupGlobals disabled
+ * @backupStaticAttributes disabled
+ */
+class Tenant_REST_TicketCommentsTest extends TestCase
+{
+
+    /**
+     * @beforeClass
+     */
+    public static function installApps()
+    {
+        Pluf::start(dirname(__FILE__) . '/../conf/config-01.php');
+        $m = new Pluf_Migration(array(
+            'Pluf',
+            'Tenant'
+        ));
+        $m->install();
+        // Test user
+        $user = new Pluf_User();
+        $user->login = 'test';
+        $user->first_name = 'test';
+        $user->last_name = 'test';
+        $user->email = 'toto@example.com';
+        $user->setPassword('test');
+        $user->active = true;
+        $user->administrator = true;
+        if (true !== $user->create()) {
+            throw new Exception();
+        }
+        
+        // Test tenant
+        $tenant = new Pluf_Tenant();
+        $tenant->domain = 'localhost';
+        $tenant->subdomain = 'test';
+        $tenant->validate = true;
+        if (true !== $tenant->create()) {
+            throw new Pluf_Exception('Faile to create new tenant');
+        }
+        
+        $client = new Test_Client(array());
+        $GLOBALS['_PX_request']->tenant = $tenant;
+        
+        $per = new Pluf_RowPermission();
+        $per->version = 1;
+        $per->model_id = $tenant->id;
+        $per->model_class = 'Pluf_Tenant';
+        $per->owner_id = $user->id;
+        $per->owner_class = 'Pluf_User';
+        $per->create();
+    }
+
+    /**
+     * @afterClass
+     */
+    public static function uninstallApps()
+    {
+        $m = new Pluf_Migration(array(
+            'Pluf',
+            'Tenant'
+        ));
+        $m->unInstall();
+    }
+
+    /**
+     * Getting tenant tickets
+     *
+     * Call tenant to get list of tickets
+     *
+     * @test
+     */
+    public function testFindTikcetComments()
+    {
+        $client = new Test_Client(array(
+            array(
+                'app' => 'Tenant',
+                'regex' => '#^/api/tenant#',
+                'base' => '',
+                'sub' => include 'Tenant/urls.php'
+            ),
+            array(
+                'app' => 'User',
+                'regex' => '#^/api/user#',
+                'base' => '',
+                'sub' => include 'User/urls.php'
+            )
+        ));
+        // login
+        $response = $client->post('/api/user/login', array(
+            'login' => 'test',
+            'password' => 'test'
+        ));
+        Test_Assert::assertResponseStatusCode($response, 200, 'Fail to login');
+        
+        // Create ticket
+        $user = new Pluf_User();
+        $user = $user->getUser('test');
+        
+        $t = new Tenant_Ticket();
+        $t->subject = 'test';
+        $t->description = 'test';
+        $t->type = 'bug';
+        $t->status = 'new';
+        $t->requester = $user;
+        $t->create();
+        
+        // find comments
+        $response = $client->get('/api/tenant/current/ticket/' . $t->id . '/comment/find');
+        Test_Assert::assertResponseNotNull($response, 'Find result is empty');
+        Test_Assert::assertResponseStatusCode($response, 200, 'Find status code is not 200');
+        Test_Assert::assertResponsePaginateList($response, 'Find result is not JSON paginated list');
+        
+        // delete
+        $t->delete();
+    }
+
+    /**
+     * Getting not empety comments
+     *
+     * @test
+     */
+    public function testFindTikcetCommentSNotEmpty()
+    {
+        $client = new Test_Client(array(
+            array(
+                'app' => 'Tenant',
+                'regex' => '#^/api/tenant#',
+                'base' => '',
+                'sub' => include 'Tenant/urls.php'
+            ),
+            array(
+                'app' => 'User',
+                'regex' => '#^/api/user#',
+                'base' => '',
+                'sub' => include 'User/urls.php'
+            )
+        ));
+        // login
+        $response = $client->post('/api/user/login', array(
+            'login' => 'test',
+            'password' => 'test'
+        ));
+        Test_Assert::assertResponseStatusCode($response, 200, 'Fail to login');
+        
+        // Create ticket
+        $user = new Pluf_User();
+        $user = $user->getUser('test');
+        
+        $t = new Tenant_Ticket();
+        $t->subject = 'test';
+        $t->description = 'test';
+        $t->type = 'bug';
+        $t->status = 'new';
+        $t->requester = $user;
+        $t->create();
+        
+        $c = new Tenant_Comment();
+        $c->title = 'test';
+        $c->description = 'test';
+        $c->author = $user;
+        $c->ticket = $t;
+        $c->create();
+        
+        // find comments
+        $response = $client->get('/api/tenant/current/ticket/' . $t->id . '/comment/find');
+        Test_Assert::assertResponseNotNull($response, 'Find result is empty');
+        Test_Assert::assertResponseStatusCode($response, 200, 'Find status code is not 200');
+        Test_Assert::assertResponsePaginateList($response);
+        Test_Assert::assertResponseNonEmptyPaginateList($response);
+        
+        // delete
+        $c->delete();
+        $t->delete();
+    }
+
+    /**
+     * Getting comment
+     *
+     * @test
+     */
+    public function testGetTikcetComment()
+    {
+        $client = new Test_Client(array(
+            array(
+                'app' => 'Tenant',
+                'regex' => '#^/api/tenant#',
+                'base' => '',
+                'sub' => include 'Tenant/urls.php'
+            ),
+            array(
+                'app' => 'User',
+                'regex' => '#^/api/user#',
+                'base' => '',
+                'sub' => include 'User/urls.php'
+            )
+        ));
+        // login
+        $response = $client->post('/api/user/login', array(
+            'login' => 'test',
+            'password' => 'test'
+        ));
+        Test_Assert::assertResponseStatusCode($response, 200, 'Fail to login');
+        
+        // Create ticket
+        $user = new Pluf_User();
+        $user = $user->getUser('test');
+        
+        $t = new Tenant_Ticket();
+        $t->subject = 'test';
+        $t->description = 'test';
+        $t->type = 'bug';
+        $t->status = 'new';
+        $t->requester = $user;
+        $t->create();
+        
+        $c = new Tenant_Comment();
+        $c->title = 'test';
+        $c->description = 'test';
+        $c->author = $user;
+        $c->ticket = $t;
+        $c->create();
+        
+        // find comments
+        $response = $client->get('/api/tenant/current/ticket/' . $t->id . '/comment/' . $c->id);
+        Test_Assert::assertResponseNotNull($response, 'Find result is empty');
+        Test_Assert::assertResponseStatusCode($response, 200, 'Find status code is not 200');
+        Test_Assert::assertResponseAsModel($response);
+        Test_Assert::assertResponseNotAnonymousModel($response);
+        
+        // delete
+        $c->delete();
+        $t->delete();
+    }
+
+    /**
+     * Creating comment
+     *
+     * @test
+     */
+    public function testCreateTikcetComment()
+    {
+        $client = new Test_Client(array(
+            array(
+                'app' => 'Tenant',
+                'regex' => '#^/api/tenant#',
+                'base' => '',
+                'sub' => include 'Tenant/urls.php'
+            ),
+            array(
+                'app' => 'User',
+                'regex' => '#^/api/user#',
+                'base' => '',
+                'sub' => include 'User/urls.php'
+            )
+        ));
+        // login
+        $response = $client->post('/api/user/login', array(
+            'login' => 'test',
+            'password' => 'test'
+        ));
+        Test_Assert::assertResponseStatusCode($response, 200, 'Fail to login');
+        
+        // Create ticket
+        $user = new Pluf_User();
+        $user = $user->getUser('test');
+        
+        $t = new Tenant_Ticket();
+        $t->subject = 'test';
+        $t->description = 'test';
+        $t->type = 'bug';
+        $t->status = 'new';
+        $t->requester = $user;
+        $t->create();
+        
+        // find comments
+        $response = $client->post('/api/tenant/current/ticket/' . $t->id . '/comment/new', array(
+            'title' => 'test',
+            'description' => 'test'
+        ));
+        Test_Assert::assertResponseStatusCode($response, 200);
+        $tc = json_decode($response->content, true);
+        
+        // find comments
+        $response = $client->get('/api/tenant/current/ticket/' . $t->id . '/comment/find');
+        Test_Assert::assertResponseNotNull($response, 'Find result is empty');
+        Test_Assert::assertResponseStatusCode($response, 200, 'Find status code is not 200');
+        Test_Assert::assertResponsePaginateList($response);
+        Test_Assert::assertResponseNonEmptyPaginateList($response);
+        
+        // delete
+        $c = new Tenant_Comment($tc['id']);
+        $c->delete();
+        $t->delete();
+    }
+
+    /**
+     * Creating comment
+     *
+     * @test
+     */
+    public function testUpdateTikcetComment()
+    {
+        $client = new Test_Client(array(
+            array(
+                'app' => 'Tenant',
+                'regex' => '#^/api/tenant#',
+                'base' => '',
+                'sub' => include 'Tenant/urls.php'
+            ),
+            array(
+                'app' => 'User',
+                'regex' => '#^/api/user#',
+                'base' => '',
+                'sub' => include 'User/urls.php'
+            )
+        ));
+        // login
+        $response = $client->post('/api/user/login', array(
+            'login' => 'test',
+            'password' => 'test'
+        ));
+        Test_Assert::assertResponseStatusCode($response, 200, 'Fail to login');
+        
+        // Create ticket
+        $user = new Pluf_User();
+        $user = $user->getUser('test');
+        
+        $t = new Tenant_Ticket();
+        $t->subject = 'test';
+        $t->description = 'test';
+        $t->type = 'bug';
+        $t->status = 'new';
+        $t->requester = $user;
+        $t->create();
+        
+        // find comments
+        $response = $client->post('/api/tenant/current/ticket/' . $t->id . '/comment/new', array(
+            'title' => 'test',
+            'description' => 'test'
+        ));
+        Test_Assert::assertResponseStatusCode($response, 200);
+        $tc = json_decode($response->content, true);
+        
+        // update
+        $response = $client->post('/api/tenant/current/ticket/' . $t->id . '/comment/' . $tc['id'], array(
+            'title' => 'test new title',
+            'description' => 'test'
+        ));
+        Test_Assert::assertResponseStatusCode($response, 200);
+        
+        // find comments
+        $response = $client->get('/api/tenant/current/ticket/' . $t->id . '/comment/find');
+        Test_Assert::assertResponseNotNull($response, 'Find result is empty');
+        Test_Assert::assertResponseStatusCode($response, 200, 'Find status code is not 200');
+        Test_Assert::assertResponsePaginateList($response);
+        Test_Assert::assertResponseNonEmptyPaginateList($response);
+        
+        // delete
+        $c = new Tenant_Comment($tc['id']);
+        $c->delete();
+        $t->delete();
+    }
+
+    /**
+     * Creating comment
+     *
+     * @test
+     */
+    public function testDeleteTikcetComment()
+    {
+        $client = new Test_Client(array(
+            array(
+                'app' => 'Tenant',
+                'regex' => '#^/api/tenant#',
+                'base' => '',
+                'sub' => include 'Tenant/urls.php'
+            ),
+            array(
+                'app' => 'User',
+                'regex' => '#^/api/user#',
+                'base' => '',
+                'sub' => include 'User/urls.php'
+            )
+        ));
+        // login
+        $response = $client->post('/api/user/login', array(
+            'login' => 'test',
+            'password' => 'test'
+        ));
+        Test_Assert::assertResponseStatusCode($response, 200, 'Fail to login');
+        
+        // Create ticket
+        $user = new Pluf_User();
+        $user = $user->getUser('test');
+        
+        $t = new Tenant_Ticket();
+        $t->subject = 'test';
+        $t->description = 'test';
+        $t->type = 'bug';
+        $t->status = 'new';
+        $t->requester = $user;
+        $t->create();
+        
+        // find comments
+        $response = $client->post('/api/tenant/current/ticket/' . $t->id . '/comment/new', array(
+            'title' => 'test',
+            'description' => 'test'
+        ));
+        Test_Assert::assertResponseStatusCode($response, 200);
+        $tc = json_decode($response->content, true);
+        
+        // update
+        $response = $client->delete('/api/tenant/current/ticket/' . $t->id . '/comment/' . $tc['id']);
+        Test_Assert::assertResponseStatusCode($response, 200);
+        
+        // find comments
+        $response = $client->get('/api/tenant/current/ticket/' . $t->id . '/comment/find');
+        Test_Assert::assertResponseNotNull($response, 'Find result is empty');
+        Test_Assert::assertResponseStatusCode($response, 200, 'Find status code is not 200');
+        Test_Assert::assertResponsePaginateList($response);
+        Test_Assert::assertResponseEmptyPaginateList($response);
+        
+        // delete
+        $t->delete();
+    }
+}
+
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index fb34fc9..e6cc256 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -2,7 +2,7 @@
 <phpunit colors="true">
     <testsuites>
         <testsuite name="Pluf">
-<!--             <directory>./Pluf_Tenant_REST/</directory> -->
+            <directory>./Pluf_Tenant_REST/</directory>
             <directory>./Tenant_REST/</directory> 
         </testsuite>
     </testsuites>