diff --git a/Admin/Installer.php b/Admin/Installer.php
index c90578d..93bc04f 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -21,7 +21,6 @@ use Modules\Knowledgebase\Models\WikiCategory;
 use Modules\Knowledgebase\Models\WikiCategoryMapper;
 use phpOMS\Application\ApplicationAbstract;
 use phpOMS\Config\SettingsInterface;
-use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\InstallerAbstract;
 use phpOMS\Module\ModuleInfo;
 
diff --git a/Models/WikiCategoryMapper.php b/Models/WikiCategoryMapper.php
index 0cc1779..81ac631 100755
--- a/Models/WikiCategoryMapper.php
+++ b/Models/WikiCategoryMapper.php
@@ -15,7 +15,6 @@ declare(strict_types=1);
 namespace Modules\Knowledgebase\Models;
 
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
-use phpOMS\DataStorage\Database\Mapper\ReadMapper;
 
 /**
  * Mapper class.
diff --git a/Models/WikiDocHistoryMapper.php b/Models/WikiDocHistoryMapper.php
index b406f12..ad8170b 100644
--- a/Models/WikiDocHistoryMapper.php
+++ b/Models/WikiDocHistoryMapper.php
@@ -34,15 +34,15 @@ final class WikiDocMapper extends DataMapperFactory
      * @since 1.0.0
      */
     public const COLUMNS = [
-        'wiki_article_versioned_id'          => ['name' => 'wiki_article_versioned_id',       'type' => 'int',    'internal' => 'id'],
+        'wiki_article_versioned_id'            => ['name' => 'wiki_article_versioned_id',       'type' => 'int',    'internal' => 'id'],
         'wiki_article_versioned_version'       => ['name' => 'wiki_article_versioned_version',    'type' => 'string', 'internal' => 'version'],
-        'wiki_article_versioned_title'       => ['name' => 'wiki_article_versioned_title',    'type' => 'string', 'internal' => 'name'],
-        'wiki_article_versioned_language'    => ['name' => 'wiki_article_versioned_language', 'type' => 'string', 'internal' => 'language'],
-        'wiki_article_versioned_doc'         => ['name' => 'wiki_article_versioned_doc',      'type' => 'string', 'internal' => 'doc'],
-        'wiki_article_versioned_docraw'      => ['name' => 'wiki_article_versioned_docraw',      'type' => 'string', 'internal' => 'docRaw'],
-        'wiki_article_versioned_article' => ['name' => 'wiki_article_versioned_article', 'type' => 'DateTimeImmutable', 'internal' => 'article'],
-        'wiki_article_versioned_at' => ['name' => 'wiki_article_versioned_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt'],
-        'wiki_article_versioned_by' => ['name' => 'wiki_article_versioned_by', 'type' => 'int',               'internal' => 'createdBy'],
+        'wiki_article_versioned_title'         => ['name' => 'wiki_article_versioned_title',    'type' => 'string', 'internal' => 'name'],
+        'wiki_article_versioned_language'      => ['name' => 'wiki_article_versioned_language', 'type' => 'string', 'internal' => 'language'],
+        'wiki_article_versioned_doc'           => ['name' => 'wiki_article_versioned_doc',      'type' => 'string', 'internal' => 'doc'],
+        'wiki_article_versioned_docraw'        => ['name' => 'wiki_article_versioned_docraw',      'type' => 'string', 'internal' => 'docRaw'],
+        'wiki_article_versioned_article'       => ['name' => 'wiki_article_versioned_article', 'type' => 'DateTimeImmutable', 'internal' => 'article'],
+        'wiki_article_versioned_at'            => ['name' => 'wiki_article_versioned_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt'],
+        'wiki_article_versioned_by'            => ['name' => 'wiki_article_versioned_by', 'type' => 'int',               'internal' => 'createdBy'],
     ];
 
     /**
diff --git a/Models/WikiDocMapper.php b/Models/WikiDocMapper.php
index 3113462..c531449 100755
--- a/Models/WikiDocMapper.php
+++ b/Models/WikiDocMapper.php
@@ -36,18 +36,18 @@ final class WikiDocMapper extends DataMapperFactory
      * @since 1.0.0
      */
     public const COLUMNS = [
-        'wiki_article_id'          => ['name' => 'wiki_article_id',       'type' => 'int',    'internal' => 'id'],
-        'wiki_article_version'       => ['name' => 'wiki_article_version',    'type' => 'string', 'internal' => 'version'],
-        'wiki_article_app'         => ['name' => 'wiki_article_app',      'type' => 'int',    'internal' => 'app'],
-        'wiki_article_title'       => ['name' => 'wiki_article_title',    'type' => 'string', 'internal' => 'name'],
-        'wiki_article_language'    => ['name' => 'wiki_article_language', 'type' => 'string', 'internal' => 'language'],
-        'wiki_article_doc'         => ['name' => 'wiki_article_doc',      'type' => 'string', 'internal' => 'doc'],
-        'wiki_article_docraw'      => ['name' => 'wiki_article_docraw',      'type' => 'string', 'internal' => 'docRaw'],
+        'wiki_article_id'             => ['name' => 'wiki_article_id',       'type' => 'int',    'internal' => 'id'],
+        'wiki_article_version'        => ['name' => 'wiki_article_version',    'type' => 'string', 'internal' => 'version'],
+        'wiki_article_app'            => ['name' => 'wiki_article_app',      'type' => 'int',    'internal' => 'app'],
+        'wiki_article_title'          => ['name' => 'wiki_article_title',    'type' => 'string', 'internal' => 'name'],
+        'wiki_article_language'       => ['name' => 'wiki_article_language', 'type' => 'string', 'internal' => 'language'],
+        'wiki_article_doc'            => ['name' => 'wiki_article_doc',      'type' => 'string', 'internal' => 'doc'],
+        'wiki_article_docraw'         => ['name' => 'wiki_article_docraw',      'type' => 'string', 'internal' => 'docRaw'],
         'wiki_article_versioned'      => ['name' => 'wiki_article_versioned',      'type' => 'bool', 'internal' => 'isVersioned'],
-        'wiki_article_status'      => ['name' => 'wiki_article_status',   'type' => 'int',    'internal' => 'status'],
-        'wiki_article_category'    => ['name' => 'wiki_article_category', 'type' => 'int',    'internal' => 'category'],
-        'wiki_article_created_at' => ['name' => 'wiki_article_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt'],
-        'wiki_article_created_by' => ['name' => 'wiki_article_created_by', 'type' => 'int',               'internal' => 'createdBy'],
+        'wiki_article_status'         => ['name' => 'wiki_article_status',   'type' => 'int',    'internal' => 'status'],
+        'wiki_article_category'       => ['name' => 'wiki_article_category', 'type' => 'int',    'internal' => 'category'],
+        'wiki_article_created_at'     => ['name' => 'wiki_article_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt'],
+        'wiki_article_created_by'     => ['name' => 'wiki_article_created_by', 'type' => 'int',               'internal' => 'createdBy'],
     ];
 
     /**