diff --git a/Admin/Installer.php b/Admin/Installer.php
index b041946..fe6f2bd 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -63,7 +63,7 @@ class Installer extends InstallerAbstract
                     'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'qa_badge` (
                             `qa_badge_id` int(11) NOT NULL AUTO_INCREMENT,
                             `qa_badge_name` varchar(255) NOT NULL,
-                            PRIMARY KEY (`qa_category_id`)
+                            PRIMARY KEY (`qa_badge_id`)
                         )ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;'
                 )->execute();
 
@@ -92,9 +92,9 @@ class Installer extends InstallerAbstract
                 $dbPool->get('core')->con->prepare(
                     'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'qa_question_badge` (
                             `qa_question_badge_id` int(11) NOT NULL AUTO_INCREMENT,
-                            `qa_question_badge_question` varchar(255) NOT NULL,
+                            `qa_question_badge_question` int(11) NOT NULL,
                             `qa_question_badge_badge` int(11) DEFAULT NULL,
-                            PRIMARY KEY (`qa_category_id`),
+                            PRIMARY KEY (`qa_question_badge_id`),
                             KEY `qa_question_badge_question` (`qa_question_badge_question`),
                             KEY `qa_question_badge_badge` (`qa_question_badge_badge`)
                         )ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;'
diff --git a/Models/QAAnswer.php b/Models/QAAnswer.php
index 9b3faab..53d189c 100644
--- a/Models/QAAnswer.php
+++ b/Models/QAAnswer.php
@@ -27,11 +27,11 @@ namespace Modules\QA\Models;
  * @link       http://orange-management.com
  * @since      1.0.0
  */
-class QAQuestion implements \JsonSerializable
+class QAAnswer implements \JsonSerializable
 {
     private $id = 0;
 
-    private $status = QAStatus::ACTIVE;
+    private $status = QAAnswerStatus::ACTIVE;
 
     private $answer = '';
 
@@ -61,7 +61,7 @@ class QAQuestion implements \JsonSerializable
         $this->answer = $answer;
     }
 
-    public function getQuestion() : string
+    public function getQuestion() : int
     {
         return $this->question;
     }
diff --git a/Models/QABadge.php b/Models/QABadge.php
index 9680592..2247d34 100644
--- a/Models/QABadge.php
+++ b/Models/QABadge.php
@@ -14,7 +14,7 @@
  * @link       http://orange-management.com
  */
 declare(strict_types=1);
-namespace Modules\Badge\Models;
+namespace Modules\QA\Models;
 
 /**
  * Task class.
diff --git a/Models/QACategory.php b/Models/QACategory.php
index cb4bb62..6a8f6db 100644
--- a/Models/QACategory.php
+++ b/Models/QACategory.php
@@ -33,7 +33,7 @@ class QACategory implements \JsonSerializable
 
     private $name = '';
 
-    private $parent = 0;
+    private $parent = null;
 
     public function __construct()
     {
@@ -54,7 +54,7 @@ class QACategory implements \JsonSerializable
         $this->name = $name;
     }
 
-    public function getParent() : int
+    public function getParent() /* : ?int */
     {
         return $this->parent;
     }
diff --git a/Models/QAQuestion.php b/Models/QAQuestion.php
index 4bcda2e..32ac044 100644
--- a/Models/QAQuestion.php
+++ b/Models/QAQuestion.php
@@ -99,7 +99,7 @@ class QAQuestion implements \JsonSerializable
         $this->status = $status;
     }
 
-    public function getCategory() : int
+    public function getCategory()
     {
         return $this->category;
     }
diff --git a/info.json b/info.json
index 48e51f8..81075db 100644
--- a/info.json
+++ b/info.json
@@ -17,9 +17,7 @@
     "description": "QA module.",
     "directory": "QA",
     "dependencies": {
-        "Admin" : "1.0.0",
-        "Tasks" : "1.0.0",
-        "Calendar" : "1.0.0"
+        "Admin" : "1.0.0"
     },
     "providing": {
         "Navigation": "*"