diff --git a/Admin/Installer.php b/Admin/Installer.php
index 4ff0573..69f2201 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 . 'wiki_badge` (
                             `wiki_badge_id` int(11) NOT NULL AUTO_INCREMENT,
                             `wiki_badge_name` varchar(255) NOT NULL,
-                            PRIMARY KEY (`wiki_category_id`)
+                            PRIMARY KEY (`wiki_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 . 'wiki_article_badge` (
                             `wiki_article_badge_id` int(11) NOT NULL AUTO_INCREMENT,
-                            `wiki_article_badge_article` varchar(255) NOT NULL,
+                            `wiki_article_badge_article` int(11) NOT NULL,
                             `wiki_article_badge_badge` int(11) DEFAULT NULL,
-                            PRIMARY KEY (`wiki_category_id`),
+                            PRIMARY KEY (`wiki_article_badge_id`),
                             KEY `wiki_article_badge_article` (`wiki_article_badge_article`),
                             KEY `wiki_article_badge_badge` (`wiki_article_badge_badge`)
                         )ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;'
diff --git a/Models/WikiCategory.php b/Models/WikiCategory.php
index d201bbb..83a8ca2 100644
--- a/Models/WikiCategory.php
+++ b/Models/WikiCategory.php
@@ -33,7 +33,7 @@ class WikiCategory implements \JsonSerializable
 
     private $name = '';
 
-    private $parent = 0;
+    private $parent = null;
 
     public function __construct()
     {
@@ -55,7 +55,7 @@ class WikiCategory implements \JsonSerializable
         $this->name = $name;
     }
 
-    public function getParent() : int
+    public function getParent() /* : ?int */
     {
         return $this->parent;
     }
diff --git a/Models/WikiDoc.php b/Models/WikiDoc.php
index 392ec63..bd05fef 100644
--- a/Models/WikiDoc.php
+++ b/Models/WikiDoc.php
@@ -97,7 +97,7 @@ class WikiDoc implements \JsonSerializable
         $this->status = $status;
     }
 
-    public function getCategory() : int
+    public function getCategory()
     {
         return $this->category;
     }
diff --git a/Models/WikiDocMapper.php b/Models/WikiDocMapper.php
index 07ce429..25adf28 100644
--- a/Models/WikiDocMapper.php
+++ b/Models/WikiDocMapper.php
@@ -62,8 +62,8 @@ class WikiDocMapper extends DataMapperAbstract
         'badges' => [
             'mapper'         => WikiBadgeMapper::class,
             'table'          => 'wiki_article_badge',
-            'dst'            => 'wiki_article_badge_badge',
-            'src'            => 'wiki_article_badge_article',
+            'dst'            => 'wiki_article_badge_article',
+            'src'            => 'wiki_article_badge_badge',
         ],
     ];
 
diff --git a/Models/WikiStatus.php b/Models/WikiStatus.php
index 110bd98..a084942 100644
--- a/Models/WikiStatus.php
+++ b/Models/WikiStatus.php
@@ -29,7 +29,7 @@ use phpOMS\Datatypes\Enum;
  * @link       http://orange-management.com
  * @since      1.0.0
  */
-abstract class WikiStauts extends Enum
+abstract class WikiStatus extends Enum
 {
     /* public */ const ACTIVE = 1;
 
diff --git a/info.json b/info.json
index 6706203..c1fcd73 100644
--- a/info.json
+++ b/info.json
@@ -17,9 +17,7 @@
     "description": "Knowledgebase module.",
     "directory": "Knowledgebase",
     "dependencies": {
-        "Admin" : "1.0.0",
-        "Tasks" : "1.0.0",
-        "Calendar" : "1.0.0"
+        "Admin" : "1.0.0"
     },
     "providing": {
         "Navigation": "*"